]> git.ipfire.org Git - pbs.git/commitdiff
bootstrap4: begin porting the distribution/repository sites
authorJonatan Schlag <jonatan.schlag@ipfire.org>
Wed, 10 Jan 2018 18:03:06 +0000 (19:03 +0100)
committerJonatan Schlag <jonatan.schlag@ipfire.org>
Wed, 10 Jan 2018 18:03:06 +0000 (19:03 +0100)
Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
src/templates/distro-detail.html
src/templates/distro-list.html
src/templates/distro-source-commit-detail.html
src/templates/distro-source-commits.html
src/templates/distro-source-detail.html
src/templates/modules/commits-table.html
src/templates/modules/repository-table.html
src/templates/modules/source-table.html
src/templates/repository-detail.html

index 1122c4c9c623835d4cf79958d4c1a7748daf29b8..bf7dc44cc15e1c72ce8f43fd2b9fbc91be3b2f42 100644 (file)
@@ -3,56 +3,90 @@
 {% block title %}{{ _("Distribution") }}: {{ distro.name }}{% end block %}
 
 {% block body %}
-       <ul class="breadcrumb">
-               <li>
-                       <a href="/">{{ _("Home") }}</a>
-                       <span class="divider">/</span>
-               </li>
-               <li>
-                       <a href="/distros">{{ _("Distributions") }}</a>
-                       <span class="divider">/</span>
-               </li>
-               <li class="active">
-                       <a href="/distro/{{ distro.identifier }}">{{ distro.name }}</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="/distros">{{ _("Distributions") }}</a></li>
+                                       <li class="breadcrumb-item active">
+                                               <a href="/distro/{{ distro.identifier }}">{{ distro.name }}</a>
+                                       </li>
+                               </ol>
+                       </nav>
+               </div>
+       </div>
+
 
-       <div class="page-header">
-               <h1>
-                       {{ _("Distribution") }}: {{ distro.name }}
-                       <small>{{ distro.slogan }}</small>
-               </h1>
+       <div class="row">
+               {% if current_user and current_user.is_admin() %}
+                       <div class="col-12 col-sm-12 col-md-9 col-lg-10 col-xl-10">
+                               <h2 style="word-wrap: break-word;">
+                                       {{ _("Distribution") }}: {{ distro.name }} <br>
+                                       <small class="text-muted">{{ distro.slogan }}</small>
+                               </h2>
+                       </div>
+                       <div class="col-12 col-sm-12 col-md-3 col-lg-2 col-xl-2 mb-2">
+                               <button class="btn dropdown-toggle btn-block " type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                       {{ _("Actions") }}
+                               </button>
+                               <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
+                                       <a class="dropdown-item" href="/distro/{{ distro.identifier }}/edit">
+                                               {{ _("Edit distribution") }}
+                                       </a>
+                                       <a class="dropdown-item" href="/distro/{{ distro.identifier }}/delete">
+                                               {{ _("Delete distribution") }}
+                                       </a>
+                                       </a>
+                                       <a class="dropdown-item" href="/distro/{{ distro.identifier }}/repo/new">
+                                               {{ _("New binary repository") }}
+                                       </a>
+                                       <a class="dropdown-item" href="/distro/{{ distro.identifier }}/source/new">
+                                               {{ _("New source repository") }}
+                                       </a>
+                               </div>
+                       </div>
+               {% else %}
+                       <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                               <h2 style="word-wrap: break-word;">
+                                       {{ _("Distribution") }}: {{ distro.name }} <br>
+                                       <small class="text-muted">{{ distro.slogan }}</small>
+                               </h2>
+                       </div>
+               {% end %}
        </div>
 
        <div class="row">
-               <div class="span10 offset1">
-                       <blockquote>
-                               {{ distro.description }}
-                               <small>{{ distro.vendor }}</small>
+               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                       <blockquote class="blockquote">
+                               <p class="mb-0">{{ distro.description }}</p>
+                               <footer class="blockquote-footer"><cite title="{{ distro.vendor }}">{{ distro.vendor }}</cite></footer>
                        </blockquote>
+               </div>
+       </div>
 
+       <div class="row">
+               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
                        <p>
                                {{ _("Supported architectures") }}:
                                {{ locale.list(distro.arches) or _("None") }}
                        </p>
-
                        <hr />
                </div>
        </div>
 
        <div class="row">
-               <div class="span10 offset1">
-                       <h2>
+               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                       <h2 style="word-wrap: break-word;">
                                {{ _("Binary repositories") }}
                                <small>({{ len(distro.repositories) }})</small>
                        </h2>
-                       
-                       <blockquote>
+
+                       <p>
                                {{ _("A binary repository is a composition of packages that are considered stable, unstable or in testing state by the developers.") }}
-                               <br /><br />
+                               <br/>
                                {{ _("Each repository can be enabled individually.") }}
-                               <a href="/documents/enable-repositories">{{ _("Learn how to use them.") }}</a>
-                       </blockquote>
+                       </p>
 
                        {% module RepositoryTable(distro, distro.repositories) %}
 
@@ -61,8 +95,8 @@
        </div>
 
        <div class="row">
-               <div class="span10 offset1">
-                       <h2>
+               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                       <h2 style="word-wrap: break-word;">
                                {{ _("Source repositories") }}
                                <small>({{ len(distro.sources) }})</small>
                        </h2>
                </div>
        </div>
 
-       {% if current_user and current_user.is_admin() %}
-               <div class="row">
-                       <div class="span10 offset1">
-                               <div class="btn-group pull-right">
-                                       <a class="btn btn-danger dropdown-toggle" data-toggle="dropdown" href="#">
-                                               <i class="icon-star icon-white"></i>
-                                               {{ _("Action") }}
-                                               <span class="caret"></span>
-                                       </a>
-                                       <ul class="dropdown-menu">
-                                               <li>
-                                                       <a href="/distro/{{ distro.identifier }}/edit">
-                                                               {{ _("Edit distribution") }}
-                                                       </a>
-                                               </li>
-                                               <li>
-                                                       <a href="/distro/{{ distro.identifier }}/delete">
-                                                               {{ _("Delete distribution") }}
-                                                       </a>
-                                               </li>
-                                               <li class="divider"></li>
-                                               <li>
-                                                       <a href="/distro/{{ distro.identifier }}/repo/new">
-                                                               {{ _("New binary repository") }}
-                                                       </a>
-                                               </li>
-                                               <li>
-                                                       <a href="/distro/{{ distro.identifier }}/source/new">
-                                                               {{ _("New source repository") }}
-                                                       </a>
-                                               </li>
-                                       </ul>
-                               </div>
-                       </div>
-               </div>
-       {% end %}
 {% end block %}
index 1714785d5b279e78a0cdb10ee1f04fc7101900a6..23a4bf44f98c443a0523ec82ac2816b8e456fec2 100644 (file)
@@ -3,68 +3,74 @@
 {% block title %}{{ _("Distributions") }}{% end block %}
 
 {% block body %}
-       <ul class="breadcrumb">
-               <li>
-                       <a href="/">{{ _("Home") }}</a>
-                       <span class="divider">/</span>
-               </li>
-               <li class="active">
-                       <a href="/distros">{{ _("Distributions") }}</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="/distros">{{ _("Distributions") }}</a></li>
+                               </ol>
+                       </nav>
+               </div>
+       </div>
 
-       <div class="page-header">
-               <h1>
-                       {{ _("Distributions") }}
-               </h1>
+       <div class="row">
+               <div class="col-12 col-sm-12 col-md-9 col-lg-10 col-xl-10">
+                       <h2>{{ _("Distributions") }}</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 mb-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="/distro/new">{{ _("New distribution") }}</a>
+                                       </div>
+                       </div>
+               {% end %}
        </div>
 
        <div class="row">
-               <div class="span10 offset1">
+               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
                        <p>
                                {{ _("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.") }}
                        </p>
-
-                       <table class="table">
-                               <thead>
-                                       <tr>
-                                               <th>{{ _("Distribution") }}</th>
-                                               <th>{{ _("Repositories") }}</th>
-                                       </tr>
-                               </thead>
-                               <tbody>
-                                       {% for distro in distros %}
-                                               <tr>
-                                                       <td>
-                                                               <a href="/distro/{{ distro.identifier }}">{{ distro.name }}</a>
-                                                               <br /><em>{{ distro.slogan }}</em>
-                                                       </td>
-                                                       <td>
-                                                               <ul class="unstyled">
-                                                                       {% for repo in distro.repositories %}
-                                                                               <li>
-                                                                                       <a href="/distro/{{ distro.identifier }}/repo/{{ repo.identifier }}">{{ repo.name }}</a>
-                                                                                       - {{ repo.summary }}
-                                                                               </li>
-                                                                       {% end %}
-                                                               </ul>
-                                                       </td>
-                                               </tr>
-                                       {% end %}
-                               </tbody>
-                       </table>
                </div>
        </div>
 
-       {% if current_user and current_user.is_admin() %}
-               <div class="row">
-                       <div class="span10 offset1">
-                               <a class="btn btn-danger pull-right" href="/distro/new">
-                                       <i class="icon-star icon-white"></i>
-                                       {{ _("New distribution") }}
-                               </a>
+       <div class="row">
+               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                       <div class="table-responsive">
+                               <table class="table">
+                                       <thead>
+                                               <tr>
+                                                       <th>{{ _("Distribution") }}</th>
+                                                       <th>{{ _("Repositories") }}</th>
+                                               </tr>
+                                       </thead>
+                                       <tbody>
+                                               {% for distro in distros %}
+                                                       <tr>
+                                                               <td>
+                                                                       <a href="/distro/{{ distro.identifier }}">{{ distro.name }}</a>
+                                                                       <br /><em>{{ distro.slogan }}</em>
+                                                               </td>
+                                                               <td>
+                                                                       <ul class="list-unstyled">
+                                                                               {% for repo in distro.repositories %}
+                                                                                       <li>
+                                                                                               <a href="/distro/{{ distro.identifier }}/repo/{{ repo.identifier }}">{{ repo.name }}</a>
+                                                                                               - {{ repo.summary }}
+                                                                                       </li>
+                                                                               {% end %}
+                                                                       </ul>
+                                                               </td>
+                                                       </tr>
+                                               {% end %}
+                                       </tbody>
+                               </table>
                        </div>
                </div>
-       {% end %}
+       </div>
 {% end block %}
index 25d98bd1b3c4b62d2421412cfb281fc19d65dac9..4c7987ae986817b328f39e41fc4965f5ec5ce16e 100644 (file)
 {% block title %}{{ _("Commit") }}: {{ commit.revision }}{% end block %}
 
 {% block body %}
-       <ul class="breadcrumb">
-               <li>
-                       <a href="/">{{ _("Home") }}</a>
-                       <span class="divider">/</span>
-               </li>
-               <li>
-                       <a href="/distros">{{ _("Distributions") }}</a>
-                       <span class="divider">/</span>
-               </li>
-               <li>
-                       <a href="/distro/{{ distro.identifier }}">{{ distro.name }}</a>
-                       <span class="divider">/</span>
-               </li>
-               <li>
-                       <a href="/distro/{{ distro.identifier }}/source/{{ source.identifier }}">
-                               {{ _("Source: %s") % source.name }}
-                       </a>
-                       <span class="divider">/</span>
-               </li>
-               <li class="active">
-                       <a href="/distro/{{ distro.identifier }}/source/{{ source.identifier }}/{{ commit.revision }}">
-                               {{ commit.revision[:7] }}
-                       </a>
-               </li>
-       </ul>
 
-       <div class="page-header">
-               <h1>
-                       {{ _("Source") }}: {{ source.name }}
-                       <br />
-                       <small>
-                               {{ commit.revision[:7] }} - {{ commit.subject }}
-                       </small>
-               </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="/distros">{{ _("Distributions") }}</a></li>
+                                       <li class="breadcrumb-item"><a href="/distro/{{ distro.identifier }}">{{ distro.name }}</a></li>
+                                       <li class="breadcrumb-item">
+                                               <a href="/distro/{{ distro.identifier }}/source/{{ source.identifier }}">
+                                                       {{ _("Source: %s") % source.name }}
+                                               </a>
+                                       </li>
+                                       <li class="breadcrumb-item active">
+                                               <a href="/distro/{{ distro.identifier }}/source/{{ source.identifier }}/{{ commit.revision }}">
+                                                       {{ commit.revision[:7] }}
+                                               </a>
+                                       </li>
+                               </ol>
+                       </nav>
+               </div>
        </div>
 
        <div class="row">
-               <div class="span10 offset1">
-                       <table class="table">
-                               <tbody>
-                                       <tr>
-                                               <td>{{ _("Revision") }}</td>
-                                               <td>{{ commit.revision }}</td>
-                                       </tr>
-                                       <tr>
-                                               <td>{{ _("Date") }}</td>
-                                               <td>{{ format_date(commit.date, full_format=True) }}</td>
-                                       </tr>
-                                       <tr>
-                                               <td>{{ _("Author") }}</td>
-                                               <td>{% module LinkToUser(commit.author) %}</td>
-                                       </tr>
-                                       <tr>
-                                               <td>{{ _("Committer") }}</td>
-                                               <td>{% module LinkToUser(commit.committer) %}</td>
-                                       </tr>
-
-                                       {% if commit.message %}
-                                               <tr>
-                                                       <td colspan="2">
-                                                               {% module CommitMessage(commit) %}
-                                                       </td>
-                                               </tr>
-                                       {% end %}
+                       {% if source.gitweb or (current_user and current_user.is_admin()) %}
+                       <div class="col-12 col-sm-12 col-md-9 col-lg-10 col-xl-10">
+                       <h2 style="word-wrap: break-word;">
+                                       {{ _("Source") }}: {{ source.name }}
+                                       <br />
+                                       <small>
+                                               {{ commit.revision[:7] }} - {{ commit.subject }}
+                                       </small>
+                               </h2>
+                       </div>
+                       <div class="col-12 col-sm-12 col-md-3 col-lg-2 col-xl-2 mb-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">
+                                               {% if source.gitweb %}
+                                                       <a class="dropdown-item" href="{{ source.gitweb }};a=commitdiff;h={{ commit.revision }}" target="_blank">
+                                                               {{ _("Open in gitweb") }}
+                                                       </a>
+                                               {% end %}
+                                               {% if current_user and current_user.is_admin() %}
+                                                       <a class="dropdown-item" href="/distro/{{ distro.identifier }}/source/{{ source.identifier }}/{{ commit.revision }}/reset">
+                                                               {{ _("Reset commit") }}
+                                                       </a>
+                                               {% end %}
+                                       </div>
+                               </div>
+                       </div>
+               {% else %}
+                       <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                               <h2 style="word-wrap: break-word;">
+                                       {{ _("Source") }}: {{ source.name }}
+                                       <br />
+                                       <small>
+                                               {{ commit.revision[:7] }} - {{ commit.subject }}
+                                       </small>
+                               </h2>
+                       </div>
+               {% end %}
+       </div>
 
-                                       <tr>
-                                               <td colspan="2">
-                                                       <div class="btn-toolbar pull-right">
-                                                               {% if source.gitweb %}
-                                                                       <div class="btn-group">
-                                                                               <a class="btn" href="{{ source.gitweb }};a=commitdiff;h={{ commit.revision }}" target="_blank">
-                                                                                       {{ _("Open in gitweb") }}
-                                                                               </a>
-                                                                       </div>
-                                                               {% end %}
 
-                                                               {% if current_user and current_user.is_admin() %}
-                                                                       <div class="btn-group">
-                                                                               <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
-                                                                                       <i class="icon-star"></i>
-                                                                                       {{ _("Action") }}
-                                                                                       <span class="caret"></span>
-                                                                               </a>
-                                                                               <ul class="dropdown-menu">
-                                                                                       <li>
-                                                                                               <a href="/distro/{{ distro.identifier }}/source/{{ source.identifier }}/{{ commit.revision }}/reset">
-                                                                                                       {{ _("Reset commit") }}
-                                                                                               </a>
-                                                                                       </li>
-                                                                               </ul>
-                                                                       </div>
-                                                               {% end %}
-                                                       </div>
-                                               </td>
-                                       </tr>
-                               </tbody>
-                       </table>
+       <div class="row">
+               {% if commit.message %}
+                       <div class="col-12 col-sm-12 col-md-6 col-lg-6 col-xl-6">
+               {% else %}
+                       <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+               {% end %}
+                               <div class="table-responsive mb-2">
+                                       <table class="table">
+                                               <tbody>
+                                                       <tr>
+                                                               <td>{{ _("Revision") }}</td>
+                                                               <td>{{ commit.revision }}</td>
+                                                       </tr>
+                                                       <tr>
+                                                               <td>{{ _("Date") }}</td>
+                                                               <td>{{ format_date(commit.date, full_format=True) }}</td>
+                                                       </tr>
+                                                       <tr>
+                                                               <td>{{ _("Author") }}</td>
+                                                               <td>{% module LinkToUser(commit.author) %}</td>
+                                                       </tr>
+                                                       <tr>
+                                                               <td>{{ _("Committer") }}</td>
+                                                               <td>{% module LinkToUser(commit.committer) %}</td>
+                                                       </tr>
+                                               </tbody>
+                                       </table>
+                               </div>
                </div>
+               {% if commit.message %}
+                       <div class="col-12 col-sm-12 col-md-6 col-lg-6 col-xl-6">
+                               {% module CommitMessage(commit) %}
+                       </div>
+               {% end %}
        </div>
 
        <div class="row">
-               <div class="span10 offset1">
-                       <h2>{{ _("Packages created from this commit") }}</h2>
+               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                               <h3 style="word-wrap: break-word;">
+                                               {{ _("Packages created from this commit") }}
+                               </h3>
+               </div>
+       </div>
 
+       <div class="row">
+               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
                        {% if commit.packages %}
-                               <table class="table table-striped table-hover">
-                                       {% for pkg in commit.packages %}
-                                               <tr>
-                                                       <td>
-                                                               <a href="/package/{{ pkg.uuid }}">{{ pkg.friendly_name }}</a>
-                                                       </td>
-                                                       <td>
-                                                               {{ pkg.summary }}
-                                                       </td>
-                                               </tr>
-                                       {% end %}
-                               </table>
+                               <div class="table-responsive">
+                                       <table class="table table-striped table-hover">
+                                               {% for pkg in commit.packages %}
+                                                       <tr>
+                                                               <td>
+                                                                       <a href="/package/{{ pkg.uuid }}">{{ pkg.friendly_name }}</a>
+                                                               </td>
+                                                               <td>
+                                                                       {{ pkg.summary }}
+                                                               </td>
+                                                       </tr>
+                                               {% end %}
+                                       </table>
+                               </div>
                        {% else %}
                                <p>{{ _("There were no packages created from this commit.") }}</p>
                        {% end %}
index e3416808e9c991b0e7eacbe35d15c2dca883aad2..32403c939b5587ad949c3673cfabd5eff7946f70 100644 (file)
@@ -1,27 +1,69 @@
 {% extends "base.html" %}
 
 {% block body %}
-       <h1>
-               {{ _("Distribution") }}: {{ distro.name }}
-               <span>- {{ _("Source") }}: {{ source.name }} - {{ _("Commits") }}</span>
-       </h1>
-
-       <p>
-               {{ _("Source repository") }}:
-               <a href="/distro/{{ distro.identifier }}/source/{{ source.identifier }}">
-                       {{ source.name }}
-               </a>
-       </p>
+<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="/distros">{{ _("Distributions") }}</a></li>
+                                       <li class="breadcrumb-item"><a href="/distro/{{ distro.identifier }}">{{ distro.name }}</a></li>
+                                       <li class="breadcrumb-item">
+                                               <a href="/distro/{{ distro.identifier }}/source/{{ source.identifier }}">
+                                                       {{ _("Source: %s") % source.name }}
+                                               </a>
+                                       </li>
+                                       <li class="breadcrumb-item active">
+                                                       <a href="/distro/{{ distro.identifier }}/source/{{ source.identifier }}/commits">
+                                                               {{ _("Commits") }}
+                                                       </a>
+                                               </li>
+                               </ol>
+                       </nav>
+               </div>
+       </div>
 
-       {% module CommitsTable(distro, source, commits) %}
+       <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;">
+                               {{ _("Distribution") }}: {{ distro.name }} </br>
+                               <span>{{ _("Source") }}: {{ source.name }} - {{ _("Commits") }}</span>
+                       </h2>
+               </div>
+       </div>
 
-       <div class="links">
-               {% if offset %}
-                       <a href="?offset={{ offset - number }}">{{ _("Previous commits") }}</a>
-               {% end %}
+       <div class="row">
+               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                       <p>
+                               {{ _("Source repository") }}:
+                               <a href="/distro/{{ distro.identifier }}/source/{{ source.identifier }}">
+                                       {{ source.name }}
+                               </a>
+                       </p>
+               </div>
+       </div>
+       <div class="row">
+               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                       {% module CommitsTable(distro, source, commits) %}
+               </div>
+       </div>
 
-               {% if limit %}
-                       <a href="?offset={{ offset + number }}">{{ _("Next commits") }}</a>
-               {% end %}
+       <div class="row">
+               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                       <nav aria-label="Page navigation example">
+                               <ul class="pagination justify-content-center">
+                                       {% if offset %}
+                                               <li class="page-item">
+                                                       <a class="page-link" href="?offset={{ offset - number }}">{{ _("Previous commits") }}</a>
+                                               </li>
+                                       {% end %}
+                                       {% if limit %}
+                                               <li class="page-item">
+                                                       <a class="page-link" href="?offset={{ offset + number }}">{{ _("Next commits") }}</a>
+                                               </li>
+                                       {% end %}
+                               </ul>
+                       </nav>
+               </div>
        </div>
 {% end block %}
index d395f65e029056c7e1509c644a5ede6ae392c65d..d8c74fe9b74f42acd99d61b0684d0df7c7636c1d 100644 (file)
@@ -1,65 +1,73 @@
 {% extends "base.html" %}
 
 {% block body %}
-       <ul class="breadcrumb">
-               <li>
-                       <a href="/">{{ _("Home") }}</a>
-                       <span class="divider">/</span>
-               </li>
-               <li>
-                       <a href="/distros">{{ _("Distributions") }}</a>
-                       <span class="divider">/</span>
-               </li>
-               <li>
-                       <a href="/distro/{{ distro.identifier }}">{{ distro.name }}</a>
-                       <span class="divider">/</span>
-               </li>
-               <li class="active">
-                       <a href="/distro/{{ distro.identifier }}/source/{{ source.identifier }}">
-                               {{ _("Source: %s") % source.name }}
-                       </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="/distros">{{ _("Distributions") }}</a></li>
+                                       <li class="breadcrumb-item"><a href="/distro/{{ distro.identifier }}">{{ distro.name }}</a></li>
+                                       <li class="breadcrumb-item active">
+                                               <a href="/distro/{{ distro.identifier }}/source/{{ source.identifier }}">
+                                                       {{ _("Source: %s") % source.name }}
+                                               </a>
+                                       </li>
+                               </ol>
+                       </nav>
+               </div>
+       </div>
 
-       <div class="page-header">
-               <h1>
-                       {{ _("Source") }}: {{ source.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;">
+                               {{ _("Source") }}: {{ source.name }}
+                       </h2>
+               </div>
        </div>
 
        <div class="row">
-               <div class="span10 offset1">
-                       <table class="table">
-                               <tbody>
-                                       {% if source.gitweb %}
+               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                       <div class="table-responsive mb-2">
+                               <table class="table">
+                                       <tbody>
+                                               {% if source.gitweb %}
+                                                       <tr>
+                                                               <td>{{ _("Gitweb") }}</td>
+                                                               <td>
+                                                                       <a href="{{ source.gitweb }}" target="_blank">
+                                                                               {{ source.gitweb }}
+                                                                       </a>
+                                                               </td>
+                                                       </tr>
+                                               {% end %}
+                                               <tr>
+                                                       <td>{{ _("Branch") }}</td>
+                                                       <td>{{ source.branch }}</td>
+                                               </tr>
                                                <tr>
-                                                       <td>{{ _("Gitweb") }}</td>
-                                                       <td>
-                                                               <a href="{{ source.gitweb }}" target="_blank">
-                                                                       {{ source.gitweb }}
-                                                               </a>
-                                                       </td>
+                                                       <td>{{ _("Imported commits") }}</td>
+                                                       <td>{{ len(source) }}</td>
                                                </tr>
-                                       {% end %}
-                                       <tr>
-                                               <td>{{ _("Branch") }}</td>
-                                               <td>{{ source.branch }}</td>
-                                       </tr>
-                                       <tr>
-                                               <td>{{ _("Imported commits") }}</td>
-                                               <td>{{ len(source) }}</td>
-                                       </tr>
-                               </tbody>
-                       </table>
+                                       </tbody>
+                               </table>
+                       </div>
                </div>
        </div>
 
        <div class="row">
-               <div class="span10 offset1">
-                       <h2>{{ _("Latest commits") }}</h2>
+               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                       <h3>{{ _("Latest commits") }}</h3>
+               </div>
+       </div>
+       <div class="row">
+               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
                        {% module CommitsTable(distro, source, commits) %}
-
-                       <a class="btn pull-right" href="/distro/{{ distro.identifier }}/source/{{ source.identifier }}/commits">
+               </div>
+       </div>
+       <div class="row justify-content-end">
+               <div class="col-12 col-sm-12 col-md-4 col-lg-3 col-xl-3">
+                       <a class="btn btn-primary btn-block" href="/distro/{{ distro.identifier }}/source/{{ source.identifier }}/commits">
                                {{ _("Show all commits") }}
                        </a>
                </div>
index 99c7bc1f904f1baed167e683996394e4b67a7dce..f0bc07709188e3b7f5c7f9c78342cab565be8db8 100644 (file)
@@ -1,36 +1,38 @@
-<table class="table table-striped table-hover">
-       <thead>
-               <tr>
-                       <th>{{ _("Commit") }}</th>
-                       <th>{{ _("Author") }}</th>
-                       <th>{{ _("Subject") }}</th>
-               </tr>
-       </thead>
-       <tbody>
-               {% for commit in commits %}
+<div class="table-responsive mb-2">
+       <table class="table table-striped table-hover">
+               <thead>
                        <tr>
-                               <td>
-                                       {% if commit.state == "pending" %}
-                                               <i class="icon-share-alt"></i>
-                                       {% elif commit.state == "running" %}
-                                               <i class="icon-cycle"></i>
-                                       {% elif commit.state == "failed" %}
-                                               <i class="icon-exclamation-mark"></i>
-                                       {% end %}
-
-                                       <a href="/distro/{{ distro.identifier }}/source/{{ source.identifier }}/{{ commit.revision }}">
-                                               {{ commit.revision[:7] }}
-                                       </a>
-                                       <br />
-                                       {{ format_date(commit.date, full_format=True) }}
-                               </td>
-                               <td>
-                                       {% module LinkToUser(commit.author) %}
-                               </td>
-                               <td>
-                                       {{ commit.subject }}
-                               </td>
+                               <th>{{ _("Commit") }}</th>
+                               <th>{{ _("Author") }}</th>
+                               <th>{{ _("Subject") }}</th>
                        </tr>
-               {% end %}
-       </tbody>
-</table>
+               </thead>
+               <tbody>
+                       {% for commit in commits %}
+                               <tr>
+                                       <td>
+                                               {% if commit.state == "pending" %}
+                                                       <i class="icon-share-alt"></i>
+                                               {% elif commit.state == "running" %}
+                                                       <i class="icon-cycle"></i>
+                                               {% elif commit.state == "failed" %}
+                                                       <i class="icon-exclamation-mark"></i>
+                                               {% end %}
+
+                                               <a href="/distro/{{ distro.identifier }}/source/{{ source.identifier }}/{{ commit.revision }}">
+                                                       {{ commit.revision[:7] }}
+                                               </a>
+                                               <br />
+                                               {{ format_date(commit.date, full_format=True) }}
+                                       </td>
+                                       <td>
+                                               {% module LinkToUser(commit.author) %}
+                                       </td>
+                                       <td>
+                                               {{ commit.subject }}
+                                       </td>
+                               </tr>
+                       {% end %}
+               </tbody>
+       </table>
+</div>
\ No newline at end of file
index 70b228ef0855f711dd19b90dfcd49eef36e45177..6bf269422fe961a1094740efa63ea6b2dde7794f 100644 (file)
@@ -1,29 +1,31 @@
-<table class="table table-striped table-hover">
-       <thead>
-               <tr>
-                       <th>{{ _("Name") }}</th>
-                       <th>{{ _("No. of builds") }}</th>
-                       <th>{{ _("Enabled for builds") }}</th>
-               </tr>
-       </thead>
-       <tbody>
-               {% for repo in repos %}
+<div class="table-responsive">
+       <table class="table table-striped table-hover">
+               <thead>
                        <tr>
-                               <td>
-                                       <a href="/distro/{{ distro.sname }}/repo/{{ repo.name }}">{{ repo.name }}</a>
-                                       <br />{{ repo.summary or _("N/A") }}
-                               </td>
-                               <td>
-                                       {{ len(repo) }}
-                               </td>
-                               <td>
-                                       {% if repo.enabled_for_builds %}
-                                               {{ _("Yes") }}
-                                       {% else %}
-                                               {{ _("No") }}
-                                       {% end %}
-                               </td>
+                               <th>{{ _("Name") }}</th>
+                               <th>{{ _("No. of builds") }}</th>
+                               <th>{{ _("Enabled for builds") }}</th>
                        </tr>
-               {% end %}
-       </tbody>
-</table>
+               </thead>
+               <tbody>
+                       {% for repo in repos %}
+                               <tr>
+                                       <td>
+                                               <a href="/distro/{{ distro.sname }}/repo/{{ repo.name }}">{{ repo.name }}</a>
+                                               <br />{{ repo.summary or _("N/A") }}
+                                       </td>
+                                       <td>
+                                               {{ len(repo) }}
+                                       </td>
+                                       <td>
+                                               {% if repo.enabled_for_builds %}
+                                                       {{ _("Yes") }}
+                                               {% else %}
+                                                       {{ _("No") }}
+                                               {% end %}
+                                       </td>
+                               </tr>
+                       {% end %}
+               </tbody>
+       </table>
+</div>
\ No newline at end of file
index e44fa0ef8a4e7259e2203b1c19ce12d6a64d8a59..88120e9c86d73b0d2cfec2def9faef29dc72ff70 100644 (file)
@@ -1,28 +1,30 @@
-<table class="table table-striped table-hover">
-       <thead>
-               <tr>
-                       <th>{{ _("Name") }}</th>
-                       <th>{{ _("No. of commits") }}</th>
-                       <th>{{ _("Latest commit") }}</th>
-               </tr>
-       </thead>
-       <tbody>
-               {% for source in sources %}
+<div class="table-responsive">
+       <table class="table table-striped table-hover">
+               <thead>
                        <tr>
-                               <td>
-                                       <a href="/distro/{{ distro.identifier }}/source/{{ source.identifier }}">{{ source.name }}</a>
-                                       <br />{{ _("Branch: %s") % source.branch }}
-                               </td>
-                               <td>
-                                       {{ len(source) }}
-                               </td>
-                               <td>
-                                       <a href="/distro/{{ distro.identifier }}/source/{{ source.identifier }}/{{ source.head_revision.revision }}">
-                                               {{ source.head_revision.revision[:7] }}
-                                       </a> - {{ format_date(source.head_revision.date) }}
-                                       <br />{{ source.head_revision.subject }}
-                               </td>
+                               <th>{{ _("Name") }}</th>
+                               <th>{{ _("No. of commits") }}</th>
+                               <th>{{ _("Latest commit") }}</th>
                        </tr>
-               {% end %}
-       </tbody>
-</table>
+               </thead>
+               <tbody>
+                       {% for source in sources %}
+                               <tr>
+                                       <td>
+                                               <a href="/distro/{{ distro.identifier }}/source/{{ source.identifier }}">{{ source.name }}</a>
+                                               <br />{{ _("Branch: %s") % source.branch }}
+                                       </td>
+                                       <td>
+                                               {{ len(source) }}
+                                       </td>
+                                       <td>
+                                               <a href="/distro/{{ distro.identifier }}/source/{{ source.identifier }}/{{ source.head_revision.revision }}">
+                                                       {{ source.head_revision.revision[:7] }}
+                                               </a> - {{ format_date(source.head_revision.date) }}
+                                               <br />{{ source.head_revision.subject }}
+                                       </td>
+                               </tr>
+                       {% end %}
+               </tbody>
+       </table>
+</div>
\ No newline at end of file
index c579dc35b4c7c5859d27d6013992c68f058204b5..928a8d75b1cb36a7e6e39f2a032cea99af4eca61 100644 (file)
 {% end block %}
 
 {% block body %}
-       <ul class="breadcrumb">
-               <li>
-                       <a href="/">{{ _("Home") }}</a>
-                       <span class="divider">/</span>
-               </li>
-               <li>
-                       <a href="/distros">{{ _("Distributions") }}</a>
-                       <span class="divider">/</span>
-               </li>
-               <li>
-                       <a href="/distro/{{ distro.identifier }}">{{ distro.name }}</a>
-                       <span class="divider">/</span>
-               </li>
-               <li class="active">
-                       <a href="/distro/{{ distro.identifier }}/repo/{{ repo.identifier }}">{{ repo.name }}</a>
-               </li>
-       </ul>
-
-       <div class="page-header">
-               <div class="pull-right">
-                       {% if repo.type == "stable" %}
-                               <span class="label label-success">
-                                       {{ _("Stable repository") }}
-                               </span>
-                       {% elif repo.type == "unstable" %}
-                               <span class="label label-warning">
-                                       {{ _("Unstable repository") }}
-                               </span>
-                       {% elif repo.type == "testing" %}
-                               <span class="label label-important">
-                                       {{ _("Testing repository") }}
-                               </span>
-                       {% end %}
-
-                       {% if repo.enabled_for_builds %}
-                               <span class="label label-inverse">
-                                       {{ _("Enabled for builds") }}
-                               </span>
-                       {% end %}
+
+       <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="/distros">{{ _("Distributions") }}</a></li>
+                                       <li class="breadcrumb-item"><a href="/distro/{{ distro.identifier }}">{{ distro.name }}</a></li>
+                                       <li class="breadcrumb-item active">
+                                               <a href="/distro/{{ distro.identifier }}/repo/{{ repo.identifier }}">{{ repo.name }}</a>
+                                       </li>
+                               </ol>
+                       </nav>
                </div>
+       </div>
 
-               <h1>
-                       {{ _("Repository") }}: {{ repo.name }}
-                       <small>{{ distro.name }}</small>
-               </h1>
+       <div class="row">
+                       {% if current_user and current_user.is_admin() %}
+                       <div class="col-12 col-sm-12 col-md-9 col-lg-10 col-xl-10">
+                               <h2 style="word-wrap: break-word;">
+                                       {{ _("Repository") }}: {{ repo.name }}
+
+                                       {% if repo.type == "stable" %}
+                                               <span class=" badge badge-success float-md-right float-lg-right float-xl-right">
+                                                       {{ _("Stable repository") }}
+                                               </span>
+                                       {% elif repo.type == "unstable" %}
+                                               <span class=" badge badge-danger float-md-right float-lg-right float-xl-right">
+                                                       {{ _("Unstable repository") }}
+                                               </span>
+                                       {% elif repo.type == "testing" %}
+                                               <span class=" badge badge-warning float-md-right float-lg-right float-xl-right">
+                                                       {{ _("Testing repository") }}
+                                               </span>
+                                       {% end %}
+
+                                       {% if repo.enabled_for_builds %}
+                                               <span class=" badge badge-secondary float-md-right float-lg-right float-xl-right">
+                                                       {{ _("Enabled for builds") }}
+                                               </span>
+                                       {% end %}
+
+                                       <br>
+                                       <small>{{ distro.name }}</small>
+                               </h2>
+                       </div>
+                       <div class="col-12 col-sm-12 col-md-3 col-lg-2 col-xl-2 mb-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="/distro/{{ distro.identifier }}/repo/{{ repo.identifier }}/edit">
+                                                       <i class="icon-edit icon-white"></i>
+                                                       {{ _("Edit") }}
+                                               </a>
+                                               <a class="dropdown-item" href="/distro/{{ distro.identifier }}/repo/{{ repo.identifier }}/delete">
+                                                       <i class="icon-trash icon-white"></i>
+                                                       {{ _("Delete") }}
+                                               </a>
+                                       </div>
+                               </div>
+                       </div>
+               {% else %}
+                       <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                               <h2 style="word-wrap: break-word;">
+                                       {{ _("Repository") }}: {{ repo.name }}
+
+                                       {% if repo.type == "stable" %}
+                                               <span class=" badge badge-success float-md-right float-lg-right float-xl-right ml-2">
+                                                       {{ _("Stable repository") }}
+                                               </span>
+                                       {% elif repo.type == "unstable" %}
+                                               <span class=" badge badge-danger float-md-right float-lg-right float-xl-right ml-2">
+                                                       {{ _("Unstable repository") }}
+                                               </span>
+                                       {% elif repo.type == "testing" %}
+                                               <span class=" badge badge-warning float-md-right float-lg-right float-xl-right ml-2">
+                                                       {{ _("Testing repository") }}
+                                               </span>
+                                       {% end %}
+
+                                       {% if repo.enabled_for_builds %}
+                                               <span class=" badge badge-secondary float-md-right float-lg-right float-xl-right ml-2">
+                                                       {{ _("Enabled for builds") }}
+                                               </span>
+                                       {% end %}
+
+                                       <br>
+                                       <small>{{ distro.name }}</small>
+                               </h2>
+                       </div>
+               {% end %}
        </div>
 
+
        <div class="row">
-               <div class="span8">
-                       <blockquote>
+               <div class="col-12 col-sm-12 col-md-6 col-lg-6 col-xl-6">
+                       <p class="mb-2">
                                {% module Text(repo.description) %}
-                       </blockquote>
-
-                       <br><br>
-
-                       <table class="table">
-                               <tr>
-                                       <td>{{ _("Repository is enabled for builds?") }}</td>
-                                       <td>
-                                               {% if repo.enabled_for_builds %}
-                                                       {{ _("Yes") }}
-                                               {% else %}
-                                                       {{ _("No") }}
-                                               {% end %}
-                                       </td>
-                               </tr>
-
-                               <tr>
-                                       <td>{{ _("Obsolete builds") }}</td>
-                                       <td>
-                                               {{ len(obsolete_builds) }}
-                                       </td>
-                               </tr>
-                       </table>
-               </div>
+                       </p>
 
-               <div class="span4">
-                       <h3>{{ _("Total build time") }}</h3>
+                       <div class="table-responsive">
+                               <table class="table table-striped table-hover">
+                                       <tr>
+                                               <td>{{ _("Repository is enabled for builds?") }}</td>
+                                               <td>
+                                                       {% if repo.enabled_for_builds %}
+                                                               {{ _("Yes") }}
+                                                       {% else %}
+                                                               {{ _("No") }}
+                                                       {% end %}
+                                               </td>
+                                       </tr>
+
+                                       <tr>
+                                               <td>{{ _("Obsolete builds") }}</td>
+                                               <td>
+                                                       {{ len(obsolete_builds) }}
+                                               </td>
+                                       </tr>
+                               </table>
+                       </div>
+               </div>
 
-                       <table class="table table-striped table-hover">
-                               <tbody>
-                                       {% for arch, build_time in build_times %}
-                                               <tr>
-                                                       <td class="arch">{{ arch }}</td>
-                                                       <td class="time">{{ friendly_time(build_time) }}</td>
-                                               </tr>
-                                       {% end %}
-                               </tbody>
-                       </table>
+               <div class="col-12 col-sm-12 col-md-6 col-lg-6 col-xl-6">
+                       <h4 class="text-center" style="word-wrap: break-word;">
+                               {{ _("Total build time") }}
+                       </h4>
+                       <div class="table-responsive mb-1">
+                               <table class="table table-striped table-hover">
+                                       <tbody>
+                                               {% for arch, build_time in build_times %}
+                                                       <tr>
+                                                               <td class="arch">{{ arch }}</td>
+                                                               <td class="time">{{ friendly_time(build_time) }}</td>
+                                                       </tr>
+                                               {% end %}
+                                       </tbody>
+                               </table>
+                       </div>
 
                        <p>
                                {{ _("The table above shows how long it took to build all packages in this repository.") }}
                </div>
        </div>
 
-       {% if current_user and current_user.is_admin() %}
-               <div class="row">
-                       <div class="span12">
-                               <hr>
-
-                               <div class="btn-group pull-right">
-                                       <a class="btn btn-small btn-danger" href="/distro/{{ distro.identifier }}/repo/{{ repo.identifier }}/edit">
-                                               <i class="icon-edit icon-white"></i>
-                                               {{ _("Edit") }}
-                                       </a>
-                                       <a class="btn btn-small btn-danger" href="/distro/{{ distro.identifier }}/repo/{{ repo.identifier }}/delete">
-                                               <i class="icon-trash icon-white"></i>
-                                               {{ _("Delete") }}
-                                       </a>
-                               </div>
-                       </div>
-               </div>
-       {% end %}
-
        {% if repo.unpushed_builds %}
-               <div class="row">
-                       <div class="span12">
-                               <h2>{{ _("Unpushed builds") }}</h2>
-                               <div class="alert">
+               <div class="row mb-2">
+                       <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                               <h3 style="word-wrap: break-word;">
+                                       {{ _("Unpushed builds") }}
+                               </h3>
+                               <div class="alert alert-info">
                                        {{ _("These builds were already put into this repository, but were not pushed out to the mirror servers, yet.") }}
                                </div>
                                {% module BuildTable(repo.unpushed_builds, show_repo_time=True) %}
        {% end %}
 
        {% if builds %}
-               <div class="row">
-                       <div class="span12">
-                               <h2>
+               <div class="row mb-2">
+                       <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                               <h3 style="word-wrap: break-word;">
                                        {{ _("Builds in this repository") }}
                                        <small>({{ len(builds) }})</small>
-                               </h2>
+                               </h3>
                                {% module BuildTable(builds, show_repo_time=True, show_can_move_forward=True) %}
                        </div>
                </div>
        {% end %}
 
        {% if obsolete_builds %}
-               <div class="row">
-                       <div class="span12">
-                               <h2>
+               <div class="row mb-2">
+                       <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                               <h3 style="word-wrap: break-word;">
                                        {{ _("Obsolete builds") }}
                                        <small>({{ len(obsolete_builds) }})</small>
-                               </h2>
+                               </h3>
                                {% module BuildTable(obsolete_builds) %}
                        </div>
                </div>