From: Michael Tremer Date: Mon, 26 Jun 2023 09:32:03 +0000 (+0000) Subject: users: Update design of groups pages X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f2c38da002bd674de5ef82a258bd401bfa622583;p=ipfire.org.git users: Update design of groups pages Signed-off-by: Michael Tremer --- diff --git a/src/templates/users/groups/index.html b/src/templates/users/groups/index.html index ed589127..a8bf8c0e 100644 --- a/src/templates/users/groups/index.html +++ b/src/templates/users/groups/index.html @@ -3,31 +3,49 @@ {% block title %}{{ _("Groups") }}{% end block %} {% block container %} -
-
-

{{ _("Groups") }}

+
+
+
+ + +

{{ _("Groups") }}

+
-
+ -
-
-
+
+
+
{% for group in backend.groups %} -
-
-
-
- {{ group }} -
+
+
+
+ + {{ len(group) }} + - - {{ _("One Member", "%(num)s Members", len(group)) % { "num" : len(group) } }} - -
+ {{ group }} +
{% end %}
-
-
+
+ {% end block %} diff --git a/src/templates/users/groups/show.html b/src/templates/users/groups/show.html index 63125b54..5e6225fe 100644 --- a/src/templates/users/groups/show.html +++ b/src/templates/users/groups/show.html @@ -3,31 +3,64 @@ {% block title %}{{ group }}{% end block %} {% block container %} -
-
-

{{ group }}

+
+
+
+ -

- {{ _("One Member", "%(num)s Members", len(group)) % { "num" : len(group) } }} -

+

{{ group }}

+
{{ group.gid }}
+
-
+ -
- {% if group.email %} -
-
- +
+
+
+
+
+

{{ _("Members") }}

+

{{ len(group) }}

+
+
+
+
+
+ +
+
+ {% if group.email %} +
+ {{ _("Email Group") }}
-
- {% end %} + {% end %} - {% if len(group) > 0 %} -
- {% module AccountsList(group) %} -
- {% end %} -
+
+ {% module UsersList(group) %} +
+
+ {% end block %} diff --git a/src/web/__init__.py b/src/web/__init__.py index 6819343c..5a238aaf 100644 --- a/src/web/__init__.py +++ b/src/web/__init__.py @@ -154,15 +154,15 @@ class Application(tornado.web.Application): (r"/password\-reset", auth.PasswordResetInitiationHandler), (r"/password\-reset/([a-z_][a-z0-9_-]{0,31})/(\w+)", auth.PasswordResetHandler), + # User Groups + (r"/users/groups", users.GroupIndexHandler), + (r"/users/groups/([a-z_][a-z0-9_-]{0,31})", users.GroupShowHandler), + # Users (r"/users", users.IndexHandler), (r"/users/([a-z_][a-z0-9_-]{0,31})", users.ShowHandler), (r"/users/([a-z_][a-z0-9_-]{0,31})\.jpg", users.AvatarHandler), - # User Groups - (r"/users/groups", users.GroupIndexHandler), - (r"/users/groups/([a-z_][a-z0-9_-]{0,31})", users.GroupShowHandler), - # RSS feed (r"/news.rss", tornado.web.RedirectHandler, { "url" : "https://blog.ipfire.org/feed.xml" }),