bootstrap4: port package detail page

Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>

diff --git a/src/templates/modules/packages-files-table.html b/src/templates/modules/packages-files-table.html
index dd7633cffc8603f5d9b9ccd41e01519b6118264f..5d25ed6751543a0064036f7f85c0d2480ac742a5 100644 (file)
--- a/src/templates/modules/packages-files-table.html
+++ b/src/templates/modules/packages-files-table.html
@@ -1,38 +1,40 @@
-<table class="table table-striped table-hover">
-       <tbody>
-               {% for file in filelist %}
-                       <tr>
-                               <td>
-                                       {{ format_filemode(file.type, file.mode) }}
-                               </td>
-                               <td>
-                                       {{ file.user }}:{{ file.group }}
-                               </td>
-                               <td>
-                                       {% if file.size is None %}
-                                               -
-                                       {% else %}
-                                               {{ format_size(file.size) }}
-                                       {% end %}
-                               </td>
-                               <td>
-                                       {{ file.name }}
-                               </td>
-                               <td>
-                                       <div class="btn-group">
-                                               {% if file.viewable %}
-                                                       <a class="btn btn-mini" href="/package/{{ pkg.uuid }}/view{{ file.name }}">
-                                                               <i class="icon-file"></i>
-                                                       </a>
+<div class="table-responsive mb-2">
+       <table class="table table-striped table-hover">
+               <tbody>
+                       {% for file in filelist %}
+                               <tr>
+                                       <td>
+                                               {{ format_filemode(file.type, file.mode) }}
+                                       </td>
+                                       <td>
+                                               {{ file.user }}:{{ file.group }}
+                                       </td>
+                                       <td>
+                                               {% if file.size is None %}
+                                                       -
+                                               {% else %}
+                                                       {{ format_size(file.size) }}

                                                {% end %}
                                                {% end %}

-                                               {% if file.downloadable %}
-                                                       <a class="btn btn-mini" href="/package/{{ pkg.uuid }}/download{{ file.name }}">
-                                                               <i class="icon-download"></i>
+                                       </td>
+                                       <td>
+                                               {{ file.name }}
+                                       </td>
+                                       <td>
+                                               {% if file.viewable %}
+                                                       <a class="btn btn-light" href="/package/{{ pkg.uuid }}/view{{ file.name }}">
+                                                               <i class="icon-file"></i>{{ _("View file") }}

                                                        </a>
                                                {% end %}
                                                        </a>
                                                {% end %}

-                                       </div>
-                               </td>
-                       </tr>
-               {% end %}
-       </tbody>
-</table>
+                                       </td>
+                                       <td>
+                                       {% if file.downloadable %}
+                                               <a class="btn btn-light" href="/package/{{ pkg.uuid }}/download{{ file.name }}">
+                                                       <i class="icon-download"></i>{{ _("Download") }}
+                                               </a>
+                                       {% end %}
+                                       </td>
+                               </tr>
+                       {% end %}
+               </tbody>
+       </table>
+</div>

diff --git a/src/templates/package-detail.html b/src/templates/package-detail.html
index 0f3dc147f94766b09aca5705e127de209101cb18..818ce1c7d2a8c2f3a7b83b235b234071815be28a 100644 (file)
--- a/src/templates/package-detail.html
+++ b/src/templates/package-detail.html
@@ -3,175 +3,211 @@
 {% block title %}{{ _("Package") }}: {{ pkg.friendly_name }}{% end block %}
 
 {% block body %}
 {% block title %}{{ _("Package") }}: {{ pkg.friendly_name }}{% end block %}
 
 {% block body %}

-       <ul class="breadcrumb">
-               <li>
-                       <a href="/">{{ _("Home") }}</a>
-                       <span class="divider">/</span>
-               </li>
-               <li>
-                       <a href="/packages">{{ _("Packages") }}</a>
-                       <span class="divider">/</span>
-               </li>
-               <li>
-                       <a href="/package/{{ pkg.name }}">{{ pkg.name }}</a>
-                       <span class="divider">/</span>
-               </li>
-               {% if pkg.build %}
-                       <li>
-                               <a href="/build/{{ pkg.build.uuid }}">{{ pkg.friendly_version }}</a>
-                               <span class="divider">/</span>
-                       </li>
-               {% end %}
-               {% if pkg.job %}
-                       <li>
-                               <a href="/job/{{ pkg.job.uuid }}">{{ pkg.job.arch }}</a>
-                               <span class="divider">/</span>
-                       </li>
-               {% end %}
-               <li class="active">
-                       <a href="/package/{{ pkg.uuid }}">{{ pkg.friendly_name }}</a>
-               </li>
-       </ul>

 
 

-       <div class="page-header">
-               <div class="pull-right">
-                       {% if pkg.type == "source" %}
-                               <span class="label label-success">{{ _("Source package") }}</span>
-                       {% end %}
-                       {% if pkg.name.endswith("-devel") %}
-                               <span class="label label-info">{{ _("Development package") }}</span>
-                       {% end %}
-                       {% if pkg.name.endswith("-debuginfo") %}
-                               <span class="label">{{ _("Debuginfo package") }}</span>
-                       {% end %}
+<div class="row">
+               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                       <nav aria-label="breadcrumb" role="navigation">
+                               <ol class="breadcrumb">
+                                       <li class="breadcrumb-item"><a href="/">{{ _("Home") }}</a></li>
+                                       <li class="breadcrumb-item"><a href="/packages">{{ _("Packages") }}</a></li>
+                                       <li class="breadcrumb-item"><a href="/package/{{ pkg.name }}">{{ pkg.name }}</a></li>
+                                       {% if pkg.build %}
+                                               <li class="breadcrumb-item">
+                                                       <a href="/build/{{ pkg.build.uuid }}">{{ pkg.friendly_version }}</a>
+                                               </li>
+                                       {% end %}
+                                       {% if pkg.job %}
+                                               <li class="breadcrumb-item">
+                                                       <a href="/job/{{ pkg.job.uuid }}">{{ pkg.job.arch }}</a>
+                                               </li>
+                                       {% end %}
+                                       <li class="breadcrumb-item active">
+                                               <a href="/package/{{ pkg.uuid }}">{{ pkg.friendly_name }}</a>
+                                       </li>
+                               </ol>
+                       </nav>

                </div>
                </div>

+       </div>

 
 

-               <h2>
-                       {{ _("Package") }}: {{ pkg.friendly_name }}<br>
-                       <small>{{ pkg.summary }}</small>
-               </h2>
+       <div class="row">
+               {% if pkg.build %}
+                       <div class="col-12 col-sm-12 col-md-9 col-lg-10 col-xl-10">
+                               <h2 style="word-wrap: break-word;">
+                                       {{ _("Package") }}: {{ pkg.friendly_name }}
+                                       {% if pkg.type == "source" %}
+                                               <span class="badge badge-info float-lg-right float-xl-right">{{ _("Source package") }}</span>
+                                       {% end %}
+                                       {% if pkg.name.endswith("-devel") %}
+                                               <span class="badge badge-info float-lg-right float-xl-right">{{ _("Development package") }}</span>
+                                       {% end %}
+                                       {% if pkg.name.endswith("-debuginfo") %}
+                                               <span class="badge badge-info float-lg-right float-xl-right">{{ _("Debuginfo package") }}</span>
+                                       {% end %}
+                                       <br>
+                                       <small>{{ pkg.summary }}</small>
+                               </h2>
+                       </div>
+                       <div class="col-12 col-sm-12 col-md-3 col-lg-2 col-xl-2">
+                               <div class="dropdown">
+                                       <button class="btn btn-block btn-light dropdown-toggle mb-2" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                               {{ _("Actions") }}
+                                       </button>
+                                       <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
+                                               <a class="dropdown-item" href="{{ pkg.build.download_prefix }}/{{ pkg.path }}">
+                                                       {{ _("Download") }}
+                                               </a>
+                                       </div>
+                               </div>
+                       </div>
+               {% else %}
+                       <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                               <h2 style="word-wrap: break-word;">
+                                       {{ _("Package") }}: {{ pkg.friendly_name }}
+                                       {% if pkg.type == "source" %}
+                                               <span class="badge badge-info float-lg-right float-xl-right">{{ _("Source package") }}</span>
+                                       {% end %}
+                                       {% if pkg.name.endswith("-devel") %}
+                                               <span class="badge badge-info float-lg-right float-xl-right">{{ _("Development package") }}</span>
+                                       {% end %}
+                                       {% if pkg.name.endswith("-debuginfo") %}
+                                               <span class="badge badge-info float-lg-right float-xl-right">{{ _("Debuginfo package") }}</span>
+                                       {% end %}
+                                       <br>
+                                       <small>{{ pkg.summary }}</small>
+                               </h2>
+                       </div>
+               {% end %}

        </div>
 
        <div class="row">
        </div>
 
        <div class="row">

-               <div class="span4">
+               <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">

                        {% module Text(pkg.description) %}
                </div>
                        {% module Text(pkg.description) %}
                </div>

-
-               <div class="span4">
-                       <table class="table">
-                               <tbody>
-                                       <tr>
-                                               <td>{{ _("Homepage") }}</td>
-                                               <td>
-                                                       <a href="{{ pkg.url }}" target="_blank">{{ pkg.url }}</a>
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                               <td>{{ _("License") }}</td>
-                                               <td>
-                                                       {{ pkg.license }}
-                                               </td>
-                                       </tr>
-                                       {% if pkg.maintainer %}
-                                               <tr>
-                                                       <td>{{ _("Maintainer") }}</td>
-                                                       <td>{% module LinkToUser(pkg.maintainer) %}</td>
-                                               </tr>
-                                       {% end %}
-                                       <tr>
-                                               <td>{{ _("Build host") }}</td>
-                                               <td>
-                                                       <a href="/builder/{{ pkg.build_host }}">{{ pkg.build_host }}</a>
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                               <td>{{ _("Build time") }}</td>
-                                               <td>{{ locale.format_date(pkg.build_time, full_format=True) }} UTC</td>
-                                       </tr>
-                               </tbody>
-                       </table>
-               </div>
-
-               <div class="span4">
-                       <table class="table">
-                               <tbody>
-                                       {% if pkg.type == "binary" %}
+       </div>
+       <div class="row">
+               <div class="col-12 col-sm-12 col-md-6 col-lg-6 col-xl-6">
+                       <div class="table-responsive mb-2">
+                               <table class="table">
+                                       <tbody>

                                                <tr>
                                                <tr>

-                                                       <td>{{ _("Source package") }}</td>
+                                                       <td>{{ _("Homepage") }}</td>

                                                        <td>
                                                        <td>

-                                                               <a href="/package/{{ pkg.build.pkg.uuid }}">{{ pkg.build.pkg.friendly_name }}</a>
+                                                               <a href="{{ pkg.url }}" target="_blank">{{ pkg.url }}</a>

                                                        </td>
                                                </tr>
                                                        </td>
                                                </tr>

-                                       {% end %}
-
-                                       {% if pkg.build %}

                                                <tr>
                                                <tr>

-                                                       <td>{{ _("Build") }}</td>
+                                                       <td>{{ _("License") }}</td>

                                                        <td>
                                                        <td>

-                                                               <a href="/build/{{ pkg.build.uuid }}">{{ pkg.build.name }}</a>
+                                                               {{ pkg.license }}

                                                        </td>
                                                </tr>
                                                        </td>
                                                </tr>

-                                       {% end %}
-
-                                       {% if pkg.job %}
+                                               {% if pkg.maintainer %}
+                                                       <tr>
+                                                               <td>{{ _("Maintainer") }}</td>
+                                                               <td>{% module LinkToUser(pkg.maintainer) %}</td>
+                                                       </tr>
+                                               {% end %}

                                                <tr>
                                                <tr>

-                                                       <td>{{ _("Job") }}</td>
+                                                       <td>{{ _("Build host") }}</td>

                                                        <td>
                                                        <td>

-                                                               <a href="/job/{{ pkg.job.uuid }}">{{ pkg.job.name }}</a>
+                                                               <a href="/builder/{{ pkg.build_host }}">{{ pkg.build_host }}</a>

                                                        </td>
                                                </tr>
                                                        </td>
                                                </tr>

-                                       {% end %}
+                                               <tr>
+                                                       <td>{{ _("Build time") }}</td>
+                                                       <td>{{ locale.format_date(pkg.build_time, full_format=True) }} UTC</td>
+                                               </tr>
+                                       </tbody>
+                               </table>
+                       </div>
+               </div>

 
 

-                                       <tr>
-                                               <td>{{ _("Size") }}</td>
-                                               <td>
-                                                       {{ format_size(pkg.filesize) }}
-                                                       {% if pkg.type == "binary" and not pkg.size == pkg.filesize %}
-                                                               ({{ _("%(size)s when installed") % { "size" : format_size(pkg.size) } }})
-                                                       {% end %}
-                                               </td>
-                                       </tr>
+               <div class="col-12 col-sm-12 col-md-6 col-lg-6 col-xl-6">
+                       <div class="table-responsive mb-2">
+                               <table class="table">
+                                       <tbody>
+                                               {% if pkg.type == "binary" %}
+                                                       <tr>
+                                                               <td>{{ _("Source package") }}</td>
+                                                               <td>
+                                                                       <a href="/package/{{ pkg.build.pkg.uuid }}">{{ pkg.build.pkg.friendly_name }}</a>
+                                                               </td>
+                                                       </tr>
+                                               {% end %}
+
+                                               {% if pkg.build %}
+                                                       <tr>
+                                                               <td>{{ _("Build") }}</td>
+                                                               <td>
+                                                                       <a href="/build/{{ pkg.build.uuid }}">{{ pkg.build.name }}</a>
+                                                               </td>
+                                                       </tr>
+                                               {% end %}
+
+                                               {% if pkg.job %}
+                                                       <tr>
+                                                               <td>{{ _("Job") }}</td>
+                                                               <td>
+                                                                       <a href="/job/{{ pkg.job.uuid }}">{{ pkg.job.name }}</a>
+                                                               </td>
+                                                       </tr>
+                                               {% end %}

 
 

-                                       {% if pkg.commit %}

                                                <tr>
                                                <tr>

-                                                       <td>{{ _("Commit") }}</td>
+                                                       <td>{{ _("Size") }}</td>

                                                        <td>
                                                        <td>

-                                                               <a href="/distro/{{ pkg.commit.distro.identifier }}/source/{{ pkg.commit.source.identifier }}/commit/{{ pkg.commit.revision }}">{{ pkg.commit.revision[:7] }}</a>
-                                                               <br />{{ pkg.commit.subject }}
+                                                               {{ format_size(pkg.filesize) }}
+                                                               {% if pkg.type == "binary" and not pkg.size == pkg.filesize %}
+                                                                       ({{ _("%(size)s when installed") % { "size" : format_size(pkg.size) } }})
+                                                               {% end %}

                                                        </td>
                                                </tr>
                                                        </td>
                                                </tr>

-                                       {% end %}
-                               </tbody>
-                       </table>
+
+                                               {% if pkg.commit %}
+                                                       <tr>
+                                                               <td>{{ _("Commit") }}</td>
+                                                               <td>
+                                                                       <a href="/distro/{{ pkg.commit.distro.identifier }}/source/{{ pkg.commit.source.identifier }}/commit/{{ pkg.commit.revision }}">{{ pkg.commit.revision[:7] }}</a>
+                                                                       <br />{{ pkg.commit.subject }}
+                                                               </td>
+                                                       </tr>
+                                               {% end %}
+                                       </tbody>
+                               </table>
+                       </div>

                </div>
        </div>
 
                </div>
        </div>
 

-       {% if pkg.build %}
-               <a class="btn pull-right" href="{{ pkg.build.download_prefix }}/{{ pkg.path }}">
-                       <i class="icon-download"></i>
-                       {{ _("Download") }}
-               </a>
-
-               <br class="clear">
-       {% end %}
-

        {% if pkg.has_deps() %}
        {% if pkg.has_deps() %}

-               <hr>
-
-               {% if pkg.type == "source" %}
-                       <h4>{{ _("Build dependencies") }}</h4>
-               {% else %}
-                       <h3>{{ _("Dependencies") }}</h3>
-               {% end %}
+               <div class="row">
+                       <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                               <h3 style="word-wrap: break-word;">
+                                       {% if pkg.type == "source" %}
+                                               {{ _("Build dependencies") }}
+                                       {% else %}
+                                               {{ _("Dependencies") }}
+                                       {% end %}
+                               </h3>
+                       </div>
+               </div>

 
                {% module PackagesDependencyTable(pkg) %}
 
                {% module PackagesDependencyTable(pkg) %}

+

        {% end %}
 
        {% if pkg.filelist %}
        {% end %}
 
        {% if pkg.filelist %}

-               <hr>
-
-               <h3>{{ _("Filelist") }}</h3>
+               <div class="row">
+                       <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                               <h3 style="word-wrap: break-word;">
+                                       {{ _("Filelist") }}
+                               </h3>
+                       </div>
+               </div>

 
 

-               {% module PackageFilesTable(pkg, pkg.filelist) %}
+               <div class="row">
+                       <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
+                               {% module PackageFilesTable(pkg, pkg.filelist) %}
+                       </div>
+               </div>

        {% end %}
 {% end block %}
        {% end %}
 {% end block %}