From: Jonatan Schlag Date: Wed, 10 Jan 2018 18:03:06 +0000 (+0100) Subject: bootstrap4: begin porting the distribution/repository sites X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c57dc368c960c9121f714b7a4e87b69464b25933;p=pbs.git bootstrap4: begin porting the distribution/repository sites Signed-off-by: Jonatan Schlag --- diff --git a/src/templates/distro-detail.html b/src/templates/distro-detail.html index 1122c4c9..bf7dc44c 100644 --- a/src/templates/distro-detail.html +++ b/src/templates/distro-detail.html @@ -3,56 +3,90 @@ {% block title %}{{ _("Distribution") }}: {{ distro.name }}{% end block %} {% block body %} - +
+
+ +
+
+ -
-

- {{ _("Distribution") }}: {{ distro.name }} - {{ distro.slogan }} -

+
+ {% if current_user and current_user.is_admin() %} +
+

+ {{ _("Distribution") }}: {{ distro.name }}
+ {{ distro.slogan }} +

+
+
+ +
+ + {{ _("Edit distribution") }} + + + {{ _("Delete distribution") }} + + + + {{ _("New binary repository") }} + + + {{ _("New source repository") }} + +
+
+ {% else %} +
+

+ {{ _("Distribution") }}: {{ distro.name }}
+ {{ distro.slogan }} +

+
+ {% end %}
-
-
- {{ distro.description }} - {{ distro.vendor }} +
+
+

{{ distro.description }}

+
{{ distro.vendor }}
+
+
+
+

{{ _("Supported architectures") }}: {{ locale.list(distro.arches) or _("None") }}

-
-
-

+
+

{{ _("Binary repositories") }} ({{ len(distro.repositories) }})

- -
+ +

{{ _("A binary repository is a composition of packages that are considered stable, unstable or in testing state by the developers.") }} -

+
{{ _("Each repository can be enabled individually.") }} - {{ _("Learn how to use them.") }} -

+

{% module RepositoryTable(distro, distro.repositories) %} @@ -61,8 +95,8 @@
-
-

+
+

{{ _("Source repositories") }} ({{ len(distro.sources) }})

@@ -71,40 +105,4 @@

- {% if current_user and current_user.is_admin() %} -
-
-
- - - {{ _("Action") }} - - - -
-
-
- {% end %} {% end block %} diff --git a/src/templates/distro-list.html b/src/templates/distro-list.html index 1714785d..23a4bf44 100644 --- a/src/templates/distro-list.html +++ b/src/templates/distro-list.html @@ -3,68 +3,74 @@ {% block title %}{{ _("Distributions") }}{% end block %} {% block body %} - +
+
+ +
+
-
-

- {{ _("Distributions") }} -

+
+
+

{{ _("Distributions") }}

+
+ {% if current_user and current_user.is_admin() %} +
+ +
+ {{ _("New distribution") }} +
+
+ {% end %}
-
+

{{ _("This is a list of all distributions, that are maintained in this build service.") }} {{ _("You may click on one of them and see more details or jump directly to one of the repositories.") }}

- - - - - - - - - - {% for distro in distros %} - - - - - {% end %} - -
{{ _("Distribution") }}{{ _("Repositories") }}
- {{ distro.name }} -
{{ distro.slogan }} - 		-
    - {% for repo in distro.repositories %} -
  • - {{ repo.name }} - - {{ repo.summary }} -
    • - {% end %} -
-
- {% if current_user and current_user.is_admin() %} -
-
- - - {{ _("New distribution") }} - +
+
+
+ + + + + + + + + {% for distro in distros %} + + + + + {% end %} + +
{{ _("Distribution") }}{{ _("Repositories") }}
+ {{ distro.name }} +
{{ distro.slogan }} + 		+
    + {% for repo in distro.repositories %} +
  • + {{ repo.name }} + - {{ repo.summary }} +
    • + {% end %} +
+
- {% end %} +
{% end block %} diff --git a/src/templates/distro-source-commit-detail.html b/src/templates/distro-source-commit-detail.html index 25d98bd1..4c7987ae 100644 --- a/src/templates/distro-source-commit-detail.html +++ b/src/templates/distro-source-commit-detail.html @@ -3,123 +3,135 @@ {% block title %}{{ _("Commit") }}: {{ commit.revision }}{% end block %} {% block body %} - -
-

- {{ _("Source") }}: {{ source.name }} -
- - {{ commit.revision[:7] }} - {{ commit.subject }} - -

+ +
+
+ +
-
- - - - - - - - - - - - - - - - - - - - {% if commit.message %} - - - - {% end %} + {% if source.gitweb or (current_user and current_user.is_admin()) %} +
+

+ {{ _("Source") }}: {{ source.name }} +
+ + {{ commit.revision[:7] }} - {{ commit.subject }} + +

+
+
+
+ +
+ {% if source.gitweb %} + + {{ _("Open in gitweb") }} + + {% end %} + {% if current_user and current_user.is_admin() %} + + {{ _("Reset commit") }} + + {% end %} +
+
+
+ {% else %} +
+

+ {{ _("Source") }}: {{ source.name }} +
+ + {{ commit.revision[:7] }} - {{ commit.subject }} + +

+
+ {% end %} + - - - - -
{{ _("Revision") }}{{ commit.revision }}
{{ _("Date") }}{{ format_date(commit.date, full_format=True) }}
{{ _("Author") }}{% module LinkToUser(commit.author) %}
{{ _("Committer") }}{% module LinkToUser(commit.committer) %}
- {% module CommitMessage(commit) %} -
-
- {% if source.gitweb %} -
- - {{ _("Open in gitweb") }} - -
- {% end %} - {% if current_user and current_user.is_admin() %} -
- - - {{ _("Action") }} - - - -
- {% end %} -
-
+
+ {% if commit.message %} +
+ {% else %} +
+ {% end %} +
+ + + + + + + + + + + + + + + + + + + +
{{ _("Revision") }}{{ commit.revision }}
{{ _("Date") }}{{ format_date(commit.date, full_format=True) }}
{{ _("Author") }}{% module LinkToUser(commit.author) %}
{{ _("Committer") }}{% module LinkToUser(commit.committer) %}
+
+ {% if commit.message %} +
+ {% module CommitMessage(commit) %} +
+ {% end %}
-
-

{{ _("Packages created from this commit") }}

+
+

+ {{ _("Packages created from this commit") }} +

+
+
+
+
{% if commit.packages %} - - {% for pkg in commit.packages %} - - - - - {% end %} -
- {{ pkg.friendly_name }} - - {{ pkg.summary }} -
+
+ + {% for pkg in commit.packages %} + + + + + {% end %} +
+ {{ pkg.friendly_name }} + + {{ pkg.summary }} +
+
{% else %}

{{ _("There were no packages created from this commit.") }}

{% end %} diff --git a/src/templates/distro-source-commits.html b/src/templates/distro-source-commits.html index e3416808..32403c93 100644 --- a/src/templates/distro-source-commits.html +++ b/src/templates/distro-source-commits.html @@ -1,27 +1,69 @@ {% extends "base.html" %} {% block body %} -

- {{ _("Distribution") }}: {{ distro.name }} - - {{ _("Source") }}: {{ source.name }} - {{ _("Commits") }} -

- -

- {{ _("Source repository") }}: - - {{ source.name }} - -

+
+
+ +
+
- {% module CommitsTable(distro, source, commits) %} +
+
+

+ {{ _("Distribution") }}: {{ distro.name }}
+ {{ _("Source") }}: {{ source.name }} - {{ _("Commits") }} +

+
+
-
- {% if offset %} - {{ _("Previous commits") }} - {% end %} +
+
+

+ {{ _("Source repository") }}: + + {{ source.name }} + +

+
+
+
+
+ {% module CommitsTable(distro, source, commits) %} +
+
- {% if limit %} - {{ _("Next commits") }} - {% end %} +
+
+ +
{% end block %} diff --git a/src/templates/distro-source-detail.html b/src/templates/distro-source-detail.html index d395f65e..d8c74fe9 100644 --- a/src/templates/distro-source-detail.html +++ b/src/templates/distro-source-detail.html @@ -1,65 +1,73 @@ {% extends "base.html" %} {% block body %} - +
+
+ +
+
-
-

- {{ _("Source") }}: {{ source.name }} -

+
+
+

+ {{ _("Source") }}: {{ source.name }} +

+
-
- - - {% if source.gitweb %} +
+
+
+ + {% if source.gitweb %} + + + + + {% end %} + + + + - - + + - {% end %} - - - - - - - - - -
{{ _("Gitweb") }} + + {{ source.gitweb }} + +
{{ _("Branch") }}{{ source.branch }}
{{ _("Gitweb") }} - - {{ source.gitweb }} - - {{ _("Imported commits") }}{{ len(source) }}
{{ _("Branch") }}{{ source.branch }}
{{ _("Imported commits") }}{{ len(source) }}
+ + +
-
-

{{ _("Latest commits") }}

+
+

{{ _("Latest commits") }}

+
+
+
+
{% module CommitsTable(distro, source, commits) %} - - +
+
+
+
+ {{ _("Show all commits") }}
diff --git a/src/templates/modules/commits-table.html b/src/templates/modules/commits-table.html index 99c7bc1f..f0bc0770 100644 --- a/src/templates/modules/commits-table.html +++ b/src/templates/modules/commits-table.html @@ -1,36 +1,38 @@ - - - - - - - - - - {% for commit in commits %} +
+
{{ _("Commit") }}{{ _("Author") }}{{ _("Subject") }}
+ - - - + + + - {% end %} - -
- {% if commit.state == "pending" %} - - {% elif commit.state == "running" %} - - {% elif commit.state == "failed" %} - - {% end %} - - - {{ commit.revision[:7] }} - -
- {{ format_date(commit.date, full_format=True) }} - 		- {% module LinkToUser(commit.author) %} - - {{ commit.subject }} - {{ _("Commit") }}{{ _("Author") }}{{ _("Subject") }}
+ + + {% for commit in commits %} + + + {% if commit.state == "pending" %} + + {% elif commit.state == "running" %} + + {% elif commit.state == "failed" %} + + {% end %} + + + {{ commit.revision[:7] }} + +
+ {{ format_date(commit.date, full_format=True) }} + + + {% module LinkToUser(commit.author) %} + + + {{ commit.subject }} + + + {% end %} + + +
\ No newline at end of file diff --git a/src/templates/modules/repository-table.html b/src/templates/modules/repository-table.html index 70b228ef..6bf26942 100644 --- a/src/templates/modules/repository-table.html +++ b/src/templates/modules/repository-table.html @@ -1,29 +1,31 @@ - - - - - - - - - - {% for repo in repos %} +
+
{{ _("Name") }}{{ _("No. of builds") }}{{ _("Enabled for builds") }}
+ - - - + + + - {% end %} - -
- {{ repo.name }} -
{{ repo.summary or _("N/A") }} - 		- {{ len(repo) }} - - {% if repo.enabled_for_builds %} - {{ _("Yes") }} - {% else %} - {{ _("No") }} - {% end %} - {{ _("Name") }}{{ _("No. of builds") }}{{ _("Enabled for builds") }}
+ + + {% for repo in repos %} + + + {{ repo.name }} +
{{ repo.summary or _("N/A") }} + + + {{ len(repo) }} + + + {% if repo.enabled_for_builds %} + {{ _("Yes") }} + {% else %} + {{ _("No") }} + {% end %} + + + {% end %} + + +
\ No newline at end of file diff --git a/src/templates/modules/source-table.html b/src/templates/modules/source-table.html index e44fa0ef..88120e9c 100644 --- a/src/templates/modules/source-table.html +++ b/src/templates/modules/source-table.html @@ -1,28 +1,30 @@ - - - - - - - - - - {% for source in sources %} +
+
{{ _("Name") }}{{ _("No. of commits") }}{{ _("Latest commit") }}
+ - - - + + + - {% end %} - -
- {{ source.name }} -
{{ _("Branch: %s") % source.branch }} - 		- {{ len(source) }} - - - {{ source.head_revision.revision[:7] }} - - {{ format_date(source.head_revision.date) }} -
{{ source.head_revision.subject }} - 		{{ _("Name") }}{{ _("No. of commits") }}{{ _("Latest commit") }}
+ + + {% for source in sources %} + + + {{ source.name }} +
{{ _("Branch: %s") % source.branch }} + + + {{ len(source) }} + + + + {{ source.head_revision.revision[:7] }} + - {{ format_date(source.head_revision.date) }} +
{{ source.head_revision.subject }} + + + {% end %} + + +
\ No newline at end of file diff --git a/src/templates/repository-detail.html b/src/templates/repository-detail.html index c579dc35..928a8d75 100644 --- a/src/templates/repository-detail.html +++ b/src/templates/repository-detail.html @@ -5,95 +5,147 @@ {% end block %} {% block body %} - - -
-
- {% if repo.type == "stable" %} - - {{ _("Stable repository") }} - - {% elif repo.type == "unstable" %} - - {{ _("Unstable repository") }} - - {% elif repo.type == "testing" %} - - {{ _("Testing repository") }} - - {% end %} - - {% if repo.enabled_for_builds %} - - {{ _("Enabled for builds") }} - - {% end %} + +
+
+
+
-

- {{ _("Repository") }}: {{ repo.name }} - {{ distro.name }} -

+
+ {% if current_user and current_user.is_admin() %} +
+

+ {{ _("Repository") }}: {{ repo.name }} + + {% if repo.type == "stable" %} + + {{ _("Stable repository") }} + + {% elif repo.type == "unstable" %} + + {{ _("Unstable repository") }} + + {% elif repo.type == "testing" %} + + {{ _("Testing repository") }} + + {% end %} + + {% if repo.enabled_for_builds %} + + {{ _("Enabled for builds") }} + + {% end %} + +
+ {{ distro.name }} +

+
+
+
+ +
+ + + {{ _("Edit") }} + + + + {{ _("Delete") }} + +
+
+
+ {% else %} +
+

+ {{ _("Repository") }}: {{ repo.name }} + + {% if repo.type == "stable" %} + + {{ _("Stable repository") }} + + {% elif repo.type == "unstable" %} + + {{ _("Unstable repository") }} + + {% elif repo.type == "testing" %} + + {{ _("Testing repository") }} + + {% end %} + + {% if repo.enabled_for_builds %} + + {{ _("Enabled for builds") }} + + {% end %} + +
+ {{ distro.name }} +

+
+ {% end %}
+
-
-
+
+

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

- -

- - - - - - - - - - - -
{{ _("Repository is enabled for builds?") }} - {% if repo.enabled_for_builds %} - {{ _("Yes") }} - {% else %} - {{ _("No") }} - {% end %} -
{{ _("Obsolete builds") }} - {{ len(obsolete_builds) }} -
-
+

-
-

{{ _("Total build time") }}

+
+ + + + + + + + + + +
{{ _("Repository is enabled for builds?") }} + {% if repo.enabled_for_builds %} + {{ _("Yes") }} + {% else %} + {{ _("No") }} + {% end %} +
{{ _("Obsolete builds") }} + {{ len(obsolete_builds) }} +
+
+
- - - {% for arch, build_time in build_times %} - - - - - {% end %} - -
{{ arch }}{{ friendly_time(build_time) }}
+
+

+ {{ _("Total build time") }} +

+
+ + + {% for arch, build_time in build_times %} + + + + + {% end %} + +
{{ arch }}{{ friendly_time(build_time) }}
+

{{ _("The table above shows how long it took to build all packages in this repository.") }} @@ -101,30 +153,13 @@

- {% if current_user and current_user.is_admin() %} -
-
-
- -
- - - {{ _("Edit") }} - - - - {{ _("Delete") }} - -
-
-
- {% end %} - {% if repo.unpushed_builds %} -
-
-

{{ _("Unpushed builds") }}

-
+
+
+

+ {{ _("Unpushed builds") }} +

+
{{ _("These builds were already put into this repository, but were not pushed out to the mirror servers, yet.") }}
{% module BuildTable(repo.unpushed_builds, show_repo_time=True) %} @@ -133,24 +168,24 @@ {% end %} {% if builds %} -
-
-

+
+
+

{{ _("Builds in this repository") }} ({{ len(builds) }}) -

+

{% module BuildTable(builds, show_repo_time=True, show_can_move_forward=True) %}
{% end %} {% if obsolete_builds %} -
-
-

+
+
+

{{ _("Obsolete builds") }} ({{ len(obsolete_builds) }}) -

+

{% module BuildTable(obsolete_builds) %}