From 4b4844ecaaeb0b57d9dc15539bf9b0b8eb2bc52e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Sch=C3=A4fer?= Date: Wed, 27 Jan 2021 17:15:19 +0100 Subject: [PATCH] Clean up icon use throughout the thing --- snikket_web/static/img/icons.svg | 15 +++++++++++++++ snikket_web/templates/admin_delete_user.html | 2 +- snikket_web/templates/admin_edit_circle.html | 8 ++++---- snikket_web/templates/admin_users.html | 4 ++-- snikket_web/templates/user_passwd.html | 2 +- tools/icons.list | 3 +++ 6 files changed, 26 insertions(+), 8 deletions(-) diff --git a/snikket_web/static/img/icons.svg b/snikket_web/static/img/icons.svg index dfc3a01..f48579f 100644 --- a/snikket_web/static/img/icons.svg +++ b/snikket_web/static/img/icons.svg @@ -17,6 +17,11 @@ licensed under the terms of the Apache 2.0 License --> + + + + + @@ -102,6 +107,16 @@ licensed under the terms of the Apache 2.0 License --> + + + + + + + + + + diff --git a/snikket_web/templates/admin_delete_user.html b/snikket_web/templates/admin_delete_user.html index bf87580..941418c 100644 --- a/snikket_web/templates/admin_delete_user.html +++ b/snikket_web/templates/admin_delete_user.html @@ -17,7 +17,7 @@ {% endcall %}
{%- call standard_button("back", url_for(".index"), class="secondary") %}{% trans %}Back{% endtrans %}{% endcall -%} - {%- call form_button("remove", form.action_delete, class="primary danger") %}{% endcall -%} + {%- call form_button("delete", form.action_delete, class="primary danger") %}{% endcall -%}
{% endblock %} diff --git a/snikket_web/templates/admin_edit_circle.html b/snikket_web/templates/admin_edit_circle.html index 3a0d0b2..793de6e 100644 --- a/snikket_web/templates/admin_edit_circle.html +++ b/snikket_web/templates/admin_edit_circle.html @@ -47,11 +47,11 @@

{% trans %}Delete circle{% endtrans %}

{% trans %}Deleting a circle does not delete any users in the circle.{% endtrans %}

- {%- call form_button("done", form.action_delete, class="secondary danger") %}{% endcall -%} + {%- call form_button("delete", form.action_delete, class="secondary danger") %}{% endcall -%}
{%- endif -%} -

{% trans %}Circle members{% endtrans %}

+

{% trans %}Circle members{% endtrans %}

{%- if circle_members -%}
@@ -65,7 +65,7 @@ @@ -85,7 +85,7 @@
{{ form.user_to_add }}
- {%- call form_button("add", form.action_add_user, class="primary") %}{% endcall -%} + {%- call form_button("add_user", form.action_add_user, class="primary") %}{% endcall -%}
{%- else -%} diff --git a/snikket_web/templates/admin_users.html b/snikket_web/templates/admin_users.html index ba4730c..7d147e1 100644 --- a/snikket_web/templates/admin_users.html +++ b/snikket_web/templates/admin_users.html @@ -18,13 +18,13 @@
{{ member.localpart }} {% call value_or_hint(member.display_name) %}{% endcall %} - {%- call custom_form_button("remove", form.action_remove_user.name, member.localpart, class="primary danger", slim=True) -%} + {%- call custom_form_button("remove_user", form.action_remove_user.name, member.localpart, class="primary danger", slim=True) -%} {% trans username=member.localpart %}Remove user {{ username }} from circle{% endtrans %} {%- endcall -%} {{ user.localpart }} {% call value_or_hint(user.display_name) %}{% endcall %} - {%- call action_button("remove", url_for(".delete_user", localpart=user.localpart), class="secondary") -%} + {%- call action_button("delete", url_for(".delete_user", localpart=user.localpart), class="secondary") -%} {% trans user_name=user.localpart %}Delete user {{ user_name }}{% endtrans %} {%- endcall -%} {%- call action_button("bug_report", url_for(".debug_user", localpart=user.localpart), class="secondary") -%} {% trans user_name=user.localpart %}Show debug information for {{ user_name }}{% endtrans %} {%- endcall -%} - {%- call custom_form_button("create_link", reset_form.action_create.name, user.localpart, class="secondary", slim=True) -%} + {%- call custom_form_button("passwd", reset_form.action_create.name, user.localpart, class="secondary", slim=True) -%} {% trans user_name=user.localpart %}Create password reset link for {{ user_name }}{% endtrans %} {%- endcall -%} diff --git a/snikket_web/templates/user_passwd.html b/snikket_web/templates/user_passwd.html index 1972535..c10e2b5 100644 --- a/snikket_web/templates/user_passwd.html +++ b/snikket_web/templates/user_passwd.html @@ -28,7 +28,7 @@
{%- call standard_button("back", url_for('.index'), class="secondary") %}{% trans %}Back{% endtrans %}{% endcall -%} - {%- call custom_form_button("done", "", "", class="primary") -%} + {%- call custom_form_button("passwd", "", "", class="primary") -%} {% trans %}Change password{% endtrans %} {%- endcall -%}
diff --git a/tools/icons.list b/tools/icons.list index 36dc346..90a0aca 100644 --- a/tools/icons.list +++ b/tools/icons.list @@ -1,6 +1,7 @@ action/account_circle:profile action/bug_report:bug_report action/done:done +action/delete:delete action/logout:logout action/login:login action/exit_to_app:exit_to_app @@ -18,5 +19,7 @@ navigation/more_vert:more social/groups:groups social/people:people social/group_add:create_group +social/person_add:add_user +social/person_remove:remove_user navigation/close:close image/edit:edit