Skip to content

Commit 46fb3da

Browse files
theskumartheskumar
committed
update
1 parent d89cf35 commit 46fb3da

21 files changed

Lines changed: 147 additions & 162 deletions

‎hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,13 @@ <h2 class="card-title">{% trans "Reviews & assignees" %}</h2>
3939
</div>
4040
</div>
4141

42-
<div class="gap-4 wrapper wrapper--sidebar-buttons">
43-
{% include 'review/includes/review_button.html' with submission=object class="w-1/2" %}
44-
{% if request.user.is_apply_staff and object.reviews.exists %}
42+
<div class="card-actions">
43+
{% include 'review/includes/review_button.html' with submission=object class="grow" %}
44+
45+
{% if request.user.is_apply_staff and not object.reviews.exists %}
4546
<a
4647
href="{% url 'apply:submissions:reviews:list' submission_pk=object.id %}"
47-
class="btn btn-secondary btn-outline button--half-width"
48+
class="btn btn-outline grow"
4849
>
4950
{% trans "View all" %}
5051
</a>

‎hypha/apply/funds/templates/funds/applicationsubmission_confirm_delete.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@ <h3 class="text-base font-semibold leading-6 text-base-content" id="modal-title"
4141
</div>
4242
</div>
4343

44-
<div class="mt-5 sm:flex sm:flex-row-reverse sm:mt-4">
44+
<div class="mt-5 sm:flex-row-reverse sm:mt-4 card-actions">
4545
<button
4646
type="submit"
4747
x-bind:disabled="value !== 'delete'"
48-
class="w-full sm:ml-3 sm:w-auto btn btn-warning"
48+
class="w-full sm:w-auto btn btn-warning"
4949
>{% trans "Delete" %}</button>
5050
<button
5151
type="button"
52-
class="mt-3 w-full sm:mt-0 sm:w-auto btn btn-secondary btn-outline btn-soft"
52+
class="w-full sm:w-auto btn btn-secondary btn-outline btn-soft"
5353
@click="show = false"
5454
>{% trans "Cancel" %}</button>
5555
</div>

‎hypha/apply/funds/templates/funds/includes/admin_primary_actions.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,18 +90,18 @@ <h2 class="mb-2 card-title">{% trans "Actions to take" %}</h2>
9090
</div>
9191

9292
<details class="mt-4">
93-
<summary class="font-semibold uppercase text-fg-muted">
93+
<summary class="mb-2 font-semibold uppercase text-fg-muted">
9494
{% trans "More actions" %}
9595
</summary>
9696

9797
<a
98-
class="w-full btn btn-outline btn-secondary button--bottom-space"
98+
class="mb-2 w-full btn btn-outline btn-secondary"
9999
href="{% url 'funds:submissions:revisions:list' submission_pk=object.id %}"
100100
>{% trans "Revisions" %}</a>
101101

102102
{% if request.user|can_translate_submission %}
103103
<button
104-
class="w-full btn btn-outline btn-secondary button--bottom-space"
104+
class="mb-2 w-full btn btn-outline btn-secondary"
105105
hx-get="{% url 'funds:submissions:translate' pk=object.pk %}"
106106
hx-target="#htmx-modal"
107107
>
@@ -111,27 +111,27 @@ <h2 class="mb-2 card-title">{% trans "Actions to take" %}</h2>
111111
{% endif %}
112112

113113
<button
114-
class="w-full btn btn-outline btn-secondary button--bottom-space"
114+
class="mb-2 w-full btn btn-outline btn-secondary"
115115
hx-get="{% url 'funds:submissions:metaterms_update' pk=object.pk %}"
116116
hx-target="#htmx-modal"
117117
>{% trans "Tags" %}</button>
118118

119119
<button
120-
class="w-full btn btn-outline btn-secondary button--bottom-space"
120+
class="mb-2 w-full btn btn-outline btn-secondary"
121121
hx-get="{% url 'funds:submissions:create_reminder' pk=object.pk %}"
122122
hx-target="#htmx-modal"
123123
>{% trans "Create Reminder" %}</button>
124124

125125
<a
126-
class="w-full btn btn-outline btn-secondary button--bottom-space"
126+
class="mb-2 w-full btn btn-outline btn-secondary"
127127
href="{% url "apply:submissions:download" pk=object.pk %}"
128128
>
129129
{% trans "Download as PDF" %}
130130
</a>
131131

132132
{% if can_archive %}
133133
<button
134-
class="w-full btn btn-outline btn-secondary button--bottom-space"
134+
class="mb-2 w-full btn btn-outline btn-secondary"
135135
hx-get="{% url 'funds:submissions:archive' pk=object.pk %}"
136136
hx-target="#htmx-modal"
137137
>

‎hypha/apply/funds/templates/funds/includes/generic_primary_actions.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ <h2 class="card-title">{% trans "Actions to take" %}</h2>
1414
{% with determination=object.determinations.last %}
1515
{% if determination %}
1616
<a
17-
class="btn btn-primary btn-block button--bottom-space"
17+
class="mb-2 btn btn-primary btn-block"
1818
href="{% url 'apply:submissions:determinations:detail' submission_pk=object.id pk=determination.id %}"
1919
>{% trans "View determination" %}</a>
2020
{% endif %}

‎hypha/apply/funds/templates/funds/includes/modal_archive_submission_confirm.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ <h3 class="text-base font-semibold leading-6 text-base-content" id="modal-title"
2020
</div>
2121
</div>
2222

23-
<div class="mt-5 sm:flex sm:flex-row-reverse sm:mt-4">
23+
<div class="mt-5 sm:flex-row-reverse sm:mt-4 card-actions">
2424
<button
2525
type="submit"
26-
class="w-full sm:ml-3 sm:w-auto btn btn-warning"
26+
class="w-full sm:w-auto btn btn-warning"
2727
>{% trans "Archive" %}</button>
2828
<button
2929
type="button"
30-
class="mt-3 w-full sm:mt-0 sm:w-auto btn btn-secondary btn-outline btn-soft"
30+
class="w-full sm:w-auto btn btn-secondary btn-outline btn-soft"
3131
@click="show = false"
3232
>{% trans "Cancel" %}</button>
3333
</div>

‎hypha/apply/funds/templates/funds/includes/modal_unarchive_submission_confirm.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ <h3 class="text-base font-semibold leading-6 text-base-content" id="modal-title"
2222
</div>
2323
</div>
2424

25-
<div class="mt-5 sm:flex sm:flex-row-reverse sm:mt-4">
25+
<div class="mt-5 sm:flex-row-reverse sm:mt-4 card-actions">
2626
<button
2727
type="submit"
28-
class="w-full sm:ml-3 sm:w-auto btn btn-warning"
28+
class="w-full sm:w-auto btn btn-warning"
2929
>{% trans "Unarchive" %}</button>
3030
<button
3131
type="button"
32-
class="mt-3 w-full sm:mt-0 sm:w-auto btn btn-secondary btn-outline btn-soft"
32+
class="w-full sm:w-auto btn btn-secondary btn-outline btn-soft"
3333
@click="show = false"
3434
>{% trans "Cancel" %}</button>
3535
</div>

‎hypha/apply/funds/templates/funds/includes/translate_application_form.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</div>
4545
</div>
4646

47-
<div class="mt-5 sm:flex sm:flex-row-reverse sm:gap-4 sm:mt-4">
47+
<div class="mt-4 sm:flex-row-reverse card-actions">
4848

4949
{# Button text inserted below to prevent redundant translations #}
5050
<button id="translate-btn" class="w-full sm:w-auto btn btn-primary" type="submit"></button>

‎hypha/apply/funds/templates/funds/includes/update_reviewer_form.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
{% endfor %}
4545
</div>
4646

47-
<div class="mt-5 sm:flex sm:flex-row-reverse sm:gap-4 sm:mt-4">
47+
<div class="mt-4 sm:flex-row-reverse card-actions">
4848
<button
4949
class="w-full sm:w-auto btn btn-primary"
5050
type="submit">
@@ -53,7 +53,7 @@
5353

5454
<button
5555
type="button"
56-
class="mt-3 w-full sm:mt-0 sm:w-auto btn btn-secondary btn-outline btn-soft"
56+
class="w-full sm:w-auto btn btn-secondary btn-outline btn-soft"
5757
@click="show = false"
5858
>{% trans "Cancel" %}</button>
5959
</div>

‎hypha/apply/funds/templates/funds/modals/update_meta_terms_form.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{% load i18n %}
22
{% modal_title %}Update tags{% endmodal_title %}
33

4-
<div class="p-6">
4+
<div class="px-4 pt-2 pb-4">
55
{% include 'includes/dialog_form_base.html' with form=form value=value %}
66
</div>

‎hypha/apply/funds/templates/submissions/partials/submission-lead.html‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{% load i18n heroicons %}
22
{% if request.user.is_apply_staff %}
3-
<a class="flex items-center text-blue-400 transition-opacity hover:opacity-80 is-active"
4-
href="{% url 'funds:submissions:lead_update' pk=submission.pk %}"
5-
hx-get="{% url 'funds:submissions:lead_update' pk=submission.pk %}"
6-
hx-target="#htmx-modal"
3+
<a
4+
class="link link-neutral"
5+
href="{% url 'funds:submissions:lead_update' pk=submission.pk %}"
6+
hx-get="{% url 'funds:submissions:lead_update' pk=submission.pk %}"
7+
hx-target="#htmx-modal"
78
>
89
{% trans "Lead" %}: {{ submission.lead }}
910
{% heroicon_micro "pencil-square" class="inline ms-1" aria_hidden=true %}

0 commit comments

Comments
 (0)