From: Jonatan Schlag Date: Fri, 12 Jan 2018 10:32:51 +0000 (+0100) Subject: bootstrap4: port package dependency table X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2257d5e85eb0a899b95590b3dc3bd4ee98313b71;p=people%2Fjschlag%2Fpbs.git bootstrap4: port package dependency table Signed-off-by: Jonatan Schlag --- diff --git a/src/templates/modules/packages/dependency-table.html b/src/templates/modules/packages/dependency-table.html index 4a8da5b..7b17d98 100644 --- a/src/templates/modules/packages/dependency-table.html +++ b/src/templates/modules/packages/dependency-table.html @@ -1,20 +1,20 @@
{% for name, deps in dependencies %} -
+
{% if name == "provides" %} -

{{ _("Provides") }}

+

{{ _("Provides") }}

{% elif name == "requires" %} -

{{ _("Requires") }}

+

{{ _("Requires") }}

{% elif name == "prerequires" %} -

{{ _("Pre-requires") }}

+

{{ _("Pre-requires") }}

{% elif name == "conflicts" %} -

{{ _("Conflicts") }}

+

{{ _("Conflicts") }}

{% elif name == "obsoletes" %} -

{{ _("Obsoletes") }}

+

{{ _("Obsoletes") }}

{% elif name == "recommends" %} -

{{ _("Recommends") }}

+

{{ _("Recommends") }}

{% elif name == "suggests" %} -

{{ _("Suggests") }}

+

{{ _("Suggests") }}

{% end %}
    diff --git a/src/web/ui_modules.py b/src/web/ui_modules.py index 99b8cf8..3ed5c35 100644 --- a/src/web/ui_modules.py +++ b/src/web/ui_modules.py @@ -154,16 +154,8 @@ class PackagesDependencyTableModule(UIModule): if deps: has_deps.append((name, deps)) - if len(has_deps): - span = math.floor(12 / len(has_deps)) - - if span > 3: - span = 3 - else: - span = 12 - return self.render_string("modules/packages/dependency-table.html", - pkg=pkg, dependencies=has_deps, span=span) + pkg=pkg, dependencies=has_deps) class PackageTable2Module(UIModule):