diff --git a/administrator/components/com_admin/views/sysinfo/tmpl/default.xml b/administrator/components/com_admin/views/sysinfo/tmpl/default.xml new file mode 100755 index 0000000000000..ae1de0ce8e815 --- /dev/null +++ b/administrator/components/com_admin/views/sysinfo/tmpl/default.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/administrator/components/com_cache/views/cache/tmpl/default.xml b/administrator/components/com_cache/views/cache/tmpl/default.xml new file mode 100755 index 0000000000000..4f9b17b3bfeba --- /dev/null +++ b/administrator/components/com_cache/views/cache/tmpl/default.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/administrator/components/com_cache/views/purge/tmpl/default.xml b/administrator/components/com_cache/views/purge/tmpl/default.xml new file mode 100755 index 0000000000000..ae1a223b0f659 --- /dev/null +++ b/administrator/components/com_cache/views/purge/tmpl/default.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/administrator/components/com_checkin/views/checkin/tmpl/default.xml b/administrator/components/com_checkin/views/checkin/tmpl/default.xml new file mode 100755 index 0000000000000..919b0e02036e1 --- /dev/null +++ b/administrator/components/com_checkin/views/checkin/tmpl/default.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/administrator/components/com_config/view/application/tmpl/default.xml b/administrator/components/com_config/view/application/tmpl/default.xml new file mode 100755 index 0000000000000..6e82c8aa917d2 --- /dev/null +++ b/administrator/components/com_config/view/application/tmpl/default.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/administrator/components/com_content/views/articles/tmpl/default.xml b/administrator/components/com_content/views/articles/tmpl/default.xml new file mode 100755 index 0000000000000..5bd7ef4f1df69 --- /dev/null +++ b/administrator/components/com_content/views/articles/tmpl/default.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/administrator/components/com_content/views/featured/tmpl/default.xml b/administrator/components/com_content/views/featured/tmpl/default.xml new file mode 100755 index 0000000000000..b9a17f84c6491 --- /dev/null +++ b/administrator/components/com_content/views/featured/tmpl/default.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/administrator/components/com_installer/views/database/tmpl/default.xml b/administrator/components/com_installer/views/database/tmpl/default.xml new file mode 100755 index 0000000000000..33bb8fe32ed06 --- /dev/null +++ b/administrator/components/com_installer/views/database/tmpl/default.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/administrator/components/com_installer/views/discover/tmpl/default.xml b/administrator/components/com_installer/views/discover/tmpl/default.xml new file mode 100755 index 0000000000000..96296088967c9 --- /dev/null +++ b/administrator/components/com_installer/views/discover/tmpl/default.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/administrator/components/com_installer/views/install/tmpl/default.xml b/administrator/components/com_installer/views/install/tmpl/default.xml new file mode 100755 index 0000000000000..7c1de6334cda7 --- /dev/null +++ b/administrator/components/com_installer/views/install/tmpl/default.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/administrator/components/com_installer/views/languages/tmpl/default.xml b/administrator/components/com_installer/views/languages/tmpl/default.xml new file mode 100755 index 0000000000000..f30ee13567f8c --- /dev/null +++ b/administrator/components/com_installer/views/languages/tmpl/default.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/administrator/components/com_installer/views/manage/tmpl/default.xml b/administrator/components/com_installer/views/manage/tmpl/default.xml new file mode 100755 index 0000000000000..d6b2b1861e028 --- /dev/null +++ b/administrator/components/com_installer/views/manage/tmpl/default.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/administrator/components/com_installer/views/update/tmpl/default.xml b/administrator/components/com_installer/views/update/tmpl/default.xml new file mode 100755 index 0000000000000..1624f37ab7e6c --- /dev/null +++ b/administrator/components/com_installer/views/update/tmpl/default.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/administrator/components/com_installer/views/updatesites/tmpl/default.xml b/administrator/components/com_installer/views/updatesites/tmpl/default.xml new file mode 100755 index 0000000000000..f2d9f28e4f760 --- /dev/null +++ b/administrator/components/com_installer/views/updatesites/tmpl/default.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/administrator/components/com_installer/views/warnings/tmpl/default.xml b/administrator/components/com_installer/views/warnings/tmpl/default.xml new file mode 100755 index 0000000000000..4eb565846bbdc --- /dev/null +++ b/administrator/components/com_installer/views/warnings/tmpl/default.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/administrator/components/com_languages/views/installed/tmpl/default.xml b/administrator/components/com_languages/views/installed/tmpl/default.xml new file mode 100755 index 0000000000000..2bb9493041d44 --- /dev/null +++ b/administrator/components/com_languages/views/installed/tmpl/default.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/administrator/components/com_languages/views/languages/tmpl/default.xml b/administrator/components/com_languages/views/languages/tmpl/default.xml new file mode 100755 index 0000000000000..6ec64cb8a8848 --- /dev/null +++ b/administrator/components/com_languages/views/languages/tmpl/default.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/administrator/components/com_languages/views/overrides/tmpl/default.xml b/administrator/components/com_languages/views/overrides/tmpl/default.xml new file mode 100755 index 0000000000000..569c421df35d0 --- /dev/null +++ b/administrator/components/com_languages/views/overrides/tmpl/default.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/administrator/components/com_media/views/media/tmpl/default.xml b/administrator/components/com_media/views/media/tmpl/default.xml new file mode 100755 index 0000000000000..bd803b32915fc --- /dev/null +++ b/administrator/components/com_media/views/media/tmpl/default.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/administrator/components/com_menus/models/forms/item.xml b/administrator/components/com_menus/models/forms/item.xml index d0abb4620fd36..0e58c808c0bb8 100644 --- a/administrator/components/com_menus/models/forms/item.xml +++ b/administrator/components/com_menus/models/forms/item.xml @@ -144,6 +144,7 @@ type="templatestyle" label="COM_MENUS_ITEM_FIELD_TEMPLATE_LABEL" description="COM_MENUS_ITEM_FIELD_TEMPLATE_DESC" + client="site" filter="int" > diff --git a/administrator/components/com_menus/models/forms/itemadmin.xml b/administrator/components/com_menus/models/forms/itemadmin.xml index 3f04668270b92..cada1accc1d3a 100644 --- a/administrator/components/com_menus/models/forms/itemadmin.xml +++ b/administrator/components/com_menus/models/forms/itemadmin.xml @@ -19,8 +19,8 @@ description="COM_MENUS_ITEM_FIELD_TITLE_DESC" class="input-xxlarge input-large-text" size="40" - readonly="true"/> - + /> + - + + type="list" + label="COM_MENUS_ITEM_FIELD_BROWSERNAV_LABEL" + description="COM_MENUS_ITEM_FIELD_BROWSERNAV_DESC" + default="Parent" + filter="int" + > + + + + + type="accesslevel" + id="access" + label="JFIELD_ACCESS_LABEL" + description="JFIELD_ACCESS_DESC" + filter="integer"/> + + type="contentlanguage" + label="JFIELD_LANGUAGE_LABEL" + description="COM_MENUS_ITEM_FIELD_LANGUAGE_DESC" + > + + +
+ +
+ + + + + + + + + + + + + + + +
+ +
diff --git a/administrator/components/com_menus/models/item.php b/administrator/components/com_menus/models/item.php index 33077fa2760c3..cbbcfcb128561 100644 --- a/administrator/components/com_menus/models/item.php +++ b/administrator/components/com_menus/models/item.php @@ -78,7 +78,7 @@ class MenusModelItem extends JModelAdmin */ protected $batch_commands = array( 'assetgroup_id' => 'batchAccess', - 'language_id' => 'batchLanguage' + 'language_id' => 'batchLanguage' ); /** @@ -96,9 +96,10 @@ protected function canDelete($record) if (!empty($record->id)) { + // Only delete trashed items if ($record->published != -2) { - return; + return false; } $menuTypeId = 0; @@ -110,6 +111,8 @@ protected function canDelete($record) return $user->authorise('core.delete', 'com_menus.menu.' . (int) $menuTypeId); } + + return false; } /** @@ -149,13 +152,13 @@ protected function canEditState($record) protected function batchCopy($value, $pks, $contexts) { // $value comes as {menutype}.{parent_id} - $parts = explode('.', $value); + $parts = explode('.', $value); $menuType = $parts[0]; $parentId = ArrayHelper::getValue($parts, 1, 0, 'int'); - $table = $this->getTable(); - $db = $this->getDbo(); - $query = $db->getQuery(true); + $table = $this->getTable(); + $db = $this->getDbo(); + $query = $db->getQuery(true); $newIds = array(); // Check that the parent exists @@ -779,10 +782,8 @@ public function getItem($pk = null) $result->params = array_merge($result->params, $args); } - // Load associated menu items - $assoc = JLanguageAssociations::isEnabled(); - - if ($assoc) + // Load associated menu items, only supported for frontend for now + if ($this->getState('item.client_id') == 0 && JLanguageAssociations::isEnabled()) { if ($pk != null) { @@ -847,7 +848,7 @@ public function getModules() /** * Get the list of all view levels * - * @return array An array of all view levels (id, title). + * @return array|bool An array of all view levels (id, title). * * @since 3.4 */ @@ -890,7 +891,7 @@ public function getViewLevels() */ protected function getReorderConditions($table) { - return 'menutype = ' . $this->_db->quote($table->menutype); + return 'menutype = ' . $this->_db->quote($table->get('menutype')); } /** @@ -900,7 +901,7 @@ protected function getReorderConditions($table) * @param string $prefix A prefix for the table class name. Optional. * @param array $config Configuration array for model. Optional. * - * @return JTable A database object. + * @return JTable|JTableNested A database object. * * @since 1.6 */ @@ -954,6 +955,14 @@ protected function populateState() // Forced client id will override/clear menuType if conflicted $forcedClientId = $app->input->get('client_id', null, 'string'); + // Current item if not new, we don't allow changing client id at all + if ($pk) + { + $table = $this->getTable(); + $table->load($pk); + $forcedClientId = $table->get('client_id', $forcedClientId); + } + if (isset($forcedClientId) && $forcedClientId != $clientId) { $clientId = $forcedClientId; @@ -1039,10 +1048,14 @@ protected function getMenuTypeId($menutype) */ protected function preprocessForm(JForm $form, $data, $group = 'content') { - $link = $this->getState('item.link'); - $type = $this->getState('item.type'); + $link = $this->getState('item.link'); + $type = $this->getState('item.type'); + $clientId = $this->getState('item.client_id'); $formFile = false; + // Load the specific type file + $typeFile = $clientId == 1 ? 'itemadmin_' . $type : 'item_' . $type; + // Initialise form with component view params if available. if ($type == 'component') { @@ -1154,7 +1167,7 @@ protected function preprocessForm(JForm $form, $data, $group = 'content') else { // We don't have a component. Load the form XML to get the help path - $xmlFile = JPath::find(JPATH_ROOT . '/administrator/components/com_menus/models/forms', 'item_' . $type . '.xml'); + $xmlFile = JPath::find(JPATH_ROOT . '/administrator/components/com_menus/models/forms', $typeFile . '.xml'); // Attempt to load the xml file. if ($xmlFile && !$xml = simplexml_load_file($xmlFile)) @@ -1177,22 +1190,20 @@ protected function preprocessForm(JForm $form, $data, $group = 'content') $this->helpLocal = (($helpLoc == 'true') || ($helpLoc == '1') || ($helpLoc == 'local')) ? true : false; } - // Load the specific type file - if (!$form->loadFile('item_' . $type, false, false)) + + if (!$form->loadFile($typeFile, false, false)) { throw new Exception(JText::_('JERROR_LOADFILE_FAILED')); } if ($type == 'alias') { - $form->setFieldAttribute('aliasoptions', 'clientid', $this->getState('item.client_id'), 'params'); + // Aliased menu item must be from same clientid + $form->setFieldAttribute('aliasoptions', 'clientid', $clientId, 'params'); } - // Association menu items - $app = JFactory::getApplication(); - $assoc = JLanguageAssociations::isEnabled(); - - if ($assoc) + // Association menu items, we currently do not support this for admin menu… may be later + if ($clientId == 0 && JLanguageAssociations::isEnabled()) { $languages = JLanguageHelper::getLanguages('lang_code'); @@ -1243,7 +1254,7 @@ protected function preprocessForm(JForm $form, $data, $group = 'content') */ public function rebuild() { - // Initialiase variables. + // Initialise variables. $db = $this->getDbo(); $query = $db->getQuery(true); $table = $this->getTable(); @@ -1323,8 +1334,9 @@ public function save($data) $dispatcher = JEventDispatcher::getInstance(); $pk = (!empty($data['id'])) ? $data['id'] : (int) $this->getState('item.id'); $isNew = true; - $table = $this->getTable(); - $context = $this->option . '.' . $this->name; + + $table = $this->getTable(); + $context = $this->option . '.' . $this->name; // Include the plugins for the on save events. JPluginHelper::importPlugin($this->events_map['save']); @@ -1386,10 +1398,11 @@ public function save($data) if (!$isNew && $data['id'] == 0) { list($title, $alias) = $this->generateNewTitle($table->parent_id, $table->alias, $table->title); - $table->title = $title; - $table->alias = $alias; + + $table->title = $title; + $table->alias = $alias; $table->published = 0; - $table->home = 0; + $table->home = 0; } // Check the data. @@ -1425,10 +1438,8 @@ public function save($data) $this->setState('item.id', $table->id); $this->setState('item.menutype', $table->menutype); - // Load associated menu items - $assoc = JLanguageAssociations::isEnabled(); - - if ($assoc) + // Load associated menu items, for now not supported for admin menu… may be later + if ($table->get('client_id') == 0 && JLanguageAssociations::isEnabled()) { // Adding self to the association $associations = isset($data['associations']) ? $data['associations'] : array(); diff --git a/administrator/components/com_menus/models/items.php b/administrator/components/com_menus/models/items.php index 29d19746a06c1..c10a1dcf8d962 100644 --- a/administrator/components/com_menus/models/items.php +++ b/administrator/components/com_menus/models/items.php @@ -341,17 +341,20 @@ protected function getListQuery() $menuTypes = $this->getDbo()->setQuery($query2)->loadObjectList(); - $types = array(); - - foreach ($menuTypes as $type) + if ($menuTypes) { - if ($user->authorise('core.manage', 'com_menus.menu.' . (int) $type->id)) + $types = array(); + + foreach ($menuTypes as $type) { - $types[] = $query->q($type->menutype); + if ($user->authorise('core.manage', 'com_menus.menu.' . (int) $type->id)) + { + $types[] = $query->q($type->menutype); + } } - } - $query->where('a.menutype IN(' . implode(',', $types) . ')'); + $query->where($types ? 'a.menutype IN(' . implode(',', $types) . ')' : 0); + } } // Default behavior => load all items from a specific menu elseif (strlen($menuType)) diff --git a/administrator/components/com_menus/views/item/tmpl/adminmenu.php b/administrator/components/com_menus/views/item/tmpl/adminmenu.php deleted file mode 100644 index 44d430bc66c36..0000000000000 --- a/administrator/components/com_menus/views/item/tmpl/adminmenu.php +++ /dev/null @@ -1,171 +0,0 @@ -'); - option.text(val.title).val(val.id); - $('#jform_parent_id').append(option); - }); - $('#jform_parent_id').trigger('liszt:updated'); - }); - }); -}); -Joomla.submitbutton = function(task, type){ - if (task == 'item.setType' || task == 'item.setMenuType') - { - if (task == 'item.setType') - { - jQuery('#item-form input[name=\"jform[type]\"]').val(type); - jQuery('#fieldtype').val('type'); - } else { - jQuery('#item-form input[name=\"jform[menutype]\"]').val(type); - } - Joomla.submitform('item.setType', document.getElementById('item-form')); - } else if (task == 'item.cancel' || document.formvalidator.isValid(document.getElementById('item-form'))) - { - Joomla.submitform(task, document.getElementById('item-form')); - - // @deprecated 4.0 The following js is not needed since __DEPLOY_VERSION__. - if (task !== 'item.apply') - { - window.parent.jQuery('#menuEdit" . (int) $this->item->id . "Modal').modal('hide'); - } - } - else - { - // special case for modal popups validation response - jQuery('#item-form .modal-value.invalid').each(function(){ - var field = jQuery(this), - idReversed = field.attr('id').split('').reverse().join(''), - separatorLocation = idReversed.indexOf('_'), - nameId = '#' + idReversed.substr(separatorLocation).split('').reverse().join('') + 'name'; - jQuery(nameId).addClass('invalid'); - }); - } -}; -"; - -$input = JFactory::getApplication()->input; - -// Add the script to the document head. -JFactory::getDocument()->addScriptDeclaration($script); -// In case of modal -$isModal = $input->get('layout') == 'modal' ? true : false; -$layout = $isModal ? 'modal' : 'edit'; -$tmpl = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=component' : ''; -?> - -
- - - -
- - 'details')); ?> - - -
-
- form->renderField('type'); - - if ($this->item->type == 'alias') - { - echo $this->form->renderFieldset('aliasoptions'); - } - - echo $this->form->renderFieldset('request'); - - if ($this->item->type == 'url') - { - $this->form->setFieldAttribute('link', 'readonly', 'false'); - } - - echo $this->form->renderField('link'); - - echo $this->form->renderField('browserNav'); - echo $this->form->renderField('template_style_id'); - ?> -
-
- fields = array( - 'id', - 'client_id', - 'menutype', - 'parent_id', - 'menuordering', - 'published', - 'home', - 'access', - 'language', - 'note', - ); - - if ($this->item->type != 'component') - { - $this->fields = array_diff($this->fields, array('home')); - } - - echo JLayoutHelper::render('joomla.edit.global', $this); ?> -
-
- - - fieldsets = array(); - $this->ignore_fieldsets = array('aliasoptions', 'request', 'item_associations'); - echo JLayoutHelper::render('joomla.edit.params', $this); - ?> - - modules)) : ?> - - loadTemplate('modules'); ?> - - - - -
- - - - form->getInput('component_id'); ?> - - -
diff --git a/administrator/components/com_menus/views/item/tmpl/adminmenu_modules.php b/administrator/components/com_menus/views/item/tmpl/adminmenu_modules.php deleted file mode 100644 index 235f8935d76d0..0000000000000 --- a/administrator/components/com_menus/views/item/tmpl/adminmenu_modules.php +++ /dev/null @@ -1,161 +0,0 @@ -levels as $key => $value) { - $allLevels[$value->id] = $value->title; -} - -JFactory::getDocument()->addScriptDeclaration(' - var viewLevels = ' . json_encode($allLevels) . ', - menuId = parseInt(' . $this->item->id . '); - - jQuery(document).ready(function() { - jQuery(document).on("click", "input:radio[id^=\'jform_toggle_modules_assigned1\']", function (event) { - jQuery(".table tr.no").hide(); - }); - jQuery(document).on("click", "input:radio[id^=\'jform_toggle_modules_assigned0\']", function (event) { - jQuery(".table tr.no").show(); - }); - jQuery(document).on("click", "input:radio[id^=\'jform_toggle_modules_published1\']", function (event) { - jQuery(".table tr.unpublished").hide(); - }); - jQuery(document).on("click", "input:radio[id^=\'jform_toggle_modules_published0\']", function (event) { - jQuery(".table tr.unpublished").show(); - }); - }); -'); -JFactory::getDocument()->addStyleDeclaration(' -ul.horizontal-buttons li { - display: inline-block; - padding-right: 10%; -} -'); -?> -fields = array('toggle_modules_assigned','toggle_modules_published'); - -echo JLayoutHelper::render('joomla.menu.edit_modules', $this); ?> - - - - - - - - - - - - - modules as $i => &$module) : ?> - menuid)) : ?> - except || $module->menuid < 0) : ?> - - - - - - - - published) : ?> - - - - - - - - - - - id . 'Modal', - array( - 'title' => JText::_('COM_MENUS_EDIT_MODULE_SETTINGS'), - 'backdrop' => 'static', - 'keyboard' => false, - 'closeButton' => false, - 'url' => $link, - 'height' => '400px', - 'width' => '800px', - 'bodyHeight' => '70', - 'modalWidth' => '80', - 'footer' => '' - . '' - . '', - ) - ); ?> - - - -
- - - - - - - - - -
- id . '&tmpl=component&view=module&layout=modal'; ?> - - escape($module->title); ?> - - escape($module->access_title); ?> - - escape($module->position); ?> - - published):?> - - - - - - - - -
diff --git a/administrator/components/com_menus/views/item/tmpl/edit.php b/administrator/components/com_menus/views/item/tmpl/edit.php index 73043cab983c2..392cb40bbae08 100644 --- a/administrator/components/com_menus/views/item/tmpl/edit.php +++ b/administrator/components/com_menus/views/item/tmpl/edit.php @@ -144,8 +144,8 @@ { $this->fields = array_diff($this->fields, array('home')); } - ?> - + + echo JLayoutHelper::render('joomla.edit.global', $this); ?> diff --git a/administrator/components/com_menus/views/menu/tmpl/edit.xml b/administrator/components/com_menus/views/menu/tmpl/edit.xml new file mode 100755 index 0000000000000..c92fd7922c959 --- /dev/null +++ b/administrator/components/com_menus/views/menu/tmpl/edit.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/administrator/components/com_menus/views/menus/tmpl/default.xml b/administrator/components/com_menus/views/menus/tmpl/default.xml new file mode 100755 index 0000000000000..7c77b6eeb8b64 --- /dev/null +++ b/administrator/components/com_menus/views/menus/tmpl/default.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/administrator/components/com_modules/views/modules/tmpl/default.xml b/administrator/components/com_modules/views/modules/tmpl/default.xml new file mode 100755 index 0000000000000..33c579db36e26 --- /dev/null +++ b/administrator/components/com_modules/views/modules/tmpl/default.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/administrator/components/com_plugins/views/plugins/tmpl/default.xml b/administrator/components/com_plugins/views/plugins/tmpl/default.xml new file mode 100755 index 0000000000000..7021dfdbc425c --- /dev/null +++ b/administrator/components/com_plugins/views/plugins/tmpl/default.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/administrator/components/com_templates/views/styles/tmpl/default.xml b/administrator/components/com_templates/views/styles/tmpl/default.xml new file mode 100755 index 0000000000000..4ae853e9612d2 --- /dev/null +++ b/administrator/components/com_templates/views/styles/tmpl/default.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/administrator/components/com_templates/views/templates/tmpl/default.xml b/administrator/components/com_templates/views/templates/tmpl/default.xml new file mode 100755 index 0000000000000..8d0810e229059 --- /dev/null +++ b/administrator/components/com_templates/views/templates/tmpl/default.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/administrator/components/com_users/views/groups/tmpl/default.xml b/administrator/components/com_users/views/groups/tmpl/default.xml new file mode 100755 index 0000000000000..c754ba464e32b --- /dev/null +++ b/administrator/components/com_users/views/groups/tmpl/default.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/administrator/components/com_users/views/levels/tmpl/default.xml b/administrator/components/com_users/views/levels/tmpl/default.xml new file mode 100755 index 0000000000000..42966d98a43dd --- /dev/null +++ b/administrator/components/com_users/views/levels/tmpl/default.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/administrator/components/com_users/views/mail/tmpl/default.xml b/administrator/components/com_users/views/mail/tmpl/default.xml new file mode 100755 index 0000000000000..486a880332521 --- /dev/null +++ b/administrator/components/com_users/views/mail/tmpl/default.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/administrator/components/com_users/views/notes/tmpl/default.xml b/administrator/components/com_users/views/notes/tmpl/default.xml new file mode 100755 index 0000000000000..ee69b48fe9a2d --- /dev/null +++ b/administrator/components/com_users/views/notes/tmpl/default.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/administrator/components/com_users/views/users/tmpl/default.xml b/administrator/components/com_users/views/users/tmpl/default.xml new file mode 100755 index 0000000000000..e62daabf71713 --- /dev/null +++ b/administrator/components/com_users/views/users/tmpl/default.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/administrator/modules/mod_menu/tmpl/default_enabled.php b/administrator/modules/mod_menu/tmpl/default_enabled.php index a155de8747e37..c96c13a8b3764 100644 --- a/administrator/modules/mod_menu/tmpl/default_enabled.php +++ b/administrator/modules/mod_menu/tmpl/default_enabled.php @@ -9,10 +9,11 @@ defined('_JEXEC') or die; +use Joomla\Registry\Registry; use Joomla\Utilities\ArrayHelper; /* @var $menu JAdminCSSMenu */ - +/** @var Registry $params */ $shownew = (boolean) $params->get('shownew', 1); $showhelp = (boolean) $params->get('showhelp', 1); $user = JFactory::getUser(); diff --git a/components/com_content/views/article/tmpl/default.xml b/components/com_content/views/article/tmpl/default.xml index b0c4f791f0bd1..40aa81526fc93 100644 --- a/components/com_content/views/article/tmpl/default.xml +++ b/components/com_content/views/article/tmpl/default.xml @@ -1,278 +1,11 @@ - + - + - - - -
- - -
- - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-