From: Jonatan Schlag Date: Tue, 28 Nov 2017 15:35:31 +0000 (+0100) Subject: bootstrap 4: rework packages detail list page X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f5311622747a6be48c6d395e0757160f26b06722;p=pbs.git bootstrap 4: rework packages detail list page Signed-off-by: Jonatan Schlag --- diff --git a/src/templates/modules/changelog/entry.html b/src/templates/modules/changelog/entry.html index 1e4ba828..511a0a90 100644 --- a/src/templates/modules/changelog/entry.html +++ b/src/templates/modules/changelog/entry.html @@ -1,27 +1,45 @@ -
  • -
    -
    -

    - {{ build.name }} - - {% if build.type == "release" and build.repo %} - - - {{ build.repo.distro.name }} ‐ - {% if build.repo.type == "stable" %} - {{ build.repo.name }} - {% elif build.repo.type == "unstable" %} - {{ build.repo.name }} - {% elif build.repo.type == "testing" %} - {{ build.repo.name }} - {% end %} - - - {% elif build.type == "scratch" %} - - {{ _("Scratch build") }} - - {% end %} +
    +
    + + {{ build.repo.distro.name }} ‐ {{ build.repo.name }} + + {% elif build.repo.type == "unstable" %} + text-warning"> + + {{ build.repo.distro.name }} ‐ {{ build.repo.name }} + + {% elif build.repo.type == "testing" %} + text-danger"> + + {{ build.repo.distro.name }} ‐ {{ build.repo.name }} + + {% end %} + {% elif build.type == "scratch" %} + text-secondary"> + {{ _("Scratch build") }} + {% end %} +
    +
    +

    + + {% if build.is_broken() %} + {{ build.name }} + {% else %} + {{ build.name }} + {% end %} +

    @@ -34,22 +52,21 @@

    {{ _("Author") }} {% module LinkToUser(build.commit.author) %} - {{ locale.format_date(build.created, shorter=True) }}

    {% else %}

    {{ _("No commit message.") }} - {{ locale.format_date(build.created, shorter=True) }}

    {% end %} {% elif build.type == "scratch" %}

    {{ _("Owner") }} {% module LinkToUser(build.owner) %} - - {{ locale.format_date(build.created, shorter=True) }}

    {% end %} -
    -
    -

    • + +
    + {{ locale.format_date(build.created, shorter=True) }} +
    + + diff --git a/src/templates/modules/changelog/index.html b/src/templates/modules/changelog/index.html index 44f0b198..828463b6 100644 --- a/src/templates/modules/changelog/index.html +++ b/src/templates/modules/changelog/index.html @@ -1,5 +1,5 @@ - + +{% for b in builds %} + {% module ChangelogEntry(b) %} +{% end %} + diff --git a/src/templates/modules/package-header.html b/src/templates/modules/package-header.html index 0feaa871..6308bd4d 100644 --- a/src/templates/modules/package-header.html +++ b/src/templates/modules/package-header.html @@ -1,27 +1,37 @@ -
    +

    {% module Text(pkg.description) %} -

    +

    -
    +
    + + + {% if pkg.url %} + + + + + {% end %} + {% if pkg.license %} + + + + + {% end %} -
    - {% if pkg.url %} -
    {{ _("Home") }}
    -
    {% raw linkify(pkg.url, shorten=True) %}
    - {% end %} + {% if pkg.groups %} +
    + + + + {% end %} - {% if pkg.license %} -
    {{ _("License") }}
    -
    {{ pkg.license }}
    - {% end %} + {% if pkg.maintainer %} + + + + + {% end %} - {% if pkg.groups %} -
    {{ _("Group", "Groups", len(pkg.groups)) }}
    -
    {{ locale.list(pkg.groups) }}
    - {% end %} - - {% if pkg.maintainer %} -
    {{ _("Maintainer") }}
    -
    {% module LinkToUser(pkg.maintainer) %}
    - {% end %} - + +
    {{ _("Home") }}{% raw linkify(pkg.url, shorten=True) %}
    {{ _("License") }}{{ pkg.license }}
    {{ _("Group", "Groups", len(pkg.groups)) }}{{ locale.list(pkg.groups) }}
    {{ _("Maintainer") }}{% module LinkToUser(pkg.maintainer) %}
    +
    \ No newline at end of file diff --git a/src/templates/package-detail-list.html b/src/templates/package-detail-list.html index ee4556b1..6b3104c6 100644 --- a/src/templates/package-detail-list.html +++ b/src/templates/package-detail-list.html @@ -3,78 +3,82 @@ {% block title %}{{ _("Package") }} {{ pkg.name }}{% end block %} {% block body %} - - -
    -
    -