Moved main_menu creation from admin.admin to admin.core.frontends.menus

Author: KirillMysnik

srcds/addons/source-python/plugins/admin/admin.py

@@ -12,7 +12,7 @@
 from .core.events.storage import admin_resource_list
 from .core.listeners import (on_spa_loaded_listener_manager,
                              on_spa_unloaded_listener_manager)
-from .core.frontends.menus import MenuSection
+from .core.frontends.menus import main_menu
 from .core.frontends.motd import MainPage
 from .core.orm import Base, engine
 from .core.plugins.command import admin_command_manager
@@ -26,12 +26,6 @@
 Base.metadata.create_all(engine)
 
 
-# =============================================================================
-# >> GLOBAL VARIABLES
-# =============================================================================
-main_menu = MenuSection(None, strings_common['title main'], 'admin')
-
-
 # =============================================================================
 # >> LOAD & UNLOAD FUNCTIONS
 # =============================================================================

srcds/addons/source-python/plugins/admin/core/frontends/menus.py

@@ -144,6 +144,9 @@ def select(self, client):
 
         client.send_popup(self.popup)
 
+# Main section
+main_menu = MenuSection(None, strings_common['title main'], 'admin')
+
 
 class MenuCommand(MenuEntry):
     """Base class for entry that is bound to execute a feature."""

srcds/addons/source-python/plugins/admin/plugins/included/admin_comm_management/admin_comm_management.py

@@ -2,8 +2,7 @@
 # >> IMPORTS
 # =============================================================================
 # Source.Python Admin
-from admin.admin import main_menu
-from admin.core.frontends.menus import MenuSection
+from admin.core.frontends.menus import main_menu, MenuSection
 
 # Included Plugin
 from .blocks.base import BlockCommMenuCommand

srcds/addons/source-python/plugins/admin/plugins/included/admin_kick_ban/admin_kick_ban.py

@@ -5,10 +5,9 @@
 from players.helpers import get_client_language
 
 # Source.Python Admin
-from admin.admin import main_menu
 from admin.core.features import PlayerBasedFeature
 from admin.core.frontends.menus import (
-    MenuCommand, MenuSection, PlayerBasedMenuCommand)
+    main_menu, MenuCommand, MenuSection, PlayerBasedMenuCommand)
 from admin.core.frontends.motd import (
     main_motd, MOTDSection, MOTDPageEntry, PlayerBasedFeaturePage)
 from admin.core.helpers import log_admin_action

srcds/addons/source-python/plugins/admin/plugins/included/admin_life_management/admin_life_management.py

@@ -6,10 +6,9 @@
 from players.entity import Player
 
 # Source.Python Admin
-from admin.admin import main_menu
 from admin.core.features import PlayerBasedFeature
 from admin.core.frontends.menus import (
-    MenuSection, PlayerBasedMenuCommand)
+    main_menu, MenuSection, PlayerBasedMenuCommand)
 from admin.core.frontends.motd import (
     main_motd, MOTDSection, MOTDPageEntry, PlayerBasedFeaturePage)
 from admin.core.helpers import log_admin_action

srcds/addons/source-python/plugins/admin/plugins/included/admin_team_management/admin_team_management.py

@@ -8,10 +8,9 @@
 from players.teams import teams_by_number
 
 # Source.Python Admin
-from admin.admin import main_menu
 from admin.core.features import PlayerBasedFeature
 from admin.core.frontends.menus import (
-    MenuSection, PlayerBasedMenuCommand)
+    main_menu, MenuSection, PlayerBasedMenuCommand)
 from admin.core.helpers import log_admin_action
 from admin.core.plugins.strings import PluginStrings
 

srcds/addons/source-python/plugins/admin/plugins/included/admin_tracking/admin_tracking.py

@@ -16,12 +16,11 @@
 from steam import SteamID
 
 # Source.Python Admin
-from admin.admin import main_menu
 from admin.core.clients import clients
 from admin.core.helpers import extract_ip_address, format_player_name
 from admin.core.features import PlayerBasedFeature
 from admin.core.frontends.menus import (
-    MenuSection, PlayerBasedMenuCommand)
+    main_menu, MenuSection, PlayerBasedMenuCommand)
 from admin.core.orm import SessionContext
 from admin.core.paths import ADMIN_CFG_PATH, get_server_file
 from admin.core.plugins.strings import PluginStrings