Skip to content

[4.0] Rename presets for main menu #26084

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

Merged
merged 5 commits into from
Sep 1, 2019
Merged

[4.0] Rename presets for main menu #26084

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0730b9f
Reame presets for main menu: default and alternate instead of joomla …
chmst Aug 29, 2019
733d823
fix typo
chmst Aug 30, 2019
35fac3f
Merge branch '4.0-dev' of github.com:joomla/joomla-cms into Rename-pr…
zero-24 Aug 30, 2019
8eaa268
Merge branch '4.0-dev' into Rename-presets
infograf768 Aug 31, 2019
3505815
Merge branch '4.0-dev' into Rename-presets
infograf768 Sep 1, 2019
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
8 changes: 4 additions & 4 deletions administrator/components/com_menus/Helper/MenusHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,8 +614,8 @@ public static function getPresets()
// Important: 'null' will cause infinite recursion.
static::$presets = array();

static::addPreset('joomla', 'JLIB_MENUS_PRESET_JOOMLA', JPATH_ADMINISTRATOR . '/components/com_menus/presets/joomla.xml');
static::addPreset('modern', 'JLIB_MENUS_PRESET_MODERN', JPATH_ADMINISTRATOR . '/components/com_menus/presets/modern.xml');
static::addPreset('default', 'JLIB_MENUS_PRESET_DEFAULT', JPATH_ADMINISTRATOR . '/components/com_menus/presets/default.xml');
static::addPreset('alternate', 'JLIB_MENUS_PRESET_ALTERNATE', JPATH_ADMINISTRATOR . '/components/com_menus/presets/alternate.xml');
static::addPreset('system', 'JLIB_MENUS_PRESET_SYSTEM', JPATH_ADMINISTRATOR . '/components/com_menus/presets/system.xml');
static::addPreset('content', 'JLIB_MENUS_PRESET_CONTENT', JPATH_ADMINISTRATOR . '/components/com_menus/presets/content.xml');
static::addPreset('help', 'JLIB_MENUS_PRESET_HELP', JPATH_ADMINISTRATOR . '/components/com_menus/presets/help.xml');
Expand Down Expand Up @@ -668,9 +668,9 @@ public static function loadPreset($name, $fallback = true, $parent = null)
{
static::loadXml($xml, $parent);
}
elseif ($fallback && isset($presets['joomla']))
elseif ($fallback && isset($presets['default']))
{
if (($xml = simplexml_load_file($presets['joomla']->path, null, LIBXML_NOCDATA)) && $xml instanceof \SimpleXMLElement)
if (($xml = simplexml_load_file($presets['default']->path, null, LIBXML_NOCDATA)) && $xml instanceof \SimpleXMLElement)
{
static::loadXml($xml, $parent);
}
Expand Down
0 ...r/components/com_menus/presets/modern.xml → ...omponents/com_menus/presets/alternate.xml
View file
Open in desktop
File renamed without changes.
0 ...r/components/com_menus/presets/joomla.xml → .../components/com_menus/presets/default.xml
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions administrator/language/en-GB/en-GB.lib_joomla.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,12 +680,12 @@ JLIB_MEDIA_ERROR_WARNINVALID_MIME="Invalid mime type detected."
JLIB_MEDIA_ERROR_WARNINVALID_MIMETYPE="Illegal mime type detected: %s"
JLIB_MEDIA_ERROR_WARNNOTADMIN="Uploaded file is not an image file and you do not have permission."

JLIB_MENUS_PRESET_ALTERNATE="Preset - Alternative Main Menu"
JLIB_MENUS_PRESET_COMPONENTS="Preset - Components Dashboard"
JLIB_MENUS_PRESET_CONTENT="Preset - Content Dashboard"
JLIB_MENUS_PRESET_DEFAULT="Preset - Joomla Main Menu"
JLIB_MENUS_PRESET_HELP="Preset - Help Dashboard"
JLIB_MENUS_PRESET_JOOMLA="Preset - Joomla"
JLIB_MENUS_PRESET_MENUS="Preset - Menus Dashboard"
JLIB_MENUS_PRESET_MODERN="Preset - Modern"
JLIB_MENUS_PRESET_SYSTEM="Preset - System Dashboard"
JLIB_MENUS_PRESET_USERS="Preset - Users Dashboard"

Expand Down
4 changes: 2 additions & 2 deletions administrator/modules/mod_menu/Menu/CssMenu.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ public function load($params, $enabled)

if ($menutype === '*')
{
$name = $this->params->get('preset', 'joomla');
$name = $this->params->get('preset', 'default');
$this->root = MenusHelper::loadPreset($name);
}
else
Expand All @@ -132,7 +132,7 @@ public function load($params, $enabled)
$heading = new MenuItem(['title' => 'MOD_MENU_RECOVERY_MENU_ROOT', 'type' => 'heading']);
$this->root->addChild($heading);

MenusHelper::loadPreset('joomla', true, $heading);
MenusHelper::loadPreset('defaulta', true, $heading);

$this->preprocess($this->root);

Expand Down