From f5f3c2a6c0a6dc9fc496a7c63dbf779f0a4befa0 Mon Sep 17 00:00:00 2001
From: kawshar <kawshar@joomshaper.com>
Date: Wed, 11 Sep 2019 03:38:34 +0600
Subject: [PATCH] main menu

---
 .../components/com_menus/presets/joomla.xml   | 242 +++++++++++-------
 .../language/en-GB/en-GB.mod_menu.ini         |   5 +-
 2 files changed, 145 insertions(+), 102 deletions(-)

diff --git a/administrator/components/com_menus/presets/joomla.xml b/administrator/components/com_menus/presets/joomla.xml
index 856cf8487d8..cd813caf4c5 100644
--- a/administrator/components/com_menus/presets/joomla.xml
+++ b/administrator/components/com_menus/presets/joomla.xml
@@ -26,7 +26,22 @@
 			element="com_content"
 			link="index.php?option=com_content&amp;view=articles"
 			quicktask="index.php?option=com_content&amp;task=article.add"
-		/>
+		>
+			<menuitem
+				title="MOD_MENU_COM_CONTENT_NEW_ARTICLE"
+				type="component"
+				element="com_content"
+				icon="fa fa-plus"
+				link="index.php?option=com_content&amp;task=article.add"
+			/>
+			<menuitem
+				title="MOD_MENU_COM_CONTENT_FEATURED"
+				type="component"
+				element="com_content"
+				link="index.php?option=com_content&amp;view=featured"
+				class="class:featured"
+			/>
+		</menuitem>
 
 		<menuitem
 			title="MOD_MENU_COM_CONTENT_CATEGORY_MANAGER"
@@ -37,18 +52,11 @@
 			quicktask="index.php?option=com_categories&amp;extension=com_content&amp;task=category.add"
 		/>
 
-		<menuitem
-			title="MOD_MENU_COM_CONTENT_FEATURED"
-			type="component"
-			element="com_content"
-			link="index.php?option=com_content&amp;view=featured"
-			class="class:featured"
-		/>
-
 		<menuitem
 			title="MOD_MENU_COM_CONTENT_WORKFLOW"
 			type="component"
 			element="com_workflow"
+			badge="new"
 			link="index.php?option=com_workflow&amp;view=workflows&amp;extension=com_content"
 		/>
 
@@ -81,22 +89,6 @@
 			link="index.php?option=com_media"
 			class="class:image"
 		/>
-
-		<menuitem
-			title="MOD_MENU_EXTENSIONS_MODULE_MANAGER_SITE"
-			quicktask-title="MOD_MENU_COM_CONTENT_NEW_MODULE"
-			type="component"
-			element="com_modules"
-			link="index.php?option=com_modules&amp;view=modules&amp;client_id=0"
-			quicktask="index.php?option=com_modules&amp;view=select"
-		/>
-
-		<menuitem
-			title="MOD_MENU_EXTENSIONS_MODULE_MANAGER_ADMINISTRATOR"
-			type="component"
-			element="com_modules"
-			link="index.php?option=com_modules&amp;view=modules&amp;client_id=1"
-		/>
 	</menuitem>
 
 	<menuitem
@@ -309,27 +301,114 @@
 		class="class:cog"
 	>
 		<menuitem
-			title="MOD_MENU_INSTALL_EXTENSIONS"
+			title="MOD_MENU_TEMPLATE_SITE_TEMPLATES"
 			type="component"
-			element="com_installer"
-			link="index.php?option=com_installer&amp;view=install"
+			element="com_templates"
+			link="index.php?option=com_templates&amp;view=templates&amp;client_id=0"
 		/>
-
 		<menuitem
-			title="MOD_MENU_INSTALL_DISCOVER"
+			title="MOD_MENU_EXTENSIONS_MODULE_MANAGER_MODULES"
+			quicktask-title="MOD_MENU_COM_CONTENT_NEW_MODULE"
 			type="component"
-			element="com_installer"
-			link="index.php?option=com_installer&amp;view=discover"
-			ajax-badge="index.php?option=com_installer&amp;task=discover.getMenuBadgeData&amp;format=json"
+			element="com_modules"
+			link="index.php?option=com_modules&amp;view=modules&amp;client_id=0"
+			quicktask="index.php?option=com_modules&amp;view=select"
+		/>
+		<menuitem
+			title="MOD_MENU_MANAGE_PLUGINS"
+			type="component"
+			element="com_plugins"
+			link="index.php?option=com_plugins"
+			permission="core.manage;com_plugins"
 		/>
 
 		<menuitem
-			title="MOD_MENU_INSTALL_LANGUAGES"
+			title="MOD_MENU_INSTALL"
+			type="heading"
+			element="com_cpanel"
+			class="class:cog"
+		>
+			<menuitem
+				title="MOD_MENU_INSTALL_EXTENSIONS"
+				desc="MOD_MENU_INSTALL_LANGUAGES"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=install"
+			/>
+
+			<menuitem
+				title="MOD_MENU_INSTALL_LANGUAGES"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=languages"
+			/>
+
+			<menuitem
+				title="MOD_MENU_INSTALL_DISCOVER"
+				type="component"
+				element="com_installer"
+				link="index.php?option=com_installer&amp;view=discover"
+				ajax-badge="index.php?option=com_installer&amp;task=discover.getMenuBadgeData&amp;format=json"
+			/>
+		</menuitem>
+	</menuitem>
+
+	<menuitem
+		title="MOD_MENU_SYSTEM"
+		type="component"
+		element="com_cpanel"
+		class="class:wrench"
+		link="index.php?option=com_cpanel&amp;view=cpanel&amp;dashboard=system"
+		dashboard="system"
+	>
+		<menuitem
+			title="MOD_MENU_CONFIGURATION"
 			type="component"
-			element="com_installer"
-			link="index.php?option=com_installer&amp;view=languages"
+			element="com_config"
+			icon="wrench"
+			link="index.php?option=com_config"
 		/>
+		
+		<menuitem
+			title="MOD_MENU_MAINTAIN"
+			type="heading"
+			icon="tools"
+		>
+			<menuitem
+				title="MOD_MENU_CLEAR_CACHE"
+				type="component"
+				element="com_cache"
+				link="index.php?option=com_cache"
+				permission="core.manage;com_cache"
+			/>
+
+			<menuitem
+				title="MOD_MENU_PURGE_EXPIRED_CACHE"
+				type="component"
+				element="com_cache"
+				link="index.php?option=com_cache&amp;view=purge"
+				permission="core.manage;com_cache"
+			/>
+
+			<menuitem
+				title="MOD_MENU_GLOBAL_CHECKIN"
+				type="component"
+				element="com_checkin"
+				link="index.php?option=com_checkin"
+				permission="core.manage;com_checkin"
+				ajax-badge="index.php?option=com_checkin&amp;task=getMenuBadgeData&amp;format=json"
+			/>
+		</menuitem>		
 
+		<menuitem
+			type="separator"
+		/>
+
+		<menuitem
+			title="MOD_MENU_MANAGE"
+			type="heading"
+			icon="tasks"
+		>
 		<menuitem
 			title="MOD_MENU_MANAGE_EXTENSIONS"
 			type="component"
@@ -370,14 +449,6 @@
 			permission="core.manage;com_csp"
 		/>
 
-		<menuitem
-			title="MOD_MENU_MANAGE_PLUGINS"
-			type="component"
-			element="com_plugins"
-			link="index.php?option=com_plugins"
-			permission="core.manage;com_plugins"
-		/>
-
 		<menuitem
 			title="MOD_MENU_MANAGE_REDIRECTS"
 			type="component"
@@ -385,73 +456,49 @@
 			link="index.php?option=com_redirect"
 			permission="core.manage;com_redirect"
 		/>
-
-		<menuitem
-			title="MOD_MENU_EXTENSIONS_MODULE_MANAGER_SITE"
-			type="component"
-			element="com_modules"
-			link="index.php?option=com_modules&amp;view=modules&amp;client_id=0"
-			permission="core.manage;com_modules"
-		/>
-
-		<menuitem
-			title="MOD_MENU_EXTENSIONS_MODULE_MANAGER_ADMINISTRATOR"
-			type="component"
-			element="com_modules"
-			link="index.php?option=com_modules&amp;view=modules&amp;client_id=1"
-			permission="core.manage;com_modules"
-		/>
 	</menuitem>
 
 	<menuitem
-		title="MOD_MENU_SYSTEM"
-		type="component"
-		element="com_cpanel"
-		class="class:wrench"
-		link="index.php?option=com_cpanel&amp;view=cpanel&amp;dashboard=system"
-		dashboard="system"
-	>
-		<menuitem
-			title="MOD_MENU_CONFIGURATION"
-			type="component"
-			element="com_config"
-			icon="wrench"
-			link="index.php?option=com_config"
-		/>
+		type="separator"
+	/>
 
+	<menuitem
+		title="MOD_MENU_UPDATE"
+		type="heading"
+		icon="sync"
+		>
 		<menuitem
-			type="separator"
-		/>
-		
-		<menuitem
-			title="MOD_MENU_CLEAR_CACHE"
+			title="MOD_MENU_UPDATE_JOOMLA"
 			type="component"
-			element="com_cache"
-			link="index.php?option=com_cache"
-			permission="core.manage;com_cache"
+			element="com_joomlaupdate"
+			link="index.php?option=com_joomlaupdate"
+			permission="core.manage;com_joomlaupdate"
+			ajax-badge="index.php?option=com_joomlaupdate&amp;task=getMenuBadgeData&amp;format=json"
 		/>
 
 		<menuitem
-			title="MOD_MENU_PURGE_EXPIRED_CACHE"
+			title="MOD_MENU_UPDATE_EXTENSIONS"
 			type="component"
-			element="com_cache"
-			link="index.php?option=com_cache&amp;view=purge"
-			permission="core.manage;com_cache"
+			element="com_installer"
+			link="index.php?option=com_installer&amp;view=update"
+			permission="core.manage;com_installer"
+			ajax-badge="index.php?option=com_installer&amp;task=update.getMenuBadgeData&amp;format=json"
 		/>
 
 		<menuitem
-			title="MOD_MENU_GLOBAL_CHECKIN"
+			title="MOD_MENU_UPDATE_SOURCES"
 			type="component"
-			element="com_checkin"
-			link="index.php?option=com_checkin"
-			permission="core.manage;com_checkin"
-			ajax-badge="index.php?option=com_checkin&amp;task=getMenuBadgeData&amp;format=json"
-		/>
-
-		<menuitem
-			type="separator"
+			element="com_installer"
+			link="index.php?option=com_installer&amp;view=updatesites"
+			permission="core.manage;com_installer"
 		/>
+	</menuitem>
 
+	<menuitem
+		title="MOD_MENU_INFORMATION"
+		type="heading"
+		icon="info-circle"
+		>
 		<menuitem
 			title="MOD_MENU_INFORMATION_WARNINGS"
 			type="component"
@@ -486,10 +533,7 @@
 			permission="core.manage;com_installer"
 			ajax-badge="index.php?option=com_installer&amp;task=database.getMenuBadgeData&amp;format=json"
 		/>
-
-		<menuitem
-			type="separator"
-		/>
+	</menuitem>
 	</menuitem>
 
 	<menuitem
diff --git a/administrator/language/en-GB/en-GB.mod_menu.ini b/administrator/language/en-GB/en-GB.mod_menu.ini
index ffe7fbdc66e..a13a772f703 100644
--- a/administrator/language/en-GB/en-GB.mod_menu.ini
+++ b/administrator/language/en-GB/en-GB.mod_menu.ini
@@ -52,6 +52,7 @@ MOD_MENU_EXTENSIONS_EXTENSION_MANAGER="Manage"
 MOD_MENU_EXTENSIONS_EXTENSIONS="Extensions"
 MOD_MENU_EXTENSIONS_LANGUAGE_MANAGER="Languages"
 MOD_MENU_EXTENSIONS_MODULE_MANAGER_ADMINISTRATOR="Administrator Modules"
+MOD_MENU_EXTENSIONS_MODULE_MANAGER_MODULES="Modules"
 MOD_MENU_EXTENSIONS_MODULE_MANAGER_SITE="Site Modules"
 MOD_MENU_COM_CONTENT_NEW_MODULE="Add New Module"
 MOD_MENU_EXTENSIONS_PLUGIN_MANAGER="Plugins"
@@ -111,7 +112,7 @@ MOD_MENU_INSTALLER_SUBMENU_UPDATESITES="Update Sites"
 MOD_MENU_INSTALLER_SUBMENU_WARNINGS="Warnings"
 MOD_MENU_INSTALL_DISCOVER="Discover"
 MOD_MENU_INSTALL_EXTENSIONS="Extensions"
-MOD_MENU_INSTALL_LANGUAGES="Install Languages"
+MOD_MENU_INSTALL_LANGUAGES="Languages"
 MOD_MENU_LOGOUT="Logout"
 MOD_MENU_MAINTAIN="Maintain"
 MOD_MENU_MANAGE="Manage"
@@ -135,9 +136,7 @@ MOD_MENU_READ_PRIVATE_MESSAGES="Read Private Messages"
 MOD_MENU_RECOVERY_EXIT="Exit Recovery Mode"
 MOD_MENU_RECOVERY_MENU_ROOT="Menu Recovery"
 MOD_MENU_SETTINGS="Settings"
-
 MOD_MENU_EXTEND="Extend"
-
 MOD_MENU_SYSTEM="System"
 MOD_MENU_SYSTEM_INFORMATION="System Information"
 MOD_MENU_SYSTEM_INFORMATION_DATABASE="Database"