From 9231bd0ec5eb737340ae03a5efdc1127b06a8298 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 5 Dec 2021 16:11:31 +0000
Subject: [PATCH] UI: Rename menu to menus

All modules should have the plural form.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 Makefile.am                                        | 14 +++++++-------
 .../modules/{menu => menus}/dropdown.html          |  6 +++---
 src/templates/modules/{menu => menus}/link.html    |  0
 src/templates/modules/{menu => menus}/sidebar.html |  0
 src/templates/modules/{menu => menus}/topbar.html  |  6 +++---
 src/westferry/handlers/analytics.py                |  6 +++---
 src/westferry/handlers/base.py                     |  2 +-
 src/westferry/handlers/demo.py                     |  2 +-
 src/westferry/ui/__init__.py                       |  2 +-
 src/westferry/ui/{menu.py => menus.py}             |  8 ++++----
 10 files changed, 23 insertions(+), 23 deletions(-)
 rename src/templates/modules/{menu => menus}/dropdown.html (64%)
 rename src/templates/modules/{menu => menus}/link.html (100%)
 rename src/templates/modules/{menu => menus}/sidebar.html (100%)
 rename src/templates/modules/{menu => menus}/topbar.html (61%)
 rename src/westferry/ui/{menu.py => menus.py} (94%)

diff --git a/Makefile.am b/Makefile.am
index 2881683..c86e056 100644
--- 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 21dcf53..579c3cb 100644
--- 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 0be7e16..b5dbad2 100644
--- 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 3cc4b1c..3cf785e 100644
--- 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 fdb624a..b73d70f 100644
--- 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 820ab51..086add7 100644
--- 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 99c898f..bdf3f17 100644
--- 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 846afdf..ecb94ee 100644
--- 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)
-- 
2.47.3