]> git.ipfire.org Git - pbs.git/commitdiff
bootstrap 4: port builder sites to bootstrap 4
authorJonatan Schlag <jonatan.schlag@ipfire.org>
Sat, 16 Dec 2017 10:27:18 +0000 (11:27 +0100)
committerJonatan Schlag <jonatan.schlag@ipfire.org>
Sat, 16 Dec 2017 10:27:18 +0000 (11:27 +0100)
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
src/templates/builders/delete.html
src/templates/builders/detail.html
src/templates/builders/edit.html
src/templates/builders/list.html
src/templates/builders/new.html
src/templates/builders/pass.html

index 940dd61fe55c0166fecabd3d4eb4b8486e959bc2..7cc83404deee88b5d18da9f21796c2714922710e 100644 (file)
@@ -3,40 +3,44 @@
 {% block title %}{{ _("Delete builder %s") % builder.name }}{% end block %}
 
 {% block body %}
-       <ul class="breadcrumb">
-               <li>
-                       <a href="/">{{ _("Home") }}</a>
-                       <span class="divider">/</span>
-               </li>
-               <li>
-                       <a href="/builders">{{ _("Builders") }}</a>
-                       <span class="divider">/</span>
-               </li>
-               <li>
-                       <a href="/builder/{{ builder.name }}">{{ builder.name }}</a>
-                       <span class="divider">/</span>
-               </li>
-               <li class="active">
-                       <a href="/builder/{{ builder.name }}/delete">{{ _("Delete") }}</a>
-               </li>
-       </ul>
-
-       <div class="page-header">
-               <h1>{{ _("Builder") }}: {{ builder.name }}</h1>
+       <div class="row">
+               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                       <nav aria-label="breadcrumb" role="navigation">
+                               <ol class="breadcrumb">
+                                       <li class="breadcrumb-item"><a href="/">{{ _("Home") }}</a></li>
+                                       <li class="breadcrumb-item"><a href="/builders">{{ _("Builders") }}</a></li>
+                                       <li class="breadcrumb-item"><a href="/builder/{{ builder.name }}">{{ builder.name }}</a></li>
+                                       <li class="breadcrumb-item active">
+                                                       <a href="/builder/{{ builder.name }}/delete">{{ _("Delete") }}</a>
+                                       </li>
+                               </ol>
+                       </nav>
+               </div>
        </div>
 
        <div class="row">
-               <div class="span6 offset3">
-                       <p>
-                               {{ _("You are going to delete the build host <strong>%s</strong>.") % builder.name }}
-                       </p>
+               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                       <div class="alert alert-danger" role="alert">
+                               <h2 class="alert-heading" style="word-wrap: break-word;">
+                                       {{ _("Delete builder: %s") % builder.name }}
+                               </h2>
+                               <p>
+                                       {{ _("You are going to delete the build host %s.") % builder.name }}
+                               </p>
+                       </div>
+               </div>
+       </div>
 
-                       <div class="btn-toolbar">
-                               <div class="btn-group pull-right">
+       <div class="row">
+               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                       <div class="btn-toolbar" role="toolbar">
+                               <div class="btn-group mr-2 mb-2" role="group">
                                        <a class="btn btn-danger" href="/builder/{{ builder.name }}/delete?confirmed=1">
                                                {{ _("Delete %s") % builder.name }}
                                        </a>
-                                       <a class="btn" href="/builder/{{ builder.name }}">{{ _("Cancel") }}</a>
+                               </div>
+                               <div class="btn-group mb-2" role="group">
+                                       <a class="btn btn-primary" href="/builder/{{ builder.name }}">{{ _("Cancel") }}</a>
                                </div>
                        </div>
                </div>
index dc4d80772a7f79ef5341ae2ff9b7ad67bd4cc2a6..ea6dd8aae77291e7615980604aa1d61c8375cc59 100644 (file)
 {% block title %}{{ _("Builder") }}: {{ builder.name }}{% end block %}
 
 {% block body %}
-       <ul class="breadcrumb">
-               <li>
-                       <a href="/">{{ _("Home") }}</a>
-                       <span class="divider">/</span>
-               </li>
-               <li>
-                       <a href="/builders">{{ _("Builders") }}</a>
-                       <span class="divider">/</span>
-               </li>
-               <li class="active">
-                       <a href="/builder/{{ builder.name }}">{{ builder.name }}</a>
-               </li>
-       </ul>
-
-       <div class="btn-group pull-right">
-               <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
-                       {{ _("Actions") }} <span class="caret"></span>
-               </a>
-               <ul class="dropdown-menu">
-                       <li>
-                               <a href="/jobs?builder={{ builder.name }}">
-                                       {{ _("Show jobs by this builder") }}
-                               </a>
-                       </li>
-                       {% if current_user and current_user.has_perm("maintain_builders") %}
-                               <li class="divider"></li>
-
-                               {% if builder.enabled %}
-                                       <li>
-                                               <a href="/builder/{{ builder.name }}/disable">
-                                                       {{ _("Disable builder") }}
-                                               </a>
-                                       </li>
-                               {% else %}
-                                       <li>
-                                               <a href="/builder/{{ builder.name }}/enable">
-                                                       {{ _("Enable builder") }}
-                                               </a>
+       <div class="row">
+               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                       <nav aria-label="breadcrumb" role="navigation">
+                               <ol class="breadcrumb">
+                                       <li class="breadcrumb-item"><a href="/">{{ _("Home") }}</a></li>
+                                       <li class="breadcrumb-item"><a href="/builders">{{ _("Builders") }}</a></li>
+                                       <li class="breadcrumb-item active">
+                                                       <a href="/builder/{{ builder.name }}">{{ builder.name }}</a>
                                        </li>
-                               {% end %}
-
-                               <li>
-                                       <a href="/builder/{{ builder.name }}/edit">
-                                               <i class="icon-edit"></i>
-                                               {{ _("Edit builder") }}
+                               </ol>
+                       </nav>
+               </div>
+       </div>
+       <div class="row">
+               <div class="col-12 col-sm-12 col-md-9 col-lg-10 col-xl-10">
+                       <h2 style="word-wrap: break-word;">
+                               {{ _("Builder") }}: {{ builder.name }}
+                       </h2>
+               </div>
+               <div class="col-12 col-sm-12 col-md-3 col-lg-2 col-xl-2">
+                       <div class="dropdown">
+                               <button class="btn btn-block btn-light dropdown-toggle mb-2" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                       {{ _("Actions") }}
+                               </button>
+                               <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
+                                       <a class="dropdown-item" href="/jobs?builder={{ builder.name }}">
+                                               {{ _("Show jobs by this builder") }}
                                        </a>
-                               </li>
-
-                               {% if not builder.enabled %}
-                                       <li>
-                                               <a href="/builder/{{ builder.name }}/renew">
-                                                       <i class="icon-refresh"></i>
-                                                       {{ _("Renew passphrase") }}
+                                       {% if current_user and current_user.has_perm("maintain_builders") %}
+                                               <div class="dropdown-divider"></div>
+                                               {% if builder.enabled %}
+                                                       <a class="dropdown-item" href="/builder/{{ builder.name }}/disable">
+                                                               {{ _("Disable builder") }}
+                                                       </a>
+                                               {% else %}
+                                                       <a class="dropdown-item" href="/builder/{{ builder.name }}/enable">
+                                                               {{ _("Enable builder") }}
+                                                       </a>
+                                               {% end %}
+                                               <a class="dropdown-item" href="/builder/{{ builder.name }}/edit">
+                                                       <i class="icon-edit"></i>
+                                                       {{ _("Edit builder") }}
                                                </a>
-                                       </li>
-                               {% end %}
-
-                               <li>
-                                       <a href="/builder/{{ builder.name }}/delete">
-                                               <i class="icon-trash"></i>
-                                               {{ _("Delete builder") }}
-                                       </a>
-                               </li>
-                       {% end %}
-               </ul>
-       </div>
-
-       <div class="page-header">
-               <h2>{{ _("Builder") }}: {{ builder.name }}</h2>
+                                               {% if not builder.enabled %}
+                                                       <a class="dropdown-item" href="/builder/{{ builder.name }}/renew">
+                                                               <i class="icon-refresh"></i>
+                                                               {{ _("Renew passphrase") }}
+                                                       </a>
+                                               {% end %}
+                                               <a class="dropdown-item"href="/builder/{{ builder.name }}/delete">
+                                                       <i class="icon-trash"></i>
+                                                       {{ _("Delete builder") }}
+                                               </a>
+                                       {% end %}
+                               </div>
+                       </div>
+               </div>
        </div>
 
        {% if builder.testmode %}
-               <div class="alert alert-block alert-warning">
-                       {{ _("This builder is in test mode!") }}
+               <div class="row">
+                       <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                               <div class="alert alert-warning">
+                                       {{ _("This builder is in test mode!") }}
+                               </div>
+                       </div>
                </div>
        {% end %}
 
        <div class="row">
-               <div class="span5">
-                       <table class="table table-striped table-hover">
-                               <tbody>
-                                       <tr>
-                                               <td>{{ _("State") }}</td>
-                                               <td>
-                                                       {% if builder.enabled %}
-                                                               {{ _("Enabled") }}
-                                                       {% else %}
-                                                               {{ _("Disabled") }}
-                                                       {% end %}
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                               <td>{{ _("Parallel builds") }}</td>
-                                               <td>{{ _("One job only.", "Up to %(num)s jobs.", builder.max_jobs) % { "num" : builder.max_jobs } }}</td>
-                                       </tr>
-                               </tbody>
-                       </table>
-
-                       {% if builder.description %}
-                               <h2>{{ _("Remarks") }}</h2>
-                               <p>
-                                       {% module Text(builder.description) %}
-                               </p>
-                       {% end %}
+               <div class="col-12 col-sm-12 col-md-6 col-lg-6 col-xl-6">
+                       <h3>{{ _("General") }}</h3>
+                       <div class="table-responsive mb-2">
+                               <table class="table table-striped table-hover">
+                                       <tbody>
+                                               <tr>
+                                                       <td>{{ _("State") }}</td>
+                                                       <td>
+                                                               {% if builder.enabled %}
+                                                                       {{ _("Enabled") }}
+                                                               {% else %}
+                                                                       {{ _("Disabled") }}
+                                                               {% end %}
+                                                       </td>
+                                               </tr>
+                                               <tr>
+                                                       <td>{{ _("Parallel builds") }}</td>
+                                                       <td>{{ _("One job only.", "Up to %(num)s jobs.", builder.max_jobs) % { "num" : builder.max_jobs } }}</td>
+                                               </tr>
+                                               <tr>
+                                                       <td>{{ _("Supported architectures") }}</td>
+                                                       <td>
+                                                               {{ locale.list(builder.supported_arches) }}
+                                                       </td>
+                                               </tr>
+                                               <tr>
+                                                       <td>{{ _("CPU model") }}</td>
+                                                       <td>
+                                                               {{ builder.cpu_model or _("Unknown") }}
+                                                       </td>
+                                               </tr>
+                                               <tr>
+                                                       <td>{{ _("CPU count") }}</td>
+                                                       <td>{{ builder.cpu_count }}</td>
+                                               </tr>
+                                               <tr>
+                                                       <td>{{ _("Bogomips") }}</td>
+                                                       <td>{{ builder.cpu_bogomips or _("N/A") }}</td>
+                                               </tr>
+                                               <tr>
+                                                       <td>{{ _("Host key") }}</td>
+                                                       <td>
+                                                               {{ builder.host_key_id or _("N/A") }}
+                                                       </td>
+                                               </tr>
+                                       </tbody>
+                               </table>
+                       </div>
                </div>
 
-               <div class="span7">
-                       <table class="table table-striped table-hover">
-                               <tbody>
-                                       <tr>
-                                               <td>{{ _("OS") }}</td>
-                                               <td>
-                                                       {{ builder.os_name or _("N/A") }}
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                               <td>{{ _("Pakfire version") }}</td>
-                                               <td>
-                                                       {{ builder.pakfire_version or _("N/A") }}
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                               <td>{{ _("Supported architectures") }}</td>
-                                               <td>
-                                                       {{ locale.list(builder.supported_arches) }}
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                               <td>{{ _("CPU model") }}</td>
-                                               <td>
-                                                       {{ builder.cpu_model or _("Unknown") }}
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                               <td>{{ _("CPU count") }}</td>
-                                               <td>{{ builder.cpu_count }}</td>
-                                       </tr>
-                                       <tr>
-                                               <td>{{ _("Bogomips") }}</td>
-                                               <td>{{ builder.cpu_bogomips or _("N/A") }}</td>
-                                       </tr>
-                                       <tr>
-                                               <td colspan="2">
-                                                       {% if builder.mem_total %}
-                                                               <h6>
-                                                                       <span class="pull-right">
-                                                                               {{ format_size(builder.mem_used) }}/{{ format_size(builder.mem_total) }}
-                                                                       </span>
-
-                                                                       {{ _("Memory") }}
-                                                               </h6>
 
-                                                               <div class="progress">
-                                                                       <div class="bar" style="width: {{ "%.2f%%" % builder.mem_percentage }}"></div>
-                                                               </div>
-                                                       {% end %}
 
-                                                       {% if builder.swap_total %}
-                                                               <h6>
-                                                                       <span class="pull-right">
-                                                                               {{ format_size(builder.swap_used) }}/{{ format_size(builder.swap_total) }}
+               <div class="col-12 col-sm-12 col-md-6 col-lg-6 col-xl-6">
+                       <h3>{{ _("Status information") }}</h3>
+                       <div class="table-responsive">
+                               <table class="table table-striped table-hover">
+                                       <tbody>
+                                               <tr>
+                                                       <td>{{ _("OS") }}</td>
+                                                       <td>
+                                                               {{ builder.os_name or _("N/A") }}
+                                                       </td>
+                                               </tr>
+                                               <tr>
+                                                       <td>{{ _("Pakfire version") }}</td>
+                                                       <td>
+                                                               {{ builder.pakfire_version or _("N/A") }}
+                                                       </td>
+                                               </tr>
+
+
+                                               {% if builder.mem_total %}
+                                                       <tr>
+                                                               <td colspan="2">
+                                                                       <h6>
+                                                                               <span class="float-right">
+                                                                                       {{ format_size(builder.mem_used) }}/{{ format_size(builder.mem_total) }}
+                                                                               </span>
+
+                                                                               {{ _("Memory") }}
+                                                                       </h6>
+                                                                       <div class="progress">
+                                                                               <div class="progress-bar" role="progressbar" style="width: {{ "%.2f%%" % builder.mem_percentage }}"></div>
+                                                                       </div>
+                                                               </td>
+                                                       <tr>
+                                               {% end %}
+
+                                               {% if builder.swap_total %}
+                                                       <tr>
+                                                               <td colspan="2">
+                                                                       <h6>
+                                                                               <span class="float-right">
+                                                                                       {{ format_size(builder.swap_used) }}/{{ format_size(builder.swap_total) }}
+                                                                               </span>
+
+                                                                               {{ _("SWAP space") }}
+                                                                       </h6>
+
+                                                                       <div class="progress">
+                                                                               <div class="bar bar-danger" style="width: {{ "%.2f%%" % builder.swap_percentage }}"></div>
+                                                                       </div>
+                                                               </td>
+                                                       </tr>
+                                               {% end %}
+
+                                               {% if not builder.mem_total and not builder.swap_total %}
+                                                       <tr>
+                                                               <td colspan="2">
+                                                                       <span class="text-muted">
+                                                                               {{ _("No memory information available.") }}
                                                                        </span>
-
-                                                                       {{ _("SWAP space") }}
-                                                               </h6>
-
-                                                               <div class="progress">
-                                                                       <div class="bar bar-danger" style="width: {{ "%.2f%%" % builder.swap_percentage }}"></div>
-                                                               </div>
-                                                       {% end %}
-
-                                                       {% if not builder.mem_total and not builder.swap_total %}
-                                                               <span class="muted">{{ _("No memory information available.") }}</span>
-                                                       {% end %}
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                               <td>{{ _("Load average") }}</td>
-                                               <td>
-                                                       {{ builder.loadavg or _("N/A") }}
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                               <td>{{ _("Free disk space") }}</td>
-                                               <td>{{ format_size(builder.space_free or 0) }}</td>
-                                       </tr>
-
-                                       <tr>
-                                               <td>{{ _("Host key") }}</td>
-                                               <td>
-                                                       {{ builder.host_key_id or _("N/A") }}
-                                               </td>
-                                       </tr>                                   
-                               </tbody>
-                       </table>
+                                                               </td>
+                                                       </tr>
+                                               {% end %}
+
+                                               <tr>
+                                                       <td>{{ _("Load average") }}</td>
+                                                       <td>
+                                                               {{ builder.loadavg or _("N/A") }}
+                                                       </td>
+                                               </tr>
+                                               <tr>
+                                                       <td>{{ _("Free disk space") }}</td>
+                                                       <td>{{ format_size(builder.space_free or 0) }}</td>
+                                               </tr>
+                                       </tbody>
+                               </table>
+                       </div>
                </div>
        </div>
 
-       {% if jobs %}
-               <hr>
+       {% if builder.description %}
+       <div class="row">
+                       <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                               <h2>{{ _("Remarks") }}</h2>
+                               {% module Text(builder.description) %}
+                       </div>
+               </div>
+       {% end %}
 
-               <h3>{{ _("Active and pending jobs") }}</h3>
-               {% module JobsList(jobs) %}
+
+       {% if jobs %}
+               <div class="row">
+                       <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                               <h3>{{ _("Active and pending jobs") }}</h3>
+                               {% module JobsList(jobs) %}
+                       </div>
+               </div>
        {% end %}
 
        {% if log %}
-               <hr>
-
-               <h3>{{ _("Log") }}</h3>
-               {% module Log(log) %}
+               <div class="row">
+                       <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                               <h3>{{ _("Log") }}</h3>
+                               {% module Log(log) %}
+                       </div>
+               </div>
        {% end %}
 {% end block %}
index b39df577837066b88a7917217eabf42d4752cf64..fcf97816e5a310c038572bfca349edb374a50530 100644 (file)
@@ -3,82 +3,81 @@
 {% block title %}{{ _("Manage builder %s") % builder.hostname }}{% end block %}
 
 {% block body %}
-       <ul class="breadcrumb">
-               <li>
-                       <a href="/">{{ _("Home") }}</a>
-                       <span class="divider">/</span>
-               </li>
-               <li>
-                       <a href="/builders">{{ _("Builders") }}</a>
-                       <span class="divider">/</span>
-               </li>
-               <li>
-                       <a href="/builder/{{ builder.name }}">{{ builder.name }}</a>
-                       <span class="divider">/</span>
-               </li>
-               <li class="active">
-                       <a href="/builder/{{ builder.name }}/edit">{{ _("Manage") }}</a>
-               </li>
-       </ul>
-
-       <div class="page-header">
-               <h2>{{ _("Builder: %s") % builder.hostname }} <small>{{ _("Manage") }}</small></h2>
+       <div class="row">
+               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                       <nav aria-label="breadcrumb" role="navigation">
+                               <ol class="breadcrumb">
+                                       <li class="breadcrumb-item"><a href="/">{{ _("Home") }}</a></li>
+                                       <li class="breadcrumb-item"><a href="/builders">{{ _("Builders") }}</a></li>
+                                       <li class="breadcrumb-item"><a href="/builder/{{ builder.name }}">{{ builder.name }}</a></li>
+                                       <li class="breadcrumb-item active">
+                                               <a href="/builder/{{ builder.name }}/edit">{{ _("Manage") }}</a>
+                                       </li>
+                               </ol>
+                       </nav>
+               </div>
        </div>
 
-       <form class="form-horizontal" method="POST" action="">
-               {% raw xsrf_form_html() %}
-               <fieldset>
-                       <div class="control-group">
-                               <label class="control-label">{{ _("Hostname") }}</label>
-                               <div class="controls">
-                                       <span class="input-xlarge uneditable-input">{{ builder.hostname }}</span>
-                                       <p class="help-block">
-                                               {{ _("The hostname cannot be changed.") }}
-                                       </p>
-                               </div>
-                       </div>
-
-                       <div class="control-group">
-                               <label class="control-label" for="enabled">{{ _("Enabled") }}</label>
-                               <div class="controls">
-                                       <label class="checkbox">
-                                               <input type="checkbox" id="enabled" name="enabled" {% if builder.enabled %}checked="checked"{% end %}>
-                                               {{ _("The builder must be enabled in order to process build jobs.") }}
-                                       </label>
-                               </div>
-                       </div>
-               </fieldset>
+       <div class="row">
+               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                       <h2 style="word-wrap: break-word;">
+                               {{ _("Manage builder: %s") % builder.hostname }}
+                       </h2>
+               </div>
+       </div>
 
-               <fieldset>
-                       <legend>{{ _("Build job settings") }}</legend>
 
-                       <div class="control-group">
-                               <label class="control-label" for="max_jobs">{{ _("Maximum number of parallel build jobs") }}</label>
-                               <div class="controls">
-                                       <select id="max_jobs" name="max_jobs">
-                                               {% for i in range(1, (2 * builder.cpu_count) + 1) %}
-                                                       <option value="{{ i }}" {% if i == builder.max_jobs %}selected="selected"{% end %}>{{ i }}</option>
-                                               {% end %}
-                                       </select>
+       <div class="row">
+               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                       <form method="POST" action="">
+                               {% raw xsrf_form_html() %}
+                               <fieldset>
+                                       <div class="form-group">
+                                               <label for="name">{{ _("Hostname") }}</label>
+                                               <input type="text" class="form-control" id="name" name="name"
+                                                       aria-describedby="nameHelp" value="{{ builder.hostname }}" disabled>
+                                               <small id="nameHelp" class="form-text text-muted">
+                                                               {{ _("The hostname cannot be changed.") }}
+                                               </small>
+                                       </div>
 
-                                       <p class="help-block">
-                                               {{ _("This is the number of build jobs that are started in parallel.") }}
-                                       </p>
-                               </div>
-                       </div>
+                                       <div class="form-check">
+                                               <label class="form-check-label">
+                                                       <input class="form-check-input" type="checkbox" id="enabled" name="enabled"
+                                                               aria-describedby="enabledHelp" {% if builder.enabled %}checked{% end %}>
+                                                       {{ _("Enabled") }}
+                                               </label>
+                                               <small id="enabledHelp" class="form-text text-muted">
+                                                               {{ _("The builder must be enabled in order to process build jobs.") }}
+                                               </small>
+                                       </div>
+                               </fieldset>
 
-                       <div class="control-group">
-                               <div class="controls">
-                                       <label class="checkbox">
-                                               <input type="checkbox" name="testmode" {%if builder.testmode %}checked{% end %}>
-                                               {{ _("Test Mode") }}
-                                       </label>
-                               </div>
-                       </div>
+                               <fieldset>
+                                       <legend>{{ _("Build job settings") }}</legend>
+                                       <div class="form-group">
+                                               <label for="max_jobs">{{ _("Maximum number of parallel build jobs") }}</label>
+                                               <select class="form-control" id="max_jobs" name="max_jobs" aria-describedby="max_jobsHelp">
+                                                       {% for i in range(1, (2 * builder.cpu_count) + 1) %}
+                                                               <option value="{{ i }}" {% if i == builder.max_jobs %}selected="selected"{% end %}>{{ i }}</option>
+                                                       {% end %}
+                                               </select>
+                                               <small id="max_jobsHelp" class="form-text text-muted">
+                                                       {{ _("This is the number of build jobs that are started in parallel.") }}
+                                               </small>
+                                       </div>
+                                       <div class="form-check">
+                                               <label class="form-check-label">
+                                                       <input class="form-check-input" type="checkbox" name="testmode"
+                                                               aria-describedby="testmodeHelp" {%if builder.testmode %}checked{% end %}>
+                                                               {{ _("Test Mode") }}
+                                               </label>
+                                       </div>
+                               </fieldset>
 
-                       <div class="form-actions">
                                <button type="submit" class="btn btn-primary">{{ _("Save changes") }}</button>
-                       </div>
-               </fieldset>
-       </form>
+                               <a class="btn" href="/builder/{{ builder.name }}">{{ _("Cancel") }}</a>
+                       </form>
+               </div>
+       </div>
 {% end block %}
index 19f5aef615e62b7f358833c1e34761d1416e681b..f3a9a76b0e291efee37e8bb8a85b8205b1335a11 100644 (file)
@@ -3,69 +3,78 @@
 {% block title %}{{ _("Builders") }}{% end block %}
 
 {% block body %}
-       <ul class="breadcrumb">
-               <li>
-                       <a href="/">{{ _("Home") }}</a>
-                       <span class="divider">/</span>
-               </li>
-               <li class="active">
-                       <a href="/builders">{{ _("Builders") }}</a>
-               </li>
-       </ul>
+       <div class="row">
+               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                       <nav aria-label="breadcrumb" role="navigation">
+                               <ol class="breadcrumb">
+                                       <li class="breadcrumb-item"><a href="/">{{ _("Home") }}</a></li>
+                                       <li class="breadcrumb-item active"><a href="/builders">{{ _("Builders") }}</a></li>
+                               </ol>
+                       </nav>
+               </div>
+       </div>
 
-       <div class="page-header">
-               <h2>{{ _("Builders") }}</h2>
+       <div class="row">
+               <div class="col-12 col-sm-12 col-md-9 col-lg-10 col-xl-10">
+                       <h2>{{ _("Builders") }}</h2>
+               </div>
+               {% if current_user and current_user.is_admin() %}
+               <div class="col-12 col-sm-12 col-md-3 col-lg-2 col-xl-2">
+                               <button class="btn btn-block dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                       {{ _("Actions") }}
+                               </button>
+                               <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
+                                       <a class="dropdown-item" href="/builder/new">{{ _("Create new builder") }}</a>
+                               </div>
+               </div>
+       {% end %}
        </div>
 
        <div class="row">
-               <div class="span12">
-                       <table class="table table-striped table-hover">
-                               <thead>
-                                       <tr>
-                                               <th>&nbsp;</th>
-                                               <th>{{ _("Hostname") }}</th>
-                                               <th>{{ _("Architecture") }}</th>
-                                               <th>{{ _("Jobs") }}</th>
-                                       </tr>
-                               </thead>
-                               <tbody>
-                                       {% for builder in builders %}
+               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                       <div class="table-responsive">
+                               <table class="table table-striped table-hover">
+                                       <thead>
                                                <tr>
-                                                       <td class="lead">
-                                                               {% if builder.state == "disabled" %}
-                                                                       <i class="icon-remove muted"></i>
-                                                               {% elif builder.state == "offline" %}
-                                                                       <i class="icon-remove text-warning"></i>
-                                                               {% elif builder.state == "online" %}
-                                                                       <i class="icon-ok text-success"></i>
-                                                               {% end %}
-                                                       </td>
-                                                       <td>
-                                                               <a href="/builder/{{ builder.name }}">{{ builder.name }}</a>
-                                                               <br>
-                                                               {{ builder.cpu_model or _("Unknown CPU") }}
-                                                               {% if builder.mem_total %}
-                                                                       - {{ format_size(builder.mem_total) }}
-                                                               {% end %}
-                                                       </td>
-                                                       <td>
-                                                               {{ builder.cpu_arch or _("Unknown") }}
-                                                       </td>
-                                                       <td>
-                                                               <p class="{% if not builder.active_jobs %}text-success{% elif len(builder.active_jobs) >= builder.max_jobs %}text-error{% else %}text-warning{% end %}">
-                                                                       {{ len(builder.active_jobs) }}/{{ builder.max_jobs }}
-                                                               </p>
-                                                       </td>
+                                                       <th>&nbsp;</th>
+                                                       <th>{{ _("Hostname") }}</th>
+                                                       <th>{{ _("Architecture") }}</th>
+                                                       <th>{{ _("Jobs") }}</th>
                                                </tr>
-                                       {% end %}
-                               </tbody>
-                       </table>
-
-                       {% if current_user and current_user.is_admin() %}
-                               <div class="btn-group pull-right">
-                                       <a class="btn" href="/builder/new">{{ _("Create new builder") }}</a>
-                               </div>
-                       {% end %}
+                                       </thead>
+                                       <tbody>
+                                               {% for builder in builders %}
+                                                       <tr>
+                                                               <td class="lead">
+                                                                       {% if builder.state == "disabled" %}
+                                                                               <i class="icon-remove text-muted"></i>
+                                                                       {% elif builder.state == "offline" %}
+                                                                               <i class="icon-remove text-warning"></i>
+                                                                       {% elif builder.state == "online" %}
+                                                                               <i class="icon-ok text-success"></i>
+                                                                       {% end %}
+                                                               </td>
+                                                               <td>
+                                                                       <a href="/builder/{{ builder.name }}">{{ builder.name }}</a>
+                                                                       <br>
+                                                                       {{ builder.cpu_model or _("Unknown CPU") }}
+                                                                       {% if builder.mem_total %}
+                                                                               - {{ format_size(builder.mem_total) }}
+                                                                       {% end %}
+                                                               </td>
+                                                               <td>
+                                                                       {{ builder.cpu_arch or _("Unknown") }}
+                                                               </td>
+                                                               <td>
+                                                                       <p class="{% if not builder.active_jobs %}text-success{% elif len(builder.active_jobs) >= builder.max_jobs %}text-danger{% else %}text-warning{% end %}">
+                                                                               {{ len(builder.active_jobs) }}/{{ builder.max_jobs }}
+                                                                       </p>
+                                                               </td>
+                                                       </tr>
+                                               {% end %}
+                                       </tbody>
+                               </table>
+                       </div>
                </div>
        </div>
 {% end block %}
index 89f4d1048e871ea6fd700c1c91ff69ba73cb62c4..ac9c0485b41aab002538e62d6a1f068c001d6a8a 100644 (file)
@@ -3,43 +3,43 @@
 {% block title %}{{ _("Create new builder") }}{% end block %}
 
 {% block body %}
-       <ul class="breadcrumb">
-               <li>
-                       <a href="/">{{ _("Home") }}</a>
-                       <span class="divider">/</span>
-               </li>
-               <li>
-                       <a href="/builders">{{ _("Builders") }}</a>
-                       <span class="divider">/</span>
-               </li>
-               <li class="active">
-                       <a href="/builder/new">{{ _("Create new builder") }}</a>
-               </li>
-       </ul>
+       <div class="row">
+               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                       <nav aria-label="breadcrumb" role="navigation">
+                               <ol class="breadcrumb">
+                                       <li class="breadcrumb-item"><a href="/">{{ _("Home") }}</a></li>
+                                       <li class="breadcrumb-item"><a href="/builders">{{ _("Builders") }}</a></li>
+                                       <li class="breadcrumb-item active">
+                                               <a href="/builder/new">{{ _("Create new builder") }}</a>
+                                       </li>
+                               </ol>
+                       </nav>
+               </div>
+       </div>
 
-       <div class="page-header">
-               <h1>{{ _("Create a new builder") }}</h1>
+       <div class="row">
+               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                       <h2 style="word-wrap: break-word;">
+                               {{ _("Create a new builder") }}
+                       </h2>
+               </div>
        </div>
 
        <div class="row">
-               <div class="span6 offset3">
-                       <form class="form-horizontal" method="POST" action="">
+               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                       <form method="POST" action="">
                                {% raw xsrf_form_html() %}
                                <fieldset>
-                                       <div class="control-group">
-                                               <label class="control-label" for="name">{{ _("Hostname") }}</label>
-                                               <div class="controls">
-                                                       <input type="text" class="input-xlarge" id="name" name="name">
-
-                                                       <p class="help-block">
-                                                               {{ _("Enter the canonical hostname of the machine.") }}
-                                                       </p>
-                                               </div>
+                                       <div class="form-group">
+                                               <label for="name">{{ _("Hostname") }}</label>
+                                               <input type="text" class="form-control" id="name" name="name"
+                                                       aria-describedby="nameHelp" placeholder="{{ _("Hostname") }}">
+                                               <small id="nameHelp" class="form-text text-muted">
+                                                       {{ _("Enter the canonical hostname of the machine.") }}
+                                               </small>
                                        </div>
 
-                                       <div class="form-actions">
-                                               <button type="submit" class="btn btn-primary">{{ _("Create new builder") }}</button>
-                                       </div>
+                                       <button type="submit" class="btn btn-primary">{{ _("Create new builder") }}</button>
                                </fieldset>
                        </form>
                </div>
index 8c7c24e1015a0ad2a06fb05ecd30f33ef88aaaab..d905ef96ddbaec907008ed006ea106fb3934f98e 100644 (file)
@@ -1,47 +1,50 @@
 {% extends "../base.html" %}
 
 {% block body %}
-       <ul class="breadcrumb">
-               <li>
-                       <a href="/">{{ _("Home") }}</a>
-                       <span class="divider">/</span>
-               </li>
-               <li>
-                       <a href="/builders">{{ _("Builders") }}</a>
-                       <span class="divider">/</span>
-               </li>
-               <li>
-                       <a href="/builder/{{ builder.name }}">{{ builder.name }}</a>
-                       <span class="divider">/</span>
-               </li>
-               <li class="active">
-                       <a href="/builder/{{ builder.name }}/edit">{{ _("Manage") }}</a>
-               </li>
-       </ul>
+       <div class="row">
+               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                       <nav aria-label="breadcrumb" role="navigation">
+                               <ol class="breadcrumb">
+                                       <li class="breadcrumb-item"><a href="/">{{ _("Home") }}</a></li>
+                                       <li class="breadcrumb-item"><a href="/builders">{{ _("Builders") }}</a></li>
+                                       <li class="breadcrumb-item"><a href="/builder/{{ builder.name }}">{{ builder.name }}</a></li>
+                                       <li class="breadcrumb-item active">
+                                               <a href="/builder/{{ builder.name }}/edit">{{ _("Manage") }}</a>
+                                       </li>
+                               </ol>
+                       </nav>
+               </div>
+       </div>
 
-       <div class="page-header">
-               <h1>{{ _("Builder") }}: {{ builder.name }}</h1>
+       <div class="row">
+               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                       <h2 style="word-wrap: break-word;">
+                               {{ _("Builder") }}: {{ builder.name }}
+                       </h2>
+               </div>
        </div>
 
        <div class="row">
-               <div class="span6 offset3">
+               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
                        <p>
                                {% if action == "new" %}
-                                       {{ _("The new host <strong>%s</strong> has been successfully created.") % builder.name }}
+                                       {{ _("The new host") }} <strong> {{ builder.name }} </strong> {{ _("has been successfully created.") }}
                                {% elif action == "update" %}
-                                       {{ _("The passphrase for <strong>%s</strong> has been regenerated.") % builder.name }}
+                                       {{ _("The passphrase for") }}  <strong> {{ builder.name }}</strong> {{ _("has been regenerated.") }}
                                {% end %}
-
+                               <br>
                                {{ _("For authorization to the Pakfire Master Server there is a passphrase required which must be configured to the host.") }}
                        </p>
 
                        <p>
                                {{ _("This passphrase is:") }} <strong>{{ passphrase }}</strong>
                        </p>
+               </div>
+       </div>
 
-                       <p class="pull-right">
-                               <a class="btn btn-primary" href="/builder/{{ builder.name }}">{{ _("Next") }}</a>
-                       </p>
+       <div class="row justify-content-end">
+               <div class="col-12 col-sm-12 col-md-3 col-lg-2 col-xl-2">
+                               <a class="btn btn-primary btn-block" href="/builder/{{ builder.name }}">{{ _("Next") }}</a>
                </div>
        </div>
 {% end block %}