Skip to content

Commit acb0393

Browse files
lukasvinclavlukasvinclav
authored
fix: confirmation buttons (#829)
1 parent 741d311 commit acb0393

File tree

5 files changed

+22
-20
lines changed

5 files changed

+22
-20
lines changed

‎src/unfold/static/unfold/css/styles.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/unfold/templates/admin/delete_confirmation.html‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,7 @@ <h2 class="font-semibold mb-2 text-font-important-light dark:text-font-important
9595
<input type="hidden" name="{{ to_field_var }}" value="{{ to_field }}">
9696
{% endif %}
9797

98-
99-
<a href="#" class="border cancel-link font-medium hidden mb-3 px-3 py-2 rounded-md w-full hover:bg-gray-50 lg:block lg:mb-0 lg:mr-3 lg:w-auto dark:border-gray-700 dark:text-font-default-dark dark:hover:text-gray-200 dark:hover:bg-gray-900">
100-
{% translate "No, take me back" %}
101-
</a>
102-
103-
<input type="submit" value="{% translate 'Yes, I’m sure' %}" class="bg-red-600 cursor-pointer font-medium ml-auto px-3 py-2 rounded-md text-white dark:bg-red-500/20 dark:text-red-500">
98+
{% include "unfold/helpers/delete_submit_line.html" %}
10499
</div>
105100
</form>
106101
</div>

‎src/unfold/templates/admin/delete_selected_confirmation.html‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,7 @@ <h2 class="font-semibold mb-2 text-font-important-light dark:text-font-important
8989
<input type="hidden" name="action" value="delete_selected">
9090
<input type="hidden" name="post" value="yes">
9191

92-
<a href="#" class="border cancel-link font-medium hidden mb-3 px-3 py-2 rounded-md transition-all w-full hover:bg-gray-50 lg:block lg:mb-0 lg:mr-3 lg:w-auto dark:border-gray-700 dark:text-font-default-dark dark:hover:text-gray-200 dark:hover:bg-gray-900">
93-
{% translate "No, take me back" %}
94-
</a>
95-
96-
<input type="submit" value="{% translate 'Yes, I’m sure' %}" class="bg-red-600 cursor-pointer font-medium ml-auto px-3 py-2 rounded-md text-white dark:bg-red-500/20 dark:text-red-500">
92+
{% include "unfold/helpers/delete_submit_line.html" %}
9793
</div>
9894
</form>
9995
</div>

‎src/unfold/templates/admin/submit_line.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{% load i18n admin_urls %}
22

3-
<div {% if not is_popup %}id="submit-row"{% endif %} class="relative z-20 {% if not is_popup %} mt-20 lg:mt-8{% endif %}">
4-
<div class="{% if not is_popup %}bottom-0 fixed left-0 right-0{% endif %}" {% if not is_popup %}x-bind:class="{'xl:left-0': !sidebarDesktopOpen, 'xl:left-72': sidebarDesktopOpen}"{% endif %}>
5-
<div class="bg-white dark:bg-gray-900 {% if not is_popup %}border-t px-4 py-4 relative scrollable-top lg:px-12 dark:border-gray-800{% endif %}">
3+
<div {% if not is_popup %}id="submit-row"{% endif %} class="relative z-20 {% if not is_popup %} mt-8{% endif %}">
4+
<div class="{% if not is_popup %}lg:bottom-0 lg:fixed lg:left-0 lg:right-0{% endif %}" {% if not is_popup %}x-bind:class="{'xl:left-0': !sidebarDesktopOpen, 'xl:left-72': sidebarDesktopOpen}"{% endif %}>
5+
<div class="bg-white dark:bg-gray-900 {% if not is_popup %}lg:border-t lg:py-4 relative scrollable-top lg:px-12 dark:border-gray-800{% endif %}">
66
<div class="container flex flex-col-reverse gap-3 items-center mx-auto lg:flex-row-reverse">
77
{% block submit-row %}
88
{% if show_save %}
@@ -18,7 +18,7 @@
1818
{% endfor %}
1919

2020
{% if show_save_and_continue %}
21-
<button type="submit" name="_continue" class="border font-medium hidden px-3 py-2 rounded-md transition-all w-full hover:bg-gray-50 lg:block lg:w-auto dark:border-gray-700 dark:hover:text-gray-200 dark:hover:bg-gray-900">
21+
<button type="submit" name="_continue" class="border font-medium px-3 py-2 rounded-md transition-all w-full hover:bg-gray-50 lg:block lg:w-auto dark:border-gray-700 dark:hover:text-gray-200 dark:hover:bg-gray-900">
2222
{% if can_change %}
2323
{% translate 'Save and continue editing' %}
2424
{% else %}
@@ -30,19 +30,19 @@
3030
{% if show_close %}
3131
{% url opts|admin_urlname:'changelist' as changelist_url %}
3232

33-
<a href="{% add_preserved_filters changelist_url %}" class="border font-medium hidden px-3 py-2 rounded-md transition-all w-full hover:bg-gray-50 lg:block lg:w-auto dark:border-gray-700 dark:hover:text-gray-200 dark:hover:bg-gray-900">
33+
<a href="{% add_preserved_filters changelist_url %}" class="border font-medium px-3 py-2 rounded-md transition-all w-full hover:bg-gray-50 lg:block lg:w-auto dark:border-gray-700 dark:hover:text-gray-200 dark:hover:bg-gray-900">
3434
{% translate 'Close' %}
3535
</a>
3636
{% endif %}
3737

3838
{% if show_save_and_add_another %}
39-
<button type="submit" name="_addanother" class="border font-medium hidden px-3 py-2 rounded-md transition-all w-full hover:bg-gray-50 lg:block lg:w-auto dark:border-gray-700 dark:hover:text-gray-200 dark:hover:bg-gray-900">
39+
<button type="submit" name="_addanother" class="border font-medium px-3 py-2 rounded-md transition-all w-full hover:bg-gray-50 lg:block lg:w-auto dark:border-gray-700 dark:hover:text-gray-200 dark:hover:bg-gray-900">
4040
{% translate 'Save and add another' %}
4141
</button>
4242
{% endif %}
4343

4444
{% if show_save_as_new %}
45-
<button type="submit" name="_saveasnew" class="border font-medium hidden px-3 py-2 rounded-md transition-all w-full hover:bg-gray-50 lg:block lg:w-auto dark:border-gray-700 dark:hover:text-gray-200 dark:hover:bg-gray-900">
45+
<button type="submit" name="_saveasnew" class="border font-medium px-3 py-2 rounded-md transition-all w-full hover:bg-gray-50 lg:block lg:w-auto dark:border-gray-700 dark:hover:text-gray-200 dark:hover:bg-gray-900">
4646
{% translate 'Save as new' %}
4747
</button>
4848
{% endif %}
@@ -51,7 +51,7 @@
5151
{% url opts|admin_urlname:'delete' original.pk|admin_urlquote as delete_url %}
5252

5353
<p class="deletelink-box mr-auto w-full lg:w-auto">
54-
<a href="{% add_preserved_filters delete_url %}" class="block border border-red-500 font-medium px-3 py-2 rounded-md text-center text-red-500 whitespace-nowrap dark:border-transparent dark:bg-red-500/20 dark:text-red-500">
54+
<a href="{% add_preserved_filters delete_url %}" class="bg-red-600 flex items-center justify-center font-medium h-9.5 ml-auto px-3 py-2 rounded-md text-white dark:bg-red-500/20 dark:text-red-500">
5555
{% translate "Delete" %} {{ opts.verbose_name }}
5656
</a>
5757
</p>

‎src/unfold/templates/unfold/helpers/delete_submit_line.html‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{% load i18n %}
2+
3+
<div class="flex flex-col gap-3 items-center w-full lg:flex-row">
4+
<a href="#" class="border cancel-link flex items-center justify-center font-medium px-3 py-2 rounded-md w-full hover:bg-gray-50 lg:block lg:mb-0 lg:w-auto dark:border-gray-700 dark:text-font-default-dark dark:hover:text-gray-200 dark:hover:bg-gray-900">
5+
{% translate "No, take me back" %}
6+
</a>
7+
8+
<button type="submit" class="bg-red-600 cursor-pointer flex items-center justify-center font-medium h-9.5 ml-0 px-3 py-2 rounded-md text-white w-full lg:ml-auto lg:w-auto dark:bg-red-500/20 dark:text-red-500">
9+
{% translate "Yes, I’m sure" %}
10+
</button>
11+
</div>

0 commit comments

Comments
 (0)