From: Jonatan Schlag Date: Sat, 16 Dec 2017 10:27:18 +0000 (+0100) Subject: bootstrap 4: port builder sites to bootstrap 4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bad7a25149c56da951d92a1395a8fe2f1dbca0b0;p=pbs.git bootstrap 4: port builder sites to bootstrap 4 Signed-off-by: Jonatan Schlag --- diff --git a/src/templates/builders/delete.html b/src/templates/builders/delete.html index 940dd61f..7cc83404 100644 --- a/src/templates/builders/delete.html +++ b/src/templates/builders/delete.html @@ -3,40 +3,44 @@ {% block title %}{{ _("Delete builder %s") % builder.name }}{% end block %} {% block body %} - - -
-

{{ _("Builder") }}: {{ builder.name }}

+
+
+ +
-
-

- {{ _("You are going to delete the build host %s.") % builder.name }} -

+
+ +
+
-
-
+
+
+
diff --git a/src/templates/builders/detail.html b/src/templates/builders/detail.html index dc4d8077..ea6dd8aa 100644 --- a/src/templates/builders/detail.html +++ b/src/templates/builders/detail.html @@ -3,215 +3,233 @@ {% block title %}{{ _("Builder") }}: {{ builder.name }}{% end block %} {% block body %} - - -
- - {{ _("Actions") }} - - -
- -
-

{{ _("Builder") }}: {{ builder.name }}

+ {% if not builder.enabled %} + + + {{ _("Renew passphrase") }} + + {% end %} + + + {{ _("Delete builder") }} + + {% end %} +
+
+
{% if builder.testmode %} -
- {{ _("This builder is in test mode!") }} +
+
+
+ {{ _("This builder is in test mode!") }} +
+
{% end %}
-
- - - - - - - - - - - -
{{ _("State") }} - {% if builder.enabled %} - {{ _("Enabled") }} - {% else %} - {{ _("Disabled") }} - {% end %} -
{{ _("Parallel builds") }}{{ _("One job only.", "Up to %(num)s jobs.", builder.max_jobs) % { "num" : builder.max_jobs } }}
- - {% if builder.description %} -

{{ _("Remarks") }}

-

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

- {% end %} +
+

{{ _("General") }}

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{ _("State") }} + {% if builder.enabled %} + {{ _("Enabled") }} + {% else %} + {{ _("Disabled") }} + {% end %} +
{{ _("Parallel builds") }}{{ _("One job only.", "Up to %(num)s jobs.", builder.max_jobs) % { "num" : builder.max_jobs } }}
{{ _("Supported architectures") }} + {{ locale.list(builder.supported_arches) }} +
{{ _("CPU model") }} + {{ builder.cpu_model or _("Unknown") }} +
{{ _("CPU count") }}{{ builder.cpu_count }}
{{ _("Bogomips") }}{{ builder.cpu_bogomips or _("N/A") }}
{{ _("Host key") }} + {{ builder.host_key_id or _("N/A") }} +
+
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - + + {% end %} + + + + + + + + + + +
{{ _("OS") }} - {{ builder.os_name or _("N/A") }} -
{{ _("Pakfire version") }} - {{ builder.pakfire_version or _("N/A") }} -
{{ _("Supported architectures") }} - {{ locale.list(builder.supported_arches) }} -
{{ _("CPU model") }} - {{ builder.cpu_model or _("Unknown") }} -
{{ _("CPU count") }}{{ builder.cpu_count }}
{{ _("Bogomips") }}{{ builder.cpu_bogomips or _("N/A") }}
- {% if builder.mem_total %} -
- - {{ format_size(builder.mem_used) }}/{{ format_size(builder.mem_total) }} - - - {{ _("Memory") }} -
-
-
-
- {% end %} - {% if builder.swap_total %} -
- - {{ format_size(builder.swap_used) }}/{{ format_size(builder.swap_total) }} +
+

{{ _("Status information") }}

+
+ + + + + + + + + + + + + {% if builder.mem_total %} + + + + {% end %} + + {% if builder.swap_total %} + + + + {% end %} + + {% if not builder.mem_total and not builder.swap_total %} + + - - - - - - - - - - - - - - - -
{{ _("OS") }} + {{ builder.os_name or _("N/A") }} +
{{ _("Pakfire version") }} + {{ builder.pakfire_version or _("N/A") }} +
+
+ + {{ format_size(builder.mem_used) }}/{{ format_size(builder.mem_total) }} + + + {{ _("Memory") }} +
+
+
+
+
+
+ + {{ format_size(builder.swap_used) }}/{{ format_size(builder.swap_total) }} + + + {{ _("SWAP space") }} +
+ +
+
+
+
+ + {{ _("No memory information available.") }} - - {{ _("SWAP space") }} - - -
-
-
- {% end %} - - {% if not builder.mem_total and not builder.swap_total %} - {{ _("No memory information available.") }} - {% end %} -
{{ _("Load average") }} - {{ builder.loadavg or _("N/A") }} -
{{ _("Free disk space") }}{{ format_size(builder.space_free or 0) }}
{{ _("Host key") }} - {{ builder.host_key_id or _("N/A") }} -
+
{{ _("Load average") }} + {{ builder.loadavg or _("N/A") }} +
{{ _("Free disk space") }}{{ format_size(builder.space_free or 0) }}
+
- {% if jobs %} -
+ {% if builder.description %} +
+
+

{{ _("Remarks") }}

+ {% module Text(builder.description) %} +
+
+ {% end %} -

{{ _("Active and pending jobs") }}

- {% module JobsList(jobs) %} + + {% if jobs %} +
+
+

{{ _("Active and pending jobs") }}

+ {% module JobsList(jobs) %} +
+
{% end %} {% if log %} -
- -

{{ _("Log") }}

- {% module Log(log) %} +
+
+

{{ _("Log") }}

+ {% module Log(log) %} +
+
{% end %} {% end block %} diff --git a/src/templates/builders/edit.html b/src/templates/builders/edit.html index b39df577..fcf97816 100644 --- a/src/templates/builders/edit.html +++ b/src/templates/builders/edit.html @@ -3,82 +3,81 @@ {% block title %}{{ _("Manage builder %s") % builder.hostname }}{% end block %} {% block body %} - - -
-

{{ _("Builder: %s") % builder.hostname }} {{ _("Manage") }}

+
+
+ +
-
- {% raw xsrf_form_html() %} -
-
- -
- {{ builder.hostname }} -

- {{ _("The hostname cannot be changed.") }} -

-
-
- -
- -
- -
-
-
+
+
+

+ {{ _("Manage builder: %s") % builder.hostname }} +

+
+
-
- {{ _("Build job settings") }} -
- -
- +
+
+ + {% raw xsrf_form_html() %} +
+
+ + + + {{ _("The hostname cannot be changed.") }} + +
-

- {{ _("This is the number of build jobs that are started in parallel.") }} -

-
-
+
+ + + {{ _("The builder must be enabled in order to process build jobs.") }} + +
+
-
-
- -
-
+
+ {{ _("Build job settings") }} +
+ + + + {{ _("This is the number of build jobs that are started in parallel.") }} + +
+
+ +
+
-
-
- -
+ {{ _("Cancel") }} + +
+
{% end block %} diff --git a/src/templates/builders/list.html b/src/templates/builders/list.html index 19f5aef6..f3a9a76b 100644 --- a/src/templates/builders/list.html +++ b/src/templates/builders/list.html @@ -3,69 +3,78 @@ {% block title %}{{ _("Builders") }}{% end block %} {% block body %} - +
+
+ +
+
-
-

{{ _("Builders") }}

+
+
+

{{ _("Builders") }}

+
+ {% if current_user and current_user.is_admin() %} +
+ +
+ {{ _("Create new builder") }} +
+
+ {% end %}
-
- - - - - - - - - - - {% for builder in builders %} +
+
+
 {{ _("Hostname") }}{{ _("Architecture") }}{{ _("Jobs") }}
+ - - - - + + + + - {% end %} - -
- {% if builder.state == "disabled" %} - - {% elif builder.state == "offline" %} - - {% elif builder.state == "online" %} - - {% end %} - - {{ builder.name }} -
- {{ builder.cpu_model or _("Unknown CPU") }} - {% if builder.mem_total %} - - {{ format_size(builder.mem_total) }} - {% end %} - 		- {{ builder.cpu_arch or _("Unknown") }} - -

- {{ len(builder.active_jobs) }}/{{ builder.max_jobs }} -

- 		 {{ _("Hostname") }}{{ _("Architecture") }}{{ _("Jobs") }}
- - {% if current_user and current_user.is_admin() %} -
- {{ _("Create new builder") }} -
- {% end %} + + + {% for builder in builders %} + + + {% if builder.state == "disabled" %} + + {% elif builder.state == "offline" %} + + {% elif builder.state == "online" %} + + {% end %} + + + {{ builder.name }} +
+ {{ builder.cpu_model or _("Unknown CPU") }} + {% if builder.mem_total %} + - {{ format_size(builder.mem_total) }} + {% end %} + + + {{ builder.cpu_arch or _("Unknown") }} + + +

+ {{ len(builder.active_jobs) }}/{{ builder.max_jobs }} +

+ + + {% end %} + + +
{% end block %} diff --git a/src/templates/builders/new.html b/src/templates/builders/new.html index 89f4d104..ac9c0485 100644 --- a/src/templates/builders/new.html +++ b/src/templates/builders/new.html @@ -3,43 +3,43 @@ {% block title %}{{ _("Create new builder") }}{% end block %} {% block body %} - +
+
+ +
+
-
-

{{ _("Create a new builder") }}

+
+
+

+ {{ _("Create a new builder") }} +

+
-
-
+
+ {% raw xsrf_form_html() %}
-
- -
- - -

- {{ _("Enter the canonical hostname of the machine.") }} -

-
+
+ + + + {{ _("Enter the canonical hostname of the machine.") }} +
-
- -
+
diff --git a/src/templates/builders/pass.html b/src/templates/builders/pass.html index 8c7c24e1..d905ef96 100644 --- a/src/templates/builders/pass.html +++ b/src/templates/builders/pass.html @@ -1,47 +1,50 @@ {% extends "../base.html" %} {% block body %} - +
+
+ +
+
-
-

{{ _("Builder") }}: {{ builder.name }}

+
+
+

+ {{ _("Builder") }}: {{ builder.name }} +

+
-
+

{% if action == "new" %} - {{ _("The new host %s has been successfully created.") % builder.name }} + {{ _("The new host") }} {{ builder.name }} {{ _("has been successfully created.") }} {% elif action == "update" %} - {{ _("The passphrase for %s has been regenerated.") % builder.name }} + {{ _("The passphrase for") }} {{ builder.name }} {{ _("has been regenerated.") }} {% end %} - +
{{ _("For authorization to the Pakfire Master Server there is a passphrase required which must be configured to the host.") }}

{{ _("This passphrase is:") }} {{ passphrase }}

+
+
-

- {{ _("Next") }} -

+
+
+ {{ _("Next") }}
{% end block %}