davejansen/snikket-web-portal
1
0
Fork 0
Code Issues Pull Requests Activity

Use tertiary style for "back" buttons

Browse Source 
This allows us to have two levels of emphasis for the actual
form buttons and is also in line with the global "Log out"
navigational button.
This commit is contained in:
Jonas Schäfer
2021-03-22 17:01:53 +01:00
parent 6650dd2046
commit 359e6b4ce2
7 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
snikket_web/templates/admin_delete_user.html
View File

@@ -16,7 +16,7 @@
<p>{% trans %}The user and their data will be deleted irrevocably, permanently and immediately upon pushing the below button. <strong>There is no way back!</strong>{% endtrans %}</p> <p>{% trans %}The user and their data will be deleted irrevocably, permanently and immediately upon pushing the below button. <strong>There is no way back!</strong>{% endtrans %}</p>
{% endcall %} {% endcall %}
<div class="f-bbox"> <div class="f-bbox">
{%- call standard_button("back", url_for(".index"), class="secondary") %}{% trans %}Back{% endtrans %}{% endcall -%} {%- call standard_button("back", url_for(".index"), class="tertiary") %}{% trans %}Back{% endtrans %}{% endcall -%}
{%- call form_button("delete", form.action_delete, class="primary danger") %}{% endcall -%} {%- call form_button("delete", form.action_delete, class="primary danger") %}{% endcall -%}
</div> </div>
</form></div> </form></div>

2
snikket_web/templates/admin_edit_circle.html
View File

@@ -40,7 +40,7 @@
{%- endif -%} {%- endif -%}
</div> </div>
<div class="f-bbox"> <div class="f-bbox">
{%- call standard_button("back", url_for(".circles"), class="secondary") -%} {%- call standard_button("back", url_for(".circles"), class="tertiary") -%}
{% trans %}Return to circle list{% endtrans %} {% trans %}Return to circle list{% endtrans %}
{%- endcall -%} {%- endcall -%}
{%- call form_button("done", form.action_save, class="primary") %}{% endcall -%} {%- call form_button("done", form.action_save, class="primary") %}{% endcall -%}

4
snikket_web/templates/admin_edit_invite.html
View File

@@ -44,10 +44,10 @@
<dd>{{ invite.created_at | format_date }}</dd> <dd>{{ invite.created_at | format_date }}</dd>
</dl> </dl>
<div class="f-bbox"> <div class="f-bbox">
{%- call form_button("remove_link", form.action_revoke, class="secondary danger") %}{% endcall -%} {%- call standard_button("back", url_for(".invitations"), class="tertiary") %}
{%- call standard_button("back", url_for(".invitations"), class="primary") %}
{% trans %}Return to invitation list{% endtrans %} {% trans %}Return to invitation list{% endtrans %}
{%- endcall %} {%- endcall %}
{%- call form_button("remove_link", form.action_revoke, class="primary danger") %}{% endcall -%}
</div> </div>
</div> </div>
</form> </form>

2
snikket_web/templates/user_logout.html
View File

@@ -6,7 +6,7 @@
<p class="form-desc">{% trans %}Click below to log yourself out of the web portal. This does not affect any other connected devices.{% endtrans %}</p> <p class="form-desc">{% trans %}Click below to log yourself out of the web portal. This does not affect any other connected devices.{% endtrans %}</p>
{{ form.csrf_token }} {{ form.csrf_token }}
<div class="f-bbox"> <div class="f-bbox">
{%- call standard_button("back", url_for("user.index"), class="secondary") -%} {%- call standard_button("back", url_for("user.index"), class="tertiary") -%}
{% trans %}Back{% endtrans %} {% trans %}Back{% endtrans %}
{%- endcall -%} {%- endcall -%}
{%- call form_button("logout", form.action_signout, class="primary") %}{% endcall -%} {%- call form_button("logout", form.action_signout, class="primary") %}{% endcall -%}

2
snikket_web/templates/user_passwd.html
View File

@@ -24,7 +24,7 @@
<p>{% trans %}After changing your password, you will have to enter the new password on all of your devices.{% endtrans %}</p> <p>{% trans %}After changing your password, you will have to enter the new password on all of your devices.{% endtrans %}</p>
</div> </div>
<div class="f-bbox"> <div class="f-bbox">
{%- call standard_button("back", url_for('.index'), class="secondary") %}{% trans %}Back{% endtrans %}{% endcall -%} {%- call standard_button("back", url_for('.index'), class="tertiary") %}{% trans %}Back{% endtrans %}{% endcall -%}
{%- call custom_form_button("passwd", "", "", class="primary") -%} {%- call custom_form_button("passwd", "", "", class="primary") -%}
{% trans %}Change password{% endtrans %} {% trans %}Change password{% endtrans %}
{%- endcall -%} {%- endcall -%}

2
snikket_web/templates/user_profile.html
View File

@@ -29,7 +29,7 @@
</fieldset> </fieldset>
</div> </div>
<div class="f-bbox"> <div class="f-bbox">
{%- call standard_button("back", url_for('.index'), class="secondary") %}{% trans %}Back{% endtrans %}{% endcall -%} {%- call standard_button("back", url_for('.index'), class="tertiary") %}{% trans %}Back{% endtrans %}{% endcall -%}
{%- call form_button("done", form.action_save, class="primary") %}{% endcall -%} {%- call form_button("done", form.action_save, class="primary") %}{% endcall -%}
</div> </div>
<script type="text/javascript"> <script type="text/javascript">

72
snikket_web/translations/messages.pot
View File

@@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PROJECT VERSION\n" "Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2021-03-22 15:08+0100\n" "POT-Creation-Date: 2021-03-25 17:31+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,131 +17,131 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.9.0\n" "Generated-By: Babel 2.9.0\n"
#: snikket_web/admin.py:59 #: snikket_web/admin.py:62
msgid "Delete user permanently" msgid "Delete user permanently"
msgstr "" msgstr ""
#: snikket_web/admin.py:72 #: snikket_web/admin.py:75
msgid "User deleted" msgid "User deleted"
msgstr "" msgstr ""
#: snikket_web/admin.py:115 #: snikket_web/admin.py:118
msgid "Password reset link created" msgid "Password reset link created"
msgstr "" msgstr ""
#: snikket_web/admin.py:121 #: snikket_web/admin.py:124
msgid "Password reset link deleted" msgid "Password reset link deleted"
msgstr "" msgstr ""
#: snikket_web/admin.py:140 #: snikket_web/admin.py:143
msgid "Invite to circle" msgid "Invite to circle"
msgstr "" msgstr ""
#: snikket_web/admin.py:146 #: snikket_web/admin.py:149
msgid "At least one circle must be selected" msgid "At least one circle must be selected"
msgstr "" msgstr ""
#: snikket_web/admin.py:151 #: snikket_web/admin.py:154
msgid "Valid for" msgid "Valid for"
msgstr "" msgstr ""
#: snikket_web/admin.py:153 #: snikket_web/admin.py:156
msgid "One hour" msgid "One hour"
msgstr "" msgstr ""
#: snikket_web/admin.py:154 #: snikket_web/admin.py:157
msgid "Twelve hours" msgid "Twelve hours"
msgstr "" msgstr ""
#: snikket_web/admin.py:155 #: snikket_web/admin.py:158
msgid "One day" msgid "One day"
msgstr "" msgstr ""
#: snikket_web/admin.py:156 #: snikket_web/admin.py:159
msgid "One week" msgid "One week"
msgstr "" msgstr ""
#: snikket_web/admin.py:157 #: snikket_web/admin.py:160
msgid "Four weeks" msgid "Four weeks"
msgstr "" msgstr ""
#: snikket_web/admin.py:163 snikket_web/templates/admin_edit_invite.html:17 #: snikket_web/admin.py:166 snikket_web/templates/admin_edit_invite.html:17
msgid "Invitation type" msgid "Invitation type"
msgstr "" msgstr ""
#: snikket_web/admin.py:165 snikket_web/templates/library.j2:116 #: snikket_web/admin.py:168 snikket_web/templates/library.j2:116
msgid "Individual" msgid "Individual"
msgstr "" msgstr ""
#: snikket_web/admin.py:166 snikket_web/templates/library.j2:114 #: snikket_web/admin.py:169 snikket_web/templates/library.j2:114
msgid "Group" msgid "Group"
msgstr "" msgstr ""
#: snikket_web/admin.py:172 #: snikket_web/admin.py:175
msgid "New invitation link" msgid "New invitation link"
msgstr "" msgstr ""
#: snikket_web/admin.py:234 #: snikket_web/admin.py:237
msgid "Revoke" msgid "Revoke"
msgstr "" msgstr ""
#: snikket_web/admin.py:258 #: snikket_web/admin.py:261
msgid "Invitation created" msgid "Invitation created"
msgstr "" msgstr ""
#: snikket_web/admin.py:274 #: snikket_web/admin.py:277
msgid "No such invitation exists" msgid "No such invitation exists"
msgstr "" msgstr ""
#: snikket_web/admin.py:289 #: snikket_web/admin.py:292
msgid "Invitation revoked" msgid "Invitation revoked"
msgstr "" msgstr ""
#: snikket_web/admin.py:306 snikket_web/admin.py:354 #: snikket_web/admin.py:309 snikket_web/admin.py:357
msgid "Name" msgid "Name"
msgstr "" msgstr ""
#: snikket_web/admin.py:311 snikket_web/templates/admin_circles.html:47 #: snikket_web/admin.py:314 snikket_web/templates/admin_circles.html:47
msgid "Create circle" msgid "Create circle"
msgstr "" msgstr ""
#: snikket_web/admin.py:341 #: snikket_web/admin.py:344
msgid "Circle created" msgid "Circle created"
msgstr "" msgstr ""
#: snikket_web/admin.py:359 #: snikket_web/admin.py:362
msgid "Select user" msgid "Select user"
msgstr "" msgstr ""
#: snikket_web/admin.py:364 #: snikket_web/admin.py:367
msgid "Update circle" msgid "Update circle"
msgstr "" msgstr ""
#: snikket_web/admin.py:368 #: snikket_web/admin.py:371
msgid "Delete circle permanently" msgid "Delete circle permanently"
msgstr "" msgstr ""
#: snikket_web/admin.py:374 #: snikket_web/admin.py:377
msgid "Add user" msgid "Add user"
msgstr "" msgstr ""
#: snikket_web/admin.py:390 #: snikket_web/admin.py:393
msgid "No such circle exists" msgid "No such circle exists"
msgstr "" msgstr ""
#: snikket_web/admin.py:427 #: snikket_web/admin.py:430
msgid "Circle data updated" msgid "Circle data updated"
msgstr "" msgstr ""
#: snikket_web/admin.py:433 #: snikket_web/admin.py:436
msgid "Circle deleted" msgid "Circle deleted"
msgstr "" msgstr ""
#: snikket_web/admin.py:444 #: snikket_web/admin.py:447
msgid "User added to circle" msgid "User added to circle"
msgstr "" msgstr ""
#: snikket_web/admin.py:453 #: snikket_web/admin.py:456
msgid "User removed from circle" msgid "User removed from circle"
msgstr "" msgstr ""
@@ -606,7 +606,7 @@ msgstr ""
msgid "Created" msgid "Created"
msgstr "" msgstr ""
#: snikket_web/templates/admin_edit_invite.html:49 #: snikket_web/templates/admin_edit_invite.html:48
msgid "Return to invitation list" msgid "Return to invitation list"
msgstr "" msgstr ""
@@ -1054,12 +1054,12 @@ msgstr ""
#: snikket_web/templates/invite_view.html:99 #: snikket_web/templates/invite_view.html:99
msgid "" msgid ""
"After downloading Snikket from the app store, you have to return to this " "After downloading Snikket from the App Store, you have to return to this "
"invite link and tap on \"Open the app\" to proceed." "invite link and tap on \"Open the app\" to proceed."
msgstr "" msgstr ""
#: snikket_web/templates/invite_view.html:101 #: snikket_web/templates/invite_view.html:101
msgid "First download Snikket from the app store using the button below:" msgid "First download Snikket from the App Store using the button below:"
msgstr "" msgstr ""
#: snikket_web/templates/invite_view.html:103 #: snikket_web/templates/invite_view.html:103