Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Menu manager for Joomla Backend Menu #13036

Merged
merged 37 commits into from
Jan 17, 2017
Merged

Menu manager for Joomla Backend Menu #13036

Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
5b7d6cd
Added client id column to menu_type table.
izharaazmi Oct 11, 2016
e64771a
In modal list view we currently hide client_id filter and show only s…
izharaazmi Oct 11, 2016
22232ce
Add/edit menu item redirect with clientId from list filter.
izharaazmi Oct 14, 2016
b943a34
Menu item type loading from component metadata xml or mvc not identif…
izharaazmi Oct 14, 2016
574081d
Edit menu item and create menu item set to follow client id and menu …
izharaazmi Oct 15, 2016
e410797
Adding layout metadata xml in backend to reference menu item types as…
izharaazmi Oct 21, 2016
8d2ae9f
Created each backend menu items using menu manager as a replica of ex…
izharaazmi Oct 22, 2016
4d44c25
[a11y] Protostar back to top (#12446)
brianteeman Oct 25, 2016
bf59761
Restructure mod_menu to load preset menu items as an option (default)…
izharaazmi Nov 1, 2016
5e36ec2
Disallow editing and set to home of protected menu type menu items vi…
izharaazmi Nov 2, 2016
ff2353c
Load menu items from databases in correct hierarchy. Remove any extra…
izharaazmi Nov 9, 2016
0214d76
View manifests for menu item type and related language key updates. r…
izharaazmi Nov 10, 2016
34dcfb0
Minor mistake fix.
izharaazmi Nov 11, 2016
8e54a46
Merge branch '3.7.x' into admin-menu-manager
izharaazmi Nov 11, 2016
402c7c0
Translate menu item titles in list view. Ref #2
izharaazmi Nov 11, 2016
40f913a
Reset the preset menu structure to be same as the current J37 branch …
izharaazmi Nov 17, 2016
f4a9fb6
Allow the existing components to leverage the menu/submenu entries in…
izharaazmi Nov 17, 2016
7986f86
Minor fix
izharaazmi Nov 19, 2016
694614e
Remove temporary dev phase files
izharaazmi Nov 19, 2016
059c9b6
Preparing for PR, database and install script updates.
izharaazmi Nov 19, 2016
3286409
Minor fix
izharaazmi Nov 19, 2016
de8cc97
Codestyle fix
izharaazmi Nov 27, 2016
9b8a99d
Merge branch 'staging' into admin-menu-manager
izharaazmi Dec 7, 2016
16ff8c4
CS fix
izharaazmi Dec 7, 2016
2454925
Don’t sort menu items
izharaazmi Dec 12, 2016
e8de57a
Sort lang keys
izharaazmi Dec 12, 2016
defdcdc
apply in hathor
izharaazmi Dec 12, 2016
c1e711a
menu item alias check for site only
izharaazmi Dec 12, 2016
28a835b
Merge ‘staging’ into admin-menu-manager
izharaazmi Dec 19, 2016
7d9e0bb
Merge joomla-cms/staging into admin-menu-manager
izharaazmi Jan 9, 2017
0aef9d4
Post merge fixes.
izharaazmi Jan 9, 2017
a991b7f
Fixes as suggested by @infograf768
izharaazmi Jan 9, 2017
600a6aa
Add recovery mode for menu where the selected admin menu does not con…
izharaazmi Jan 9, 2017
07a9a6a
minor bug fix
izharaazmi Jan 9, 2017
9c6f953
Merge joomla-cms/staging into admin-menu-manager
izharaazmi Jan 10, 2017
9b52f78
Remove assoc column for admin menu items.
izharaazmi Jan 10, 2017
3f1e8c5
Merge 'staging' into admin-menu-manager
izharaazmi Jan 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions administrator/components/com_admin/script.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1546,6 +1546,9 @@ public function deleteUnexistingFiles()
'/components/com_users/views/remind/metadata.xml',
'/components/com_users/views/reset/metadata.xml',
'/components/com_wrapper/metadata.xml',
'/administrator/modules/mod_menu/tmpl/default_enabled.php',
'/administrator/modules/mod_menu/tmpl/default_disabled.php',
'/administrator/templates/hathor/html/mod_menu/default_enabled.php',
);

// TODO There is an issue while deleting folders using the ftp mode
Expand Down Expand Up @@ -1657,6 +1660,7 @@ public function deleteUnexistingFiles()
'/media/editors/codemirror/mode/jade',
// Joomla! __DEPLOY_VERSION__
'/libraries/joomla/data',
'/administrator/templates/hathor/html/mod_menu',
);

jimport('joomla.filesystem.file');
Expand Down
3 changes: 3 additions & 0 deletions administrator/components/com_admin/sql/updates/mysql/3.7.0-2016-11-19.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ALTER TABLE `#__menu_types` ADD `client_id` int(11) NOT NULL DEFAULT 0;

UPDATE `#__menu` SET `published` = 1 WHERE `menutype` = 'main' OR `menutype` = 'menu';
3 changes: 3 additions & 0 deletions administrator/components/com_admin/sql/updates/postgresql/3.7.0-2016-11-19.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ALTER TABLE "#__menu_types" ADD "client_id" int DEFAULT 0 NOT NULL;

UPDATE "#__menu" SET "published" = 1 WHERE "menutype" = 'main' OR "menutype" = 'menu';
3 changes: 3 additions & 0 deletions administrator/components/com_admin/sql/updates/sqlazure/3.7.0-2016-11-19.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ALTER TABLE [#__menu_types] ADD [client_id] [tinyint] NOT NULL DEFAULT 0;

UPDATE [#__menu] SET [published] = 1 WHERE [menutype] = 'main' OR [menutype] = 'menu';
8 changes: 8 additions & 0 deletions administrator/components/com_admin/views/help/tmpl/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<metadata>
<layout title="COM_ADMIN_HELP_VIEW_DEFAULT_TITLE">
<message>
<![CDATA[COM_ADMIN_HELP_VIEW_DEFAULT_DESC]]>
</message>
</layout>
</metadata>
8 changes: 8 additions & 0 deletions administrator/components/com_admin/views/sysinfo/tmpl/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<metadata>
<layout title="COM_ADMIN_SYSINFO_VIEW_DEFAULT_TITLE">
<message>
<![CDATA[COM_ADMIN_SYSINFO_VIEW_DEFAULT_DESC]]>
</message>
</layout>
</metadata>
8 changes: 8 additions & 0 deletions administrator/components/com_cache/views/cache/tmpl/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<metadata>
<layout title="COM_CACHE_CACHE_VIEW_DEFAULT_TITLE">
<message>
<![CDATA[COM_CACHE_CACHE_VIEW_DEFAULT_DESC]]>
</message>
</layout>
</metadata>
8 changes: 8 additions & 0 deletions administrator/components/com_cache/views/purge/tmpl/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<metadata>
<layout title="COM_CACHE_PURGE_VIEW_DEFAULT_TITLE">
<message>
<![CDATA[COM_CACHE_PURGE_VIEW_DEFAULT_DESC]]>
</message>
</layout>
</metadata>
19 changes: 19 additions & 0 deletions administrator/components/com_categories/views/categories/tmpl/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<metadata>
<layout title="COM_CATEGORIES_CATEGORIES_VIEW_DEFAULT_TITLE">
<message>
<![CDATA[COM_CATEGORIES_CATEGORIES_VIEW_DEFAULT_DESC]]>
</message>
</layout>
<fieldset name="request">
<fields name="request">
<field
name="extension"
type="components"
label="COM_CATEGORIES_CHOOSE_COMPONENT_LABEL"
description="COM_CATEGORIES_CHOOSE_COMPONENT_DESC"
required="true"
/>
</fields>
</fieldset>
</metadata>
24 changes: 24 additions & 0 deletions administrator/components/com_categories/views/category/tmpl/edit.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<metadata>
<layout title="COM_CATEGORIES_CATEGORY_VIEW_EDIT_TITLE">
<message>
<![CDATA[COM_CATEGORIES_CATEGORY_VIEW_EDIT_DESC]]>
</message>
</layout>
<fieldset name="request">
<fields name="request">
<field
name="extension"
type="components"
label="COM_CATEGORIES_CHOOSE_COMPONENT_LABEL"
description="COM_CATEGORIES_CHOOSE_COMPONENT_DESC"
required="true"
/>
<field
name="id"
type="hidden"
default="0"
/>
</fields>
</fieldset>
</metadata>
8 changes: 8 additions & 0 deletions administrator/components/com_checkin/views/checkin/tmpl/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<metadata>
<layout title="COM_CHECKIN_CHECKIN_VIEW_DEFAULT_TITLE">
<message>
<![CDATA[COM_CHECKIN_CHECKIN_VIEW_DEFAULT_DESC]]>
</message>
</layout>
</metadata>
8 changes: 8 additions & 0 deletions administrator/components/com_config/view/application/tmpl/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<metadata>
<layout title="COM_CONFIG_CONFIG_VIEW_DEFAULT_TITLE">
<message>
<![CDATA[COM_CONFIG_CONFIG_VIEW_DEFAULT_DESC]]>
</message>
</layout>
</metadata>
19 changes: 19 additions & 0 deletions administrator/components/com_config/view/component/tmpl/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<metadata>
<layout title="COM_CONFIG_COMPONENT_VIEW_DEFAULT_TITLE">
<message>
<![CDATA[COM_CONFIG_COMPONENT_VIEW_DEFAULT_DESC]]>
</message>
</layout>
<fields name="request">
<fieldset name="request">
<field
name="component"
type="components"
label="JGLOBAL_CHOOSE_COMPONENT_LABEL"
description="JGLOBAL_CHOOSE_COMPONENT_DESC"
required="true"
/>
</fieldset>
</fields>
</metadata>
17 changes: 17 additions & 0 deletions administrator/components/com_content/views/article/tmpl/edit.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<metadata>
<layout title="COM_CONTENT_ARTICLE_VIEW_EDIT_TITLE">
<message>
<![CDATA[COM_CONTENT_ARTICLE_VIEW_EDIT_DESC]]>
</message>
</layout>
<fieldset name="request">
<fields name="request">
<field
name="id"
type="hidden"
default="0"
/>
</fields>
</fieldset>
</metadata>
8 changes: 8 additions & 0 deletions administrator/components/com_content/views/articles/tmpl/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<metadata>
<layout title="COM_CONTENT_ARTICLES_VIEW_DEFAULT_TITLE">
<message>
<![CDATA[COM_CONTENT_ARTICLES_VIEW_DEFAULT_DESC]]>
</message>
</layout>
</metadata>
8 changes: 8 additions & 0 deletions administrator/components/com_content/views/featured/tmpl/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<metadata>
<layout title="COM_CONTENT_FEATURED_VIEW_DEFAULT_TITLE">
<message>
<![CDATA[COM_CONTENT_FEATURED_VIEW_DEFAULT_DESC]]>
</message>
</layout>
</metadata>
8 changes: 8 additions & 0 deletions administrator/components/com_cpanel/views/cpanel/tmpl/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<metadata>
<layout title="COM_CPANEL_CPANEL_VIEW_DEFAULT_TITLE">
<message>
<![CDATA[COM_CPANEL_CPANEL_VIEW_DEFAULT_TITLE_DESC]]>
</message>
</layout>
</metadata>
8 changes: 8 additions & 0 deletions administrator/components/com_installer/views/database/tmpl/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<metadata>
<layout title="COM_INSTALLER_DATABASE_VIEW_DEFAULT_TITLE">
<message>
<![CDATA[COM_INSTALLER_DATABASE_VIEW_DEFAULT_DESC]]>
</message>
</layout>
</metadata>
8 changes: 8 additions & 0 deletions administrator/components/com_installer/views/discover/tmpl/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<metadata>
<layout title="COM_INSTALLER_DISCOVER_VIEW_DEFAULT_TITLE">
<message>
<![CDATA[COM_INSTALLER_DISCOVER_VIEW_DEFAULT_DESC]]>
</message>
</layout>
</metadata>
8 changes: 8 additions & 0 deletions administrator/components/com_installer/views/install/tmpl/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<metadata>
<layout title="COM_INSTALLER_INSTALL_VIEW_DEFAULT_TITLE">
<message>
<![CDATA[COM_INSTALLER_INSTALL_VIEW_DEFAULT_DESC]]>
</message>
</layout>
</metadata>
8 changes: 8 additions & 0 deletions administrator/components/com_installer/views/languages/tmpl/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<metadata>
<layout title="COM_INSTALLER_LANGUAGES_VIEW_DEFAULT_TITLE">
<message>
<![CDATA[COM_INSTALLER_LANGUAGES_VIEW_DEFAULT_DESC]]>
</message>
</layout>
</metadata>
8 changes: 8 additions & 0 deletions administrator/components/com_installer/views/manage/tmpl/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<metadata>
<layout title="COM_INSTALLER_MANAGE_VIEW_DEFAULT_TITLE">
<message>
<![CDATA[COM_INSTALLER_MANAGE_VIEW_DEFAULT_DESC]]>
</message>
</layout>
</metadata>
8 changes: 8 additions & 0 deletions administrator/components/com_installer/views/update/tmpl/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<metadata>
<layout title="COM_INSTALLER_UPDATE_VIEW_DEFAULT_TITLE">
<message>
<![CDATA[COM_INSTALLER_UPDATE_VIEW_DEFAULT_DESC]]>
</message>
</layout>
</metadata>
8 changes: 8 additions & 0 deletions administrator/components/com_installer/views/updatesites/tmpl/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<metadata>
<layout title="COM_INSTALLER_UPDATESITES_VIEW_DEFAULT_TITLE">
<message>
<![CDATA[COM_INSTALLER_UPDATESITES_VIEW_DEFAULT_DESC]]>
</message>
</layout>
</metadata>
8 changes: 8 additions & 0 deletions administrator/components/com_installer/views/warnings/tmpl/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<metadata>
<layout title="COM_INSTALLER_WARNINGS_VIEW_DEFAULT_TITLE">
<message>
<![CDATA[COM_INSTALLER_WARNINGS_VIEW_DEFAULT_DESC]]>
</message>
</layout>
</metadata>
8 changes: 8 additions & 0 deletions administrator/components/com_joomlaupdate/views/default/tmpl/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<metadata>
<layout title="COM_JOOMLAUPDATE_DEFAULT_VIEW_DEFAULT_TITLE">
<message>
<![CDATA[COM_JOOMLAUPDATE_DEFAULT_VIEW_DEFAULT_DESC]]>
</message>
</layout>
</metadata>
8 changes: 8 additions & 0 deletions administrator/components/com_languages/views/installed/tmpl/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<metadata>
<layout title="COM_LANGUAGES_INSTALLED_VIEW_DEFAULT_TITLE">
<message>
<![CDATA[COM_LANGUAGES_INSTALLED_VIEW_DEFAULT_DESC]]>
</message>
</layout>
</metadata>
8 changes: 8 additions & 0 deletions administrator/components/com_languages/views/languages/tmpl/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<metadata>
<layout title="COM_LANGUAGES_LANGUAGES_VIEW_DEFAULT_TITLE">
<message>
<![CDATA[COM_LANGUAGES_LANGUAGES_VIEW_DEFAULT_DESC]]>
</message>
</layout>
</metadata>
8 changes: 8 additions & 0 deletions administrator/components/com_languages/views/overrides/tmpl/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<metadata>
<layout title="COM_LANGUAGES_OVERRIDE_VIEW_DEFAULT_TITLE">
<message>
<![CDATA[COM_LANGUAGES_OVERRIDE_VIEW_DEFAULT_DESC]]>
</message>
</layout>
</metadata>
8 changes: 8 additions & 0 deletions administrator/components/com_media/views/media/tmpl/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<metadata>
<layout title="COM_MEDIA_MEDIA_VIEW_DEFAULT_TITLE">
<message>
<![CDATA[COM_MEDIA_MEDIA_VIEW_DEFAULT_DESC]]>
</message>
</layout>
</metadata>
Loading