From: Michael Tremer Date: Fri, 12 May 2023 23:03:15 +0000 (+0000) Subject: distros: Improve design X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8f11bd59f77a3ed540ee141e70f86cd5b024b9f5;p=pbs.git distros: Improve design Signed-off-by: Michael Tremer --- diff --git a/src/templates/distros/index.html b/src/templates/distros/index.html index 7b1e51e9..e0e7147b 100644 --- a/src/templates/distros/index.html +++ b/src/templates/distros/index.html @@ -3,19 +3,27 @@ {% block title %}{{ _("Distributions") }}{% end block %} {% block body %} +
+
+
+ + +

{{ _("Distributions") }}

+
+
+
+
- - -

{{ _("Distributions") }}

+ {% module DistrosList(distros) %} {% if current_user and current_user.is_admin() %}
@@ -24,8 +32,6 @@
{% end %} - - {% module DistrosList(distros) %}
{% end block %} diff --git a/src/templates/distros/modules/list.html b/src/templates/distros/modules/list.html index 4ea3881b..5dfb8b75 100644 --- a/src/templates/distros/modules/list.html +++ b/src/templates/distros/modules/list.html @@ -1,9 +1,14 @@ -{% for distro in distros %} -
-
-
- {{ distro }} -
-
-
-{% end %} + diff --git a/src/templates/distros/show.html b/src/templates/distros/show.html index 169db31e..220690f5 100644 --- a/src/templates/distros/show.html +++ b/src/templates/distros/show.html @@ -3,57 +3,63 @@ {% block title %}{{ _("Distributions") }} - {{ distro }}{% end block %} {% block body %} -
-
- +
+
+
+ -

{{ distro }}

+

+ {{ distro }} {% if distro.codename %}‐ {{ distro.codename }}{% end %} +

- {% if distro.slogan %} -

{{ distro.slogan }}

- {% end %} + {% if distro.slogan %} +

{{ distro.slogan }}

+ {% end %} - {% if distro.description %} -
-
+ {% if distro.description %} +
{% module Text(distro.description) %} +
+
- -
- {% if distro.has_perm(current_user) %} - - {{ _("Edit") }} - - {% end %} -
-
- {% end %} + {% end %} +
+
+
+ +
+
+
+ {% if distro.has_perm(current_user) %} + + {{ _("Edit") }} + + {% end %} +
diff --git a/src/templates/repos/modules/list.html b/src/templates/repos/modules/list.html index 3ce2f2ca..556eb91f 100644 --- a/src/templates/repos/modules/list.html +++ b/src/templates/repos/modules/list.html @@ -27,6 +27,10 @@ {{ _("Added %s") % locale.format_date(t, shorter=True) }} + {% else %} + + {{ _("One Build", "%(num)s Builds", repo.total_builds) % { "num" : repo.total_builds } }} + {% end %} {% end %}