]> git.ipfire.org Git - people/ms/westferry.git/commitdiff
templates: Migrate base template to Foundation
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 29 Nov 2021 15:52:42 +0000 (15:52 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 29 Nov 2021 15:52:42 +0000 (15:52 +0000)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Makefile.am
src/templates/base.html
src/templates/modules/menu/sidebar-divider.html [deleted file]
src/templates/modules/menu/sidebar-link.html
src/templates/modules/menu/sidebar-submenu-header.html [deleted file]
src/templates/modules/menu/sidebar-submenu.html [deleted file]
src/templates/modules/menu/sidebar.html
src/westferry/ui/menu.py

index b8c6b66daa485f6c0a1fb53aa9bbeaab63ca828d..708bec7fb6e19616a9839fbe88b1f06ba189b62d 100644 (file)
@@ -175,9 +175,7 @@ templates_modules_menudir = $(templates_modulesdir)/menu
 
 dist_templates_modules_menu_DATA = \
        src/templates/modules/menu/sidebar.html \
-       src/templates/modules/menu/sidebar-divider.html \
-       src/templates/modules/menu/sidebar-link.html \
-       src/templates/modules/menu/sidebar-submenu.html
+       src/templates/modules/menu/sidebar-link.html
 
 ui_modulesdir = $(datadir)/westferry/templates/modules
 
index e72eddf359048cd651b570751807760902d90e17..fca9d8254d03ab5b6ccdf4b3d79a12752ff99923 100644 (file)
@@ -1,13 +1,11 @@
 <!DOCTYPE html>
-<html lang="en">
+<html class="no-js" lang="en">
        <head>
                <meta charset="utf-8">
                <meta http-equiv="X-UA-Compatible" content="IE=edge">
                <meta name="viewport" content="width=device-width, initial-scale=1">
                <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
 
-               <meta name="description" content="">
-               <meta name="author" content="">
                <link rel="icon" href="/favicon.ico">
 
                <title>
        </head>
 
        <body>
-               <nav class="navbar navbar-inverse navbar-fixed-top">
-                       <div class="container">
-                               <div class="navbar-header">
-                                       <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
-                                               <span class="sr-only">{{ _("Toggle navigation") }}</span>
-                                               <span class="icon-bar"></span>
-                                               <span class="icon-bar"></span>
-                                               <span class="icon-bar"></span>
-                                       </button>
-
-                                       <a class="navbar-brand" href="/">{{ hostname() }}</a>
+               <div class="grid-container">
+                       <div class="top-bar">
+                               <div class="top-bar-left">
+                                       <ul class="dropdown menu" data-dropdown-menu>
+                                               <li class="menu-text">{{ hostname() }}</li>
+                                               <li>
+                                                       <a href="#">One</a>
+                                                       <ul class="menu vertical">
+                                                               <li><a href="#">One</a></li>
+                                                               <li><a href="#">Two</a></li>
+                                                               <li><a href="#">Three</a></li>
+                                                       </ul>
+                                               </li>
+                                               <li><a href="#">Two</a></li>
+                                               <li><a href="#">Three</a></li>
+                                       </ul>
                                </div>
-                               <div id="navbar" class="navbar-collapse collapse">
-                                       <ul class="nav navbar-nav navbar-right">
-                                               <li><a href="#">Dashboard</a></li>
-                                               <li><a href="#">Settings</a></li>
-                                               <li><a href="#">Profile</a></li>
-                                               <li><a href="#">Help</a></li>
+
+                               <div class="top-bar-right">
+                                       <ul class="menu">
+                                               <li><input type="search" placeholder="{{ _("Search") }}"></li>
+                                               <li><button type="button" class="button">{{ _("Search") }}</button></li>
                                        </ul>
                                </div>
                        </div>
-               </nav>
 
-               <div class="container">
-                       {% if menu %}
-                               <div class="row">
-                                       <div class="col-sm-3 col-md-2">
+                       <div class="grid-x grid-padding-x">
+                               {% if menu %}
+                                       <div class="cell small-3">
                                                {% module SidebarMenu(menu) %}
                                        </div>
+                               {% end %}
 
-                                       <div class="col-sm-9 col-md-10 main">
-                                               {% block main %}
-                                                       <h1 class="page-header">Dashboard</h1>
-                                               {% end %}
-                                       </div>
+                               <div class="cell auto">
+                                       {% block main %}{% end block %}
                                </div>
-                       {% else %}
-                               {% block main %}{% end %}
-                       {% end %}
+                       </div>
                </div>
 
                <script src="{{ static_url("scripts/jquery.min.js") }}"></script>
diff --git a/src/templates/modules/menu/sidebar-divider.html b/src/templates/modules/menu/sidebar-divider.html
deleted file mode 100644 (file)
index ab404d2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<li class="divider"></li>
index b5ef146a4d1415e2ecaffe044f99e9b6ea38e45f..4a2facfa544bae06b780f855e81a5c571058ab76 100644 (file)
@@ -1,5 +1,3 @@
-<li {% if item.is_active() %}class="active"{% end %}>
-       <a href="{{ item.url }}">
-               {{ item.title }}
-       </a>
-</li>
+<a href="{{ item.url }}">
+       {{ item.title }}
+</a>
diff --git a/src/templates/modules/menu/sidebar-submenu-header.html b/src/templates/modules/menu/sidebar-submenu-header.html
deleted file mode 100644 (file)
index b3b8eca..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<li class="dropdown-header">{{ item.title }}</li>
diff --git a/src/templates/modules/menu/sidebar-submenu.html b/src/templates/modules/menu/sidebar-submenu.html
deleted file mode 100644 (file)
index 2a70981..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-<li class="dropdown">
-       <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-               {{ submenu.title or _("No Title") }} <b class="caret"></b>
-       </a>
-
-       <ul class="dropdown-menu">
-               {% for i in submenu %}
-                       {% if i.type == "header" %}
-                               {% module SidebarMenuSubMenuHeader(submenu, i) %}
-                       {% elif i.type == "link" %}
-                               {% module SidebarMenuLink(submenu, i) %}
-                       {% elif i.type == "divider" %}
-                               {% module SidebarMenuDivider(submenu, i) %}
-                       {% end %}
-               {% end %}
-       </ul>
-</li>
index 69d795aa2b846e7bd72eb6e845450aa9f695af00..48a1599d0fde32f138406d905de63e9db4962353 100644 (file)
@@ -1,25 +1,11 @@
-<div class="sidebar-nav">
-       <div class="navbar navbar-default" role="navigation">
-               <div class="navbar-header">
-                       <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".sidebar-navbar-collapse">
-                               <span class="sr-only">{{ _("Toggle navigation") }}</span>
-                               <span class="icon-bar"></span>
-                               <span class="icon-bar"></span>
-                               <span class="icon-bar"></span>
-                       </button>
-                       <span class="visible-xs navbar-brand">{{ _("Sidebar menu") }}</span>
-               </div>
-
-               <div class="navbar-collapse collapse sidebar-navbar-collapse">
-                       <ul class="nav navbar-nav">
-                               {% for i in menu %}
-                                       {% if i.type == "link" %}
-                                               {% module SidebarMenuLink(menu, i) %}
-                                       {% elif i.type == "menu" %}
-                                               {% module SidebarMenuSubMenu(menu, i) %}
-                                       {% end %}
-                               {% end %}
-                       </ul>
-               </div>
-       </div>
-</div>
+<ul class="vertical menu">
+       {% for i in menu %}
+               <li {% if i.is_active() %}class="is-active"{% end %}>
+                       {% if i.type == "link" %}
+                               {% module SidebarMenuLink(i) %}
+                       {% elif i.type == "menu" %}
+                               {% module SidebarMenu(i, nested=True) %}
+                       {% end %}
+               </li>
+       {% end %}
+</ul>
index b720ae8d4541b6f494a9a3d125cd0c0d8a2ce992..0742edae0d037803bdb368408f2e38f078c3d40f 100644 (file)
@@ -172,25 +172,14 @@ class SubMenu(MenuItem, MenuMixin):
 
 
 class SidebarMenuModule(base.BaseUIModule):
-       def render(self, menu):
-               return self.render_string("modules/menu/sidebar.html", menu=menu)
+       def render(self, menu, nested=False):
+               return self.render_string(
+                       "modules/menu/sidebar.html",
+                       menu=menu,
+                       nested=nested,
+               )
 
 
 class SidebarMenuLinkModule(base.BaseUIModule):
-       def render(self, menu, item):
+       def render(self, item):
                return self.render_string("modules/menu/sidebar-link.html", item=item)
-
-
-class SidebarMenuDividerModule(base.BaseUIModule):
-       def render(self, menu, item):
-               return self.render_string("modules/menu/sidebar-divider.html")
-
-
-class SidebarMenuSubMenuModule(base.BaseUIModule):
-       def render(self, menu, submenu):
-               return self.render_string("modules/menu/sidebar-submenu.html", submenu=submenu)
-
-
-class SidebarMenuSubMenuHeaderModule(base.BaseUIModule):
-       def render(self, menu, item):
-               return self.render_string("modules/menu/sidebar-submenu-header.html", item=item)