]> git.ipfire.org Git - pbs.git/commitdiff
web: Correctly use <section> and the container class
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 9 May 2023 16:12:44 +0000 (16:12 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 9 May 2023 16:12:44 +0000 (16:12 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
16 files changed:
src/templates/base.html
src/templates/builders/detail.html
src/templates/builders/list.html
src/templates/builds/index.html
src/templates/builds/show.html
src/templates/distros/index.html
src/templates/distros/show.html
src/templates/log.html
src/templates/packages/index.html
src/templates/packages/name.html
src/templates/packages/show.html
src/templates/packages/view-file.html
src/templates/queue.html
src/templates/repos/show.html
src/templates/users/index.html
src/templates/users/show.html

index 5edafb16ea7c88b83424043cf5b205b1ba9646f2..5fc6ae96d44ce0076c31e82018677aa0fe2a65c6 100644 (file)
                {# Main Stuff #}
 
                {% block body %}
-                       <section class="section">
-                               <div class="container">
-                                       {% block container %}
-                                               NO CONTENT
-                                       {% end block %}
-                               </div>
-                       </section>
+                       <div class="container">
+                               {% block container %}
+                                       NO CONTENT
+                               {% end block %}
+                       </div>
                {% end block %}
 
                {# Footer #}
index d1d88bbd610459428bf84442a8f1e55694340255..40679f7b982e84ba0baf7716f02ce15c21942d1c 100644 (file)
 
 {% block title %}{{ _("Builders") }} - {{ builder.name }}{% end block %}
 
-{% block container %}
-       <nav class="breadcrumb" aria-label="breadcrumbs">
-               <ul>
-                       <li>
-                               <a href="/builders">{{ _("Builders") }}</a>
-                       </li>
-                       <li class="is-active">
-                               <a href="#" aria-current="page">{{ builder }}</a>
-                       </li>
-               </ul>
-       </nav>
-
+{% block body %}
        <section class="section">
-               <h1 class="title is-1">{{ builder }}</h1>
-               {% if builder.cpu_model %}
-                       <h4 class="subtitle is-4">
-                               {{ builder.cpu_model or _("Unknown CPU Model") }}
-                               {% if builder.cpu_count > 1 %}
-                                       &times; {{ builder.cpu_count }}
-                               {% end %}
+               <div class="container">
+                       <nav class="breadcrumb" aria-label="breadcrumbs">
+                               <ul>
+                                       <li>
+                                               <a href="/builders">{{ _("Builders") }}</a>
+                                       </li>
+                                       <li class="is-active">
+                                               <a href="#" aria-current="page">{{ builder }}</a>
+                                       </li>
+                               </ul>
+                       </nav>
 
-                               <span class="tag">
-                                       {{ builder.arch }}
-                               </span>
-                       </h4>
-               {% end %}
+                       <h1 class="title is-1">{{ builder }}</h1>
 
-               <div class="block">
-                       <div class="box">
-                               <div class="block">
-                                       <nav class="level">
-                                               {% if builder.total_build_time %}
-                                                       <div class="level-item has-text-centered">
-                                                               <div>
-                                                                       <p class="heading">{{ _("Total Build Time") }}</p>
-                                                                       <p class="title">
-                                                                               {{ format_time(builder.total_build_time) }}
-                                                                       </p>
+                       {% if builder.cpu_model %}
+                               <h4 class="subtitle is-4">
+                                       {{ builder.cpu_model or _("Unknown CPU Model") }}
+                                       {% if builder.cpu_count > 1 %}
+                                               &times; {{ builder.cpu_count }}
+                                       {% end %}
+
+                                       <span class="tag">
+                                               {{ builder.arch }}
+                                       </span>
+                               </h4>
+                       {% end %}
+
+                       <div class="block">
+                               <div class="box">
+                                       <div class="block">
+                                               <nav class="level">
+                                                       {% if builder.total_build_time %}
+                                                               <div class="level-item has-text-centered">
+                                                                       <div>
+                                                                               <p class="heading">{{ _("Total Build Time") }}</p>
+                                                                               <p class="title">
+                                                                                       {{ format_time(builder.total_build_time) }}
+                                                                               </p>
+                                                                       </div>
                                                                </div>
-                                                       </div>
-                                               {% end %}
+                                                       {% end %}
 
-                                               {% if builder.pakfire_version %}
-                                                       <div class="level-item has-text-centered">
-                                                               <div>
-                                                                       <p class="heading">{{ _("Pakfire Version") }}</p>
-                                                                       <p class="title">
-                                                                               {{ builder.pakfire_version }}
-                                                                       </p>
+                                                       {% if builder.pakfire_version %}
+                                                               <div class="level-item has-text-centered">
+                                                                       <div>
+                                                                               <p class="heading">{{ _("Pakfire Version") }}</p>
+                                                                               <p class="title">
+                                                                                       {{ builder.pakfire_version }}
+                                                                               </p>
+                                                                       </div>
                                                                </div>
-                                                       </div>
-                                               {% end %}
+                                                       {% end %}
 
-                                               {% if builder.os_name %}
-                                                       <div class="level-item has-text-centered">
-                                                               <div>
-                                                                       <p class="heading">{{ _("Operating System") }}</p>
-                                                                       <p class="title">
-                                                                               {{ builder.os_name }}
-                                                                       </p>
+                                                       {% if builder.os_name %}
+                                                               <div class="level-item has-text-centered">
+                                                                       <div>
+                                                                               <p class="heading">{{ _("Operating System") }}</p>
+                                                                               <p class="title">
+                                                                                       {{ builder.os_name }}
+                                                                               </p>
+                                                                       </div>
                                                                </div>
-                                                       </div>
-                                               {% end %}
-                                       </nav>
+                                                       {% end %}
+                                               </nav>
+                                       </div>
+
+                                       {# Builder Stats #}
+                                       {% if builder.is_online() %}
+                                               <div class="block">
+                                                       {% module BuilderStats(builder) %}
+                                               </div>
+                                       {% end %}
+
+                                       {% if builder.description %}
+                                               {% module Text(builder.description) %}
+                                       {% end %}
                                </div>
+                       </div>
 
-                               {# Builder Stats #}
+                       {% if builder.has_perm(current_user) %}
                                <div class="block">
-                                       {% module BuilderStats(builder) %}
+                                       <a class="button is-warning" href="/builders/{{ builder.hostname }}/edit">
+                                               {{ _("Edit") }}
+                                       </a>
                                </div>
-
-
-                               {% if builder.description %}
-                                       {% module Text(builder.description) %}
-                               {% end %}
-                       </div>
+                       {% end %}
                </div>
-
-               {% if builder.has_perm(current_user) %}
-                       <div class="block">
-                               <a class="button is-warning" href="/builders/{{ builder.hostname }}/edit">
-                                       {{ _("Edit") }}
-                               </a>
-                       </div>
-               {% end %}
        </section>
 
        {% if builder.jobs %}
                <section class="section">
-                       <h5 class="subtitle is-5">{{ _("Running Jobs") }}</h5>
+                       <div class="container">
+                               <h5 class="subtitle is-5">{{ _("Running Jobs") }}</h5>
 
-                       {% module JobsList(builder.jobs) %}
+                               {% module JobsList(builder.jobs) %}
+                       </div>
                </section>
        {% end %}
 
        <section class="section">
-               <h5 class="title is-5">{{ _("Log") }}</h5>
+               <div class="container">
+                       <h5 class="title is-5">{{ _("Log") }}</h5>
 
-               {% module EventsList(builder=builder, show_builder=False, limit=10) %}
+                       {% module EventsList(builder=builder, show_builder=False, limit=10) %}
+               </div>
        </section>
 {% end block %}
index ccdedf3622546fdd506543f5c3a3fbe740f69d6b..74c78b6eee73c428e3a7208399cef5f2f6788af7 100644 (file)
@@ -2,71 +2,79 @@
 
 {% block title %}{{ _("Builders") }}{% end block %}
 
-{% block container %}
-       <nav class="breadcrumb" aria-label="breadcrumbs">
-               <ul>
-                       <li class="is-active">
-                               <a href="#" aria-current="page">{{ _("Builders") }}</a>
-                       </li>
-               </ul>
-       </nav>
+{% block body %}
+       <section class="section">
+               <div class="container">
+                       <nav class="breadcrumb" aria-label="breadcrumbs">
+                               <ul>
+                                       <li class="is-active">
+                                               <a href="#" aria-current="page">{{ _("Builders") }}</a>
+                                       </li>
+                               </ul>
+                       </nav>
 
-       <h1 class="title is-1">{{ _("Builders") }}</h1>
+                       <h1 class="title is-1">{{ _("Builders") }}</h1>
 
-       {% if current_user and current_user.is_admin() %}
-               <div class="block">
-                       <a class="button is-success is-small" href="/builders/new">
-                               {{ _("Create A New Builder") }}
-                       </a>
-               </div>
-       {% end %}
+                       {% if current_user and current_user.is_admin() %}
+                               <div class="block">
+                                       <a class="button is-success" href="/builders/new">
+                                               {{ _("Create Builder") }}
+                                       </a>
+                               </div>
+                       {% end %}
 
-       {% for builder in builders %}
-               <div class="block">
-                       <div class="box">
-                               <h5 class="title is-5">
-                                       <a href="/builders/{{ builder.hostname }}">{{ builder }}</a>
+                       {% for builder in builders %}
+                               <div class="block">
+                                       <div class="box">
+                                               <h5 class="title is-5">
+                                                       <a href="/builders/{{ builder.hostname }}">{{ builder }}</a>
 
-                                       {% if builder.is_online() %}
-                                               <div class="tags has-addons is-pulled-right">
-                                                       <span class="tag is-success">{{ _("Online") }}</span>
-                                                       <span class="tag">{{ len(builder.jobs) }}</span>
-                                               </div>
-                                       {% else %}
-                                               <span class="tag is-dark is-pulled-right">{{ _("Offline") }}</span>
-                                       {% end %}
-                               </h5>
+                                                       {% if builder.is_online() %}
+                                                               <div class="tags has-addons is-pulled-right">
+                                                                       <span class="tag is-success">{{ _("Online") }}</span>
+                                                                       <span class="tag">{{ len(builder.jobs) }}</span>
+                                                               </div>
+                                                       {% else %}
+                                                               <span class="tag is-dark is-pulled-right">{{ _("Offline") }}</span>
+                                                       {% end %}
+                                               </h5>
 
-                               <h6 class="subtitle is-6">
-                                       {{ builder.cpu_model or _("Unknown Processor") }}
-                               </h6>
-                       </div>
+                                               <h6 class="subtitle is-6">
+                                                       {{ builder.cpu_model or _("Unknown Processor") }}
+                                               </h6>
+                                       </div>
+                               </div>
+                       {% end %}
                </div>
-       {% end %}
+       </section>
 
        {# Statistics #}
 
-       <nav class="level">
-               <div class="level-item has-text-centered">
-                       <div>
-                               <p class="heading">{{ _("Total Build Time") }}</p>
-                               <p class="title">{{ format_time(backend.builders.total_build_time) }}</p>
-                       </div>
-               </div>
-       </nav>
+       <section class="section">
+               <div class="container">
+                       <nav class="level">
+                               <div class="level-item has-text-centered">
+                                       <div>
+                                               <p class="heading">{{ _("Total Build Time") }}</p>
+                                               <p class="title">{{ format_time(backend.builders.total_build_time) }}</p>
+                                       </div>
+                               </div>
+                       </nav>
 
-       <h6 class="subtitle is-6">{{ _("Total Build Time By Architecture") }}</h6>
+                       <h6 class="subtitle is-6">{{ _("Total Build Time By Architecture") }}</h6>
 
-       {% set arches = backend.builders.total_build_time_by_arch %}
+                       {% set arches = backend.builders.total_build_time_by_arch %}
 
-       <nav class="level">
-               {% for arch in arches %}
-                       <div class="level-item has-text-centered">
-                               <div>
-                                       <p class="heading">{{ arch }}</p>
-                                       <p class="title">{{ format_time(arches[arch]) }}</p>
-                               </div>
-                       </div>
-               {% end %}
-       </nav>
+                       <nav class="level">
+                               {% for arch in arches %}
+                                       <div class="level-item has-text-centered">
+                                               <div>
+                                                       <p class="heading">{{ arch }}</p>
+                                                       <p class="title">{{ format_time(arches[arch]) }}</p>
+                                               </div>
+                                       </div>
+                               {% end %}
+                       </nav>
+               </div>
+       </section>
 {% end block %}
index 95b22af91f05596aac74ad875d0c1c5fc2b1ddb9..5767ad91d22f3f3887cc1e5dab1f40a29bc7b4a6 100644 (file)
@@ -2,25 +2,29 @@
 
 {% block title %}{{ _("Builds") }}{% end block %}
 
-{% block container %}
-       <nav class="breadcrumb" aria-label="breadcrumbs">
-               <ul>
-                       <li class="is-active">
-                               <a href="#" aria-current="page">
-                                       {{ _("Builds") }}
-                               </a>
-                       </li>
-               </ul>
-       </nav>
+{% block body %}
+       <section class="section">
+               <div class="container">
+                       <nav class="breadcrumb" aria-label="breadcrumbs">
+                               <ul>
+                                       <li class="is-active">
+                                               <a href="#" aria-current="page">
+                                                       {{ _("Builds") }}
+                                               </a>
+                                       </li>
+                               </ul>
+                       </nav>
 
-       <h1 class="title">
-               {% if user %}
-                       {{ _("%s's Builds") % user }}
-               {% else %}
-                       {{ _("Recent Builds") }}
-               {% end %}
-       </h1>
+                       <h1 class="title">
+                               {% if user %}
+                                       {{ _("%s's Builds") % user }}
+                               {% else %}
+                                       {{ _("Recent Builds") }}
+                               {% end %}
+                       </h1>
 
-       {# Render all builds #}
-       {% module BuildsList(builds) %}
+                       {# Render all builds #}
+                       {% module BuildsList(builds) %}
+               </div>
+       </section>
 {% end block %}
index 1aa1a21c4400b7ed615d0ff784dc6a5291373f03..402bf9246392b4dffb13095f991043118814ae4b 100644 (file)
 
 {% block title %}{{ _("Build") }} - {{ build }}{% end block %}
 
-{% block container %}
-       <nav class="breadcrumb" aria-label="breadcrumbs">
-               <ul>
-                       <li>
-                               <a href="/packages">{{ _("Packages") }}</a>
-                       </li>
-                       <li>
-                               <a href="/packages/{{ build.pkg.name }}">{{ build.pkg.name }}</a>
-                       </li>
-                       <li class="is-active">
-                               <a href="#" aria-current="page">{{ build.pkg.evr }}</a>
-                       </li>
-               </ul>
-       </nav>
-
+{% block body %}
        <section class="section">
-               <h1 class="title is-1">{{ build }}</h1>
-
-               {% if build.is_test() %}
-                       <h6 class="subtitle is-6">
-                               <span class="tag is-warning">{{ _("Test Build") }}</span>
+               <div class="container">
+                       <nav class="breadcrumb" aria-label="breadcrumbs">
+                               <ul>
+                                       <li>
+                                               <a href="/packages">{{ _("Packages") }}</a>
+                                       </li>
+                                       <li>
+                                               <a href="/packages/{{ build.pkg.name }}">{{ build.pkg.name }}</a>
+                                       </li>
+                                       <li class="is-active">
+                                               <a href="#" aria-current="page">{{ build.pkg.evr }}</a>
+                                       </li>
+                               </ul>
+                       </nav>
+
+                       <h1 class="title is-1">{{ build }}</h1>
+
+                       {% if build.is_test() %}
+                               <h6 class="subtitle is-6">
+                                       <span class="tag is-warning">{{ _("Test Build") }}</span>
 
-                               <a href="/builds/{{ build.test_build_for.uuid }}">
-                                       {{ build.test_build_for }}
-                               </a>
-                       </h6>
-               {% else %}
-                       {% if build.pkg.summary %}
+                                       <a href="/builds/{{ build.test_build_for.uuid }}">
+                                               {{ build.test_build_for }}
+                                       </a>
+                               </h6>
+                       {% else %}
                                <h6 class="subtitle is-6">
                                        {{ build.pkg.summary }}
                                </h6>
                        {% end %}
-               {% end %}
-
-               <div class="columns">
-                       <div class="column">
-                               <div class="media">
-                                       {% if build.owner %}
-                                               <div class="media-left">
-                                                       <p class="image is-64x64">
-                                                               <img src="{{ build.owner.avatar(64) }}">
-                                                       </p>
-                                               </div>
-
-                                               <div class="media-content">
-                                                       <p>
-                                                               <small>
-                                                                       <a href="/users/{{ build.owner }}">{{ build.owner }}</a>
-                                                               </small>
-
-                                                               <small>
-                                                                       {{ _("Created %s") % locale.format_date(build.created_at, shorter=True) }}
-                                                               </small>
-                                                       </p>
-
-                                                       {% module Text(build.message) %}
-                                               </div>
-                                       {% end %}
-                               </div>
 
-                               {# List any fixed bugs #}
-                               {% if bugs %}
-                                       <h6 class="title is-6">
-                                               {{ _("Fixed Bugs") }}
-                                       </h6>
+                       <div class="tags">
+                               {# Scratch Build #}
+                               {% if build.owner %}
+                                       <span class="tag is-warning">
+                                               {{ _("Scratch Build by %s") % build.owner }}
+                                       </span>
+                               {% end %}
 
-                                       {% module BugsList(bugs) %}
+                               {# Deprecated? #}
+                               {% if build.is_deprecated() %}
+                                       <span class="tag is-warning">
+                                               {{ _("Deprecated") }}
+                                       </span>
                                {% end %}
                        </div>
 
-                       <div class="column">
-                               <div class="box">
-                                       {# Icon Bar #}
-                                       <nav class="level">
-                                               <div class="level-item">
-                                                       <span class="icon">
-                                                               {% if build.owner %}
-                                                                       <i class="fa-solid fa-flask" title="{{ _("Scratch Build") }}"></i>
-                                                               {% else %}
-                                                                       <i class="fa-solid fa-truck" title="{{ _("Release Build") }}"></i>
-                                                               {% end %}
-                                                       </span>
-                                               </div>
-
-                                               {# Deprecation #}
-                                               {% if build.is_deprecated() %}
-                                                       <div class="level-item">
-                                                               {% if build.deprecating_build %}
-                                                                       <a href="/builds/{{ build.deprecating_build.uuid }}">
-                                                                               <span class="icon">
-                                                                                       <i class="fa-solid fa-arrow-right" title="{{ _("Deprecated") }}"></i>
-                                                                               </span>
-                                                                       </a>
-                                                               {% else %}
-                                                                       <span class="icon">
-                                                                               <i class="fa-solid fa-arrow-right" title="{{ _("Deprecated") }}"></i>
-                                                                       </span>
-                                                               {% end %}
-                                                       </div>
-                                               {% end %}
-
-                                               <div class="level-item">
-                                                       X
-                                               </div>
-
-                                               {# XXX Add icons for critical path, security fixes,
-                                                       broken/obsolete builds, scratch or other type of build #}
-                                       </nav>
-
-                                       {# Score #}
-                                       <nav class="level">
-                                               <div class="level-item has-text-centered">
-                                                       <div>
-                                                               <p class="heading">{{ _("Score") }}</p>
-                                                               <p class="title">{{ build.score }}</p>
-                                                       </div>
-                                               </div>
-                                       </nav>
-
-                                       <div class="buttons are-small">
-                                               {# Watch/Unwatch #}
-                                               {% if current_user in build.watchers %}
-                                                       <form method="POST" action="/builds/{{ build.uuid }}/unwatch">
-                                                               {% raw xsrf_form_html() %}
+                       <div class="columns">
+                               <div class="column">
+                                       <div class="media">
+                                               {# Scratch Build #}
+                                               {% if build.owner %}
+                                                       {% if build.message %}
+                                                               {% module Text(build.message) %}
+                                                       {% else %}
+                                                               <p class="has-text-centered p-5">
+                                                                       {{ _("No Message") }}
+                                                               </p>
+                                                       {% end %}
+
+                                               {# Commit Message #}
+                                               {% elif build.commit %}
+                                                       {% module CommitMessage(build.commit) %}
 
-                                                               <button class="button is-primary is-outlined">
-                                                                       <span class="icon is-small">
-                                                                               <i class="fa-solid fa-eye"></i>
-                                                                       </span>
-
-                                                                       <span>
-                                                                               {{ _("Unwatch") }} ({{ len(build.watchers) }})
-                                                                       </span>
-                                                               </button>
-                                                       </form>
-                                               {% else %}
-                                                       <form method="POST" action="/builds/{{ build.uuid }}/watch">
-                                                               {% raw xsrf_form_html() %}
-
-                                                               <button class="button is-primary">
-                                                                       <span class="icon is-small">
-                                                                               <i class="fa-regular fa-eye"></i>
-                                                                       </span>
-
-                                                                       <span>
-                                                                               {{ _("Watch") }} ({{ len(build.watchers) }})
-                                                                       </span>
-                                                               </button>
-                                                       </form>
                                                {% end %}
+                                       </div>
+                               </div>
 
-                                               {# More... #}
-                                               <div class="dropdown">
-                                                       <div class="dropdown-trigger">
-                                                               <button class="button" aria-haspopup="true" aria-controls="dropdown-more">
-                                                                       <span>{{ _("More") }}</span>
-
-                                                                       <span class="icon is-small">
-                                                                               <i class="fas fa-angle-down" aria-hidden="true"></i>
-                                                                       </span>
-                                                               </button>
-                                                       </div>
-                                                       <div class="dropdown-menu" id="dropdown-more" role="menu">
-                                                               <div class="dropdown-content">
-                                                                       <a class="dropdown-item" href="/packages/{{ build.pkg.uuid }}">
-                                                                               {{ _("Source Package") }}
-                                                                       </a>
-
-                                                                       {% if build.can_be_deleted(current_user) %}
-                                                                               <hr class="dropdown-divider"/>
-
-                                                                               <a class="dropdown-item" href="/builds/{{ build.uuid }}/delete">
-                                                                                       {{ _("Delete Build") }}
-                                                                               </a>
-                                                                       {% end %}
+                               <div class="column is-3">
+                                       <div class="box">
+                                               {# Score #}
+                                               <nav class="level">
+                                                       <div class="level-item has-text-centered">
+                                                               <div>
+                                                                       <p class="heading">{{ _("Score") }}</p>
+                                                                       <p class="title">{{ build.score }}</p>
                                                                </div>
                                                        </div>
-                                               </div>
+                                               </nav>
                                        </div>
                                </div>
                        </div>
-               </div>
 
-               {# XXX THIS IS SOME LEGACY STUFF I DON'T KNOW WHERE TO PUT #}
-               <div class="callout large">
-                       <div class="grid-x grid-padding-x">
-                               <div class="cell large-8">
-                                       {% if build.commit %}
-                                               {% module CommitMessage(build.commit) %}
+                       <div class="block">
+                               <div class="buttons">
+                                       <a class="button is-light" href="/packages/{{ build.pkg.uuid }}">
+                                               <span class="icon">
+                                                       <i class="fa-brands fa-osi"></i>
+                                               </span>
+
+                                               <span>{{ _("Source Package") }}</span>
+                                       </a>
+
+                                       {# Delete #}
+                                       {% if build.can_be_deleted(current_user) %}
+                                               <a class="button is-danger" href="/builds/{{ build.uuid }}/delete">
+                                                       {{ _("Delete Build") }}
+                                               </a>
+                                       {% end %}
+                               </div>
 
-                                               <p>
-                                                       <ul class="menu simple">
-                                                               <li>
-                                                                       {% module LinkToUser(build.commit.author) %}
-                                                               </li>
+                               {# Watch/Unwatch #}
+                               {% if current_user in build.watchers %}
+                                       <form method="POST" action="/builds/{{ build.uuid }}/unwatch">
+                                               {% raw xsrf_form_html() %}
 
-                                                               <li>
-                                                                       {#
-                                                                               <a href="/distro/{{ build.distro.slug }}/source/{{ build.pkg.commit.source.identifier }}/{{ build.pkg.commit.revision }}">
-                                                                                       {{ build.pkg.commit.revision[:7] }}
-                                                                               </a>
-                                                                       #}
-                                                               </li>
+                                               <button class="button is-primary is-outlined">
+                                                       <span class="icon is-small">
+                                                               <i class="fa-solid fa-eye"></i>
+                                                       </span>
 
-                                                               <li>
-                                                                       {{ locale.format_date(build.pkg.commit.date, shorter=True) }}
-                                                               </li>
-                                                       </ul>
-                                               </p>
-                                       {% end %}
-                               </div>
+                                                       <span>
+                                                               {% if len(build.watchers) == 1 %}
+                                                                       {{ _("You are watching this build") }}
+                                                               {% else %}
+                                                                       {{ _("You and one other are watching this build",
+                                                                               "You and %(num)s others are watching this build",
+                                                                               len(build.watchers)) % { "num" : len(build.watchers) }
+                                                                       }}
+                                                               {% end %}
+                                                       </span>
+                                               </button>
+                                       </form>
+                               {% else %}
+                                       <form method="POST" action="/builds/{{ build.uuid }}/watch">
+                                               {% raw xsrf_form_html() %}
+
+                                               <button class="button is-primary">
+                                                       <span class="icon is-small">
+                                                               <i class="fa-regular fa-eye"></i>
+                                                       </span>
+
+                                                       <span>
+                                                               {% if build.watchers %}
+                                                                       {{ _("One person is watching this build",
+                                                                               "%(num)s persons are watching this build",
+                                                                               len(build.watchers)) % { "num" : len(build.watchers) }
+                                                                       }}
+                                                               {% else %}
+                                                                       {{ _("Watch this build") }}
+                                                               {% end %}
+                                                       </span>
+                                               </button>
+                                       </form>
+                               {% end %}
                        </div>
                </div>
        </section>
 
+       {# List any fixed bugs #}
+       {% if bugs %}
+               <section class="section">
+                       <div class="container">
+                               <h5 class="title is-5">{{ _("Fixed Bugs") }}</h5>
+
+                               {% module BugsList(bugs) %}
+                       </div>
+               </section>
+       {% end %}
+
        {% if build.jobs %}
                <section class="section">
-                       {% module JobsList(build.jobs, show_arch_only=True, show_packages=True) %}
+                       <div class="container">
+                               {% module JobsList(build.jobs, show_arch_only=True, show_packages=True) %}
+                       </div>
                </section>
        {% end %}
 
        {# Test Builds #}
        {% if build.disable_test_builds %}
                <section class="section">
-                       <h5 class="title is-5">{{ _("Test Builds")}}</h5>
+                       <div class="container">
+                               <h5 class="title is-5">{{ _("Test Builds")}}</h5>
 
-                       <div class="notification">
-                               {{ _("Test builds have been disabled for this build") }}
+                               <div class="notification">
+                                       {{ _("Test builds have been disabled for this build") }}
+                               </div>
                        </div>
                </section>
        {% elif build.test_builds %}
                <section class="section">
-                       <h5 class="title is-5">{{ _("Test Builds")}}</h5>
+                       <div class="container">
+                               <h5 class="title is-5">{{ _("Test Builds")}}</h5>
 
-                       {% module BuildGroupList(build.test_builds, limit=8) %}
+                               {% module BuildGroupList(build.test_builds, limit=8) %}
+                       </div>
                </section>
        {% end %}
 
        {# Log #}
        <section class="section">
-               <h5 class="title is-5">{{ _("Log") }}</h5>
+               <div class="container">
+                       <h5 class="title is-5">{{ _("Log") }}</h5>
 
-               {% module EventsList(priority=4, build=build, show_build=False) %}
+                       {% module EventsList(priority=4, build=build, show_build=False) %}
+               </div>
        </section>
 
        {# Comment - This probably should go into a modal #}
        <section class="section">
-               <form method="POST" action="/builds/{{ build.uuid }}/comment">
-                       {% raw xsrf_form_html() %}
-
-                       <div class="field">
-                               <label class="label">{{ _("Comment") }}</label>
-                               <div class="control">
-                                       <textarea class="textarea" name="text" rows="8"
-                                               placeholder="{{ _("Comment...") }}"></textarea>
+               <div class="container">
+                       <form method="POST" action="/builds/{{ build.uuid }}/comment">
+                               {% raw xsrf_form_html() %}
+
+                               <div class="field">
+                                       <label class="label">{{ _("Comment") }}</label>
+                                       <div class="control">
+                                               <textarea class="textarea" name="text" rows="8"
+                                                       placeholder="{{ _("Comment...") }}"></textarea>
+                                       </div>
                                </div>
-                       </div>
 
-                       <div class="field">
-                               <div class="control">
-                                       <button class="button is-link">Submit</button>
+                               <div class="field">
+                                       <div class="control">
+                                               <button class="button is-link">Submit</button>
+                                       </div>
                                </div>
-                       </div>
-               </form>
+                       </form>
+               </div>
        </section>
 {% end block %}
index 95deeb245f68963717f00a8fea6f66dc8e5a85eb..7b1e51e9bf1169b6bbb20476c0a67906be87977d 100644 (file)
@@ -2,26 +2,30 @@
 
 {% block title %}{{ _("Distributions") }}{% end block %}
 
-{% block container %}
-       <nav class="breadcrumb" aria-label="breadcrumbs">
-               <ul>
-                       <li class="is-active">
-                               <a href="#" aria-current="page">
-                                       {{ _("Distributions") }}
-                               </a>
-                       </li>
-               </ul>
-       </nav>
+{% block body %}
+       <section class="section">
+               <div class="container">
+                       <nav class="breadcrumb" aria-label="breadcrumbs">
+                               <ul>
+                                       <li class="is-active">
+                                               <a href="#" aria-current="page">
+                                                       {{ _("Distributions") }}
+                                               </a>
+                                       </li>
+                               </ul>
+                       </nav>
 
-       <h1 class="title">{{ _("Distributions") }}</h1>
+                       <h1 class="title">{{ _("Distributions") }}</h1>
 
-       {% if current_user and current_user.is_admin() %}
-               <div class="block">
-                       <a class="button is-success is-small" href="/distros/create">
-                               {{ _("Create A New Distribution") }}
-                       </a>
-               </div>
-       {% end %}
+                       {% if current_user and current_user.is_admin() %}
+                               <div class="block">
+                                       <a class="button is-success" href="/distros/create">
+                                               {{ _("Create Distribution") }}
+                                       </a>
+                               </div>
+                       {% end %}
 
-       {% module DistrosList(distros) %}
+                       {% module DistrosList(distros) %}
+               </div>
+       </section>
 {% end block %}
index 05d43b802522a94ea414246cc345a069b461f8ba..169db31e9d14e4f58ba03e4fca0eaff5f006a70a 100644 (file)
@@ -2,61 +2,70 @@
 
 {% block title %}{{ _("Distributions") }} - {{ distro }}{% end block %}
 
-{% block container %}
-       <nav class="breadcrumb" aria-label="breadcrumbs">
-               <ul>
-                       <li>
-                               <a href="/distros">{{ _("Distributions") }}</a>
-                       </li>
-                       <li class="is-active">
-                               <a href="#" aria-current="page">{{ distro }}</a>
-                       </li>
-               </ul>
-       </nav>
-
-       <h1 class="title is-1">{{ distro }}</h1>
-       {% if distro.slogan %}
-               <h4 class="subtitle is-4">{{ distro.slogan }}</h4>
-       {% end %}
+{% block body %}
+       <section class="section">
+               <div class="container">
+                       <nav class="breadcrumb" aria-label="breadcrumbs">
+                               <ul>
+                                       <li>
+                                               <a href="/distros">{{ _("Distributions") }}</a>
+                                       </li>
+                                       <li class="is-active">
+                                               <a href="#" aria-current="page">{{ distro }}</a>
+                                       </li>
+                               </ul>
+                       </nav>
+
+                       <h1 class="title is-1">{{ distro }}</h1>
+
+                       {% if distro.slogan %}
+                               <h4 class="subtitle is-4">{{ distro.slogan }}</h4>
+                       {% end %}
+
+                       {% if distro.description %}
+                               <div class="block">
+                                       <div class="box">
+                                               {% module Text(distro.description) %}
 
-       {% if distro.description %}
-               <div class="block">
-                       <div class="box">
-                               {% module Text(distro.description) %}
-
-                               <nav class="level">
-                                       <div class="level-left">
-                                               <div class="level-item has-text-centered">
-                                                       <div>
-                                                               <p class="heading">{{ _("Supported Architectures") }}</p>
-                                                               <p>
-                                                                       <span class="tags">
-                                                                               {% for arch in distro.arches %}
-                                                                                       <span class="tag is-dark">{{ arch }}</span>
-                                                                               {% end %}
-                                                                       </span>
-                                                               </p>
+                                               <nav class="level">
+                                                       <div class="level-left">
+                                                               <div class="level-item has-text-centered">
+                                                                       <div>
+                                                                               <p class="heading">{{ _("Supported Architectures") }}</p>
+                                                                               <p>
+                                                                                       <span class="tags">
+                                                                                               {% for arch in distro.arches %}
+                                                                                                       <span class="tag is-dark">{{ arch }}</span>
+                                                                                               {% end %}
+                                                                                       </span>
+                                                                               </p>
+                                                                       </div>
+                                                               </div>
                                                        </div>
+                                               </nav>
+
+                                               <div class="buttons are-small">
+                                                       {% if distro.has_perm(current_user) %}
+                                                               <a class="button is-warning" href="/distros/{{ distro.slug }}/edit">
+                                                                       {{ _("Edit") }}
+                                                               </a>
+                                                       {% end %}
                                                </div>
                                        </div>
-                               </nav>
-
-                               <div class="buttons are-small">
-                                       {% if distro.has_perm(current_user) %}
-                                               <a class="button is-warning" href="/distros/{{ distro.slug }}/edit">
-                                                       {{ _("Edit") }}
-                                               </a>
-                                       {% end %}
                                </div>
-                       </div>
+                       {% end %}
                </div>
-       {% end %}
+       </section>
 
        {# Repositories #}
 
        {% if distro.repos %}
-               <h4 class="title is-4">{{ _("Repositories") }}</h4>
+               <section class="section">
+                       <div class="container">
+                               <h4 class="title is-4">{{ _("Repositories") }}</h4>
 
-               {% module ReposList(distro.repos) %}
+                               {% module ReposList(distro.repos) %}
+                       </div>
+               </section>
        {% end %}
 {% end block %}
index 76d42c1fd4fa581f9ea02f9e2c8b18ee60cd4417..6d5162f4aa8e25b1c8b43ffe43fb276f855030a6 100644 (file)
@@ -2,34 +2,36 @@
 
 {% block title %}{{ _("Log") }}{% end block %}
 
-{% block container %}
-       <nav class="breadcrumb" aria-label="breadcrumbs">
-               <ul>
-                       <li class="is-active">
-                               <a href="#" aria-current="page">{{ _("Log") }}</a>
-                       </li>
-               </ul>
-       </nav>
-
+{% block body %}
        <section class="section">
-               <h1 class="title">{{ _("Log") }}</h1>
+               <div class="container">
+                       <nav class="breadcrumb" aria-label="breadcrumbs">
+                               <ul>
+                                       <li class="is-active">
+                                               <a href="#" aria-current="page">{{ _("Log") }}</a>
+                                       </li>
+                               </ul>
+                       </nav>
 
-               <div class="block">
-                       {% module EventsList(priority=priority, offset=offset, limit=limit,
-                               builder=builder, user=user) %}
-               </div>
+                       <h1 class="title">{{ _("Log") }}</h1>
 
-               <div class="block">
-                       <nav class="pagination is-centered" role="navigation" aria-label="pagination">
-                               <a class="pagination-previous {% if not offset %}is-disabled{% end %}"
-                                               href="/log?offset={{ offset - limit }}&limit={{ limit }}">
-                                       {{ _("Previous Page") }}
-                               </a>
+                       <div class="block">
+                               {% module EventsList(priority=priority, offset=offset, limit=limit,
+                                       builder=builder, user=user) %}
+                       </div>
 
-                               <a class="pagination-next" href="/log?offset={{ offset + limit }}&limit={{ limit }}">
-                                       {{ _("Next Page") }}
-                               </a>
-                       </nav>
+                       <div class="block">
+                               <nav class="pagination is-centered" role="navigation" aria-label="pagination">
+                                       <a class="pagination-previous {% if not offset %}is-disabled{% end %}"
+                                                       href="/log?offset={{ offset - limit }}&limit={{ limit }}">
+                                               {{ _("Previous Page") }}
+                                       </a>
+
+                                       <a class="pagination-next" href="/log?offset={{ offset + limit }}&limit={{ limit }}">
+                                               {{ _("Next Page") }}
+                                       </a>
+                               </nav>
+                       </div>
                </div>
        </section>
 {% end %}
index 309e03cad43196d1e56b2b151e4ce548b5e4cfaa..fd649e831cb130db9fd74b2a7cc83dc2f2b65f93 100644 (file)
@@ -2,41 +2,45 @@
 
 {% block title %}{{ _("Packages") }}{% end block %}
 
-{% block container %}
-       <nav class="breadcrumb" aria-label="breadcrumbs">
-               <ul>
-                       <li class="is-active">
-                               <a href="#" aria-current="page">
-                                       {{ _("Packages") }}
-                               </a>
-                       </li>
-               </ul>
-       </nav>
+{% block body %}
+       <section class="section">
+               <div class="container">
+                       <nav class="breadcrumb" aria-label="breadcrumbs">
+                               <ul>
+                                       <li class="is-active">
+                                               <a href="#" aria-current="page">
+                                                       {{ _("Packages") }}
+                                               </a>
+                                       </li>
+                               </ul>
+                       </nav>
 
-       <h1 class="title">{{ _("Packages") }}</h1>
+                       <h1 class="title">{{ _("Packages") }}</h1>
 
-       <table class="table is-fullwidth">
-               <tbody>
-                       {% for letter, pkgs in sorted(packages.items()) %}
-                               <tr>
-                                       <th scope="row" colspan="2">
-                                               {{ letter.upper() }}
-                                       </th>
-                               </tr>
+                       <table class="table is-fullwidth">
+                               <tbody>
+                                       {% for letter, pkgs in sorted(packages.items()) %}
+                                               <tr>
+                                                       <th scope="row" colspan="2">
+                                                               {{ letter.upper() }}
+                                                       </th>
+                                               </tr>
 
-                               {% for package in pkgs %}
-                                       <tr>
-                                               <td>
-                                                       <a href="/packages/{{ package.name }}">
-                                                               {{ package.name }}
-                                                       </a>
-                                               </td>
-                                               <td>
-                                                       {{ package.summary }}
-                                               </td>
-                                       </tr>
-                               {% end %}
-                       {% end %}
-               </tbody>
-       </table>
+                                               {% for package in pkgs %}
+                                                       <tr>
+                                                               <td>
+                                                                       <a href="/packages/{{ package.name }}">
+                                                                               {{ package.name }}
+                                                                       </a>
+                                                               </td>
+                                                               <td>
+                                                                       {{ package.summary }}
+                                                               </td>
+                                                       </tr>
+                                               {% end %}
+                                       {% end %}
+                               </tbody>
+                       </table>
+               </div>
+       </section>
 {% end block %}
index 01ef92488bcc4827be44ec58edc021a1946e3ad1..99b91bb019028ef3ce4558784b4f367a55471cba 100644 (file)
@@ -2,67 +2,73 @@
 
 {% block title %}{{ _("Package") }} - {{ package.name }}{% end block %}
 
-{% block container %}
-       <nav class="breadcrumb" aria-label="breadcrumbs">
-               <ul>
-                       <li>
-                               <a href="/packages">{{ _("Packages") }}</a>
-                       </li>
-                       <li class="is-active">
-                               <a href="#" aria-current="page">{{ package.name }}</a>
-                       </li>
-               </ul>
-       </nav>
-
+{% block body %}
        <section class="section">
-               {% module PackageInfo(package) %}
+               <div class="container">
+                       <nav class="breadcrumb" aria-label="breadcrumbs">
+                               <ul>
+                                       <li>
+                                               <a href="/packages">{{ _("Packages") }}</a>
+                                       </li>
+                                       <li class="is-active">
+                                               <a href="#" aria-current="page">{{ package.name }}</a>
+                                       </li>
+                               </ul>
+                       </nav>
+
+                       {% module PackageInfo(package) %}
+               </div>
        </section>
 
        <section class="section">
-               {% for distro in backend.distros %}
-                       <div class="block">
-                               <h4 class="title is-4">{{ distro }}</h4>
+               <div class="container">
+                       {% for distro in backend.distros %}
+                               <div class="block">
+                                       <h4 class="title is-4">{{ distro }}</h4>
 
-                               {% for repo in distro.repositories %}
-                                       {% set builds = repo.get_builds_by_name(package.name) %}
+                                       {% for repo in distro.repositories %}
+                                               {% set builds = repo.get_builds_by_name(package.name) %}
 
-                                       {% if builds %}
-                                               <div class="panel">
-                                                       <div class="panel-heading">
-                                                               {{ repo }}
-                                                       </div>
+                                               {% if builds %}
+                                                       <div class="panel">
+                                                               <div class="panel-heading">
+                                                                       {{ repo }}
+                                                               </div>
 
-                                                       {% for build in builds %}
-                                                               <a class="panel-block" href="/builds/{{ build.uuid }}">
-                                                                       <span class="panel-icon">
-                                                                               <i class="fa-solid fa-box" aria-hidden="true"></i>
-                                                                       </span>
+                                                               {% for build in builds %}
+                                                                       <a class="panel-block" href="/builds/{{ build.uuid }}">
+                                                                               <span class="panel-icon">
+                                                                                       <i class="fa-solid fa-box" aria-hidden="true"></i>
+                                                                               </span>
 
-                                                                       {{ build }}
-                                                               </a>
-                                                       {% end %}
-                                               </div>
+                                                                               {{ build }}
+                                                                       </a>
+                                                               {% end %}
+                                                       </div>
+                                               {% end %}
                                        {% end %}
-                               {% end %}
-                       </div>
-               {% end %}
+                               </div>
+                       {% end %}
+               </div>
        </section>
 
        {% if bugs %}
                <section class="section">
-                       <h4 class="title is-4">{{ _("Open Bugs") }}</h4>
+                       <div class="container">
+                               <h4 class="title is-4">{{ _("Open Bugs") }}</h4>
 
-                       <div class="buttons are-small">
-                               <a class="button is-info is-outlined" href="{{ backend.bugzilla.list_url(package.name) }}">
-                                       {{ _("Show All Bugs in Bugzilla") }}
-                               </a>
+                               <div class="buttons are-small">
+                                       <a class="button is-info is-outlined" href="{{ backend.bugzilla.list_url(package.name) }}">
+                                               {{ _("Show All Bugs in Bugzilla") }}
+                                       </a>
 
-                               <a class="button is-success" href="{{ backend.bugzilla.enter_url(package.name) }}">
-                                       {{ _("File A New Bug") }}
-                               </a>
-                       </div>
+                                       <a class="button is-success" href="{{ backend.bugzilla.enter_url(package.name) }}">
+                                               {{ _("File A New Bug") }}
+                                       </a>
+                               </div>
 
-                       {% module BugsList(bugs) %}
+                               {% module BugsList(bugs) %}
+                       </div>
                </section>
        {% end %}
 {% end block %}
index 03286e8aceda37688e819ef65d25281341069157..72c1267fb7796dc711d3bd358c06641be6c28a59 100644 (file)
@@ -2,65 +2,71 @@
 
 {% block title %}{{ _("Packages") }} - {{ package }}{% end block %}
 
-{% block container %}
-       <nav class="breadcrumb" aria-label="breadcrumbs">
-               <ul>
-                       <li>
-                               <a href="/packages">{{ _("Packages") }}</a>
-                       </li>
-                       <li>
-                               <a href="/packages/{{ package.name }}">{{ package.name }}</a>
-                       </li>
-                       <li class="is-active">
-                               <a href="#" aria-current="page">{{ package.evr }}</a>
-                       </li>
-               </ul>
-       </nav>
+{% block body %}
+       <section class="section">
+               <div class="container">
+                       <nav class="breadcrumb" aria-label="breadcrumbs">
+                               <ul>
+                                       <li>
+                                               <a href="/packages">{{ _("Packages") }}</a>
+                                       </li>
+                                       <li>
+                                               <a href="/packages/{{ package.name }}">{{ package.name }}</a>
+                                       </li>
+                                       <li class="is-active">
+                                               <a href="#" aria-current="page">{{ package.evr }}</a>
+                                       </li>
+                               </ul>
+                       </nav>
 
-       {% module PackageInfo(package, show_evr=True) %}
+                       {% module PackageInfo(package, show_evr=True) %}
 
-       <div class="buttons">
-               {# Download Button #}
-               <a class="button is-primary" href="{{ package.download_url }}">
-                       {{ _("Download Package") }} ({{ format_size(package.size) }})
-               </a>
+                       <div class="buttons">
+                               {# Download Button #}
+                               <a class="button is-primary" href="{{ package.download_url }}">
+                                       {{ _("Download Package") }} ({{ format_size(package.size) }})
+                               </a>
 
-               {# Dropdown with all Builds #}
-               {% if package.builds %}
-                       <div class="dropdown">
-                               <div class="dropdown-trigger">
-                                       <button class="button is-light" aria-haspopup="true" aria-controls="dropdown-builds">
-                                               <span>{{ _("Builds") }}</span>
-                                               <span class="icon is-small">
-                                                       <i class="fas fa-angle-down" aria-hidden="true"></i>
-                                               </span>
-                                       </button>
-                               </div>
-                               <div class="dropdown-menu" id="dropdown-builds" role="menu">
-                                       <div class="dropdown-content">
-                                               {% for build in package.builds %}
-                                                       <a href="/builds/{{ build.uuid }}" class="dropdown-item">
-                                                               {{ _("Build from %s") % locale.format_date(build.created_at) }}
-                                                       </a>
-                                               {% end %}
+                               {# Dropdown with all Builds #}
+                               {% if package.builds %}
+                                       <div class="dropdown">
+                                               <div class="dropdown-trigger">
+                                                       <button class="button is-light" aria-haspopup="true" aria-controls="dropdown-builds">
+                                                               <span>{{ _("Builds") }}</span>
+                                                               <span class="icon is-small">
+                                                                       <i class="fas fa-angle-down" aria-hidden="true"></i>
+                                                               </span>
+                                                       </button>
+                                               </div>
+                                               <div class="dropdown-menu" id="dropdown-builds" role="menu">
+                                                       <div class="dropdown-content">
+                                                               {% for build in package.builds %}
+                                                                       <a href="/builds/{{ build.uuid }}" class="dropdown-item">
+                                                                               {{ _("Build from %s") % locale.format_date(build.created_at) }}
+                                                                       </a>
+                                                               {% end %}
+                                                       </div>
+                                               </div>
                                        </div>
-                               </div>
+                               {% end %}
                        </div>
-               {% end %}
-       </div>
 
-       {# XXX add reference to commit for source packages #}
+                       {# XXX add reference to commit for source packages #}
 
-       <div class="block">
-               {% module PackageDependencies(package) %}
-       </div>
+                       <div class="block">
+                               {% module PackageDependencies(package) %}
+                       </div>
+               </div>
+       </section>
 
        {# Filelist #}
        {% if package.files %}
-               <div class="block">
-                       <h5 class="title is-5">{{ _("Filelist") }}</h5>
+               <section class="section">
+                       <div class="container">
+                               <h5 class="title is-5">{{ _("Filelist") }}</h5>
 
-                       {% module PackageFilesTable(package, package.files) %}
-               </div>
+                               {% module PackageFilesTable(package, package.files) %}
+                       </div>
+               </section>
        {% end %}
 {% end block %}
index 5546d503b901b690f28862565262fc3a9ad69116..a3a6eafa3917ccc26f24067f138b43d621ee04b1 100644 (file)
@@ -2,32 +2,34 @@
 
 {% block title %}{{ package }} - {{ file }}{% end block %}
 
-{% block container %}
-       <nav class="breadcrumb" aria-label="breadcrumbs">
-               <ul>
-                       <li>
-                               <a href="/packages">{{ _("Packages") }}</a>
-                       </li>
-                       <li>
-                               <a href="/packages/{{ package.uuid }}">{{ package }}</a>
-                       </li>
-                       <li class="is-active">
-                               <a href="#" aria-current="page">{{ _("File %s") % file }}</a>
-                       </li>
-               </ul>
-       </nav>
-
+{% block body %}
        <section class="section">
-               <h1 class="title">{{ file }}</h1>
+               <div class="container">
+                       <nav class="breadcrumb" aria-label="breadcrumbs">
+                               <ul>
+                                       <li>
+                                               <a href="/packages">{{ _("Packages") }}</a>
+                                       </li>
+                                       <li>
+                                               <a href="/packages/{{ package.uuid }}">{{ package }}</a>
+                                       </li>
+                                       <li class="is-active">
+                                               <a href="#" aria-current="page">{{ _("File %s") % file }}</a>
+                                       </li>
+                               </ul>
+                       </nav>
 
-               <div class="block">
-                       {% module Highlight(payload, filename=file.path) %}
-               </div>
+                       <h1 class="title">{{ file }}</h1>
+
+                       <div class="block">
+                               {% module Highlight(payload, filename=file.path) %}
+                       </div>
 
-               <div class="block">
-                       <a class="button" href="/package/{{ package.uuid }}/download{{ file.path }}">
-                               {{ _("Download (%s)") % format_size(file.size) }}
-                       </a>
+                       <div class="block">
+                               <a class="button is-light is-fullwidth" href="/package/{{ package.uuid }}/download{{ file.path }}">
+                                       {{ _("Download (%s)") % format_size(file.size) }}
+                               </a>
+                       </div>
                </div>
        </section>
 {% end block %}
index 318212440f1bd1e2694bf8cde207e203059bda4e..b6bdc8e22ec262a049a370a78cf856cafdb741ba 100644 (file)
@@ -2,18 +2,22 @@
 
 {% block title %}{{ _("Job Queue") }}{% end block %}
 
-{% block container %}
-       <nav class="breadcrumb" aria-label="breadcrumbs">
-               <ul>
-                       <li class="is-active">
-                               <a href="#" aria-current="page">
-                                       {{ _("Job Queue") }}
-                               </a>
-                       </li>
-               </ul>
-       </nav>
+{% block body %}
+       <section class="section">
+               <div class="container">
+                       <nav class="breadcrumb" aria-label="breadcrumbs">
+                               <ul>
+                                       <li class="is-active">
+                                               <a href="#" aria-current="page">
+                                                       {{ _("Job Queue") }}
+                                               </a>
+                                       </li>
+                               </ul>
+                       </nav>
 
-       <h1 class="title">{{ _("Job Queue") }}</h1>
+                       <h1 class="title">{{ _("Job Queue") }}</h1>
 
-       {% module JobsList(queue) %}
+                       {% module JobsList(queue) %}
+               </div>
+       </section>
 {% end block %}
index 7047c81c7c5ef9b57210b0bed64250626940137d..f2de048b87bfd7cdbfccdb1d297f957507316f9d 100644 (file)
@@ -2,78 +2,81 @@
 
 {% block title %}{{ _("Repository") }} - {{ repo }}{% end block %}
 
-{% block container %}
-       <nav class="breadcrumb" aria-label="breadcrumbs">
-               <ul>
-                       {% if repo.owner %}
-                               <li>
-                                       <a href="/users">{{ _("Users") }}</a>
-                               </li>
-                               <li>
-                                       <a href="/users/{{ repo.owner.name }}">{{ repo.owner }}</a>
-                               </li>
-                               <li>
-                                       <a href="#" disabled>{{ _("Distributions") }}</a>
-                               </li>
-                               <li>
-                                       <a href="#" disabled>{{ distro }}</a>
-                               </li>
-                       {% else %}
-                               <li>
-                                       <a href="/distros">{{ _("Distributions") }}</a>
-                               </li>
-                               <li>
-                                       <a href="/distros/{{ distro.slug }}">{{ distro }}</a>
-                               </li>
-                       {% end %}
-                       <li>
-                               <a href="#" disabled>{{ _("Repositories") }}</a>
-                       </li>
-                       <li class="is-active">
-                               <a href="#" aria-current="page">{{ repo }}</a>
-                       </li>
-               </ul>
-       </nav>
-
-       <h1 class="title is-1">{{ distro }} - {{ repo }}</h1>
+{% block body %}
+       <section class="section">
+               <div class="container">
+                       <nav class="breadcrumb" aria-label="breadcrumbs">
+                               <ul>
+                                       {% if repo.owner %}
+                                               <li>
+                                                       <a href="/users">{{ _("Users") }}</a>
+                                               </li>
+                                               <li>
+                                                       <a href="/users/{{ repo.owner.name }}">{{ repo.owner }}</a>
+                                               </li>
+                                               <li>
+                                                       <a href="#" disabled>{{ _("Distributions") }}</a>
+                                               </li>
+                                               <li>
+                                                       <a href="#" disabled>{{ distro }}</a>
+                                               </li>
+                                       {% else %}
+                                               <li>
+                                                       <a href="/distros">{{ _("Distributions") }}</a>
+                                               </li>
+                                               <li>
+                                                       <a href="/distros/{{ distro.slug }}">{{ distro }}</a>
+                                               </li>
+                                       {% end %}
+                                       <li>
+                                               <a href="#" disabled>{{ _("Repositories") }}</a>
+                                       </li>
+                                       <li class="is-active">
+                                               <a href="#" aria-current="page">{{ repo }}</a>
+                                       </li>
+                               </ul>
+                       </nav>
 
+                       <h1 class="title is-1">{{ distro }} - {{ repo }}</h1>
 
-       <div class="block">
-               <div class="box">
-                       {# Description #}
-                       {% if repo.description %}
-                               {% module Text(repo.description) %}
-                       {% end %}
+                       <div class="block">
+                               <div class="box">
+                                       {# Description #}
+                                       {% if repo.description %}
+                                               {% module Text(repo.description) %}
+                                       {% end %}
 
-                       <nav class="level">
-                               <div class="level-left">
-                                       {# Sizes #}
-                                       {% for arch, size in sorted(repo.size.items()) %}
-                                               <div class="level-item has-text-centered">
-                                                       <div>
-                                                               <p class="heading">
-                                                                       {{ _("Size") }} <span class="tag">{{ arch }}</span>
-                                                               </p>
-                                                               <p class="title">
-                                                                       {{ format_size(size) }}
-                                                               </p>
-                                                       </div>
+                                       <nav class="level">
+                                               <div class="level-left">
+                                                       {# Sizes #}
+                                                       {% for arch, size in sorted(repo.size.items()) %}
+                                                               <div class="level-item has-text-centered">
+                                                                       <div>
+                                                                               <p class="heading">
+                                                                                       {{ _("Size") }} <span class="tag">{{ arch }}</span>
+                                                                               </p>
+                                                                               <p class="title">
+                                                                                       {{ format_size(size) }}
+                                                                               </p>
+                                                                       </div>
+                                                               </div>
+                                                       {% end %}
                                                </div>
-                                       {% end %}
+                                       </nav>
                                </div>
-                       </nav>
-
-                       <div class="buttons are-small">
-                               <a class="button is-primary" href="{{ repo.url }}.repo">
-                                       {{ _("Download Configuration") }}
-                               </a>
 
-                               {% if repo.has_perm(current_user) %}
-                                       <a class="button is-warning" href="{{ repo.url }}/edit">
-                                               {{ _("Edit") }}
+                               <div class="buttons">
+                                       <a class="button is-primary" href="{{ repo.url }}.repo">
+                                               {{ _("Download Configuration") }}
                                        </a>
-                               {% end %}
+
+                                       {% if repo.has_perm(current_user) %}
+                                               <a class="button is-warning" href="{{ repo.url }}/edit">
+                                                       {{ _("Edit") }}
+                                               </a>
+                                       {% end %}
+                               </div>
                        </div>
                </div>
-       </div>
+       </section>
 {% end block %}
index 7b226e7f1f8489209f074de4272191e00eb3862b..270381cf1d49165d8796fb5873a0170924d56a4e 100644 (file)
@@ -2,20 +2,22 @@
 
 {% block title %}{{ _("Users") }}{% end block %}
 
-{% block container %}
-       <nav class="breadcrumb" aria-label="breadcrumbs">
-               <ul>
-                       <li class="is-active">
-                               <a href="#" aria-current="page">
-                                       {{ _("Users") }}
-                               </a>
-                       </li>
-               </ul>
-       </nav>
+{% block body %}
+       <section class="section">
+               <div class="container">
+                       <nav class="breadcrumb" aria-label="breadcrumbs">
+                               <ul>
+                                       <li class="is-active">
+                                               <a href="#" aria-current="page">
+                                                       {{ _("Users") }}
+                                               </a>
+                                       </li>
+                               </ul>
+                       </nav>
 
-       <h1 class="title">{{ _("Users") }}</h1>
+                       <h1 class="title">{{ _("Users") }}</h1>
 
-       <section class="section">
-               {% module UsersList(users) %}
+                       {% module UsersList(users) %}
+               </div>
        </section>
 {% end block %}
index 29b99a0d854b3c06548d00e5655d0c86fc9925e0..2eff083ab329c6708caf78faf096e44831661b51 100644 (file)
 
 {% block title %}{{ _("Users") }} - {{ user }}{% end block %}
 
-{% block container %}
-       <nav class="breadcrumb" aria-label="breadcrumbs">
-               <ul>
-                       <li>
-                               <a href="/users">{{ _("Users") }}</a>
-                       </li>
-                       <li class="is-active">
-                               <a href="#" aria-current="page">{{ user }}</a>
-                       </li>
-               </ul>
-       </nav>
+{% block body %}
+       <section class="section">
+               <div class="container">
+                       <nav class="breadcrumb" aria-label="breadcrumbs">
+                               <ul>
+                                       <li>
+                                               <a href="/users">{{ _("Users") }}</a>
+                                       </li>
+                                       <li class="is-active">
+                                               <a href="#" aria-current="page">{{ user }}</a>
+                                       </li>
+                               </ul>
+                       </nav>
 
-       <h1 class="title is-1">{{ user }}</h1>
-       <h4 class="subtitle is-4">{{ user.name }}</h4>
+                       <h1 class="title is-1">{{ user }}</h1>
+                       <h4 class="subtitle is-4">{{ user.name }}</h4>
 
-       <div class="block">
-               {% if user == current_user and user.has_exceeded_quota() %}
-                       <article class="message is-danger">
-                               <div class="message-header">
-                                       <p>{{ _("Quota Exceeded") }}</p>
-                               </div>
+                       <div class="block">
+                               {% if user == current_user and user.has_exceeded_quota() %}
+                                       <article class="message is-danger">
+                                               <div class="message-header">
+                                                       <p>{{ _("Quota Exceeded") }}</p>
+                                               </div>
 
-                               <div class="message-body">
-                                       {{ _("You have exceeded your quota.") }}
-                               </div>
-                       </article>
-               {% end %}
+                                               <div class="message-body">
+                                                       {{ _("You have exceeded your quota.") }}
+                                               </div>
+                                       </article>
+                               {% end %}
 
-               <div class="box">
-                       <div class="columns">
-                               <div class="column is-4">
-                                       <figure class="image is-1by1">
-                                               <img src="{{ user.avatar(512) }}" alt="{{ user }}" />
-                                       </figure>
-                               </div>
+                               <div class="box">
+                                       <div class="columns">
+                                               <div class="column is-4">
+                                                       <figure class="image is-1by1">
+                                                               <img src="{{ user.avatar(512) }}" alt="{{ user }}" />
+                                                       </figure>
+                                               </div>
 
-                               <div class="column">
-                                       {% if user.has_perm(current_user) %}
-                                               <h6 class="subtitle is-6">{{ _("Resource Limits") }}</h6>
+                                               <div class="column">
+                                                       {% if user.has_perm(current_user) %}
+                                                               <h6 class="subtitle is-6">{{ _("Resource Limits") }}</h6>
 
-                                               <nav class="level">
-                                                       <div class="level-left">
-                                                               <div class="level-item has-text-centered">
-                                                                       <div>
-                                                                               {% if user.quota %}
-                                                                                       <p class="heading">{{ _("Disk Quota") }}</p>
-                                                                                       <p class="title {% if user.has_exceeded_quota() %}has-text-danger{% end %}">
-                                                                                               {{ format_size(user.disk_usage) }}/{{ format_size(user.quota) }}
-                                                                                       </p>
-                                                                               {% else %}
-                                                                                       <p class="heading">{{ _("Disk Usage") }}</p>
-                                                                                       <p class="title">
-                                                                                               {{ format_size(user.disk_usage) }}
-                                                                                       </p>
-                                                                               {% end %}
+                                                               <nav class="level">
+                                                                       <div class="level-left">
+                                                                               <div class="level-item has-text-centered">
+                                                                                       <div>
+                                                                                               {% if user.quota %}
+                                                                                                       <p class="heading">{{ _("Disk Quota") }}</p>
+                                                                                                       <p class="title {% if user.has_exceeded_quota() %}has-text-danger{% end %}">
+                                                                                                               {{ format_size(user.disk_usage) }}/{{ format_size(user.quota) }}
+                                                                                                       </p>
+                                                                                               {% else %}
+                                                                                                       <p class="heading">{{ _("Disk Usage") }}</p>
+                                                                                                       <p class="title">
+                                                                                                               {{ format_size(user.disk_usage) }}
+                                                                                                       </p>
+                                                                                               {% end %}
+                                                                                       </div>
+                                                                               </div>
                                                                        </div>
-                                                               </div>
-                                                       </div>
-                                               </nav>
-                                       {% end %}
+                                                               </nav>
+                                                       {% end %}
 
-                                       <div class="buttons are-small">
-                                               {% if user.has_perm(current_user) %}
-                                                       <a class="button is-warning" href="/users/{{ user.name }}/edit">
-                                                               {{ _("Edit") }}
-                                                       </a>
-                                               {% end %}
+                                                       <div class="buttons are-small">
+                                                               {% if user.has_perm(current_user) %}
+                                                                       <a class="button is-warning" href="/users/{{ user.name }}/edit">
+                                                                               {{ _("Edit") }}
+                                                                       </a>
+                                                               {% end %}
 
-                                               {% if current_user and current_user.is_admin() %}
-                                                       <a class="button is-light" href="mailto:{{ user.email }}">
-                                                               {{ _("Email") }}
-                                                       </a>
-                                               {% end %}
+                                                               {% if current_user and current_user.is_admin() %}
+                                                                       <a class="button is-light" href="mailto:{{ user.email }}">
+                                                                               {{ _("Email") }}
+                                                                       </a>
+                                                               {% end %}
+                                                       </div>
+                                               </div>
                                        </div>
                                </div>
                        </div>
                </div>
-       </div>
+       </section>
 
        {# Repositories #}
 
-       <div class="block">
-               <h5 class="title is-5">{{ _("Repositories") }}</h5>
+       <section class="section">
+               <div class="container">
+                       <h5 class="title is-5">{{ _("Repositories") }}</h5>
 
-               {% if user.has_perm(current_user) %}
-                       <a class="button is-success is-small" href="/users/{{ user.name }}/repos/create">
-                               {{ _("Create Repository") }}
-                       </a>
-               {% end %}
+                       {% if user.has_perm(current_user) %}
+                               <a class="button is-success" href="/users/{{ user.name }}/repos/create">
+                                       {{ _("Create Repository") }}
+                               </a>
+                       {% end %}
 
-               {% if user.repos %}
-                       {% for distro in sorted(user.repos) %}
-                               <h6 class="title is-6">{{ distro }}</h6>
+                       {% if user.repos %}
+                               {% for distro in sorted(user.repos) %}
+                                       <h6 class="title is-6">{{ distro }}</h6>
 
-                               {% module ReposList(user.repos[distro]) %}
+                                       {% module ReposList(user.repos[distro]) %}
+                               {% end %}
                        {% end %}
-               {% end %}
-       </div>
+               </div>
+       </section>
 {% end block %}