]> git.ipfire.org Git - pbs.git/commitdiff
projects / pbs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7668107)
templates: Add footer
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 29 May 2022 14:20:48 +0000 (14:20 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 29 May 2022 14:20:48 +0000 (14:20 +0000)
And remove the old one

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Makefile.am patch | blob | blame | history
src/templates/base.html patch | blob | blame | history
src/templates/modules/footer.html [deleted file] patch | blob | blame | history
src/web/__init__.py patch | blob | blame | history
src/web/ui_modules.py patch | blob | blame | history

diff --git a/Makefile.am b/Makefile.am
index 33a43bd695f1bd39358e01859af912b0f7e56524..1c2859ff57a4afb6341bb7dc9549701d66afe612 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -264,7 +264,6 @@ dist_templates_modules_DATA = \
        src/templates/modules/commits-table.html \
        src/templates/modules/commit-message.html \
        src/templates/modules/files-table.html \
-       src/templates/modules/footer.html \
        src/templates/modules/jobs-table.html \
        src/templates/modules/link-to-user.html \
        src/templates/modules/log-entry-comment.html \
diff --git a/src/templates/base.html b/src/templates/base.html
index d8e5cf0c5bddcba14a1e00df82b22d0397d9ec13..d94a5fb4a65fc7f8f5e03d50f9f269329dc0defa 100644 (file)
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -13,97 +13,111 @@
 
        <body>
                <div class="grid-container">
-                       <div class="top-bar">
-                               <div class="top-bar-left">
-                                       <ul class="dropdown menu" data-dropdown-menu>
-                                               <li class="menu-text">{{ _("Pakfire Build Service") }}</li>
+                       <div class="grid-y medium-grid-frame">
+                               <div class="cell shrink header medium-cell-block-container">
+                                       <div class="top-bar">
+                                               <div class="top-bar-left">
+                                                       <ul class="dropdown menu" data-dropdown-menu>
+                                                               <li class="menu-text">{{ _("Pakfire Build Service") }}</li>
 
-                                               {# Some important links... #}
-                                               <li>
-                                                       <a href="/packages">{{ _("Packages") }}</a>
-                                               </li>
-                                               <li>
-                                                       <a href="/builds">{{ _("Builds") }}</a>
-                                               </li>
-
-                                               {# Dropdown menu with more stuff... #}
-                                               <li>
-                                                       <a href="#">{{ _("More") }}</a>
-
-                                                       <ul class="menu vertical">
+                                                               {# Some important links... #}
                                                                <li>
-                                                                       <a href="/search">{{ _("Search") }}</a>
+                                                                       <a href="/packages">{{ _("Packages") }}</a>
                                                                </li>
                                                                <li>
-                                                                       <a href="/distros">{{ _("Distributions") }}</a>
-                                                               </li>
-                                                               <li>
-                                                                       <a href="/builders">{{ _("Builders") }}</a>
-                                                               </li>
-                                                               <li>
-                                                                       <a href="/mirrors">{{ _("Mirrors") }}</a>
+                                                                       <a href="/builds">{{ _("Builds") }}</a>
                                                                </li>
+
+                                                               {# Dropdown menu with more stuff... #}
                                                                <li>
-                                                                       <a href="/keys">{{ _("Key Management") }}</a>
-                                                               </li>
-                                                               {% if current_user %}
-                                                                       <li>
-                                                                               <a href="/users">{{ _("Users") }}</a>
-                                                                       </li>
-                                                                       {% if current_user.is_admin() %}
+                                                                       <a href="#">{{ _("More") }}</a>
+
+                                                                       <ul class="menu vertical">
                                                                                <li>
-                                                                                       <a href="/sessions">{{ _("Sessions") }}</a>
+                                                                                       <a href="/search">{{ _("Search") }}</a>
                                                                                </li>
                                                                                <li>
-                                                                                       <a href="/uploads">{{ _("Uploads") }}</a>
+                                                                                       <a href="/distros">{{ _("Distributions") }}</a>
                                                                                </li>
-                                                                       {% end %}
-                                                               {% end %}
+                                                                               <li>
+                                                                                       <a href="/builders">{{ _("Builders") }}</a>
+                                                                               </li>
+                                                                               <li>
+                                                                                       <a href="/mirrors">{{ _("Mirrors") }}</a>
+                                                                               </li>
+                                                                               <li>
+                                                                                       <a href="/keys">{{ _("Key Management") }}</a>
+                                                                               </li>
+                                                                               {% if current_user %}
+                                                                                       <li>
+                                                                                               <a href="/users">{{ _("Users") }}</a>
+                                                                                       </li>
+                                                                                       {% if current_user.is_admin() %}
+                                                                                               <li>
+                                                                                                       <a href="/sessions">{{ _("Sessions") }}</a>
+                                                                                               </li>
+                                                                                               <li>
+                                                                                                       <a href="/uploads">{{ _("Uploads") }}</a>
+                                                                                               </li>
+                                                                                       {% end %}
+                                                                               {% end %}
+                                                                       </ul>
+                                                               </li>
                                                        </ul>
-                                               </li>
-                                       </ul>
-                               </div>
-
-                               <div class="top-bar-right">
-                                       <div class="dropdown menu">
-                                               <li>
-                                                       <form method="GET" action="/search">
-                                                               <input type="search" placeholder="Search" name="q">
-                                                       </form>
-                                               </li>
+                                               </div>
 
-                                               {% if current_user %}
-                                                       <li>
-                                                               <a href="#">{{ current_user }}</a>
+                                               <div class="top-bar-right">
+                                                       <div class="dropdown menu">
+                                                               <li>
+                                                                       <form method="GET" action="/search">
+                                                                               <input type="search" placeholder="Search" name="q">
+                                                                       </form>
+                                                               </li>
 
-                                                               <ul class="menu vertical">
-                                                                       <li>
-                                                                               <a href="/profile">{{ _("My Profile") }}</a>
-                                                                       </li>
+                                                               {% if current_user %}
                                                                        <li>
-                                                                               <a href="/profile/builds">{{ _("My Builds") }}</a>
+                                                                               <a href="#">{{ current_user }}</a>
+
+                                                                               <ul class="menu vertical">
+                                                                                       <li>
+                                                                                               <a href="/profile">{{ _("My Profile") }}</a>
+                                                                                       </li>
+                                                                                       <li>
+                                                                                               <a href="/profile/builds">{{ _("My Builds") }}</a>
+                                                                                       </li>
+                                                                                       <li>
+                                                                                               <a href="/logout">{{ _("Log Out") }}</a>
+                                                                                       </li>
+                                                                               </ul>
                                                                        </li>
+                                                               {% else %}
                                                                        <li>
-                                                                               <a href="/logout">{{ _("Log Out") }}</a>
+                                                                               <a href="/login">{{ _("Sign In") }}</a>
                                                                        </li>
-                                                               </ul>
-                                                       </li>
-                                               {% else %}
-                                                       <li>
-                                                               <a href="/login">{{ _("Sign In") }}</a>
-                                                       </li>
-                                               {% end %}
+                                                               {% end %}
+                                                       </div>
+                                               </div>
                                        </div>
                                </div>
-                       </div>
 
-                       {% block container %}
-                               <div class="grid-x grid-padding-x">
-                                       {% block body %}EMPTY BODY{% end block %}
+                               {# Main Stuff #}
 
-                                       {% module Footer() %}
+                               <div class="cell medium-auto medium-cell-block-container">
+                                       {% block container %}
+                                               <div class="grid-x grid-padding-x">
+                                                       {% block body %}EMPTY BODY{% end block %}
+                                               </div>
+                                       {% end block %}
                                </div>
-                       {% end block %}
+
+                               {# Footer #}
+
+                               <div class="cell shrink footer">
+                                       <p>
+                                               &copy; {{ year }} - Pakfire Build Service {{ version }}
+                                       </p>
+                               </div>
+                       </div>
                </div>
 
                <!-- include javascript files -->
diff --git a/src/templates/modules/footer.html b/src/templates/modules/footer.html
deleted file mode 100644 (file)
index 58d7435..0000000
--- a/src/templates/modules/footer.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<hr />
-
-<footer class="footer">
-       <p>
-               &copy; {{ year }} - Pakfire Build Service {{ version }}
-       </p>
-</footer>
diff --git a/src/web/__init__.py b/src/web/__init__.py
index 4a92f90abb489178bf991314e7d6a3b5f491f570..7cf010855df59a573a0c7a6f4b623202ea2b3377 100644 (file)
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -36,8 +36,6 @@ class Application(tornado.web.Application):
                                "Text"               : ui_modules.TextModule,
                                "Modal"              : ui_modules.ModalModule,
 
-                               "Footer"             : ui_modules.FooterModule,
-
                                # Logging
                                "Log"                : ui_modules.LogModule,
                                "LogEntry"           : ui_modules.LogEntryModule,
diff --git a/src/web/ui_modules.py b/src/web/ui_modules.py
index dd3f4ecf507e91f860033d358bdb129aa6c77262..6b225b663d3c5af2cc6f874007667ed65405f52f 100644 (file)
--- a/src/web/ui_modules.py
+++ b/src/web/ui_modules.py
@@ -101,11 +101,6 @@ class CommitsTableModule(UIModule):
                        full_format=full_format)
 
 
-class FooterModule(UIModule):
-       def render(self):
-               return self.render_string("modules/footer.html")
-
-
 class HeadingDateModule(UIModule):
        def render(self, date):
                _ = self.locale.translate
The pakfire build service repository.