diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php index 23354d520ec51..f7b8addabec20 100644 --- a/administrator/components/com_admin/script.php +++ b/administrator/components/com_admin/script.php @@ -27,6 +27,11 @@ class JoomlaInstallerScript */ public function update($installer) { + $options['format'] = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}'; + $options['text_file'] = 'joomla_update.php'; + JLog::addLogger($options, JLog::INFO, array('Update', 'databasequery', 'jerror')); + JLog::add(JText::_('COM_JOOMLAUPDATE_UPDATE_LOG_DELETE_FILES'), JLog::INFO, 'Update'); + $this->deleteUnexistingFiles(); $this->updateManifestCaches(); $this->updateDatabase(); diff --git a/administrator/components/com_admin/views/help/view.html.php b/administrator/components/com_admin/views/help/view.html.php index 7709c01a71f55..2f4768d73279f 100644 --- a/administrator/components/com_admin/views/help/view.html.php +++ b/administrator/components/com_admin/views/help/view.html.php @@ -69,6 +69,6 @@ public function display($tpl = null) */ protected function addToolbar() { - JToolbarHelper::title(JText::_('COM_ADMIN_HELP'), 'help_header.png'); + JToolbarHelper::title(JText::_('COM_ADMIN_HELP'), 'support help_header'); } } diff --git a/administrator/components/com_admin/views/profile/view.html.php b/administrator/components/com_admin/views/profile/view.html.php index c9e7cb18d3688..b07d3f422ca51 100644 --- a/administrator/components/com_admin/views/profile/view.html.php +++ b/administrator/components/com_admin/views/profile/view.html.php @@ -56,7 +56,7 @@ protected function addToolbar() { JFactory::getApplication()->input->set('hidemainmenu', 1); - JToolbarHelper::title(JText::_('COM_ADMIN_VIEW_PROFILE_TITLE'), 'user-profile'); + JToolbarHelper::title(JText::_('COM_ADMIN_VIEW_PROFILE_TITLE'), 'user user-profile'); JToolbarHelper::apply('profile.apply'); JToolbarHelper::save('profile.save'); JToolbarHelper::cancel('profile.cancel', 'JTOOLBAR_CLOSE'); diff --git a/administrator/components/com_admin/views/sysinfo/view.html.php b/administrator/components/com_admin/views/sysinfo/view.html.php index 487e65faeb148..f369730b381d0 100644 --- a/administrator/components/com_admin/views/sysinfo/view.html.php +++ b/administrator/components/com_admin/views/sysinfo/view.html.php @@ -93,7 +93,7 @@ protected function _setSubMenu() */ protected function addToolbar() { - JToolbarHelper::title(JText::_('COM_ADMIN_SYSTEM_INFORMATION'), 'systeminfo.png'); + JToolbarHelper::title(JText::_('COM_ADMIN_SYSTEM_INFORMATION'), 'info systeminfo'); JToolbarHelper::help('JHELP_SITE_SYSTEM_INFORMATION'); } } diff --git a/administrator/components/com_banners/config.xml b/administrator/components/com_banners/config.xml index e397175d9e1fd..54078d1799dd4 100644 --- a/administrator/components/com_banners/config.xml +++ b/administrator/components/com_banners/config.xml @@ -26,7 +26,7 @@ @@ -39,7 +39,7 @@ diff --git a/administrator/components/com_banners/models/forms/banner.xml b/administrator/components/com_banners/models/forms/banner.xml index 454e78688741e..64f91b8a850c2 100644 --- a/administrator/components/com_banners/models/forms/banner.xml +++ b/administrator/components/com_banners/models/forms/banner.xml @@ -7,22 +7,25 @@ readonly="true" class="readonly" label="JGLOBAL_FIELD_ID_LABEL" description ="JGLOBAL_FIELD_ID_DESC" /> - + description="COM_BANNERS_FIELD_ALIAS_DESC" + hint="JFIELD_ALIAS_PLACEHOLDER" /> - + + class="chzn-color-state" + size="1" default="1" > @@ -110,10 +113,10 @@
- + class="btn-group btn-group-yesno"> @@ -174,7 +177,8 @@ rows="3" cols="30" label="JFIELD_META_KEYWORDS_LABEL" description="COM_BANNERS_FIELD_METAKEYWORDS_DESC" /> - @@ -195,11 +199,11 @@ description="COM_BANNERS_FIELD_IMAGE_DESC" /> @@ -25,7 +26,7 @@ @@ -52,6 +53,7 @@ @@ -61,6 +63,7 @@ @@ -78,7 +81,8 @@ rows="3" cols="30" label="JFIELD_META_KEYWORDS_LABEL" description="COM_BANNERS_FIELD_CLIENT_METAKEYWORDS_DESC" /> - -
- - - - + +
diff --git a/administrator/components/com_banners/models/forms/download.xml b/administrator/components/com_banners/models/forms/download.xml index b69d222728ed7..ce9129e1d0eb1 100644 --- a/administrator/components/com_banners/models/forms/download.xml +++ b/administrator/components/com_banners/models/forms/download.xml @@ -2,7 +2,7 @@
- addScriptDeclaration($script); ?> - + - + - -
- -
+
'details')); ?> - -
-
- form->getLabel('name'); ?> -
-
- form->getInput('name'); ?> -
-
-
-
- form->getLabel('alias'); ?> -
-
- form->getInput('alias'); ?> -
-
-
-
- form->getLabel('catid'); ?> -
-
- form->getInput('catid'); ?> -
-
-
-
- form->getLabel('type'); ?> -
-
- form->getInput('type'); ?> -
-
+ +
+
+ form->getControlGroup('type'); ?>
- form->getFieldset('image') as $field) : ?> -
-
- label; ?> -
-
- input; ?> -
-
- -
-
-
- form->getLabel('custombannercode'); ?> -
-
- form->getInput('custombannercode'); ?> -
+ form->getControlGroups('image'); ?>
-
-
- form->getLabel('clickurl'); ?> -
-
- form->getInput('clickurl'); ?> -
+
+ form->getControlGroup('custombannercode'); ?>
-
-
- form->getLabel('description'); ?> -
-
- form->getInput('description'); ?> -
-
-
-
- form->getLabel('id'); ?> -
-
- form->getInput('id'); ?> -
-
- - - - form->getFieldset('publish') as $field) : ?> -
-
- label; ?> -
-
- input; ?> -
-
- -
-
- form->getLabel('ordering'); ?> -
-
- form->getInput('ordering'); ?> -
-
- + form->getControlGroup('clickurl'); + echo $this->form->getControlGroup('description'); + ?> +
+
+ +
+
+ - - form->getFieldset('otherparams') as $field) : ?> -
-
- label; ?> -
-
- input; ?> -
-
- - + + form->getControlGroups('otherparams'); ?> + - - form->getFieldset('metadata') as $field) : ?> -
-
- label; ?> -
-
- input; ?> -
-
- - + +
+
+ +
+
+ form->getControlGroups('metadata'); ?> +
+
+ -
+
- - - -
-

-
-
-
-
- form->getValue('name'); ?> -
-
- -
-
- form->getLabel('state'); ?> -
-
- form->getInput('state'); ?> -
-
-
-
- form->getLabel('sticky'); ?> -
-
- form->getInput('sticky'); ?> -
-
-
-
- form->getLabel('language'); ?> -
-
- form->getInput('language'); ?> -
-
-
- form->getLabel('version_note'); ?> -
- form->getInput('version_note'); ?> -
-
-
-
- diff --git a/administrator/components/com_banners/views/banner/view.html.php b/administrator/components/com_banners/views/banner/view.html.php index a9a208f45dabf..c19d01305e4dd 100644 --- a/administrator/components/com_banners/views/banner/view.html.php +++ b/administrator/components/com_banners/views/banner/view.html.php @@ -66,7 +66,7 @@ protected function addToolbar() // Since we don't track these assets at the item level, use the category id. $canDo = JHelperContent::getActions($this->item->catid, 0, 'com_banners'); - JToolbarHelper::title($isNew ? JText::_('COM_BANNERS_MANAGER_BANNER_NEW') : JText::_('COM_BANNERS_MANAGER_BANNER_EDIT'), 'banners.png'); + JToolbarHelper::title($isNew ? JText::_('COM_BANNERS_MANAGER_BANNER_NEW') : JText::_('COM_BANNERS_MANAGER_BANNER_EDIT'), 'bookmark banners'); // If not checked out, can save the item. if (!$checkedOut && ($canDo->get('core.edit') || count($user->getAuthorisedCategories('com_banners', 'core.create')) > 0)) diff --git a/administrator/components/com_banners/views/banners/tmpl/default.php b/administrator/components/com_banners/views/banners/tmpl/default.php index 01a627a045371..a36c9098f2413 100644 --- a/administrator/components/com_banners/views/banners/tmpl/default.php +++ b/administrator/components/com_banners/views/banners/tmpl/default.php @@ -13,7 +13,6 @@ JHtml::_('bootstrap.tooltip'); JHtml::_('behavior.multiselect'); -JHtml::_('dropdown.init'); JHtml::_('formbehavior.chosen', 'select'); $user = JFactory::getUser(); @@ -21,8 +20,8 @@ $listOrder = $this->escape($this->state->get('list.ordering')); $listDirn = $this->escape($this->state->get('list.direction')); $canOrder = $user->authorise('core.edit.state', 'com_banners.category'); -$archived = $this->state->get('filter.published') == 2 ? true : false; -$trashed = $this->state->get('filter.published') == -2 ? true : false; +$archived = $this->state->get('filter.state') == 2 ? true : false; +$trashed = $this->state->get('filter.state') == -2 ? true : false; $params = (isset($this->state->params)) ? $this->state->params : new JObject; $saveOrder = $listOrder == 'ordering'; if ($saveOrder) @@ -164,7 +163,20 @@ id); ?> - state, $i, 'banners.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?> +
+ state, $i, 'banners.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?> + escape($item->name)); + ?> +
@@ -181,39 +193,6 @@ escape($item->category_title); ?>
-
- id, 'banner.'); - JHtml::_('dropdown.divider'); - if ($item->state) : - JHtml::_('dropdown.unpublish', 'cb' . $i, 'banners.'); - else : - JHtml::_('dropdown.publish', 'cb' . $i, 'banners.'); - endif; - - JHtml::_('dropdown.divider'); - - if ($archived) : - JHtml::_('dropdown.unarchive', 'cb' . $i, 'banners.'); - else : - JHtml::_('dropdown.archive', 'cb' . $i, 'banners.'); - endif; - - if ($item->checked_out) : - JHtml::_('dropdown.checkin', 'cb' . $i, 'banners.'); - endif; - - if ($trashed) : - JHtml::_('dropdown.untrash', 'cb' . $i, 'banners.'); - else : - JHtml::_('dropdown.trash', 'cb' . $i, 'banners.'); - endif; - - // render dropdown list - echo JHtml::_('dropdown.render'); - ?> -
sticky, $i, $canChange); ?> diff --git a/administrator/components/com_banners/views/banners/view.html.php b/administrator/components/com_banners/views/banners/view.html.php index 5209cb1f073a5..718cee6f816d5 100644 --- a/administrator/components/com_banners/views/banners/view.html.php +++ b/administrator/components/com_banners/views/banners/view.html.php @@ -78,7 +78,7 @@ protected function addToolbar() // Get the toolbar object instance $bar = JToolBar::getInstance('toolbar'); - JToolbarHelper::title(JText::_('COM_BANNERS_MANAGER_BANNERS'), 'banners.png'); + JToolbarHelper::title(JText::_('COM_BANNERS_MANAGER_BANNERS'), 'bookmark banners'); if (count($user->getAuthorisedCategories('com_banners', 'core.create')) > 0) { JToolbarHelper::addNew('banner.add'); diff --git a/administrator/components/com_banners/views/client/tmpl/edit.php b/administrator/components/com_banners/views/client/tmpl/edit.php index 9a259926b432e..f5042cc691335 100644 --- a/administrator/components/com_banners/views/client/tmpl/edit.php +++ b/administrator/components/com_banners/views/client/tmpl/edit.php @@ -12,6 +12,8 @@ JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html'); JHtml::_('behavior.formvalidation'); JHtml::_('formbehavior.chosen', 'select'); + +$canDo = JHelperContent::getActions(0, 0, 'com_banners'); ?> -
+ + + - +
+ 'general')); ?> - 'general')); ?> item->id) ? JText::_('COM_BANNERS_NEW_CLIENT', true) : JText::sprintf('COM_BANNERS_EDIT_CLIENT', $this->item->id, true)); ?> -
-
- canDo->get('core.edit.state')) : ?> -
-
- form->getLabel('state'); ?> -
-
- form->getInput('state'); ?> -
-
- -
-
- form->getLabel('name'); ?> -
-
- form->getInput('name'); ?> -
-
-
-
- form->getLabel('contact'); ?> -
-
- form->getInput('contact'); ?> -
-
-
-
- form->getLabel('email'); ?> -
-
- form->getInput('email'); ?> -
-
-
-
- form->getLabel('purchase_type'); ?> -
-
- form->getInput('purchase_type'); ?> -
-
-
-
- form->getLabel('track_impressions'); ?> -
-
- form->getInput('track_impressions'); ?> -
-
-
-
- form->getLabel('track_clicks'); ?> -
-
- form->getInput('track_clicks'); ?> -
-
-
-
- form->getLabel('id'); ?> -
-
- form->getInput('id'); ?> -
-
-
-
- form->getFieldset('extra') as $field) : ?> -
- hidden) : ?> -
- label; ?> -
- -
- input; ?> -
-
- -
+
+
+ form->getControlGroup('contact'); + echo $this->form->getControlGroup('email'); + echo $this->form->getControlGroup('purchase_type'); + echo $this->form->getControlGroup('track_impressions'); + echo $this->form->getControlGroup('track_clicks'); + echo $this->form->getControlGroups('extra'); + ?> +
+
+
+
- form->getFieldset('metadata') as $field) : ?> -
- hidden) : ?> -
- label; ?> -
- -
- input; ?> -
-
- + form->getControlGroups('metadata'); ?> +
diff --git a/administrator/components/com_banners/views/client/view.html.php b/administrator/components/com_banners/views/client/view.html.php index 036cfe8f3c12d..ec61c831609b0 100644 --- a/administrator/components/com_banners/views/client/view.html.php +++ b/administrator/components/com_banners/views/client/view.html.php @@ -66,7 +66,7 @@ protected function addToolbar() $checkedOut = !($this->item->checked_out == 0 || $this->item->checked_out == $user->get('id')); $canDo = $this->canDo; - JToolbarHelper::title($isNew ? JText::_('COM_BANNERS_MANAGER_CLIENT_NEW') : JText::_('COM_BANNERS_MANAGER_CLIENT_EDIT'), 'banners-clients.png'); + JToolbarHelper::title($isNew ? JText::_('COM_BANNERS_MANAGER_CLIENT_NEW') : JText::_('COM_BANNERS_MANAGER_CLIENT_EDIT'), 'bookmark banners-clients'); // If not checked out, can save the item. if (!$checkedOut && ($canDo->get('core.edit')||$canDo->get('core.create'))) diff --git a/administrator/components/com_banners/views/clients/tmpl/default.php b/administrator/components/com_banners/views/clients/tmpl/default.php index 169e4776c1a3d..bb01781f5a121 100644 --- a/administrator/components/com_banners/views/clients/tmpl/default.php +++ b/administrator/components/com_banners/views/clients/tmpl/default.php @@ -13,7 +13,6 @@ JHtml::_('bootstrap.tooltip'); JHtml::_('behavior.multiselect'); -JHtml::_('dropdown.init'); JHtml::_('formbehavior.chosen', 'select'); $user = JFactory::getUser(); @@ -21,8 +20,8 @@ $listOrder = $this->escape($this->state->get('list.ordering')); $listDirn = $this->escape($this->state->get('list.direction')); $params = (isset($this->state->params)) ? $this->state->params : new JObject; -$archived = $this->state->get('filter.published') == 2 ? true : false; -$trashed = $this->state->get('filter.published') == -2 ? true : false; +$archived = $this->state->get('filter.state') == 2 ? true : false; +$trashed = $this->state->get('filter.state') == -2 ? true : false; $sortFields = $this->getSortFields(); ?> - - - - -
- -
- 'general')); ?> - - -
-
- form->getLabel('title'); ?> -
-
- form->getInput('title'); ?> -
-
-
-
- form->getLabel('alias'); ?> -
-
- form->getInput('alias'); ?> -
-
-
-
- form->getLabel('description'); ?> -
-
- form->getInput('description'); ?> -
-
-
-
- form->getLabel('extension'); ?> -
-
- form->getInput('extension'); ?> -
-
- - - -
-
- form->getLabel('id'); ?> -
-
- form->getInput('id'); ?> -
-
-
-
- form->getLabel('hits'); ?> -
-
- form->getInput('hits'); ?> -
-
-
-
- form->getLabel('created_user_id'); ?> -
-
- form->getInput('created_user_id'); ?> -
-
- item->created_time)) : ?> -
-
- form->getLabel('created_time'); ?> -
-
- form->getInput('created_time'); ?> -
-
- - item->modified_user_id) : ?> -
-
- form->getLabel('modified_user_id'); ?> -
-
- form->getInput('modified_user_id'); ?> -
-
-
-
- form->getLabel('modified_time'); ?> -
-
- form->getInput('modified_time'); ?> -
-
- - - - -
- loadTemplate('options'); ?> -
- - - -
- loadTemplate('metadata'); ?> -
- - - loadTemplate('extrafields'); ?> - - assoc) : ?> - -
- loadTemplate('associations'); ?> -
- - - - canDo->get('core.admin')) : ?> - -
- form->getInput('rules'); ?> -
- - - - - - - + + + + +
+ 'general')); ?> + + +
+
+ form->getInput('description'); ?> +
+
+ +
- - -
-

-
-
-
-
- form->getValue('title'); ?> -
-
-
- form->getLabel('parent_id'); ?> -
- form->getInput('parent_id'); ?> -
-
-
- form->getLabel('published'); ?> -
- form->getInput('published'); ?> -
-
-
- form->getLabel('access'); ?> -
- form->getInput('access'); ?> -
-
-
- form->getLabel('language'); ?> -
- form->getInput('language'); ?> -
-
- checkTags) : ?> -
- form->getLabel('tags'); ?> -
- form->getInput('tags'); ?> -
-
- - -
- form->getLabel('version_note'); ?> -
- form->getInput('version_note'); ?> -
-
- - -
+ + + +
+
+ +
+
+ +
- + + + + + loadTemplate('associations'); ?> + + + + canDo->get('core.admin')) : ?> + + form->getInput('rules'); ?> + + + + + + + + form->getInput('extension'); ?> + +
diff --git a/administrator/components/com_categories/views/category/tmpl/edit_extrafields.php b/administrator/components/com_categories/views/category/tmpl/edit_extrafields.php index 967fbc5b380f0..24bbcdff84b56 100644 --- a/administrator/components/com_categories/views/category/tmpl/edit_extrafields.php +++ b/administrator/components/com_categories/views/category/tmpl/edit_extrafields.php @@ -5,32 +5,8 @@ * * @copyright Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt + * + * @deprecated 3.2 */ -defined('_JEXEC') or die; -?> - -form->getFieldsets('attribs'); ?> - $fieldSet) : ?> - label) ? $fieldSet->label : 'COM_CATEGORIES_' . $name . '_FIELDSET_LABEL'; ?> - - -
- description) && trim($fieldSet->description)) : ?> -

escape(JText::_($fieldSet->description)); ?>

- - form->getFieldset($name) as $field) : ?> -
-
- label; ?> -
-
- input; ?> -
-
- -
- - - - +defined('_JEXEC') or die; \ No newline at end of file diff --git a/administrator/components/com_categories/views/category/tmpl/edit_options.php b/administrator/components/com_categories/views/category/tmpl/edit_options.php index 0b0f289b84701..24bbcdff84b56 100644 --- a/administrator/components/com_categories/views/category/tmpl/edit_options.php +++ b/administrator/components/com_categories/views/category/tmpl/edit_options.php @@ -5,44 +5,8 @@ * * @copyright Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt + * + * @deprecated 3.2 */ -defined('_JEXEC') or die; - -echo JHtml::_('bootstrap.startAccordion', 'categoryOptions', array('active' => 'collapse0')); -$fieldSets = $this->form->getFieldsets('params'); -$i = 0; -?> - $fieldSet) : ?> - label) ? $fieldSet->label : 'COM_CATEGORIES_' . $name . '_FIELDSET_LABEL'; - echo JHtml::_('bootstrap.addSlide', 'categoryOptions', JText::_($label), 'collapse' . $i++); - if (isset($fieldSet->description) && trim($fieldSet->description)) - { - echo '

' . $this->escape(JText::_($fieldSet->description)) . '

'; - } - ?> - form->getFieldset($name) as $field) : ?> -
-
- label; ?> -
-
- input; ?> -
-
- - - -
-
- form->getLabel('note'); ?> -
-
- form->getInput('note'); ?> -
-
- - - -getAuthorisedCategories($component, 'core.create')) > 0)) diff --git a/administrator/components/com_checkin/views/checkin/view.html.php b/administrator/components/com_checkin/views/checkin/view.html.php index e287e8e9ec689..c44b702162c38 100644 --- a/administrator/components/com_checkin/views/checkin/view.html.php +++ b/administrator/components/com_checkin/views/checkin/view.html.php @@ -45,7 +45,7 @@ public function display($tpl = null) */ protected function addToolbar() { - JToolbarHelper::title(JText::_('COM_CHECKIN_GLOBAL_CHECK_IN'), 'checkin.png'); + JToolbarHelper::title(JText::_('COM_CHECKIN_GLOBAL_CHECK_IN'), 'checkin'); if (JFactory::getUser()->authorise('core.admin', 'com_checkin')) { JToolbarHelper::custom('checkin', 'checkin.png', 'checkin_f2.png', 'JTOOLBAR_CHECKIN', true); diff --git a/administrator/components/com_config/models/forms/application.xml b/administrator/components/com_config/models/forms/application.xml index 5c8fcf4b8d0a8..006b527c564c8 100644 --- a/administrator/components/com_config/models/forms/application.xml +++ b/administrator/components/com_config/models/forms/application.xml @@ -41,7 +41,7 @@ + + + + + + + component->option . '_configuration'), 'config.png'); + JToolbarHelper::title(JText::_($this->component->option . '_configuration'), 'equalizer config'); JToolbarHelper::apply('component.apply'); JToolbarHelper::save('component.save'); JToolbarHelper::divider(); diff --git a/administrator/components/com_contact/config.xml b/administrator/components/com_contact/config.xml index 4524ca659b5fa..758150a73847c 100644 --- a/administrator/components/com_contact/config.xml +++ b/administrator/components/com_contact/config.xml @@ -31,7 +31,7 @@ @@ -117,7 +117,7 @@ @@ -231,7 +231,7 @@ @@ -265,7 +265,7 @@ label="COM_CONTACT_FIELD_SHOW_LINKS_LABEL" description="COM_CONTACT_FIELD_SHOW_LINKS_LABEL" type="radio" - class="btn-group" + class="btn-group btn-group-yesno" default="1" > @@ -312,7 +312,7 @@ id="show_tags" name="show_tags" type="radio" - class="btn-group" + class="btn-group btn-group-yesno" default="1" label="COM_CONTACT_FIELD_SHOW_TAGS_LABEL" description="COM_CONTACT_FIELD_SHOW_TAGS_DESC"> @@ -389,7 +389,7 @@ @@ -399,7 +399,7 @@ @@ -409,7 +409,7 @@ @@ -433,7 +433,7 @@ @@ -443,7 +443,7 @@ @@ -453,7 +453,7 @@ @@ -464,7 +464,7 @@ @@ -478,7 +478,7 @@ > @@ -502,7 +502,7 @@ @@ -513,7 +513,7 @@ @@ -524,7 +524,7 @@ @@ -552,7 +552,7 @@ @@ -563,7 +563,7 @@ @@ -574,7 +574,7 @@ @@ -585,7 +585,7 @@ @@ -596,7 +596,7 @@ @@ -643,7 +643,7 @@ diff --git a/administrator/components/com_contact/models/forms/contact.xml b/administrator/components/com_contact/models/forms/contact.xml index be7aa5288c106..6feb1f4561f66 100644 --- a/administrator/components/com_contact/models/forms/contact.xml +++ b/administrator/components/com_contact/models/forms/contact.xml @@ -15,8 +15,8 @@ type="text" label="COM_CONTACT_FIELD_NAME_LABEL" description="COM_CONTACT_FIELD_NAME_DESC" - class="inputbox" - size="30" + class="inputbox input-xxlarge input-large-text" + size="40" required="true" /> @@ -24,15 +24,16 @@ type="text" label="JFIELD_ALIAS_LABEL" description="JFIELD_ALIAS_DESC" + hint="JFIELD_ALIAS_PLACEHOLDER" class="inputbox" - size="30" + size="45" /> - - @@ -47,7 +48,7 @@ type="list" label="JSTATUS" description="JFIELD_PUBLISHED_DESC" - class="inputbox span12 small" + class="chzn-color-state" size="1" default="1" > @@ -75,107 +76,8 @@ type="accesslevel" label="JFIELD_ACCESS_LABEL" description="JFIELD_ACCESS_DESC" - class="inputbox span12 small" - size="1" - /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -214,8 +110,6 @@ readonly="true" filter="unset"/> - - - @@ -343,9 +237,125 @@
-
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ @@ -381,6 +391,7 @@ @@ -391,6 +402,7 @@ @@ -399,6 +411,7 @@ @@ -408,6 +421,7 @@ @@ -417,6 +431,7 @@ @@ -426,6 +441,7 @@ @@ -435,6 +451,7 @@ @@ -444,6 +461,7 @@ @@ -465,6 +484,7 @@ @@ -475,6 +495,7 @@ @@ -484,6 +505,7 @@ @@ -493,6 +515,7 @@ @@ -502,6 +525,7 @@ @@ -511,6 +535,7 @@ @@ -520,6 +545,7 @@ @@ -530,12 +556,14 @@ @@ -642,10 +671,11 @@
- + JGLOBAL_INDEX_NOFOLLOW - + - - + + + + diff --git a/administrator/components/com_contact/views/contact/tmpl/edit.php b/administrator/components/com_contact/views/contact/tmpl/edit.php index 0bb0969f5a76b..84ac749d03921 100644 --- a/administrator/components/com_contact/views/contact/tmpl/edit.php +++ b/administrator/components/com_contact/views/contact/tmpl/edit.php @@ -16,9 +16,6 @@ JHtml::_('formbehavior.chosen', 'select'); $app = JFactory::getApplication(); -$input = $app->input; - -$assoc = JLanguageAssociations::isEnabled(); ?> -
+ - + -
- -
-
- 'details')); ?> +
+ 'details')); ?> - item->id) ? JText::_('COM_CONTACT_NEW_CONTACT', true) : JText::sprintf('COM_CONTACT_EDIT_CONTACT', $this->item->id, true)); ?> -
-
form->getLabel('name'); ?>
-
form->getInput('name'); ?>
-
-
-
form->getLabel('alias'); ?>
-
form->getInput('alias'); ?>
-
-
-
form->getLabel('user_id'); ?>
-
form->getInput('user_id'); ?>
-
-
-
form->getLabel('catid'); ?>
-
form->getInput('catid'); ?>
-
-
-
form->getLabel('ordering'); ?>
-
form->getInput('ordering'); ?>
+ item->id) ? JText::_('COM_CONTACT_NEW_CONTACT', true) : JText::sprintf('COM_CONTACT_EDIT_CONTACT', $this->item->id, true)); ?> +
+
+ form->getControlGroup('user_id'); ?> +
+ form->getControlGroup('misc'); ?>
-
-
form->getLabel('id'); ?>
-
form->getInput('id'); ?>
-
-
- form->getLabel('misc'); ?> -
- form->getInput('misc'); ?> - +
+
+ +
+
+ - -
-
form->getLabel('created_by'); ?>
-
form->getInput('created_by'); ?>
-
-
-
form->getLabel('created_by_alias'); ?>
-
form->getInput('created_by_alias'); ?>
-
-
-
form->getLabel('created'); ?>
-
form->getInput('created'); ?>
-
-
-
form->getLabel('publish_up'); ?>
-
form->getInput('publish_up'); ?>
-
-
-
form->getLabel('publish_down'); ?>
-
form->getInput('publish_down'); ?>
-
- item->modified_by) : ?> -
-
form->getLabel('modified_by'); ?>
-
form->getInput('modified_by'); ?>
-
-
-
form->getLabel('modified'); ?>
-
form->getInput('modified'); ?>
-
- - item->version) : ?> -
-
- form->getLabel('version'); ?> -
-
- form->getInput('version'); ?> -
-
- - item->hits) : ?> -
-
- form->getLabel('hits'); ?> -
-
- form->getInput('hits'); ?> -
-
- - - + +
+
+ +
+
+ +
+
+ -

item->id) ? JText::_('COM_CONTACT_DETAILS', true) : JText::sprintf('COM_CONTACT_EDIT_DETAILS', $this->item->id, true); ?>

+ -
-
form->getLabel('image'); ?>
-
form->getInput('image'); ?>
-
-
-
form->getLabel('con_position'); ?>
-
form->getInput('con_position'); ?>
-
-
-
form->getLabel('email_to'); ?>
-
form->getInput('email_to'); ?>
-
-
-
form->getLabel('address'); ?>
-
form->getInput('address'); ?>
-
-
-
form->getLabel('suburb'); ?>
-
form->getInput('suburb'); ?>
-
-
-
form->getLabel('state'); ?>
-
form->getInput('state'); ?>
-
-
-
form->getLabel('postcode'); ?>
-
form->getInput('postcode'); ?>
-
-
-
form->getLabel('country'); ?>
-
form->getInput('country'); ?>
-
-
-
form->getLabel('telephone'); ?>
-
form->getInput('telephone'); ?>
-
-
-
form->getLabel('mobile'); ?>
-
form->getInput('mobile'); ?>
-
-
-
form->getLabel('fax'); ?>
-
form->getInput('fax'); ?>
-
-
-
form->getLabel('webpage'); ?>
-
form->getInput('webpage'); ?>
-
-
-
form->getLabel('sortname1'); ?>
-
form->getInput('sortname1'); ?>
-
-
-
form->getLabel('sortname2'); ?>
-
form->getInput('sortname2'); ?>
-
-
-
form->getLabel('sortname3'); ?>
-
form->getInput('sortname3'); ?>
-
+ item_associations)) : ?> + + loadTemplate('associations'); ?> + - loadTemplate('params'); ?> - - - loadTemplate('metadata'); ?> - - - - - loadTemplate('associations'); ?> - - - - -
- - +
- - - - + + diff --git a/administrator/components/com_contact/views/contact/view.html.php b/administrator/components/com_contact/views/contact/view.html.php index e606c8c6abbf3..f8db83aab5f10 100644 --- a/administrator/components/com_contact/views/contact/view.html.php +++ b/administrator/components/com_contact/views/contact/view.html.php @@ -67,7 +67,7 @@ protected function addToolbar() // Since we don't track these assets at the item level, use the category id. $canDo = JHelperContent::getActions($this->item->catid, 0, 'com_contact'); - JToolbarHelper::title(JText::_('COM_CONTACT_MANAGER_CONTACT'), 'contact.png'); + JToolbarHelper::title(JText::_('COM_CONTACT_MANAGER_CONTACT'), 'address contact'); // Build the actions for new and existing records. if ($isNew) diff --git a/administrator/components/com_contact/views/contacts/tmpl/default.php b/administrator/components/com_contact/views/contacts/tmpl/default.php index d7ff7525ccb03..46fbe712709d0 100644 --- a/administrator/components/com_contact/views/contacts/tmpl/default.php +++ b/administrator/components/com_contact/views/contacts/tmpl/default.php @@ -13,7 +13,6 @@ JHtml::_('bootstrap.tooltip'); JHtml::_('behavior.multiselect'); -JHtml::_('dropdown.init'); JHtml::_('formbehavior.chosen', 'select'); $app = JFactory::getApplication(); @@ -165,7 +164,20 @@ id); ?> - published, $i, 'contacts.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?> +
+ published, $i, 'contacts.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?> + escape($item->name)); + ?> +
@@ -185,45 +197,6 @@ category_title; ?>
-
- id, 'contact.'); - JHtml::_('dropdown.divider'); - if ($item->published) : - JHtml::_('dropdown.unpublish', 'cb' . $i, 'contacts.'); - else : - JHtml::_('dropdown.publish', 'cb' . $i, 'contacts.'); - endif; - - if ($item->featured) : - JHtml::_('dropdown.unfeatured', 'cb' . $i, 'contacts.'); - else : - JHtml::_('dropdown.featured', 'cb' . $i, 'contacts.'); - endif; - - JHtml::_('dropdown.divider'); - - if ($archived) : - JHtml::_('dropdown.unarchive', 'cb' . $i, 'contacts.'); - else : - JHtml::_('dropdown.archive', 'cb' . $i, 'contacts.'); - endif; - - if ($item->checked_out) : - JHtml::_('dropdown.checkin', 'cb' . $i, 'contacts.'); - endif; - - if ($trashed) : - JHtml::_('dropdown.untrash', 'cb' . $i, 'contacts.'); - else : - JHtml::_('dropdown.trash', 'cb' . $i, 'contacts.'); - endif; - - // render dropdown list - echo JHtml::_('dropdown.render'); - ?> -
linked_user)) : ?> diff --git a/administrator/components/com_contact/views/contacts/view.html.php b/administrator/components/com_contact/views/contacts/view.html.php index 7abc0305481df..eab6f078b1d17 100644 --- a/administrator/components/com_contact/views/contacts/view.html.php +++ b/administrator/components/com_contact/views/contacts/view.html.php @@ -71,7 +71,7 @@ protected function addToolbar() // Get the toolbar object instance $bar = JToolBar::getInstance('toolbar'); - JToolbarHelper::title(JText::_('COM_CONTACT_MANAGER_CONTACTS'), 'contact.png'); + JToolbarHelper::title(JText::_('COM_CONTACT_MANAGER_CONTACTS'), 'address contact'); if ($canDo->get('core.create') || (count($user->getAuthorisedCategories('com_contact', 'core.create'))) > 0) { diff --git a/administrator/components/com_content/config.xml b/administrator/components/com_content/config.xml index 8b9670807db2f..66d22dc75caf7 100644 --- a/administrator/components/com_content/config.xml +++ b/administrator/components/com_content/config.xml @@ -17,7 +17,7 @@ @@ -30,7 +30,7 @@ @@ -43,7 +43,7 @@ @@ -67,7 +67,7 @@ @@ -80,7 +80,7 @@ @@ -93,7 +93,7 @@ @@ -106,7 +106,7 @@ @@ -125,7 +125,7 @@ @@ -138,7 +138,7 @@ @@ -151,7 +151,7 @@ @@ -164,7 +164,7 @@ @@ -177,7 +177,7 @@ @@ -190,7 +190,7 @@ @@ -203,7 +203,7 @@ @@ -215,7 +215,7 @@ @@ -228,7 +228,7 @@ @@ -250,7 +250,7 @@ id="show_tags" name="show_tags" type="radio" - class="btn-group" + class="btn-group btn-group-yesno" default="1" label="COM_CONTENT_FIELD_SHOW_TAGS_LABEL" description="COM_CONTENT_FIELD_SHOW_TAGS_DESC"> @@ -266,7 +266,7 @@ @@ -279,7 +279,7 @@ @@ -292,7 +292,7 @@ @@ -305,7 +305,7 @@ @@ -318,7 +318,7 @@ @@ -342,7 +342,7 @@ @@ -508,7 +508,7 @@ @@ -529,7 +529,7 @@ @@ -538,67 +538,67 @@ - - - - - - - + description="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_DESC" + label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL" + default="-1" + > + + + + + + + - - + > + + - - + > + + - - + > + + - - + > + + @@ -613,61 +613,60 @@ > + + + - - - - - - - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + +
@@ -728,15 +727,15 @@ description="JGLOBAL_SHOW_SUBCATEGORY_CONTENT_DESC" label="JGLOBAL_SHOW_SUBCATEGORY_CONTENT_LABEL" > - - - - - - - - -
+ + + + + + + + +
@@ -766,7 +765,7 @@ @@ -793,7 +792,7 @@ @@ -803,7 +802,7 @@ @@ -879,7 +878,7 @@ @@ -897,7 +896,7 @@ @@ -920,7 +919,7 @@ diff --git a/administrator/components/com_content/models/featured.php b/administrator/components/com_content/models/featured.php index d77f7e75012b9..07713ec38f417 100644 --- a/administrator/components/com_content/models/featured.php +++ b/administrator/components/com_content/models/featured.php @@ -71,7 +71,7 @@ protected function getListQuery($resolveFKs = true) $this->getState( 'list.select', 'a.id, a.title, a.alias, a.checked_out, a.checked_out_time, a.catid, a.state, a.access, a.created, a.hits,' . - 'a.language, a.created_by_alias, a.publish_up, a.publish_down' + 'a.featured, a.language, a.created_by_alias, a.publish_up, a.publish_down' ) ); $query->from('#__content AS a'); diff --git a/administrator/components/com_content/models/forms/article.xml b/administrator/components/com_content/models/forms/article.xml index 1b01eb9fbe715..53b20c12b19b3 100644 --- a/administrator/components/com_content/models/forms/article.xml +++ b/administrator/components/com_content/models/forms/article.xml @@ -8,21 +8,27 @@ + description="JFIELD_TITLE_DESC" + class="inputbox input-xxlarge input-large-text" + size="40" + required="true" /> - + description="JFIELD_ALIAS_DESC" + hint="JFIELD_ALIAS_PLACEHOLDER" + class="inputbox" size="40" /> + + description="JGLOBAL_FIELD_VERSION_NOTE_DESC" + class="inputbox span12" + size="45" /> + + + + format="%Y-%m-%d %H:%M:%S" filter="user_utc" /> + label="COM_CONTENT_FIELD_CREATED_BY_LABEL" description="COM_CONTENT_FIELD_CREATED_BY_DESC" /> + class="inputbox" size="20" /> + size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" /> @@ -76,61 +90,52 @@ + filter="user_utc" /> + filter="user_utc" /> + readonly="true" filter="unset" /> + default="0" /> + class="inputbox" rows="3" cols="30" /> + class="inputbox" rows="3" cols="30" /> + description="JFIELD_ACCESS_DESC" size="1" /> - - - - + description="JGLOBAL_SHOW_TITLE_DESC"> @@ -154,21 +158,20 @@ + description="JGLOBAL_LINKED_TITLES_DESC"> - @@ -176,11 +179,10 @@ @@ -200,11 +202,10 @@ + description="JGLOBAL_SHOW_CATEGORY_DESC"> @@ -212,11 +213,10 @@ + description="JGLOBAL_LINK_CATEGORY_DESC"> @@ -224,11 +224,10 @@ + description="JGLOBAL_SHOW_PARENT_CATEGORY_DESC"> @@ -236,11 +235,10 @@ + description="JGLOBAL_LINK_PARENT_CATEGORY_DESC"> @@ -248,11 +246,10 @@ + description="JGLOBAL_SHOW_AUTHOR_DESC"> @@ -260,11 +257,10 @@ + description="JGLOBAL_LINK_AUTHOR_DESC"> @@ -272,11 +268,10 @@ + description="JGLOBAL_SHOW_CREATE_DATE_DESC"> @@ -284,11 +279,10 @@ + description="JGLOBAL_SHOW_MODIFY_DATE_DESC"> @@ -296,11 +290,10 @@ + description="JGLOBAL_SHOW_PUBLISH_DATE_DESC"> @@ -308,11 +301,10 @@ + description="JGLOBAL_SHOW_NAVIGATION_DESC"> @@ -320,11 +312,10 @@ + description="JGLOBAL_SHOW_ICONS_DESC"> @@ -332,11 +323,10 @@ + description="JGLOBAL_SHOW_PRINT_ICON_DESC"> @@ -344,11 +334,10 @@ + description="JGLOBAL_SHOW_EMAIL_ICON_DESC"> @@ -356,11 +345,10 @@ @@ -369,11 +357,10 @@ + description="JGLOBAL_SHOW_HITS_DESC"> @@ -381,11 +368,10 @@ + description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC"> @@ -393,11 +379,10 @@ + description="COM_CONTENT_FIELD_URLSPOSITION_DESC"> @@ -410,430 +395,209 @@ /> - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ + class="inputbox" size="20" /> - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + -
- - - - - - - - - - - - - + + + + + + + + + + + + +
diff --git a/administrator/components/com_content/views/article/tmpl/edit.php b/administrator/components/com_content/views/article/tmpl/edit.php index e876331b81e66..e2ce662957e80 100644 --- a/administrator/components/com_content/views/article/tmpl/edit.php +++ b/administrator/components/com_content/views/article/tmpl/edit.php @@ -18,40 +18,10 @@ // Create shortcut to parameters. $params = $this->state->get('params'); -$params = $params->toArray(); - -// This checks if the config options have ever been saved. If they haven't they will fall back to the original settings. -$editoroptions = isset($params['show_publishing_options']); $app = JFactory::getApplication(); $input = $app->input; -$assoc = JLanguageAssociations::isEnabled(); - -if (!$editoroptions) -{ - $params['show_publishing_options'] = '1'; - $params['show_article_options'] = '1'; - $params['show_urls_images_backend'] = '0'; - $params['show_urls_images_frontend'] = '0'; -} - -// Check if the article uses configuration settings besides global. If so, use them. -if (isset($this->item->attribs['show_publishing_options']) && $this->item->attribs['show_publishing_options'] !== '') -{ - $params['show_publishing_options'] = $this->item->attribs['show_publishing_options']; -} - -if (isset($this->item->attribs['show_article_options']) && $this->item->attribs['show_article_options'] !== '') -{ - $params['show_article_options'] = $this->item->attribs['show_article_options']; -} - -if (isset($this->item->attribs['show_urls_images_backend']) && $this->item->attribs['show_urls_images_backend'] !== '') -{ - $params['show_urls_images_backend'] = $this->item->attribs['show_urls_images_backend']; -} - ?> -
- - - -
- -
- 'general')); ?> - - -
-
- form->getLabel('title'); ?> form->getInput('title'); ?> form->getLabel('catid'); ?> form->getInput('catid'); ?> -
- form->getInput('articletext'); ?> -
- - -
-
-

-
- form->getLabel('images'); ?> -
- form->getInput('images'); ?> -
-
- form->getGroup('images') as $field) : ?> -
- hidden) : ?> - label; ?> - -
- input; ?> -
-
- -
-
- form->getGroup('urls') as $field) : ?> -
- hidden) : ?> - label; ?> - -
- input; ?> -
-
- -
-
- - - - - - -
-
-
- form->getLabel('alias'); ?> -
- form->getInput('alias'); ?> -
-
-
-
- form->getLabel('id'); ?> -
-
- form->getInput('id'); ?> -
-
-
- form->getLabel('created_by'); ?> -
- form->getInput('created_by'); ?> -
-
-
- form->getLabel('created_by_alias'); ?> -
- form->getInput('created_by_alias'); ?> -
-
-
- form->getLabel('created'); ?> -
- form->getInput('created'); ?> -
-
-
-
-
- form->getLabel('publish_up'); ?> -
- form->getInput('publish_up'); ?> -
-
-
- form->getLabel('publish_down'); ?> -
- form->getInput('publish_down'); ?> -
-
- item->modified_by) : ?> -
- form->getLabel('modified_by'); ?> -
- form->getInput('modified_by'); ?> -
-
-
- form->getLabel('modified'); ?> -
- form->getInput('modified'); ?> -
-
- - - item->version) : ?> -
- form->getLabel('version'); ?> -
- form->getInput('version'); ?> -
-
- - - item->hits) : ?> -
-
- form->getLabel('hits'); ?> -
-
- form->getInput('hits'); ?> -
-
- -
-
- - - - - form->getFieldsets('attribs'); ?> - $fieldSet) : ?> - - - label, true)); ?> - - - - - - - description) && trim($fieldSet->description)) : ?> -

escape(JText::_($fieldSet->description));?>

- - form->getFieldset($name) as $field) : ?> -
- label; ?> -
- input; ?> -
-
- - - - form->getFieldset('basic-limited') as $field) : - echo $field->input; - endforeach; - endif;?> - - - - - - - - - - canDo->get('core.admin')): ?> - - form->getFieldset('editorConfig') as $field) : ?> -
- label; ?> -
- input; ?> -
-
- - - - - - loadTemplate('metadata'); ?> - - - - - loadTemplate('associations'); ?> - - + - canDo->get('core.admin')) : ?> - -
- form->getInput('rules'); ?> -
- - + - +
+ 'general')); ?> - - - + +
+
+
+ form->getInput('articletext'); ?> +
+
+
+ +
- - - - + + + + get('show_publishing_options')) : ?> + +
+
+ +
+
+ +
+
+ + + + + get('show_urls_images_backend')) : ?> + +
+
+ form->getControlGroup('images'); ?> + form->getGroup('images') as $field) : ?> + getControlGroup(); ?> + +
+
+ form->getGroup('urls') as $field) : ?> + getControlGroup(); ?> + +
+
+ + + + item_associations) && JLanguageAssociations::isEnabled()) : ?> + + loadTemplate('associations'); ?> + + + + canDo->get('core.admin')) : ?> + + form->getInput('rules'); ?> + + + + show_options = $params->get('show_article_options'); ?> + + + + + + +
diff --git a/administrator/components/com_content/views/article/view.html.php b/administrator/components/com_content/views/article/view.html.php index fa67a9a601d2e..10309c63be580 100644 --- a/administrator/components/com_content/views/article/view.html.php +++ b/administrator/components/com_content/views/article/view.html.php @@ -78,7 +78,7 @@ protected function addToolbar() // Built the actions for new and existing records. $canDo = $this->canDo; - JToolbarHelper::title(JText::_('COM_CONTENT_PAGE_' . ($checkedOut ? 'VIEW_ARTICLE' : ($isNew ? 'ADD_ARTICLE' : 'EDIT_ARTICLE'))), 'article-add.png'); + JToolbarHelper::title(JText::_('COM_CONTENT_PAGE_' . ($checkedOut ? 'VIEW_ARTICLE' : ($isNew ? 'ADD_ARTICLE' : 'EDIT_ARTICLE'))), 'pencil-2 article-add'); // For new records, check the create permission. if ($isNew && (count($user->getAuthorisedCategories('com_content', 'core.create')) > 0)) diff --git a/administrator/components/com_content/views/articles/tmpl/default.php b/administrator/components/com_content/views/articles/tmpl/default.php index c2b2644763115..484fa92d08fd4 100644 --- a/administrator/components/com_content/views/articles/tmpl/default.php +++ b/administrator/components/com_content/views/articles/tmpl/default.php @@ -13,7 +13,6 @@ JHtml::_('bootstrap.tooltip'); JHtml::_('behavior.multiselect'); -JHtml::_('dropdown.init'); JHtml::_('formbehavior.chosen', 'select'); $app = JFactory::getApplication(); @@ -168,6 +167,17 @@
state, $i, 'articles.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?> featured, $i, $canChange); ?> + escape($item->title)); + ?>
@@ -190,45 +200,6 @@ escape($item->category_title); ?>
-
- id, 'article.'); - JHtml::_('dropdown.divider'); - if ($item->state) : - JHtml::_('dropdown.unpublish', 'cb' . $i, 'articles.'); - else : - JHtml::_('dropdown.publish', 'cb' . $i, 'articles.'); - endif; - - if ($item->featured) : - JHtml::_('dropdown.unfeatured', 'cb' . $i, 'articles.'); - else : - JHtml::_('dropdown.featured', 'cb' . $i, 'articles.'); - endif; - - JHtml::_('dropdown.divider'); - - if ($archived) : - JHtml::_('dropdown.unarchive', 'cb' . $i, 'articles.'); - else : - JHtml::_('dropdown.archive', 'cb' . $i, 'articles.'); - endif; - - if ($item->checked_out) : - JHtml::_('dropdown.checkin', 'cb' . $i, 'articles.'); - endif; - - if ($trashed) : - JHtml::_('dropdown.untrash', 'cb' . $i, 'articles.'); - else : - JHtml::_('dropdown.trash', 'cb' . $i, 'articles.'); - endif; - - // Render dropdown list - echo JHtml::_('dropdown.render'); - ?> -
escape($item->access_level); ?> diff --git a/administrator/components/com_content/views/articles/view.html.php b/administrator/components/com_content/views/articles/view.html.php index 1dc1bc4998d13..612ffd3578a20 100644 --- a/administrator/components/com_content/views/articles/view.html.php +++ b/administrator/components/com_content/views/articles/view.html.php @@ -86,7 +86,7 @@ protected function addToolbar() // Get the toolbar object instance $bar = JToolBar::getInstance('toolbar'); - JToolbarHelper::title(JText::_('COM_CONTENT_ARTICLES_TITLE'), 'article.png'); + JToolbarHelper::title(JText::_('COM_CONTENT_ARTICLES_TITLE'), 'stack article'); if ($canDo->get('core.create') || (count($user->getAuthorisedCategories('com_content', 'core.create'))) > 0 ) { diff --git a/administrator/components/com_content/views/featured/tmpl/default.php b/administrator/components/com_content/views/featured/tmpl/default.php index e2857c21242b7..9acdb471be05e 100644 --- a/administrator/components/com_content/views/featured/tmpl/default.php +++ b/administrator/components/com_content/views/featured/tmpl/default.php @@ -13,7 +13,6 @@ JHtml::_('bootstrap.tooltip'); JHtml::_('behavior.multiselect'); -JHtml::_('dropdown.init'); JHtml::_('formbehavior.chosen', 'select'); $user = JFactory::getUser(); @@ -109,7 +108,21 @@ id); ?> +
state, $i, 'articles.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?> + featured, $i, $canChange); ?> + escape($item->title)); + ?> +
@@ -131,39 +144,6 @@ escape($item->category_title); ?>
-
- id, 'article.', 'index.php?option=com_content&return=featured'); - JHtml::_('dropdown.divider'); - if ($item->state) : - JHtml::_('dropdown.unpublish', 'cb' . $i, 'articles.'); - else : - JHtml::_('dropdown.publish', 'cb' . $i, 'articles.'); - endif; - - JHtml::_('dropdown.divider'); - - if ($archived) : - JHtml::_('dropdown.unarchive', 'cb' . $i, 'articles.'); - else : - JHtml::_('dropdown.archive', 'cb' . $i, 'articles.'); - endif; - - if ($item->checked_out) : - JHtml::_('dropdown.checkin', 'cb' . $i, 'articles.'); - endif; - - if ($trashed) : - JHtml::_('dropdown.untrash', 'cb' . $i, 'articles.'); - else : - JHtml::_('dropdown.trash', 'cb' . $i, 'articles.'); - endif; - - // Render dropdown list - echo JHtml::_('dropdown.render'); - ?> -
diff --git a/administrator/components/com_content/views/featured/view.html.php b/administrator/components/com_content/views/featured/view.html.php index 19f1bee4d60cb..b4104d13801f3 100644 --- a/administrator/components/com_content/views/featured/view.html.php +++ b/administrator/components/com_content/views/featured/view.html.php @@ -70,7 +70,7 @@ protected function addToolbar() $state = $this->get('State'); $canDo = JHelperContent::getActions($this->state->get('filter.category_id'), 0, 'com_content'); - JToolbarHelper::title(JText::_('COM_CONTENT_FEATURED_TITLE'), 'featured.png'); + JToolbarHelper::title(JText::_('COM_CONTENT_FEATURED_TITLE'), 'star featured'); if ($canDo->get('core.create')) { diff --git a/administrator/components/com_cpanel/views/cpanel/view.html.php b/administrator/components/com_cpanel/views/cpanel/view.html.php index e8f6e0d02abfc..ce57b52da6c7d 100644 --- a/administrator/components/com_cpanel/views/cpanel/view.html.php +++ b/administrator/components/com_cpanel/views/cpanel/view.html.php @@ -35,7 +35,7 @@ class CpanelViewCpanel extends JViewLegacy public function display($tpl = null) { // Set toolbar items for the page - JToolbarHelper::title(JText::_('COM_CPANEL'), 'cpanel.png'); + JToolbarHelper::title(JText::_('COM_CPANEL'), 'dashboard cpanel'); JToolbarHelper::help('screen.cpanel'); $input = JFactory::getApplication()->input; diff --git a/administrator/components/com_finder/config.xml b/administrator/components/com_finder/config.xml index 1508d2af03def..1202298c36f68 100644 --- a/administrator/components/com_finder/config.xml +++ b/administrator/components/com_finder/config.xml @@ -7,7 +7,7 @@ @@ -17,7 +17,7 @@ @@ -34,7 +34,7 @@ description="COM_FINDER_CONFIG_DESCRIPTION_LENGTH_DESCRIPTION" /> @@ -44,7 +44,7 @@ @@ -54,7 +54,7 @@ @@ -64,7 +64,7 @@ @@ -73,7 +73,7 @@ @@ -83,7 +83,7 @@ @@ -93,7 +93,7 @@ @@ -122,7 +122,7 @@ @@ -211,7 +211,7 @@ @@ -231,7 +231,7 @@ diff --git a/administrator/components/com_finder/models/forms/filter.xml b/administrator/components/com_finder/models/forms/filter.xml index cbf7481f683fd..ec9edba8a04d9 100644 --- a/administrator/components/com_finder/models/forms/filter.xml +++ b/administrator/components/com_finder/models/forms/filter.xml @@ -7,11 +7,13 @@ + size="40" default="" required="true" /> + description="JFIELD_ALIAS_DESC" + hint="JFIELD_ALIAS_PLACEHOLDER" class="inputbox" size="45" /> @@ -55,39 +58,41 @@
- - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + +
diff --git a/administrator/components/com_finder/views/filter/tmpl/edit.php b/administrator/components/com_finder/views/filter/tmpl/edit.php index 992cfdefb04a3..cd43d416a5dd1 100644 --- a/administrator/components/com_finder/views/filter/tmpl/edit.php +++ b/administrator/components/com_finder/views/filter/tmpl/edit.php @@ -14,72 +14,42 @@ JHtml::_('formbehavior.chosen', 'select'); ?> -
+ -
- 'basic')); ?> + - -
-
form->getLabel('title'); ?>
-
form->getInput('title'); ?>
-
-
-
form->getLabel('alias'); ?>
-
form->getInput('alias'); ?>
-
-
-
form->getLabel('state'); ?>
-
form->getInput('state'); ?>
-
-
-
form->getLabel('map_count'); ?>
-
form->getInput('map_count'); ?>
-
- +
+ 'details')); ?> - - form->getGroup('params') as $field) : ?> -
- hidden) : ?> -
label; ?>
- -
input; ?>
-
- - + +
+
+
+ form->getControlGroup('map_count'); ?> - -
-
form->getLabel('created_by'); ?>
-
form->getInput('created_by'); ?>
-
-
-
form->getLabel('created_by_alias'); ?>
-
form->getInput('created_by_alias'); ?>
-
-
-
form->getLabel('created'); ?>
-
form->getInput('created'); ?>
-
- item->modified_by) : ?> -
-
form->getLabel('modified_by'); ?>
-
form->getInput('modified_by'); ?>
-
-
-
form->getLabel('modified'); ?>
-
form->getInput('modified'); ?>
+
+ + $this->filter->data)); ?>
- - +
+
+
+ +
+
+ - -
+ +
+ +
+ -
- $this->filter->data)); ?> + + +
+ diff --git a/administrator/components/com_finder/views/filter/view.html.php b/administrator/components/com_finder/views/filter/view.html.php index 58e8b176ef794..a5b570d1ded53 100644 --- a/administrator/components/com_finder/views/filter/view.html.php +++ b/administrator/components/com_finder/views/filter/view.html.php @@ -69,7 +69,7 @@ protected function addToolbar() $canDo = FinderHelper::getActions(); // Configure the toolbar. - JToolbarHelper::title(JText::_('COM_FINDER_FILTER_EDIT_TOOLBAR_TITLE'), 'finder'); + JToolbarHelper::title(JText::_('COM_FINDER_FILTER_EDIT_TOOLBAR_TITLE'), 'zoom-in finder'); // Set the actions for new and existing records. if ($isNew) diff --git a/administrator/components/com_finder/views/filters/view.html.php b/administrator/components/com_finder/views/filters/view.html.php index db9530d6e107f..aa5087e3ebfca 100644 --- a/administrator/components/com_finder/views/filters/view.html.php +++ b/administrator/components/com_finder/views/filters/view.html.php @@ -63,7 +63,7 @@ protected function addToolbar() { $canDo = FinderHelper::getActions(); - JToolbarHelper::title(JText::_('COM_FINDER_FILTERS_TOOLBAR_TITLE'), 'finder'); + JToolbarHelper::title(JText::_('COM_FINDER_FILTERS_TOOLBAR_TITLE'), 'zoom-in finder'); $toolbar = JToolbar::getInstance('toolbar'); if ($canDo->get('core.create')) diff --git a/administrator/components/com_finder/views/index/view.html.php b/administrator/components/com_finder/views/index/view.html.php index 6bb3682bf0b95..206e42f837943 100644 --- a/administrator/components/com_finder/views/index/view.html.php +++ b/administrator/components/com_finder/views/index/view.html.php @@ -68,7 +68,7 @@ protected function addToolbar() { $canDo = FinderHelper::getActions(); - JToolbarHelper::title(JText::_('COM_FINDER_INDEX_TOOLBAR_TITLE'), 'finder'); + JToolbarHelper::title(JText::_('COM_FINDER_INDEX_TOOLBAR_TITLE'), 'zoom-in finder'); $toolbar = JToolbar::getInstance('toolbar'); $toolbar->appendButton( diff --git a/administrator/components/com_finder/views/maps/view.html.php b/administrator/components/com_finder/views/maps/view.html.php index e12f437fd484d..a7a19c042bcdf 100644 --- a/administrator/components/com_finder/views/maps/view.html.php +++ b/administrator/components/com_finder/views/maps/view.html.php @@ -70,7 +70,7 @@ protected function addToolbar() include_once JPATH_COMPONENT . '/helpers/finder.php'; $canDo = FinderHelper::getActions(); - JToolbarHelper::title(JText::_('COM_FINDER_MAPS_TOOLBAR_TITLE'), 'finder'); + JToolbarHelper::title(JText::_('COM_FINDER_MAPS_TOOLBAR_TITLE'), 'zoom-in finder'); $toolbar = JToolbar::getInstance('toolbar'); if ($canDo->get('core.edit.state')) diff --git a/administrator/components/com_installer/config.xml b/administrator/components/com_installer/config.xml index c741282ab4970..5d26167e0f8be 100644 --- a/administrator/components/com_installer/config.xml +++ b/administrator/components/com_installer/config.xml @@ -5,6 +5,18 @@ label="COM_INSTALLER_PREFERENCES_LABEL" description="COM_INSTALLER_PREFERENCES_DESCRIPTION" > + + + + + default="6" />
input->getWord('installtype')) + // Load installer plugins for assistance if required: + JPluginHelper::importPlugin('installer'); + $dispatcher = JEventDispatcher::getInstance(); + + $package = null; + + // This event allows an input pre-treatment, a custom pre-packing or custom installation (e.g. from a JSON description) + $results = $dispatcher->trigger('onInstallerBeforeInstallation', array($this, &$package)); + + if (in_array(true, $results, true)) + { + return true; + } + elseif (in_array(false, $results, true)) + { + return false; + } + + $installType = $app->input->getWord('installtype'); + + if ($package === null) + { + switch ($installType) + { + case 'folder': + // Remember the 'Install from Directory' path. + $app->getUserStateFromRequest($this->_context . '.install_directory', 'install_directory'); + $package = $this->_getPackageFromFolder(); + break; + + case 'upload': + $package = $this->_getPackageFromUpload(); + break; + + case 'url': + $package = $this->_getPackageFromUrl(); + break; + + default: + $app->setUserState('com_installer.message', JText::_('COM_INSTALLER_NO_INSTALL_TYPE_FOUND')); + + return false; + break; + } + } + + // This event allows a custom installation of the package or a customization of the package: + $results = $dispatcher->trigger('onInstallerBeforeInstaller', array($this, &$package)); + + if (in_array(true, $results, true)) + { + return true; + } + elseif (in_array(false, $results, true)) { - case 'folder': - // Remember the 'Install from Directory' path. - $app->getUserStateFromRequest($this->_context . '.install_directory', 'install_directory'); - $package = $this->_getPackageFromFolder(); - break; - - case 'upload': - $package = $this->_getPackageFromUpload(); - break; - - case 'url': - $package = $this->_getPackageFromUrl(); - break; - - default: - $app->setUserState('com_installer.message', JText::_('COM_INSTALLER_NO_INSTALL_TYPE_FOUND')); - return false; - break; + if (in_array($installType, array('upload', 'url'))) + { + JInstallerHelper::cleanupInstall($package['packagefile'], $package['extractdir']); + } + + return false; } // Was the package unpacked? - if (!$package) + if (!$package || !$package['type']) { + if (in_array($installType, array('upload', 'url'))) + { + JInstallerHelper::cleanupInstall($package['packagefile'], $package['extractdir']); + } + $app->setUserState('com_installer.message', JText::_('COM_INSTALLER_UNABLE_TO_FIND_INSTALL_PACKAGE')); return false; } @@ -120,6 +166,9 @@ public function install() $result = true; } + // This event allows a custom a post-flight: + $dispatcher->trigger('onInstallerAfterInstaller', array($this, &$package, $installer, &$result, &$msg)); + // Set some model state values $app = JFactory::getApplication(); $app->enqueueMessage($msg); @@ -189,7 +238,7 @@ protected function _getPackageFromUpload() JFile::upload($tmp_src, $tmp_dest); // Unpack the downloaded package file - $package = JInstallerHelper::unpack($tmp_dest); + $package = JInstallerHelper::unpack($tmp_dest, true); return $package; } @@ -223,7 +272,6 @@ protected function _getPackageFromFolder() if (!$type) { JError::raiseWarning('', JText::_('COM_INSTALLER_MSG_INSTALL_PATH_DOES_NOT_HAVE_A_VALID_PACKAGE')); - return false; } $package['packagefile'] = null; @@ -255,6 +303,20 @@ protected function _getPackageFromUrl() return false; } + // Handle updater XML file case: + if (preg_match('/\.xml\s*$/', $url)) + { + jimport('joomla.updater.update'); + $update = new JUpdate; + $update->loadFromXML($url); + $package_url = trim($update->get('downloadurl', false)->_data); + if ($package_url) + { + $url = $package_url; + } + unset($update); + } + // Download the package at the URL given $p_file = JInstallerHelper::downloadPackage($url); @@ -269,7 +331,7 @@ protected function _getPackageFromUrl() $tmp_dest = $config->get('tmp_path'); // Unpack the downloaded package file - $package = JInstallerHelper::unpack($tmp_dest . '/' . $p_file); + $package = JInstallerHelper::unpack($tmp_dest . '/' . $p_file, true); return $package; } diff --git a/administrator/components/com_installer/views/default/view.php b/administrator/components/com_installer/views/default/view.php index ea599192aecc9..73c7c1c77b854 100644 --- a/administrator/components/com_installer/views/default/view.php +++ b/administrator/components/com_installer/views/default/view.php @@ -73,7 +73,7 @@ public function display($tpl = null) protected function addToolbar() { $canDo = InstallerHelper::getActions(); - JToolbarHelper::title(JText::_('COM_INSTALLER_HEADER_' . $this->getName()), 'install.png'); + JToolbarHelper::title(JText::_('COM_INSTALLER_HEADER_' . $this->getName()), 'puzzle install'); if ($canDo->get('core.admin')) { diff --git a/administrator/components/com_installer/views/install/tmpl/default.php b/administrator/components/com_installer/views/install/tmpl/default.php index 94202e193407c..b7c3ce53b613a 100644 --- a/administrator/components/com_installer/views/install/tmpl/default.php +++ b/administrator/components/com_installer/views/install/tmpl/default.php @@ -8,9 +8,11 @@ */ defined('_JEXEC') or die; + +JHtml::_('bootstrap.tooltip'); ?> -
+
sidebar)) : ?>
@@ -70,15 +106,42 @@ showMessage) : ?> loadTemplate('message'); ?> + showJedAndWebInstaller) : ?> +
+ ">× + Joomla Extension Directory now available with Install from Web on this page: and enjoy" + echo preg_replace( + '#([^<]*)([^<]*)([^<]*)([^<]*)([^<]*)([^<]*)#', + '\1' + . '' . '\2' . '' + . '\3' + . '' . '\4' . '' + . '\5' + . '' + . '\7', + str_replace('"', '"', JText::_('COM_INSTALLER_INSTALL_FROM_WEB_INFORMATION')) + ) + + /* results in: + Joomla Extension Directory + now available with Install from Web on this page:   + + */ + ?> +
'upload')); ?> - + trigger('onInstallerViewBeforeFirstTab', array()); ?> + +
- +
- +
@@ -117,8 +180,11 @@
+ + trigger('onInstallerViewAfterLastTab', array()); ?> + ftp) : ?> loadTemplate('ftp'); ?> diff --git a/administrator/components/com_installer/views/install/view.html.php b/administrator/components/com_installer/views/install/view.html.php index 8735383ad8c38..b5e4173209731 100644 --- a/administrator/components/com_installer/views/install/view.html.php +++ b/administrator/components/com_installer/views/install/view.html.php @@ -38,6 +38,13 @@ public function display($tpl = null) $this->paths = &$paths; $this->state = &$state; + $this->showJedAndWebInstaller = JComponentHelper::getParams('com_installer')->get('show_jed_info', 1); + + JPluginHelper::importPlugin('installer'); + + $dispatcher = JEventDispatcher::getInstance(); + $dispatcher->trigger('onInstallerBeforeDisplay', array(&$this->showJedAndWebInstaller, $this)); + parent::display($tpl); } diff --git a/administrator/components/com_installer/views/languages/view.html.php b/administrator/components/com_installer/views/languages/view.html.php index 188501ffe81ce..4b4f18f89a625 100644 --- a/administrator/components/com_installer/views/languages/view.html.php +++ b/administrator/components/com_installer/views/languages/view.html.php @@ -66,7 +66,7 @@ public function display($tpl = null) protected function addToolbar() { $canDo = InstallerHelper::getActions(); - JToolBarHelper::title(JText::_('COM_INSTALLER_HEADER_' . $this->getName()), 'install.png'); + JToolBarHelper::title(JText::_('COM_INSTALLER_HEADER_' . $this->getName()), 'puzzle install'); if ($canDo->get('core.admin')) { diff --git a/administrator/components/com_joomlaupdate/controllers/update.php b/administrator/components/com_joomlaupdate/controllers/update.php index 2321262bd1c92..98c73ba966e3e 100644 --- a/administrator/components/com_joomlaupdate/controllers/update.php +++ b/administrator/components/com_joomlaupdate/controllers/update.php @@ -27,6 +27,12 @@ class JoomlaupdateControllerUpdate extends JControllerLegacy */ public function download() { + $options['format'] = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}'; + $options['text_file'] = 'joomla_update.php'; + JLog::addLogger($options, JLog::INFO, array('Update', 'databasequery', 'jerror')); + $user = JFactory::getUser(); + JLog::add(JText::sprintf('COM_JOOMLAUPDATE_UPDATE_LOG_START', $user->id, $user->name, JVERSION), JLog::INFO, 'Update'); + $this->_applyCredentials(); $model = $this->getModel('Default'); @@ -39,6 +45,7 @@ public function download() { JFactory::getApplication()->setUserState('com_joomlaupdate.file', $file); $url = 'index.php?option=com_joomlaupdate&task=update.install'; + JLog::add(JText::sprintf('COM_JOOMLAUPDATE_UPDATE_LOG_FILE', $file), JLog::INFO, 'Update'); } else { @@ -59,6 +66,11 @@ public function download() */ public function install() { + $options['format'] = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}'; + $options['text_file'] = 'joomla_update.php'; + JLog::addLogger($options, JLog::INFO, array('Update', 'databasequery', 'jerror')); + JLog::add(JText::_('COM_JOOMLAUPDATE_UPDATE_LOG_INSTALL'), JLog::INFO, 'Update'); + $this->_applyCredentials(); $model = $this->getModel('Default'); @@ -78,6 +90,10 @@ public function install() */ public function finalise() { + $options['format'] = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}'; + $options['text_file'] = 'joomla_update.php'; + JLog::addLogger($options, JLog::INFO, array('Update', 'databasequery', 'jerror')); + JLog::add(JText::_('COM_JOOMLAUPDATE_UPDATE_LOG_FINALISE'), JLog::INFO, 'Update'); $this->_applyCredentials(); $model = $this->getModel('Default'); @@ -97,6 +113,10 @@ public function finalise() */ public function cleanup() { + $options['format'] = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}'; + $options['text_file'] = 'joomla_update.php'; + JLog::addLogger($options, JLog::INFO, array('Update', 'databasequery', 'jerror')); + JLog::add(JText::_('COM_JOOMLAUPDATE_UPDATE_LOG_CLEANUP'), JLog::INFO, 'Update'); $this->_applyCredentials(); $model = $this->getModel('Default'); @@ -105,6 +125,7 @@ public function cleanup() $url = 'index.php?option=com_joomlaupdate&layout=complete'; $this->setRedirect($url); + JLog::add(JText::sprintf('COM_JOOMLAUPDATE_UPDATE_LOG_COMPLETE', JVERSION), JLog::INFO, 'Update'); } /** diff --git a/administrator/components/com_joomlaupdate/models/default.php b/administrator/components/com_joomlaupdate/models/default.php index f276897574ebc..ef45115909d14 100644 --- a/administrator/components/com_joomlaupdate/models/default.php +++ b/administrator/components/com_joomlaupdate/models/default.php @@ -284,6 +284,7 @@ public function download() protected function downloadPackage($url, $target) { JLoader::import('helpers.download', JPATH_COMPONENT_ADMINISTRATOR); + JLog::add(JText::sprintf('COM_JOOMLAUPDATE_UPDATE_LOG_URL', $packageURL), JLog::INFO, 'Update'); $result = AdmintoolsHelperDownload::download($url, $target); if (!$result) diff --git a/administrator/components/com_joomlaupdate/views/default/view.html.php b/administrator/components/com_joomlaupdate/views/default/view.html.php index 92082a412db79..bd482842d7733 100644 --- a/administrator/components/com_joomlaupdate/views/default/view.html.php +++ b/administrator/components/com_joomlaupdate/views/default/view.html.php @@ -42,7 +42,7 @@ public function display($tpl=null) $this->assign('methodSelect', JoomlaupdateHelperSelect::getMethods($ftp['enabled'])); // Set the toolbar information - JToolbarHelper::title(JText::_('COM_JOOMLAUPDATE_OVERVIEW'), 'install'); + JToolbarHelper::title(JText::_('COM_JOOMLAUPDATE_OVERVIEW'), 'arrow-up-2 install'); JToolbarHelper::custom('update.purge', 'purge', 'purge', 'JTOOLBAR_PURGE_CACHE', false, false); // Add toolbar buttons diff --git a/administrator/components/com_joomlaupdate/views/update/view.html.php b/administrator/components/com_joomlaupdate/views/update/view.html.php index f064be7788453..9228f61615a22 100644 --- a/administrator/components/com_joomlaupdate/views/update/view.html.php +++ b/administrator/components/com_joomlaupdate/views/update/view.html.php @@ -33,7 +33,7 @@ public function display($tpl=null) $returnUrl = 'index.php?option=com_joomlaupdate&task=update.finalise'; // Set the toolbar information - JToolbarHelper::title(JText::_('COM_JOOMLAUPDATE_OVERVIEW'), 'install'); + JToolbarHelper::title(JText::_('COM_JOOMLAUPDATE_OVERVIEW'), 'arrow-up-2 install'); JToolBarHelper::divider(); JToolBarHelper::help('JHELP_COMPONENTS_JOOMLA_UPDATE'); diff --git a/administrator/components/com_languages/models/forms/override.xml b/administrator/components/com_languages/models/forms/override.xml index 7f1851cb87f5d..f7d0834ce424e 100644 --- a/administrator/components/com_languages/models/forms/override.xml +++ b/administrator/components/com_languages/models/forms/override.xml @@ -40,8 +40,7 @@ diff --git a/administrator/components/com_languages/views/installed/view.html.php b/administrator/components/com_languages/views/installed/view.html.php index 4f249782820c4..e61c4d311c21e 100644 --- a/administrator/components/com_languages/views/installed/view.html.php +++ b/administrator/components/com_languages/views/installed/view.html.php @@ -77,7 +77,7 @@ protected function addToolbar() $canDo = LanguagesHelper::getActions(); - JToolbarHelper::title(JText::_('COM_LANGUAGES_VIEW_INSTALLED_TITLE'), 'langmanager.png'); + JToolbarHelper::title(JText::_('COM_LANGUAGES_VIEW_INSTALLED_TITLE'), 'comments-2 langmanager'); if ($canDo->get('core.edit.state')) { diff --git a/administrator/components/com_languages/views/language/view.html.php b/administrator/components/com_languages/views/language/view.html.php index 7d692fa21c420..60898abb60911 100644 --- a/administrator/components/com_languages/views/language/view.html.php +++ b/administrator/components/com_languages/views/language/view.html.php @@ -57,7 +57,7 @@ protected function addToolbar() $isNew = empty($this->item->lang_id); $canDo = LanguagesHelper::getActions(); - JToolbarHelper::title(JText::_($isNew ? 'COM_LANGUAGES_VIEW_LANGUAGE_EDIT_NEW_TITLE' : 'COM_LANGUAGES_VIEW_LANGUAGE_EDIT_EDIT_TITLE'), 'langmanager.png'); + JToolbarHelper::title(JText::_($isNew ? 'COM_LANGUAGES_VIEW_LANGUAGE_EDIT_NEW_TITLE' : 'COM_LANGUAGES_VIEW_LANGUAGE_EDIT_EDIT_TITLE'), 'comments-2 langmanager'); // If a new item, can save. if ($isNew && $canDo->get('core.create')) diff --git a/administrator/components/com_languages/views/languages/view.html.php b/administrator/components/com_languages/views/languages/view.html.php index 7ef9f864dd8da..73f0d36ec73d8 100644 --- a/administrator/components/com_languages/views/languages/view.html.php +++ b/administrator/components/com_languages/views/languages/view.html.php @@ -57,7 +57,7 @@ protected function addToolbar() require_once JPATH_COMPONENT.'/helpers/languages.php'; $canDo = LanguagesHelper::getActions(); - JToolbarHelper::title(JText::_('COM_LANGUAGES_VIEW_LANGUAGES_TITLE'), 'langmanager.png'); + JToolbarHelper::title(JText::_('COM_LANGUAGES_VIEW_LANGUAGES_TITLE'), 'comments-2 langmanager'); if ($canDo->get('core.create')) { diff --git a/administrator/components/com_languages/views/override/tmpl/edit.php b/administrator/components/com_languages/views/override/tmpl/edit.php index e046038628a81..a698b10478f9f 100644 --- a/administrator/components/com_languages/views/override/tmpl/edit.php +++ b/administrator/components/com_languages/views/override/tmpl/edit.php @@ -14,7 +14,6 @@ JHtml::_('behavior.formvalidation'); JHtml::_('behavior.keepalive'); JHtml::_('formbehavior.chosen', 'select'); - ?> - - -
- 'details')); ?> - - -
-
-
-
- form->getLabel('type'); ?> -
-
- form->getInput('type'); ?> -
-
- item->type == 'url') : ?> - form->setFieldAttribute('link', 'readonly', 'false');?> -
-
- form->getLabel('link'); ?> -
-
- form->getInput('link'); ?> -
-
- - - item->link == 'index.php?Itemid=') : ?> - form->getFieldsets('params'); ?> - form->getFieldset('aliasoptions') as $field) : ?> -
-
- label; ?> -
-
- input; ?> -
-
- - - - item->link == 'index.php?option=com_wrapper&view=wrapper') : ?> - form->getFieldsets('params'); ?> - form->getFieldset('request') as $field) : ?> -
-
- label; ?> -
-
- input; ?> -
-
- - + - form->getFieldsets('request'); + item->type == 'url') + { + $this->form->setFieldAttribute('alias', 'type', 'hidden'); + } + ?> + - if (!empty($fieldSets)) : - $fieldSet = array_shift($fieldSets); - $label = !empty($fieldSet->label) ? $fieldSet->label : 'COM_MENUS_' . $fieldSet->name . '_FIELDSET_LABEL'; - if (isset($fieldSet->description) && trim($fieldSet->description)) : - echo '

' . $this->escape(JText::_($fieldSet->description)) . '

'; - endif; - ?> - - form->getFieldset('request') as $field) : ?> - hidden) : ?> -
-
- label; ?> -
-
- input; ?> -
-
- input; ?> - - - - -
-
- form->getLabel('title'); ?> -
-
- form->getInput('title'); ?> -
-
- item->type == 'alias') : ?> -
-
- form->getLabel('aliastip'); ?> -
-
- - item->type != 'url') : ?> -
-
- form->getLabel('alias'); ?> -
-
- form->getInput('alias'); ?> -
-
- -
-
-
- form->getLabel('published'); ?> -
-
- form->getInput('published'); ?> -
-
- item->type !== 'url') : ?> -
-
- form->getLabel('link'); ?> -
-
- form->getInput('link'); ?> -
-
- -
-
- form->getLabel('menutype'); ?> -
-
- form->getInput('menutype'); ?> -
-
-
-
- form->getLabel('parent_id'); ?> -
-
- form->getInput('parent_id'); ?> -
-
-
-
- form->getLabel('menuordering'); ?> -
-
- form->getInput('menuordering'); ?> -
-
-
-
-
-
- form->getLabel('access'); ?> -
-
- form->getInput('access'); ?> -
-
- item->type == 'component') : ?> -
-
- form->getLabel('home'); ?> -
-
- form->getInput('home'); ?> -
-
- -
-
- form->getLabel('browserNav'); ?> -
-
- form->getInput('browserNav'); ?> -
-
-
-
- form->getLabel('template_style_id'); ?> -
-
- form->getInput('template_style_id'); ?> -
-
-
-
- form->getLabel('language'); ?> -
-
- form->getInput('language'); ?> -
-
-
-
- form->getLabel('note'); ?> -
-
- form->getInput('note'); ?> -
-
-
-
- form->getLabel('id'); ?> -
-
- form->getInput('id'); ?> -
-
-
-
- +
- - loadTemplate('options'); ?> - + 'details')); ?> - + +
+
+ item->type == 'alias') + { + echo $this->form->getControlGroup('aliastip'); + } + + echo $this->form->getControlGroup('type'); + + if ($this->item->type == 'alias') + { + echo $this->form->getControlGroups('aliasoptions'); + } + + echo $this->form->getControlGroups('request'); + + if ($this->item->type == 'url') + { + $this->form->setFieldAttribute('link', 'readonly', 'false'); + } + echo $this->form->getControlGroup('link'); + + echo $this->form->getControlGroup('browserNav'); + echo $this->form->getControlGroup('template_style_id'); + ?> +
+
+ fields = array( + 'menutype', + 'parent_id', + 'published', + 'home', + 'access', + 'language', + 'note' + + ); + if ($this->item->type != 'component') + { + $this->fields = array_diff($this->fields, array('home')); + } + ?> + +
+
+ + + fieldsets = array(); + $this->ignore_fieldsets = array('aliasoptions', 'request'); + echo JLayoutHelper::render('joomla.edit.params', $this); + ?> + + - loadTemplate('associations'); ?> + loadTemplate('associations'); ?> - + - modules)) : ?> - - loadTemplate('modules'); ?> - - + modules)) : ?> + + loadTemplate('modules'); ?> + + -
+
form->getInput('component_id'); ?> diff --git a/administrator/components/com_menus/views/item/view.html.php b/administrator/components/com_menus/views/item/view.html.php index 47e75ea2bc07a..718ca8ff1cfb3 100644 --- a/administrator/components/com_menus/views/item/view.html.php +++ b/administrator/components/com_menus/views/item/view.html.php @@ -62,7 +62,7 @@ protected function addToolbar() $checkedOut = !($this->item->checked_out == 0 || $this->item->checked_out == $user->get('id')); $canDo = MenusHelper::getActions($this->state->get('filter.parent_id')); - JToolbarHelper::title(JText::_($isNew ? 'COM_MENUS_VIEW_NEW_ITEM_TITLE' : 'COM_MENUS_VIEW_EDIT_ITEM_TITLE'), 'menu-add'); + JToolbarHelper::title(JText::_($isNew ? 'COM_MENUS_VIEW_NEW_ITEM_TITLE' : 'COM_MENUS_VIEW_EDIT_ITEM_TITLE'), 'list menu-add'); // If a new item, can save the item. Allow users with edit permissions to apply changes to prevent returning to grid. if ($isNew && $canDo->get('core.create')) diff --git a/administrator/components/com_menus/views/items/view.html.php b/administrator/components/com_menus/views/items/view.html.php index 5e7493f5fcb00..c715b5cd7bd23 100644 --- a/administrator/components/com_menus/views/items/view.html.php +++ b/administrator/components/com_menus/views/items/view.html.php @@ -211,7 +211,7 @@ protected function addToolbar() // Get the toolbar object instance $bar = JToolBar::getInstance('toolbar'); - JToolbarHelper::title(JText::_('COM_MENUS_VIEW_ITEMS_TITLE'), 'menumgr.png'); + JToolbarHelper::title(JText::_('COM_MENUS_VIEW_ITEMS_TITLE'), 'list menumgr'); if ($canDo->get('core.create')) { diff --git a/administrator/components/com_menus/views/menu/view.html.php b/administrator/components/com_menus/views/menu/view.html.php index f2979e5bbc4de..d0f3cb37b38bd 100644 --- a/administrator/components/com_menus/views/menu/view.html.php +++ b/administrator/components/com_menus/views/menu/view.html.php @@ -57,7 +57,7 @@ protected function addToolbar() $isNew = ($this->item->id == 0); $canDo = MenusHelper::getActions($this->state->get('filter.parent_id')); - JToolbarHelper::title(JText::_($isNew ? 'COM_MENUS_VIEW_NEW_MENU_TITLE' : 'COM_MENUS_VIEW_EDIT_MENU_TITLE'), 'menu.png'); + JToolbarHelper::title(JText::_($isNew ? 'COM_MENUS_VIEW_NEW_MENU_TITLE' : 'COM_MENUS_VIEW_EDIT_MENU_TITLE'), 'list menu'); // If a new item, can save the item. Allow users with edit permissions to apply changes to prevent returning to grid. if ($isNew && $canDo->get('core.create')) diff --git a/administrator/components/com_menus/views/menus/view.html.php b/administrator/components/com_menus/views/menus/view.html.php index d7dcbb3327b02..71eadea56fc77 100644 --- a/administrator/components/com_menus/views/menus/view.html.php +++ b/administrator/components/com_menus/views/menus/view.html.php @@ -61,7 +61,7 @@ protected function addToolbar() $canDo = MenusHelper::getActions($this->state->get('filter.parent_id')); - JToolbarHelper::title(JText::_('COM_MENUS_VIEW_MENUS_TITLE'), 'menumgr.png'); + JToolbarHelper::title(JText::_('COM_MENUS_VIEW_MENUS_TITLE'), 'list menumgr'); if ($canDo->get('core.create')) { diff --git a/administrator/components/com_menus/views/menutypes/view.html.php b/administrator/components/com_menus/views/menutypes/view.html.php index fd9e592faa51b..177d8cdf73d2b 100644 --- a/administrator/components/com_menus/views/menutypes/view.html.php +++ b/administrator/components/com_menus/views/menutypes/view.html.php @@ -88,7 +88,7 @@ public function display($tpl = null) protected function addToolbar() { // Add page title - JToolbarHelper::title(JText::_('COM_MENUS'), 'menumgr.png'); + JToolbarHelper::title(JText::_('COM_MENUS'), 'list menumgr'); // Get the toolbar object instance $bar = JToolBar::getInstance('toolbar'); diff --git a/administrator/components/com_messages/models/forms/config.xml b/administrator/components/com_messages/models/forms/config.xml index 939f7e91d00c4..3ec03e3b75e0c 100644 --- a/administrator/components/com_messages/models/forms/config.xml +++ b/administrator/components/com_messages/models/forms/config.xml @@ -4,7 +4,7 @@ @@ -17,7 +17,7 @@ diff --git a/administrator/components/com_messages/views/message/view.html.php b/administrator/components/com_messages/views/message/view.html.php index 10c93723ddc75..182e3c7d74e93 100644 --- a/administrator/components/com_messages/views/message/view.html.php +++ b/administrator/components/com_messages/views/message/view.html.php @@ -50,14 +50,14 @@ protected function addToolbar() { if ($this->getLayout() == 'edit') { - JToolbarHelper::title(JText::_('COM_MESSAGES_WRITE_PRIVATE_MESSAGE'), 'new-privatemessage.png'); + JToolbarHelper::title(JText::_('COM_MESSAGES_WRITE_PRIVATE_MESSAGE'), 'envelope-opened new-privatemessage'); JToolbarHelper::save('message.save', 'COM_MESSAGES_TOOLBAR_SEND'); JToolbarHelper::cancel('message.cancel'); JToolbarHelper::help('JHELP_COMPONENTS_MESSAGING_WRITE'); } else { - JToolbarHelper::title(JText::_('COM_MESSAGES_VIEW_PRIVATE_MESSAGE'), 'inbox.png'); + JToolbarHelper::title(JText::_('COM_MESSAGES_VIEW_PRIVATE_MESSAGE'), 'envelope inbox'); $sender = JUser::getInstance($this->item->user_id_from); if ($sender->authorise('core.admin') || $sender->authorise('core.manage', 'com_messages') && $sender->authorise('core.login.admin')) { diff --git a/administrator/components/com_messages/views/messages/view.html.php b/administrator/components/com_messages/views/messages/view.html.php index 7b832ca8e24d3..bba0e94a68a63 100644 --- a/administrator/components/com_messages/views/messages/view.html.php +++ b/administrator/components/com_messages/views/messages/view.html.php @@ -56,7 +56,7 @@ protected function addToolbar() $state = $this->get('State'); $canDo = MessagesHelper::getActions(); - JToolbarHelper::title(JText::_('COM_MESSAGES_MANAGER_MESSAGES'), 'inbox.png'); + JToolbarHelper::title(JText::_('COM_MESSAGES_MANAGER_MESSAGES'), 'envelope inbox'); if ($canDo->get('core.create')) { diff --git a/administrator/components/com_modules/controller.php b/administrator/components/com_modules/controller.php index d00fa1466fd31..f95a52585f9d2 100644 --- a/administrator/components/com_modules/controller.php +++ b/administrator/components/com_modules/controller.php @@ -21,10 +21,11 @@ class ModulesController extends JControllerLegacy /** * Method to display a view. * - * @param boolean If true, the view output will be cached - * @param array An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}. + * @param boolean $cachable If true, the view output will be cached + * @param array|boolean $urlparams An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()} + . * - * @return JController This object to support chaining. + * @return JController This object to support chaining. * @since 1.5 */ public function display($cachable = false, $urlparams = false) @@ -38,17 +39,6 @@ public function display($cachable = false, $urlparams = false) $layout = $this->input->get('layout', 'default'); $id = $this->input->getInt('id'); - // Check for edit form. - if ($view == 'module' && $layout == 'edit' && !$this->checkEditId('com_modules.edit.module', $id)) - { - // Somehow the person just went to the form - we don't allow that. - $this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id)); - $this->setMessage($this->getError(), 'error'); - $this->setRedirect(JRoute::_('index.php?option=com_modules&view=modules', false)); - - return false; - } - - parent::display(); + return parent::display(); } } diff --git a/administrator/components/com_modules/models/forms/module.xml b/administrator/components/com_modules/models/forms/module.xml index d6b7f89c8b6c5..f4192d7181de5 100644 --- a/administrator/components/com_modules/models/forms/module.xml +++ b/administrator/components/com_modules/models/forms/module.xml @@ -11,16 +11,18 @@ JHIDE - addScriptDeclaration($script); + ?> - -
-
    -
    • -
    • - - -
    • - - item->client_id == 0) : ?> -
    • - -
- -
-
-
-
-
-
- form->getLabel('title'); ?> -
-
- form->getInput('title'); ?> -
-
-
-
- form->getLabel('showtitle'); ?> -
-
- form->getInput('showtitle'); ?> -
-
-
-
- form->getLabel('position'); ?> -
-
- loadTemplate('positions'); ?> -
-
-
- item->xml->name != 'Login Form') : ?> -
-
- form->getLabel('published'); ?> -
-
- form->getInput('published'); ?> -
-
- -
-
- form->getLabel('access'); ?> -
-
- form->getInput('access'); ?> -
-
-
-
- form->getLabel('ordering'); ?> -
-
- form->getInput('ordering'); ?> -
-
- item->xml->name != 'Login Form') : ?> -
-
- form->getLabel('publish_up'); ?> -
-
- form->getInput('publish_up'); ?> -
-
-
-
- form->getLabel('publish_down'); ?> -
-
- form->getInput('publish_down'); ?> -
-
- - -
-
- form->getLabel('language'); ?> -
-
- form->getInput('language'); ?> -
-
-
-
- form->getLabel('note'); ?> -
-
- form->getInput('note'); ?> -
+ + + + +
+ 'general')); ?> + + + +
+
+ item->xml) : ?> + item->xml->description) : ?> +

+ item->xml) + { + echo ($text = (string) $this->item->xml->name) ? JText::_($text) : $this->item->module; + } + else + { + echo JText::_('COM_MODULES_ERR_XML'); + } + ?> +

+
+ + item->client_id == 0 ? JText::_('JSITE') : JText::_('JADMINISTRATOR'); ?> +
-
-
- item->xml) : ?> - item->xml->description)) : ?> -
-

- - item->id) : ?> - : item->id; ?> - -

-
-
- -
-
-
- item->client_id == 0 ? JText::_('JSITE') : JText::_('JADMINISTRATOR'); ?> / item->xml) echo ($text = (string) $this->item->xml->name) ? JText::_($text) : $this->item->module;else echo JText::_('COM_MODULES_ERR_XML');?> -
-
+
+ item->xml->description); + $this->fieldset = 'description'; + $long_description = JLayoutHelper::render('joomla.edit.fieldset', $this); + if(!$long_description) { + $truncated = JHtmlString::truncate($short_description, 550, true, false); + if(strlen($truncated) > 500) { + $long_description = $short_description; + $short_description = JHtmlString::truncate($truncated, 250); + if($short_description == $long_description) { + $long_description = ''; + } + } + } + ?> +

+ +

+ + + +

- -
- -
-
-
-
- loadTemplate('options'); ?> +
+ + +
+ + form->getInput('content'); + } + $this->fieldset = 'basic'; + $html = JLayoutHelper::render('joomla.edit.fieldset', $this); + echo $html ? '
' . $html : ''; + ?>
+
+ fields = array( + 'showtitle', + 'position', + 'published', + 'publish_up', + 'publish_down', + 'access', + 'language', + 'note' + ); - -
- form->getInput('content'); ?> + if ((string) $this->item->xml->name == 'mod_login') + { + $this->fields = array_diff($this->fields, array('published', 'publish_up', 'publish_down')); + } + ?> +
- - item->client_id == 0) : ?> -
- loadTemplate('assignment'); ?> -
-
+ + + + + + + + + item->client_id == 0) : ?> + + loadTemplate('assignment'); ?> + + + + fieldsets = array(); + $this->ignore_fieldsets = array('basic'); + echo JLayoutHelper::render('joomla.edit.params', $this); + ?> + + form->getInput('module'); ?> form->getInput('client_id'); ?> -
+
diff --git a/administrator/components/com_modules/views/module/view.html.php b/administrator/components/com_modules/views/module/view.html.php index d73726ae44975..4117d420f7bad 100644 --- a/administrator/components/com_modules/views/module/view.html.php +++ b/administrator/components/com_modules/views/module/view.html.php @@ -58,7 +58,7 @@ protected function addToolbar() $checkedOut = !($this->item->checked_out == 0 || $this->item->checked_out == $user->get('id')); $canDo = ModulesHelper::getActions($this->state->get('filter.category_id'), $this->item->id); - JToolbarHelper::title(JText::sprintf('COM_MODULES_MANAGER_MODULE', JText::_($this->item->module)), 'module.png'); + JToolbarHelper::title(JText::sprintf('COM_MODULES_MANAGER_MODULE', JText::_($this->item->module)), 'cube module'); // If not checked out, can save the item. if (!$checkedOut && ($canDo->get('core.edit') || $canDo->get('core.create') )) diff --git a/administrator/components/com_modules/views/modules/tmpl/default.php b/administrator/components/com_modules/views/modules/tmpl/default.php index 73d681ba81188..6a9ec686d27cd 100644 --- a/administrator/components/com_modules/views/modules/tmpl/default.php +++ b/administrator/components/com_modules/views/modules/tmpl/default.php @@ -11,7 +11,6 @@ JHtml::_('bootstrap.tooltip'); JHtml::_('behavior.multiselect'); -JHtml::_('dropdown.init'); JHtml::_('formbehavior.chosen', 'select'); $client = $this->state->get('filter.client_id') ? 'administrator' : 'site'; @@ -159,7 +158,19 @@ id); ?> - published, $i, $canChange, 'cb'); ?> +
+ published, $i, $canChange, 'cb'); ?> + escape($item->title)); + ?> +
@@ -170,7 +181,7 @@ escape($item->title); ?> - escape($item->title); ?> + escape($item->title); ?> note)) : ?> @@ -179,33 +190,6 @@
-
- id, 'module.'); - JHtml::_('dropdown.divider'); - if ($item->published) : - JHtml::_('dropdown.unpublish', 'cb' . $i, 'modules.'); - else : - JHtml::_('dropdown.publish', 'cb' . $i, 'modules.'); - endif; - - JHtml::_('dropdown.divider'); - - if ($item->checked_out) : - JHtml::_('dropdown.checkin', 'cb' . $i, 'modules.'); - endif; - - if ($trashed) : - JHtml::_('dropdown.untrash', 'cb' . $i, 'modules.'); - else : - JHtml::_('dropdown.trash', 'cb' . $i, 'modules.'); - endif; - - // Render dropdown list - echo JHtml::_('dropdown.render'); - ?> -
position) : ?> diff --git a/administrator/components/com_modules/views/modules/view.html.php b/administrator/components/com_modules/views/modules/view.html.php index a668b6a828e1c..fd3f618f5e37f 100644 --- a/administrator/components/com_modules/views/modules/view.html.php +++ b/administrator/components/com_modules/views/modules/view.html.php @@ -68,7 +68,7 @@ protected function addToolbar() // Get the toolbar object instance $bar = JToolBar::getInstance('toolbar'); - JToolbarHelper::title(JText::_('COM_MODULES_MANAGER_MODULES'), 'module.png'); + JToolbarHelper::title(JText::_('COM_MODULES_MANAGER_MODULES'), 'cube module'); if ($canDo->get('core.create')) { diff --git a/administrator/components/com_modules/views/select/view.html.php b/administrator/components/com_modules/views/select/view.html.php index c5193a1b7cc36..e593636984e12 100644 --- a/administrator/components/com_modules/views/select/view.html.php +++ b/administrator/components/com_modules/views/select/view.html.php @@ -52,7 +52,7 @@ public function display($tpl = null) protected function addToolbar() { // Add page title - JToolbarHelper::title(JText::_('COM_MODULES_MANAGER_MODULES'), 'module.png'); + JToolbarHelper::title(JText::_('COM_MODULES_MANAGER_MODULES'), 'cube module'); // Get the toolbar object instance $bar = JToolBar::getInstance('toolbar'); diff --git a/administrator/components/com_newsfeeds/config.xml b/administrator/components/com_newsfeeds/config.xml index 2717dc8826afa..3ff6977796d99 100644 --- a/administrator/components/com_newsfeeds/config.xml +++ b/administrator/components/com_newsfeeds/config.xml @@ -18,7 +18,7 @@ @@ -54,7 +54,7 @@ id="show_feed_description" name="show_feed_description" type="radio" - class="btn-group" + class="btn-group btn-group-yesno" default="1" label="COM_NEWSFEEDS_FIELD_SHOW_FEED_DESCRIPTION_LABEL" description="COM_NEWSFEEDS_FIELD_SHOW_FEED_DESCRIPTION_DESC"> @@ -66,7 +66,7 @@ id="show_item_description" name="show_item_description" type="radio" - class="btn-group" + class="btn-group btn-group-yesno" default="1" label="COM_NEWSFEEDS_FIELD_SHOW_ITEM_DESCRIPTION_LABEL" description="COM_NEWSFEEDS_FIELD_SHOW_ITEM_DESCRIPTION_DESC"> @@ -118,7 +118,7 @@ id="show_tags" name="show_tags" type="radio" - class="btn-group" + class="btn-group btn-group-yesno" default="1" label="COM_NEWSFEEDS_FIELD_SHOW_TAGS_LABEL" description="COM_NEWSFEEDS_FIELD_SHOW_TAGS_DESC"> @@ -143,7 +143,7 @@ /> @@ -167,7 +167,7 @@ @@ -241,7 +241,7 @@ @@ -263,7 +263,7 @@ @@ -34,25 +37,25 @@ - - - @@ -61,7 +64,8 @@ filter="JComponentHelper::filterText" label="JGLOBAL_DESCRIPTION" description="COM_NEWSFEEDS_FIELD_DESCRIPTION_DESC" /> - @@ -78,18 +82,6 @@ - - - - - - + description="JFIELD_ACCESS_DESC" class="inputbox" size="1" />
- +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php index 3a7bfe1610ca1..6f0311bba08b1 100644 --- a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php +++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php @@ -18,186 +18,66 @@ $app = JFactory::getApplication(); $input = $app->input; - $assoc = JLanguageAssociations::isEnabled(); ?> -
- - + -
- -
+ -
- 'details')); ?> +
+ 'details')); ?> item->id) ? JText::_('COM_NEWSFEEDS_NEW_NEWSFEED', true) : JText::sprintf('COM_NEWSFEEDS_EDIT_NEWSFEED', $this->item->id, true)); ?> -
-
form->getLabel('name'); ?>
-
form->getInput('name'); ?>
-
-
-
form->getLabel('link'); ?>
-
form->getInput('link'); ?>
-
-
-
form->getLabel('catid'); ?>
-
form->getInput('catid'); ?>
-
-
-
form->getLabel('description'); ?>
-
form->getInput('description'); ?>
-
- -
-

-
-
- form->getLabel('images'); ?> -
-
- form->getInput('images'); ?> -
+
+
+
+ form->getControlGroup('link'); ?> + form->getControlGroup('description'); ?>
- form->getGroup('images') as $field) : ?> -
- hidden) : ?> -
- label; ?> -
- -
- input; ?> -
-
-
- +
+ +
+
-
-
form->getLabel('alias'); ?>
-
form->getInput('alias'); ?>
-
-
-
form->getLabel('id'); ?>
-
form->getInput('id'); ?>
-
-
-
form->getLabel('created_by'); ?>
-
form->getInput('created_by'); ?>
-
-
-
form->getLabel('created_by_alias'); ?>
-
form->getInput('created_by_alias'); ?>
-
-
-
form->getLabel('created'); ?>
-
form->getInput('created'); ?>
-
-
-
form->getLabel('publish_up'); ?>
-
form->getInput('publish_up'); ?>
+
+
+
-
-
form->getLabel('publish_down'); ?>
-
form->getInput('publish_down'); ?>
+
+
+
+ - item->modified_by) : ?> -
-
form->getLabel('modified_by'); ?>
-
form->getInput('modified_by'); ?>
-
-
-
form->getLabel('modified'); ?>
-
form->getInput('modified'); ?>
-
- - - item->version) : ?> -
-
- form->getLabel('version'); ?> -
-
- form->getInput('version'); ?> -
-
- - - item->hits) : ?> -
-
- form->getLabel('hits'); ?> -
-
- form->getInput('hits'); ?> -
-
- -
-
form->getLabel('ordering'); ?>
-
form->getInput('ordering'); ?>
-
-
-
form->getLabel('numarticles'); ?>
-
form->getInput('numarticles'); ?>
-
-
-
form->getLabel('cache_time'); ?>
-
form->getInput('cache_time'); ?>
-
-
-
form->getLabel('rtl'); ?>
-
form->getInput('rtl'); ?>
-
+ + loadTemplate('display'); ?> - form->getFieldsets('params'); ?> - $fieldSet) : ?> - - label, true)); ?> - loadTemplate('params'); ?> - - + set('ignore_fieldsets', array('jbasic')); ?> + - form->getFieldsets('metadata'); ?> - $fieldSet) : ?> - - label, true)); ?> - loadTemplate('metadata'); ?> - - - + item_associations)) : ?> - loadTemplate('associations'); ?> + loadTemplate('associations'); ?> -
- - - -
- - - -
+ +
diff --git a/administrator/templates/isis/html/mod_title/default.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_display.php similarity index 59% rename from administrator/templates/isis/html/mod_title/default.php rename to administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_display.php index 764ed72d09c58..667c34548cd6f 100644 --- a/administrator/templates/isis/html/mod_title/default.php +++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_display.php @@ -1,7 +1,7 @@ -

- -

- +$this->fieldset = 'jbasic'; +echo JLayoutHelper::render('joomla.edit.fieldset', $this); diff --git a/administrator/components/com_newsfeeds/views/newsfeed/view.html.php b/administrator/components/com_newsfeeds/views/newsfeed/view.html.php index 823ed946fc2f6..2d8ce66ad33a8 100644 --- a/administrator/components/com_newsfeeds/views/newsfeed/view.html.php +++ b/administrator/components/com_newsfeeds/views/newsfeed/view.html.php @@ -66,7 +66,7 @@ protected function addToolbar() // Since we don't track these assets at the item level, use the category id. $canDo = JHelperContent::getActions($this->item->catid, 0, 'com_newsfeeds'); - JToolbarHelper::title(JText::_('COM_NEWSFEEDS_MANAGER_NEWSFEED'), 'newsfeeds.png'); + JToolbarHelper::title(JText::_('COM_NEWSFEEDS_MANAGER_NEWSFEED'), 'feed newsfeeds'); // If not checked out, can save the item. if (!$checkedOut && ($canDo->get('core.edit') || count($user->getAuthorisedCategories('com_newsfeeds', 'core.create')) > 0)) diff --git a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php index eadb05c60923d..87ab228c800f3 100644 --- a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php +++ b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php @@ -165,7 +165,20 @@ id); ?> - published, $i, 'newsfeeds.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?> +
+ published, $i, 'newsfeeds.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?> + escape($item->name)); + ?> +
@@ -185,40 +198,6 @@ escape($item->category_title); ?>
-
- id, 'newsfeed.'); - JHtml::_('dropdown.divider'); - if ($item->published) : - JHtml::_('dropdown.unpublish', 'cb' . $i, 'newsfeeds.'); - else : - JHtml::_('dropdown.publish', 'cb' . $i, 'newsfeeds.'); - endif; - - JHtml::_('dropdown.divider'); - - if ($archived) : - JHtml::_('dropdown.unarchive', 'cb' . $i, 'newsfeeds.'); - else : - JHtml::_('dropdown.archive', 'cb' . $i, 'newsfeeds.'); - endif; - - if ($item->checked_out) : - JHtml::_('dropdown.checkin', 'cb' . $i, 'newsfeeds.'); - endif; - - if ($trashed) : - JHtml::_('dropdown.untrash', 'cb' . $i, 'newsfeeds.'); - else : - JHtml::_('dropdown.trash', 'cb' . $i, 'newsfeeds.'); - endif; - - // render dropdown list - echo JHtml::_('dropdown.render'); - ?> -
- escape($item->access_level); ?> diff --git a/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php b/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php index 24e131271cc37..84697ec58338f 100644 --- a/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php +++ b/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php @@ -60,7 +60,7 @@ protected function addToolbar() // Get the toolbar object instance $bar = JToolBar::getInstance('toolbar'); - JToolbarHelper::title(JText::_('COM_NEWSFEEDS_MANAGER_NEWSFEEDS'), 'newsfeeds.png'); + JToolbarHelper::title(JText::_('COM_NEWSFEEDS_MANAGER_NEWSFEEDS'), 'feed newsfeeds'); if (count($user->getAuthorisedCategories('com_newsfeeds', 'core.create')) > 0) { diff --git a/administrator/components/com_plugins/models/forms/plugin.xml b/administrator/components/com_plugins/models/forms/plugin.xml index 5ee153274380e..87f558b28761a 100644 --- a/administrator/components/com_plugins/models/forms/plugin.xml +++ b/administrator/components/com_plugins/models/forms/plugin.xml @@ -20,8 +20,8 @@ JDISABLED - - - -
+ +
+ + + +
diff --git a/administrator/components/com_plugins/views/plugin/tmpl/edit.php b/administrator/components/com_plugins/views/plugin/tmpl/edit.php index 0795e116f82e1..a698bff323d17 100644 --- a/administrator/components/com_plugins/views/plugin/tmpl/edit.php +++ b/administrator/components/com_plugins/views/plugin/tmpl/edit.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html'); +JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); JHtml::_('behavior.formvalidation'); JHtml::_('formbehavior.chosen', 'select'); @@ -18,100 +18,97 @@ -
-
- 'details')); ?> + +
- -
-
- form->getLabel('name'); ?> -
-
- form->getInput('name'); ?> - item->name);?> -
-
-
-
- form->getLabel('enabled'); ?> -
-
- form->getInput('enabled'); ?> -
-
-
-
- form->getLabel('access'); ?> -
-
- form->getInput('access'); ?> -
-
-
-
- form->getLabel('ordering'); ?> -
-
- form->getInput('ordering'); ?> -
-
-
-
- form->getLabel('folder'); ?> -
-
- form->getInput('folder'); ?> -
-
-
-
- form->getLabel('element'); ?> -
-
- form->getInput('element'); ?> -
-
- item->extension_id) : ?> -
-
- form->getLabel('extension_id'); ?> -
-
- form->getInput('extension_id'); ?> -
-
- - + 'general')); ?> + + + +
+
item->xml) : ?> - item->xml->description)) : ?> -
- -
- -
+ item->xml->description) : ?> +

+ item->xml) + { + echo ($text = (string) $this->item->xml->name) ? JText::_($text) : $this->item->name; + } + else + { + echo JText::_('COM_PLUGINS_XML_ERR'); + } + ?> +

+
+ + form->getValue('folder'); ?> + / + + form->getValue('element'); ?> + +
+
+ item->xml->description); + $this->fieldset = 'description'; + $long_description = JLayoutHelper::render('joomla.edit.fieldset', $this); + if(!$long_description) { + $truncated = JHtmlString::truncate($short_description, 550, true, false); + if(strlen($truncated) > 500) { + $long_description = $short_description; + $short_description = JHtmlString::truncate($truncated, 250); + if($short_description == $long_description) { + $long_description = ''; + } + } + } + ?> +

+ +

+ + + +

+
-
- -
+
+
+ + fieldset = 'basic'; + $html = JLayoutHelper::render('joomla.edit.fieldset', $this); + echo $html ? '
' . $html : ''; + ?> +
+
+ + + + + + - loadTemplate('options'); ?> + fieldsets = array(); + $this->ignore_fieldsets = array('basic'); + echo JLayoutHelper::render('joomla.edit.params', $this); + ?> -
+ diff --git a/administrator/components/com_plugins/views/plugin/tmpl/edit_options.php b/administrator/components/com_plugins/views/plugin/tmpl/edit_options.php index 9e1457b5ce2e8..52287aaf1c825 100644 --- a/administrator/components/com_plugins/views/plugin/tmpl/edit_options.php +++ b/administrator/components/com_plugins/views/plugin/tmpl/edit_options.php @@ -9,30 +9,43 @@ defined('_JEXEC') or die; -foreach ($this->fieldsets as $name => $fieldset) : - $label = !empty($fieldset->label) ? JText::_($fieldset->label, true) : JText::_('COM_PLUGINS_'.$fieldset->name.'_FIELDSET_LABEL', true); - $optionsname = 'options-' . $fieldset->name; - echo JHtml::_('bootstrap.addTab', 'myTab', $optionsname, $label); - if (isset($fieldset->description) && trim($fieldset->description)) : - echo '

'.$this->escape(JText::_($fieldset->description)).'

'; - endif; - ?> - - form->getFieldset($name) as $field) : ?> - hidden) : ?> -
-
- label; ?> -
-
- input; ?> -
-
- input; ?> - - - +foreach ($this->fieldsets as $name => $fieldset) +{ + if (!isset($fieldset->repeat) || isset($fieldset->repeat) && $fieldset->repeat == false) + { + $label = !empty($fieldset->label) ? JText::_($fieldset->label, true) : JText::_('COM_PLUGINS_' . $fieldset->name . '_FIELDSET_LABEL', true); + $optionsname = 'options-' . $fieldset->name; + echo JHtml::_('bootstrap.addTab', 'myTab', $optionsname, $label); - + if (isset($fieldset->description) && trim($fieldset->description)) + { + echo '

' . $this->escape(JText::_($fieldset->description)) . '

'; + } - + $hidden_fields = ''; + + foreach ($this->form->getFieldset($name) as $field) + { + if (!$field->hidden) + { + ?> +
+
+ label; ?> +
+
+ input; ?> +
+
+ input; + } + } + echo $hidden_fields; + + echo JHtml::_('bootstrap.endTab'); + } +} diff --git a/administrator/components/com_plugins/views/plugin/view.html.php b/administrator/components/com_plugins/views/plugin/view.html.php index d9aaf4411433a..486feb18086d0 100644 --- a/administrator/components/com_plugins/views/plugin/view.html.php +++ b/administrator/components/com_plugins/views/plugin/view.html.php @@ -55,7 +55,7 @@ protected function addToolbar() $canDo = PluginsHelper::getActions(); - JToolbarHelper::title(JText::sprintf('COM_PLUGINS_MANAGER_PLUGIN', JText::_($this->item->name)), 'plugin'); + JToolbarHelper::title(JText::sprintf('COM_PLUGINS_MANAGER_PLUGIN', JText::_($this->item->name)), 'power-cord plugin'); // If not checked out, can save the item. if ($canDo->get('core.edit')) diff --git a/administrator/components/com_plugins/views/plugins/tmpl/default.php b/administrator/components/com_plugins/views/plugins/tmpl/default.php index 6710fc26a1ab1..1c67d8d946f61 100644 --- a/administrator/components/com_plugins/views/plugins/tmpl/default.php +++ b/administrator/components/com_plugins/views/plugins/tmpl/default.php @@ -14,7 +14,6 @@ JHtml::_('bootstrap.tooltip'); JHtml::_('behavior.multiselect'); -JHtml::_('dropdown.init'); JHtml::_('formbehavior.chosen', 'select'); $user = JFactory::getUser(); diff --git a/administrator/components/com_plugins/views/plugins/view.html.php b/administrator/components/com_plugins/views/plugins/view.html.php index 7ca8c03c58ceb..a7fbf5b17c917 100644 --- a/administrator/components/com_plugins/views/plugins/view.html.php +++ b/administrator/components/com_plugins/views/plugins/view.html.php @@ -62,7 +62,7 @@ protected function addToolbar() { $canDo = PluginsHelper::getActions(); - JToolbarHelper::title(JText::_('COM_PLUGINS_MANAGER_PLUGINS'), 'plugin'); + JToolbarHelper::title(JText::_('COM_PLUGINS_MANAGER_PLUGINS'), 'power-cord plugin'); if ($canDo->get('core.edit')) { diff --git a/administrator/components/com_redirect/views/link/view.html.php b/administrator/components/com_redirect/views/link/view.html.php index 87fb55fd4685e..f92f42a03b809 100644 --- a/administrator/components/com_redirect/views/link/view.html.php +++ b/administrator/components/com_redirect/views/link/view.html.php @@ -57,7 +57,7 @@ protected function addToolbar() $canDo = RedirectHelper::getActions(); - JToolbarHelper::title(JText::_('COM_REDIRECT_MANAGER_LINK'), 'redirect'); + JToolbarHelper::title(JText::_('COM_REDIRECT_MANAGER_LINK'), 'refresh redirect'); // If not checked out, can save the item. if ($canDo->get('core.edit')) diff --git a/administrator/components/com_redirect/views/links/view.html.php b/administrator/components/com_redirect/views/links/view.html.php index eed25c424dce8..657a1ae2e1714 100644 --- a/administrator/components/com_redirect/views/links/view.html.php +++ b/administrator/components/com_redirect/views/links/view.html.php @@ -60,7 +60,7 @@ protected function addToolbar() $state = $this->get('State'); $canDo = RedirectHelper::getActions(); - JToolbarHelper::title(JText::_('COM_REDIRECT_MANAGER_LINKS'), 'redirect'); + JToolbarHelper::title(JText::_('COM_REDIRECT_MANAGER_LINKS'), 'refresh redirect'); if ($canDo->get('core.create')) { JToolbarHelper::addNew('link.add'); diff --git a/administrator/components/com_search/config.xml b/administrator/components/com_search/config.xml index bebb37f5eb1c8..8eec5db64b2fb 100644 --- a/administrator/components/com_search/config.xml +++ b/administrator/components/com_search/config.xml @@ -4,7 +4,7 @@ @@ -16,7 +16,7 @@ diff --git a/administrator/components/com_search/views/searches/view.html.php b/administrator/components/com_search/views/searches/view.html.php index df28bc5c71260..41018d75fc652 100644 --- a/administrator/components/com_search/views/searches/view.html.php +++ b/administrator/components/com_search/views/searches/view.html.php @@ -56,7 +56,7 @@ protected function addToolbar() { $canDo = SearchHelper::getActions(); - JToolbarHelper::title(JText::_('COM_SEARCH_MANAGER_SEARCHES'), 'search.png'); + JToolbarHelper::title(JText::_('COM_SEARCH_MANAGER_SEARCHES'), 'search'); if ($canDo->get('core.edit.state')) { diff --git a/administrator/components/com_tags/config.xml b/administrator/components/com_tags/config.xml index ef782a4512d6e..15595ac343ab0 100644 --- a/administrator/components/com_tags/config.xml +++ b/administrator/components/com_tags/config.xml @@ -17,7 +17,7 @@ @@ -331,7 +331,7 @@ diff --git a/administrator/components/com_tags/models/forms/tag.xml b/administrator/components/com_tags/models/forms/tag.xml index 2e2314148c7c9..fb91a31920a85 100644 --- a/administrator/components/com_tags/models/forms/tag.xml +++ b/administrator/components/com_tags/models/forms/tag.xml @@ -12,7 +12,7 @@ type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL" - description ="JGLOBAL_FIELD_ID_DESC" + description="JGLOBAL_FIELD_ID_DESC" default="0" readonly="true" /> @@ -22,7 +22,7 @@ type="text" class="readonly" label="JGLOBAL_HITS" - description ="COM_TAGS_FIELD_HITS_DESC" + description="COM_TAGS_FIELD_HITS_DESC" default="0" readonly="true" /> @@ -30,7 +30,6 @@ @@ -167,7 +166,7 @@ label="JGLOBAL_FIELD_CREATED_BY_LABEL" desc="JGLOBAL_FIELD_CREATED_BY_DESC" /> - + @@ -217,7 +215,7 @@
@@ -244,6 +242,96 @@ />
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -256,7 +344,7 @@ description="JFIELD_METADATA_AUTHOR_DESC" size="30" /> - + JGLOBAL_NOINDEX_NOFOLLOW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/administrator/components/com_tags/views/tag/tmpl/edit.php b/administrator/components/com_tags/views/tag/tmpl/edit.php index d2aa20031a950..488f3a98adf6c 100644 --- a/administrator/components/com_tags/views/tag/tmpl/edit.php +++ b/administrator/components/com_tags/views/tag/tmpl/edit.php @@ -10,10 +10,7 @@ defined('_JEXEC') or die; // Include the component HTML helpers. -JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html'); - -$app = JFactory::getApplication(); -$input = $app->input; +JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); JHtml::_('behavior.formvalidation'); JHtml::_('behavior.keepalive'); @@ -22,7 +19,6 @@ // Create shortcut to parameters. $params = $this->state->get('params'); $params = $params->toArray(); - ?> -
- - - -
- -
- 'general')); ?> + - -
-
- form->getLabel('title'); ?> form->getInput('title'); ?> form->getLabel('catid'); ?> form->getInput('catid'); ?> -
- form->getInput('description'); ?> -
-
-
-

-
- form->getLabel('images'); ?> -
- form->getInput('images'); ?> -
-
- form->getGroup('images') as $field) : ?> -
- hidden) : ?> - label; ?> - -
- input; ?> -
-
- -
-
- + - -
-
-
- form->getLabel('alias'); ?> -
- form->getInput('alias'); ?> -
-
-
-
- form->getLabel('id'); ?> -
-
- form->getInput('id'); ?> -
-
-
- form->getLabel('created_user_id'); ?> -
- form->getInput('created_user_id'); ?> -
-
-
- form->getLabel('created_by_alias'); ?> -
- form->getInput('created_by_alias'); ?> -
-
-
- form->getLabel('created_time'); ?> -
- form->getInput('created_time'); ?> -
-
-
-
-
- form->getLabel('publish_up'); ?> -
- form->getInput('publish_up'); ?> -
-
-
- form->getLabel('publish_down'); ?> -
- form->getInput('publish_down'); ?> -
-
- item->modified_user_id) : ?> -
- form->getLabel('modified_user_id'); ?> -
- form->getInput('modified_user_id'); ?> -
-
-
- form->getLabel('modified_time'); ?> -
- form->getInput('modified_time'); ?> -
-
- +
+ 'details')); ?> - item->version) : ?> -
- form->getLabel('version'); ?> -
- form->getInput('version'); ?> -
-
- - - item->hits) : ?> -
-
- form->getLabel('hits'); ?> -
-
- form->getInput('hits'); ?> -
-
- -
-
- - - - loadTemplate('options'); ?> - - - - loadTemplate('metadata'); ?> - -
- - -
- - -
-

-
-
-
-
- form->getValue('title'); ?> -
+ +
+
+
+ form->getControlGroup('description'); ?>
-
- form->getLabel('parent_id'); ?> -
- form->getInput('parent_id'); ?> -
-
-
- form->getLabel('published'); ?> -
- form->getInput('published'); ?> -
-
-
- form->getLabel('access'); ?> -
- form->getInput('access'); ?> -
-
-
- form->getLabel('language'); ?> -
- form->getInput('language'); ?> -
-
-
+
+
+ +
- + + + +
+
+ +
+
+ +
+
+ + + + + +
diff --git a/administrator/components/com_tags/views/tag/view.html.php b/administrator/components/com_tags/views/tag/view.html.php index 75a8c210b9367..1b5c9d94f0d9c 100644 --- a/administrator/components/com_tags/views/tag/view.html.php +++ b/administrator/components/com_tags/views/tag/view.html.php @@ -87,7 +87,7 @@ protected function addToolbar() $title = JText::_('COM_TAGS_BASE_' . ($isNew?'ADD':'EDIT') . '_TITLE'); // Prepare the toolbar. - JToolbarHelper::title($title, 'tag-' . ($isNew?'add':'edit') . ($isNew?'add':'edit')); + JToolbarHelper::title($title, 'tag tag-' . ($isNew?'add':'edit') . ($isNew?'add':'edit')); // For new records, check the create permission. if ($isNew) diff --git a/administrator/components/com_templates/config.xml b/administrator/components/com_templates/config.xml index 401096e4a9e24..5fadb891d2373 100644 --- a/administrator/components/com_templates/config.xml +++ b/administrator/components/com_templates/config.xml @@ -8,7 +8,7 @@ diff --git a/administrator/components/com_templates/models/forms/style.xml b/administrator/components/com_templates/models/forms/style.xml index 2df7c8c56764b..5036896ac80ee 100644 --- a/administrator/components/com_templates/models/forms/style.xml +++ b/administrator/components/com_templates/models/forms/style.xml @@ -32,7 +32,7 @@ diff --git a/administrator/components/com_templates/views/style/tmpl/edit.php b/administrator/components/com_templates/views/style/tmpl/edit.php index bf7af27f38407..16ca457583a98 100644 --- a/administrator/components/com_templates/views/style/tmpl/edit.php +++ b/administrator/components/com_templates/views/style/tmpl/edit.php @@ -9,7 +9,7 @@ defined('_JEXEC') or die; -JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html'); +JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); JHtml::_('behavior.formvalidation'); JHtml::_('behavior.keepalive'); @@ -19,93 +19,84 @@ -
-
+ + + + +
'details')); ?> - -
-
- form->getLabel('title'); ?> -
-
- form->getInput('title'); ?> -
-
-
-
- form->getLabel('template'); ?> -
-
- form->getInput('template'); ?> -
-
-
-
- form->getLabel('client_id'); ?> -
-
- form->getInput('client_id'); ?> - -
-
-
-
- form->getLabel('home'); ?> -
-
- form->getInput('home'); ?> -
+ + +
+
+

+ item->template); ?> +

+
+ + item->client_id == 0 ? JText::_('JSITE') : JText::_('JADMINISTRATOR'); ?> +
- item->id) : ?> -
-
- form->getLabel('id'); ?> -
-
- item->id; ?> -
-
- - item->xml) : ?> - item->xml->description)) : ?> -
- -
- -
-
+
+

item->xml->description); ?>

+ fieldset = 'description'; + $description = JLayoutHelper::render('joomla.edit.fieldset', $this); + ?> + +

+ + + +

- -
- - +
+ fieldset = 'basic'; + $html = JLayoutHelper::render('joomla.edit.fieldset', $this); + echo $html ? '
' . $html : ''; + ?> +
+
+ fields = array( + 'home' + ); + ?> + +
+
+ - - loadTemplate('options'); ?> + + + + - authorise('core.edit', 'com_menu') && $this->item->client_id == 0):?> - get('core.edit.state')) : ?> - - loadTemplate('assignment'); ?> - - - + fieldsets = array(); + $this->ignore_fieldsets = array('basic'); + echo JLayoutHelper::render('joomla.edit.params', $this); + ?> + + authorise('core.edit', 'com_menu') && $this->item->client_id == 0 && $canDo->get('core.edit.state')) : ?> + + loadTemplate('assignment'); ?> + + -
- - + + +
diff --git a/administrator/components/com_templates/views/style/view.html.php b/administrator/components/com_templates/views/style/view.html.php index fa95132519cc8..52ed4810bc9dd 100644 --- a/administrator/components/com_templates/views/style/view.html.php +++ b/administrator/components/com_templates/views/style/view.html.php @@ -66,7 +66,7 @@ protected function addToolbar() JToolbarHelper::title( $isNew ? JText::_('COM_TEMPLATES_MANAGER_ADD_STYLE') - : JText::_('COM_TEMPLATES_MANAGER_EDIT_STYLE'), 'thememanager' + : JText::_('COM_TEMPLATES_MANAGER_EDIT_STYLE'), 'eye thememanager' ); // If not checked out, can save the item. diff --git a/administrator/components/com_templates/views/styles/view.html.php b/administrator/components/com_templates/views/styles/view.html.php index aeeb1768c0c7b..538446a3e9291 100644 --- a/administrator/components/com_templates/views/styles/view.html.php +++ b/administrator/components/com_templates/views/styles/view.html.php @@ -74,7 +74,7 @@ protected function addToolbar() { $canDo = TemplatesHelper::getActions(); - JToolbarHelper::title(JText::_('COM_TEMPLATES_MANAGER_STYLES'), 'thememanager'); + JToolbarHelper::title(JText::_('COM_TEMPLATES_MANAGER_STYLES'), 'eye thememanager'); if ($canDo->get('core.edit.state')) { diff --git a/administrator/components/com_templates/views/template/view.html.php b/administrator/components/com_templates/views/template/view.html.php index 375fa7af74720..f1a311553d895 100644 --- a/administrator/components/com_templates/views/template/view.html.php +++ b/administrator/components/com_templates/views/template/view.html.php @@ -188,7 +188,7 @@ protected function addToolbar() $explodeArray = explode('.', $this->fileName); $ext = end($explodeArray); - JToolbarHelper::title(JText::_('COM_TEMPLATES_MANAGER_VIEW_TEMPLATE'), 'thememanager'); + JToolbarHelper::title(JText::_('COM_TEMPLATES_MANAGER_VIEW_TEMPLATE'), 'eye thememanager'); // Add a Apply and save button if ($this->type == 'file') diff --git a/administrator/components/com_templates/views/templates/view.html.php b/administrator/components/com_templates/views/templates/view.html.php index 6ceeec9d2e1e1..f747028259b8d 100644 --- a/administrator/components/com_templates/views/templates/view.html.php +++ b/administrator/components/com_templates/views/templates/view.html.php @@ -93,7 +93,7 @@ protected function addToolbar() { $canDo = TemplatesHelper::getActions(); - JToolbarHelper::title(JText::_('COM_TEMPLATES_MANAGER_TEMPLATES'), 'thememanager'); + JToolbarHelper::title(JText::_('COM_TEMPLATES_MANAGER_TEMPLATES'), 'eye thememanager'); if ($canDo->get('core.admin')) { diff --git a/administrator/components/com_users/config.xml b/administrator/components/com_users/config.xml index f11f8826e7413..f2e9d43c44620 100644 --- a/administrator/components/com_users/config.xml +++ b/administrator/components/com_users/config.xml @@ -4,7 +4,7 @@ @@ -33,7 +33,7 @@ @@ -60,7 +60,7 @@ @@ -87,7 +87,7 @@ @@ -99,7 +99,7 @@ @@ -111,7 +111,7 @@ diff --git a/administrator/components/com_users/models/forms/user.xml b/administrator/components/com_users/models/forms/user.xml index 0d5a280502274..863b03cfefe57 100644 --- a/administrator/components/com_users/models/forms/user.xml +++ b/administrator/components/com_users/models/forms/user.xml @@ -97,7 +97,7 @@ name="sendEmail" type="radio" default="0" - class="btn-group" + class="btn-group btn-group-yesno" label="COM_USERS_USER_FIELD_SENDEMAIL_LABEL" description="COM_USERS_USER_FIELD_SENDEMAIL_DESC">
- +
+ + +
diff --git a/administrator/components/com_weblinks/views/weblink/tmpl/edit.php b/administrator/components/com_weblinks/views/weblink/tmpl/edit.php index e46f347a1e47c..781d197739d7c 100644 --- a/administrator/components/com_weblinks/views/weblink/tmpl/edit.php +++ b/administrator/components/com_weblinks/views/weblink/tmpl/edit.php @@ -18,143 +18,57 @@ -