From 0ead8ce4b35d40590c5f601fc8a5721c002173bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Sch=C3=A4fer?= Date: Wed, 27 Jan 2021 17:14:51 +0100 Subject: [PATCH] Improve navigation in circles section Separate the people/edit buttons visually (although they lead to the same page) to anticipate user intent. --- snikket_web/static/img/icons.svg | 15 ++++++++++----- snikket_web/templates/admin_circles.html | 7 +++++-- snikket_web/translations/messages.pot | 23 ++++++++++++----------- tools/icons.list | 3 ++- 4 files changed, 29 insertions(+), 19 deletions(-) diff --git a/snikket_web/static/img/icons.svg b/snikket_web/static/img/icons.svg index f4314ee..dfc3a01 100644 --- a/snikket_web/static/img/icons.svg +++ b/snikket_web/static/img/icons.svg @@ -52,11 +52,6 @@ licensed under the terms of the Apache 2.0 License --> - - - - - @@ -97,6 +92,11 @@ licensed under the terms of the Apache 2.0 License --> + + + + + @@ -107,4 +107,9 @@ licensed under the terms of the Apache 2.0 License --> + + + + + diff --git a/snikket_web/templates/admin_circles.html b/snikket_web/templates/admin_circles.html index f726e0f..c4bdf7f 100644 --- a/snikket_web/templates/admin_circles.html +++ b/snikket_web/templates/admin_circles.html @@ -24,8 +24,11 @@ {%- call custom_form_button("create_link", invite_form.circles.name, circle.id_, slim=True, class="secondary accent") -%} {% trans circle_name=circle.name %}Create invitation to circle {{ circle_name }}{% endtrans %} {%- endcall -%} - {%- call action_button("more", url_for(".edit_circle", id_=circle.id_), class="primary") -%} - {% trans circle_name=circle.name %}Show details of circle {{ circle_name }}{% endtrans %} + {%- call action_button("people", url_for(".edit_circle", id_=circle.id_) + "#members", class="secondary") -%} + {% trans circle_name=circle.name %}Manage members of {{ circle_name }}{% endtrans %} + {%- endcall -%} + {%- call action_button("edit", url_for(".edit_circle", id_=circle.id_), class="primary") -%} + {% trans circle_name=circle.name %}Edit circle {{ circle_name }}{% endtrans %} {%- endcall -%} diff --git a/snikket_web/translations/messages.pot b/snikket_web/translations/messages.pot index 0eb19e9..441d141 100644 --- a/snikket_web/translations/messages.pot +++ b/snikket_web/translations/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2021-01-27 15:55+0100\n" +"POT-Creation-Date: 2021-01-27 17:16+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -77,7 +77,7 @@ msgstr "" msgid "Name" msgstr "" -#: snikket_web/admin.py:284 snikket_web/templates/admin_circles.html:44 +#: snikket_web/admin.py:284 snikket_web/templates/admin_circles.html:47 msgid "Create circle" msgstr "" @@ -302,20 +302,26 @@ msgstr "" #: snikket_web/templates/admin_circles.html:28 #, python-format -msgid "Show details of circle %(circle_name)s" +msgid "Manage members of %(circle_name)s" msgstr "" -#: snikket_web/templates/admin_circles.html:37 +#: snikket_web/templates/admin_circles.html:31 +#: snikket_web/templates/admin_edit_circle.html:8 +#, python-format +msgid "Edit circle %(circle_name)s" +msgstr "" + +#: snikket_web/templates/admin_circles.html:40 msgid "No circles" msgstr "" -#: snikket_web/templates/admin_circles.html:38 +#: snikket_web/templates/admin_circles.html:41 msgid "" "Currently, there are no circles on this service. Use the form below to " "create one." msgstr "" -#: snikket_web/templates/admin_circles.html:41 +#: snikket_web/templates/admin_circles.html:44 msgid "New circle" msgstr "" @@ -396,11 +402,6 @@ msgstr "" msgid "Back" msgstr "" -#: snikket_web/templates/admin_edit_circle.html:8 -#, python-format -msgid "Edit circle %(circle_name)s" -msgstr "" - #: snikket_web/templates/admin_edit_circle.html:13 msgid "This circle cannot be modified" msgstr "" diff --git a/tools/icons.list b/tools/icons.list index a2b9576..36dc346 100644 --- a/tools/icons.list +++ b/tools/icons.list @@ -8,7 +8,6 @@ communication/qr_code:qrcode communication/vpn_key:passwd content/add_circle_outline:add content/add_link:create_link -content/create:edit content/remove_circle_outline:remove content/content_copy:copy content/link_off:remove_link @@ -17,5 +16,7 @@ navigation/arrow_forward:forward navigation/cancel:cancel navigation/more_vert:more social/groups:groups +social/people:people social/group_add:create_group navigation/close:close +image/edit:edit