From: Michael Tremer Date: Mon, 29 Nov 2021 15:52:42 +0000 (+0000) Subject: templates: Migrate base template to Foundation X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3c9a9d48ba1a0bffceb9c5d54c722cf2c8d74c27;p=people%2Fms%2Fwestferry.git templates: Migrate base template to Foundation Signed-off-by: Michael Tremer --- diff --git a/Makefile.am b/Makefile.am index b8c6b66..708bec7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 diff --git a/src/templates/base.html b/src/templates/base.html index e72eddf..fca9d82 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -1,13 +1,11 @@ - + - - @@ -22,45 +20,43 @@ </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 index ab404d2..0000000 --- a/src/templates/modules/menu/sidebar-divider.html +++ /dev/null @@ -1 +0,0 @@ -<li class="divider"></li> diff --git a/src/templates/modules/menu/sidebar-link.html b/src/templates/modules/menu/sidebar-link.html index b5ef146..4a2facf 100644 --- a/src/templates/modules/menu/sidebar-link.html +++ b/src/templates/modules/menu/sidebar-link.html @@ -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 index b3b8eca..0000000 --- a/src/templates/modules/menu/sidebar-submenu-header.html +++ /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 index 2a70981..0000000 --- a/src/templates/modules/menu/sidebar-submenu.html +++ /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> diff --git a/src/templates/modules/menu/sidebar.html b/src/templates/modules/menu/sidebar.html index 69d795a..48a1599 100644 --- a/src/templates/modules/menu/sidebar.html +++ b/src/templates/modules/menu/sidebar.html @@ -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> diff --git a/src/westferry/ui/menu.py b/src/westferry/ui/menu.py index b720ae8..0742eda 100644 --- a/src/westferry/ui/menu.py +++ b/src/westferry/ui/menu.py @@ -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)