UI: Rename menu to menus

All modules should have the plural form.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index 2881683252d4b0acd1622516154b5c256708ad20..c86e056935af1bebc59763cc3c4d132f16602898 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -122,7 +122,7 @@ westferry_ui_PYTHON = \
        src/westferry/ui/boxes.py \
        src/westferry/ui/forms.py \
        src/westferry/ui/graphs.py \
-       src/westferry/ui/menu.py \
+       src/westferry/ui/menus.py \
        src/westferry/ui/tabs.py \
        src/westferry/ui/utils.py
 
@@ -168,13 +168,13 @@ templates_modules_graphsdir = $(templates_modulesdir)/graphs
 dist_templates_modules_graphs_DATA = \
        src/templates/modules/graphs/box.html
 
-templates_modules_menudir = $(templates_modulesdir)/menu
+templates_modules_menusdir = $(templates_modulesdir)/menus
 
-dist_templates_modules_menu_DATA = \
-       src/templates/modules/menu/dropdown.html \
-       src/templates/modules/menu/link.html \
-       src/templates/modules/menu/sidebar.html \
-       src/templates/modules/menu/topbar.html
+dist_templates_modules_menus_DATA = \
+       src/templates/modules/menus/dropdown.html \
+       src/templates/modules/menus/link.html \
+       src/templates/modules/menus/sidebar.html \
+       src/templates/modules/menus/topbar.html
 
 ui_modulesdir = $(datadir)/westferry/templates/modules
 

diff --git a/src/templates/modules/menu/dropdown.html b/src/templates/modules/menus/dropdown.html
similarity index 64%
rename from src/templates/modules/menu/dropdown.html
rename to src/templates/modules/menus/dropdown.html
index 21dcf5303a649ff1cdf046d404df68faf0c0d2a0..579c3cb2b3013a6b3d324198b4410d3139f03af8 100644 (file)
--- a/src/templates/modules/menu/dropdown.html
+++ b/src/templates/modules/menus/dropdown.html
@@ -1,13 +1,13 @@
-{% import westferry.ui.menu %}
+{% import westferry.ui.menus %}
 
 <a href="#">{{ menu.title or _("- No Title -") }}</a>
 
 <ul class="menu vertical {% if nested %}nested{% end %}">
        {% for element in menu %}
                <li>
-                       {% if isinstance(element, westferry.ui.menu.Menu) %}
+                       {% if isinstance(element, westferry.ui.menus.Menu) %}
                                {% module MenuDropdown(element, nested=True) %}
-                       {% elif isinstance(element, westferry.ui.menu.MenuLink) %}
+                       {% elif isinstance(element, westferry.ui.menus.MenuLink) %}
                                {% module MenuLink(element) %}
                        {% end %}
                </li>

diff --git a/src/templates/modules/menu/link.html b/src/templates/modules/menus/link.html
similarity index 100%
rename from src/templates/modules/menu/link.html
rename to src/templates/modules/menus/link.html

diff --git a/src/templates/modules/menu/sidebar.html b/src/templates/modules/menus/sidebar.html
similarity index 100%
rename from src/templates/modules/menu/sidebar.html
rename to src/templates/modules/menus/sidebar.html

diff --git a/src/templates/modules/menu/topbar.html b/src/templates/modules/menus/topbar.html
similarity index 61%
rename from src/templates/modules/menu/topbar.html
rename to src/templates/modules/menus/topbar.html
index 0be7e16ae403fec5090e78729c1742c1e174bc7d..b5dbad29f64e047833b9f6d9a178b2b9915cf6c1 100644 (file)
--- a/src/templates/modules/menu/topbar.html
+++ b/src/templates/modules/menus/topbar.html
@@ -1,13 +1,13 @@
-{% import westferry.ui.menu %}
+{% import westferry.ui.menus %}
 
 <ul class="dropdown menu" data-dropdown-menu>
        <li class="menu-text">{{ hostname() }}</li>
 
        {% for element in menu %}
                <li>
-                       {% if isinstance(element, westferry.ui.menu.Menu) %}
+                       {% if isinstance(element, westferry.ui.menus.Menu) %}
                                {% module MenuDropdown(element) %}
-                       {% elif isinstance(element, westferry.ui.menu.MenuLink) %}
+                       {% elif isinstance(element, westferry.ui.menus.MenuLink) %}
                                {% module MenuLink(element) %}
                        {% end %}
                </li>

diff --git a/src/westferry/handlers/analytics.py b/src/westferry/handlers/analytics.py
index 3cc4b1ce66d0dd06dcf1b259d7869b70972ed00c..3cf785e838f681a95eadc0977ebe7f06853f6ef9 100644 (file)
--- a/src/westferry/handlers/analytics.py
+++ b/src/westferry/handlers/analytics.py
@@ -33,7 +33,7 @@ class AnalyticsBaseHandler(base.BaseHandler):
        def menu(self):
                _ = self.locale.translate
 
-               m = ui.menu.Menu(self, _("Analytics"))
+               m = ui.menus.Menu(self, _("Analytics"))
 
                # Overview
                m.add_handler(AnalyticsOverviewHandler)
@@ -63,7 +63,7 @@ class AnalyticsNetworkBaseHandler(AnalyticsBaseHandler):
        def menu(self):
                _ = self.locale.translate
 
-               m = ui.menu.Menu(self, _("Network"))
+               m = ui.menus.Menu(self, _("Network"))
 
                # Back...
                m.add_handler(AnalyticsOverviewHandler, title=_("Back..."))
@@ -120,7 +120,7 @@ class AnalyticsSystemBaseHandler(AnalyticsBaseHandler):
        def menu(self):
                _ = self.locale.translate
 
-               m = ui.menu.Menu(self, _("System"))
+               m = ui.menus.Menu(self, _("System"))
 
                # Back...
                m.add_handler(AnalyticsOverviewHandler, title=_("Back..."))

diff --git a/src/westferry/handlers/base.py b/src/westferry/handlers/base.py
index fdb624aeba19d98379ed350343c2fe471f0982df..b73d70f6e15adbf1112484bb2c255a894835335d 100644 (file)
--- a/src/westferry/handlers/base.py
+++ b/src/westferry/handlers/base.py
@@ -73,7 +73,7 @@ class BaseHandler(tornado.web.RequestHandler, metaclass=HandlerRegistration):
                from . import analytics
                from . import demo
 
-               menu = ui.menu.Menu(self)
+               menu = ui.menus.Menu(self)
 
                # Analytics
                menu.add_handler(analytics.AnalyticsOverviewHandler, title=_("Analytics"))

diff --git a/src/westferry/handlers/demo.py b/src/westferry/handlers/demo.py
index 820ab51b139e77b0cb6935c9d927d17c2fea60d5..086add79ecc9b1dbca7e7e4e3ae5cba8252f4e78 100644 (file)
--- a/src/westferry/handlers/demo.py
+++ b/src/westferry/handlers/demo.py
@@ -30,7 +30,7 @@ class DemoBaseHandler(base.BaseHandler):
        def menu(self):
                _ = self.locale.translate
 
-               m = ui.menu.Menu(self, _("Demo"))
+               m = ui.menus.Menu(self, _("Demo"))
 
                # Overview
                m.add_handler(DemoOverviewHandler)

diff --git a/src/westferry/ui/__init__.py b/src/westferry/ui/__init__.py
index 99c898f7ffd8c62b7441afe58a68a67c1495a51e..bdf3f1716ce08f013f7721491fad4e1c5f001c71 100644 (file)
--- a/src/westferry/ui/__init__.py
+++ b/src/westferry/ui/__init__.py
@@ -23,7 +23,7 @@ from . import base
 from . import boxes
 from . import forms
 from . import graphs
-from . import menu
+from . import menus
 from . import tabs
 from . import utils
 

diff --git a/src/westferry/ui/menu.py b/src/westferry/ui/menus.py
similarity index 94%
rename from src/westferry/ui/menu.py
rename to src/westferry/ui/menus.py
index 846afdf5aa76738fb8eee40ab3805ffb3818b325..ecb94eefbf7955ae1c4ae8a89111046fb2ff0e74 100644 (file)
--- a/src/westferry/ui/menu.py
+++ b/src/westferry/ui/menus.py
@@ -131,13 +131,13 @@ class Menu(object):
 
 class TopbarMenuModule(base.BaseUIModule):
        def render(self, menu):
-               return self.render_string("modules/menu/topbar.html", menu=menu)
+               return self.render_string("modules/menus/topbar.html", menu=menu)
 
 
 class SidebarMenuModule(base.BaseUIModule):
        def render(self, menu, nested=False):
                return self.render_string(
-                       "modules/menu/sidebar.html",
+                       "modules/menus/sidebar.html",
                        menu=menu,
                        nested=nested,
                )
@@ -145,10 +145,10 @@ class SidebarMenuModule(base.BaseUIModule):
 
 class MenuLinkModule(base.BaseUIModule):
        def render(self, element):
-               return self.render_string("modules/menu/link.html", element=element)
+               return self.render_string("modules/menus/link.html", element=element)
 
 
 class MenuDropdownModule(base.BaseUIModule):
        def render(self, menu, nested=False):
-               return self.render_string("modules/menu/dropdown.html",
+               return self.render_string("modules/menus/dropdown.html",
                        menu=menu, nested=nested)