From 6234151121a601d3659f2d4da9b2eab441699223 Mon Sep 17 00:00:00 2001 From: Peter van Westen Date: Thu, 3 Oct 2013 17:40:17 +0200 Subject: [PATCH 01/21] Refactored to be in sync with master --- .../components/com_banners/config.xml | 4 +- .../com_banners/models/forms/banner.xml | 353 +++-- .../com_banners/models/forms/client.xml | 131 +- .../com_banners/models/forms/download.xml | 6 +- .../com_banners/views/banner/tmpl/edit.php | 234 +--- .../com_banners/views/client/tmpl/edit.php | 119 +- administrator/components/com_cache/config.xml | 7 +- .../components/com_cache/controller.php | 3 - .../components/com_cache/helpers/cache.php | 7 +- .../components/com_categories/controller.php | 1 - .../com_categories/helpers/categories.php | 7 +- .../com_categories/models/forms/category.xml | 184 ++- .../views/category/tmpl/edit.php | 241 +--- .../views/category/tmpl/edit_extrafields.php | 30 +- .../views/category/tmpl/edit_options.php | 42 +- .../components/com_checkin/config.xml | 7 +- .../components/com_config/config.php | 2 +- .../com_config/controllers/application.php | 12 +- .../com_config/controllers/component.php | 4 +- .../com_config/models/forms/application.xml | 270 ++-- .../components/com_contact/config.xml | 400 +++--- .../com_contact/helpers/contact.php | 49 +- .../components/com_contact/models/contact.php | 16 +- .../com_contact/models/forms/contact.xml | 774 ++++++----- .../com_contact/views/contact/tmpl/edit.php | 207 +-- .../components/com_content/config.xml | 882 +++++------- .../com_content/controllers/articles.php | 2 +- .../com_content/helpers/content.php | 50 +- .../com_content/models/articles.php | 11 +- .../com_content/models/featured.php | 75 +- .../com_content/models/forms/article.xml | 1213 +++++++---------- .../com_content/views/article/tmpl/edit.php | 323 +---- .../com_contenthistory/contenthistory.xml | 1 + .../com_contenthistory/controller.php | 20 +- .../controllers/history.php | 6 +- .../controllers/preview.php | 23 +- .../helpers/contenthistory.php | 31 +- .../com_contenthistory/models/history.php | 33 +- .../com_contenthistory/models/preview.php | 2 +- .../components/com_finder/config.xml | 125 +- .../com_finder/controllers/indexer.json.php | 6 +- .../components/com_finder/helpers/finder.php | 7 +- .../com_finder/helpers/indexer/helper.php | 2 + .../com_finder/models/forms/filter.xml | 218 +-- .../com_finder/views/filter/tmpl/edit.php | 86 +- .../components/com_installer/config.xml | 18 +- .../views/languages/tmpl/default_filter.php | 4 +- .../components/com_joomlaupdate/config.xml | 23 +- .../components/com_languages/config.xml | 20 +- .../com_languages/models/forms/language.xml | 46 +- .../com_languages/models/forms/override.xml | 32 +- .../views/override/tmpl/edit.php | 20 +- administrator/components/com_media/config.xml | 59 +- administrator/components/com_media/media.xml | 1 - administrator/components/com_menus/config.xml | 40 +- .../components/com_menus/controller.php | 26 +- .../components/com_menus/controllers/item.php | 11 - .../components/com_menus/controllers/menu.php | 10 - .../components/com_menus/helpers/menus.php | 1 + .../com_menus/models/forms/item.xml | 144 +- .../com_menus/models/forms/item_alias.xml | 41 +- .../com_menus/models/forms/item_component.xml | 117 +- .../com_menus/models/forms/item_heading.xml | 7 +- .../com_menus/models/forms/item_separator.xml | 24 +- .../com_menus/models/forms/item_url.xml | 27 +- .../com_menus/models/forms/menu.xml | 13 +- .../components/com_menus/models/item.php | 37 +- .../components/com_menus/models/items.php | 8 +- .../components/com_menus/models/menutypes.php | 63 +- .../com_menus/views/item/tmpl/edit.php | 366 ++--- .../components/com_messages/config.xml | 7 +- .../components/com_messages/controller.php | 2 - .../com_messages/helpers/messages.php | 7 +- .../com_messages/models/forms/config.xml | 27 +- .../com_messages/models/forms/message.xml | 11 +- .../com_modules/models/forms/module.xml | 16 +- .../com_modules/views/module/tmpl/edit.php | 240 ++-- .../components/com_newsfeeds/config.xml | 200 ++- .../com_newsfeeds/helpers/newsfeeds.php | 40 +- .../com_newsfeeds/models/forms/newsfeed.xml | 484 ++++--- .../com_newsfeeds/models/newsfeed.php | 13 +- .../com_newsfeeds/models/newsfeeds.php | 8 +- .../views/newsfeed/tmpl/edit.php | 179 +-- .../components/com_plugins/config.xml | 4 +- .../com_plugins/models/forms/plugin.xml | 106 +- .../com_plugins/views/plugin/tmpl/edit.php | 147 +- .../components/com_redirect/config.xml | 4 +- .../components/com_redirect/controller.php | 3 - .../com_redirect/models/forms/link.xml | 41 +- .../components/com_search/config.xml | 49 +- .../components/com_search/controller.php | 3 - administrator/components/com_tags/config.xml | 287 ++-- .../components/com_tags/models/forms/tag.xml | 363 ++--- .../com_tags/views/tag/tmpl/edit.php | 205 +-- .../components/com_templates/config.xml | 20 +- .../com_templates/models/forms/style.xml | 2 +- .../models/forms/style_administrator.xml | 2 +- .../com_templates/views/style/tmpl/edit.php | 141 +- administrator/components/com_users/config.xml | 138 +- .../com_users/models/forms/group.xml | 21 +- .../com_users/models/forms/level.xml | 14 +- .../com_users/models/forms/mail.xml | 24 +- .../com_users/models/forms/note.xml | 90 +- .../com_users/models/forms/user.xml | 4 +- .../components/com_weblinks/config.xml | 160 +-- .../com_weblinks/models/forms/weblink.xml | 341 +++-- .../com_weblinks/views/weblink/tmpl/edit.php | 160 +-- .../language/en-GB/en-GB.com_banners.ini | 6 +- .../language/en-GB/en-GB.com_categories.ini | 8 +- .../language/en-GB/en-GB.com_contact.ini | 6 +- .../language/en-GB/en-GB.com_content.ini | 10 +- .../language/en-GB/en-GB.com_menus.ini | 16 +- .../language/en-GB/en-GB.com_modules.ini | 12 +- .../language/en-GB/en-GB.com_newsfeeds.ini | 2 +- .../language/en-GB/en-GB.com_plugins.ini | 6 +- .../language/en-GB/en-GB.com_tags.ini | 4 +- .../language/en-GB/en-GB.com_templates.ini | 4 +- .../language/en-GB/en-GB.com_weblinks.ini | 2 +- administrator/language/en-GB/en-GB.ini | 24 +- .../en-GB/en-GB.plg_editors_tinymce.ini | 2 +- .../language/en-GB/en-GB.plg_system_debug.ini | 2 +- .../modules/mod_custom/mod_custom.xml | 36 +- administrator/modules/mod_feed/mod_feed.xml | 100 +- .../modules/mod_latest/mod_latest.xml | 63 +- .../modules/mod_logged/mod_logged.xml | 44 +- administrator/modules/mod_login/mod_login.xml | 30 +- administrator/modules/mod_menu/mod_menu.xml | 30 +- .../modules/mod_menu/tmpl/default_enabled.php | 2 +- .../mod_multilangstatus.xml | 17 +- .../modules/mod_popular/mod_popular.xml | 53 +- .../modules/mod_quickicon/helper.php | 104 +- .../modules/mod_quickicon/mod_quickicon.xml | 40 +- .../mod_stats_admin/mod_stats_admin.xml | 74 +- .../modules/mod_status/mod_status.xml | 55 +- .../modules/mod_submenu/mod_submenu.xml | 17 +- administrator/modules/mod_title/mod_title.xml | 17 +- .../modules/mod_toolbar/mod_toolbar.xml | 17 +- .../modules/mod_version/mod_version.xml | 39 +- administrator/templates/isis/css/template.css | 303 ++-- administrator/templates/isis/js/template.js | 26 +- .../templates/isis/less/template.less | 420 ++++-- .../templates/isis/templateDetails.xml | 6 +- .../com_contact/models/forms/contact.xml | 32 +- components/com_contact/models/forms/form.xml | 229 ++-- .../com_content/models/forms/article.xml | 202 ++- .../com_content/views/category/tmpl/blog.xml | 182 +-- .../com_content/views/form/tmpl/edit.xml | 13 +- .../com_finder/views/search/tmpl/default.xml | 6 +- components/com_tags/views/tag/tmpl/list.xml | 195 ++- .../com_users/models/forms/frontend.xml | 13 +- .../com_users/models/forms/frontend_admin.xml | 12 +- components/com_users/models/forms/login.xml | 15 +- .../com_users/views/profile/tmpl/edit.xml | 3 +- components/com_weblinks/models/category.php | 26 - .../com_weblinks/views/form/tmpl/edit.php | 2 +- .../views/wrapper/tmpl/default.xml | 6 +- layouts/joomla/edit/associations.php | 16 +- layouts/joomla/edit/details.php | 163 +-- layouts/joomla/edit/fieldset.php | 86 ++ layouts/joomla/edit/item_title.php | 8 +- layouts/joomla/edit/main.php | 64 + layouts/joomla/edit/metadata.php | 56 +- layouts/joomla/edit/params.php | 80 ++ layouts/joomla/edit/publishingdata.php | 46 + layouts/joomla/edit/title_alias.php | 22 + layouts/joomla/toolbar/help.php | 8 +- layouts/joomla/toolbar/link.php | 10 +- libraries/cms/form/field/editor.php | 2 +- libraries/cms/form/field/moduleposition.php | 1 - libraries/cms/html/html.php | 4 +- libraries/cms/layout/file.php | 316 +---- libraries/cms/layout/helper.php | 5 +- libraries/cms/toolbar/button/help.php | 17 +- libraries/cms/toolbar/button/link.php | 9 +- libraries/cms/toolbar/button/popup.php | 4 +- libraries/joomla/form/field.php | 21 + libraries/joomla/form/fields/text.php | 3 +- libraries/joomla/form/form.php | 42 + libraries/legacy/view/legacy.php | 16 + media/jui/less/bootstrap-extended.less | 35 + media/jui/less/bootstrap-rtl.less | 74 +- media/jui/less/mixins.less | 3 +- .../mod_articles_archive.xml | 20 +- modules/mod_articles_categories/helper.php | 5 +- .../mod_articles_categories.xml | 60 +- .../tmpl/default_items.php | 4 +- .../mod_articles_category.xml | 302 ++-- modules/mod_articles_latest/helper.php | 1 - .../mod_articles_latest.xml | 78 +- .../mod_articles_news/mod_articles_news.xml | 123 +- .../mod_articles_popular.xml | 44 +- modules/mod_banners/mod_banners.xml | 74 +- modules/mod_breadcrumbs/mod_breadcrumbs.xml | 76 +- modules/mod_custom/mod_custom.xml | 48 +- modules/mod_feed/mod_feed.xml | 101 +- modules/mod_finder/mod_finder.xml | 125 +- modules/mod_footer/mod_footer.xml | 33 +- modules/mod_languages/mod_languages.xml | 77 +- modules/mod_login/mod_login.xml | 84 +- modules/mod_menu/helper.php | 2 +- modules/mod_menu/mod_menu.xml | 76 +- modules/mod_random_image/mod_random_image.xml | 40 +- .../mod_related_items/mod_related_items.xml | 36 +- modules/mod_search/mod_search.xml | 110 +- modules/mod_stats/mod_stats.xml | 74 +- modules/mod_syndicate/mod_syndicate.xml | 46 +- modules/mod_tags_popular/mod_tags_popular.xml | 49 +- modules/mod_tags_similar/mod_tags_similar.xml | 40 +- modules/mod_users_latest/mod_users_latest.xml | 48 +- modules/mod_weblinks/mod_weblinks.xml | 128 +- modules/mod_whosonline/mod_whosonline.xml | 45 +- modules/mod_wrapper/mod_wrapper.xml | 99 +- plugins/authentication/gmail/gmail.xml | 17 +- plugins/authentication/ldap/ldap.xml | 63 +- plugins/content/emailcloak/emailcloak.xml | 6 +- plugins/content/finder/finder.xml | 2 + plugins/content/joomla/joomla.xml | 9 +- plugins/content/loadmodule/loadmodule.xml | 3 + plugins/content/pagebreak/pagebreak.xml | 29 +- .../content/pagenavigation/pagenavigation.xml | 10 +- plugins/editors/codemirror/codemirror.xml | 11 +- plugins/editors/tinymce/tinymce.xml | 70 +- .../extensionupdate/extensionupdate.xml | 8 +- .../quickicon/joomlaupdate/joomlaupdate.xml | 8 +- plugins/search/categories/categories.xml | 16 +- plugins/search/contacts/contacts.xml | 17 +- plugins/search/content/content.xml | 16 +- plugins/search/newsfeeds/newsfeeds.xml | 15 +- plugins/search/weblinks/weblinks.xml | 4 +- plugins/system/cache/cache.xml | 13 +- plugins/system/debug/debug.xml | 114 +- .../system/languagefilter/languagefilter.xml | 34 +- plugins/system/log/log.xml | 10 +- plugins/system/p3p/p3p.xml | 8 +- .../user/contactcreator/contactcreator.xml | 18 +- plugins/user/joomla/joomla.xml | 19 +- templates/protostar/templateDetails.xml | 4 +- .../Pages/Menus/MenuItemEditPage.php | 4 +- 238 files changed, 7809 insertions(+), 9358 deletions(-) create mode 100644 layouts/joomla/edit/fieldset.php create mode 100644 layouts/joomla/edit/main.php create mode 100644 layouts/joomla/edit/params.php create mode 100644 layouts/joomla/edit/publishingdata.php create mode 100644 layouts/joomla/edit/title_alias.php diff --git a/administrator/components/com_banners/config.xml b/administrator/components/com_banners/config.xml index 37e7cc94ec3ee..3b47954b9f830 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 081eb197e99dc..4ca74b39eb212 100644 --- a/administrator/components/com_banners/models/forms/banner.xml +++ b/administrator/components/com_banners/models/forms/banner.xml @@ -1,173 +1,267 @@ - +
-
- - - - - - - - - - + +
+ + + + + + + + > + + + - - + - - - - + + + - + + + -
+ label="COM_BANNERS_GROUP_LABEL_PUBLISHING_DETAILS"> - - + - + - + - - + - - +
+ label="COM_BANNERS_GROUP_LABEL_BANNER_DETAILS"> - + type="radio" + class="btn-group btn-group-yesno"> +
- - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - + description="COM_BANNERS_FIELD_TRACKIMPRESSION_DESC"> + - - + + +
+ label="JGLOBAL_FIELDSET_METADATA_OPTIONS"> - - @@ -175,35 +269,58 @@ - +
+
- - - - + +
+ -
- +
+ + +
diff --git a/administrator/components/com_banners/models/forms/client.xml b/administrator/components/com_banners/models/forms/client.xml index 5b79f3763a630..e546ac47f7c88 100644 --- a/administrator/components/com_banners/models/forms/client.xml +++ b/administrator/components/com_banners/models/forms/client.xml @@ -1,68 +1,85 @@ - +
-
- +
- - + + - + - - + - - - - - - - + + + + + + + - + class="chzn-color"> - + @@ -70,33 +87,41 @@
-
+
- - + default="0"> -
-
+
-
diff --git a/administrator/components/com_banners/models/forms/download.xml b/administrator/components/com_banners/models/forms/download.xml index b69d222728ed7..39005f1331370 100644 --- a/administrator/components/com_banners/models/forms/download.xml +++ b/administrator/components/com_banners/models/forms/download.xml @@ -1,12 +1,12 @@ +
- + default="0"> diff --git a/administrator/components/com_banners/views/banner/tmpl/edit.php b/administrator/components/com_banners/views/banner/tmpl/edit.php index 1cde227d9b9b7..9daac69b084f7 100644 --- a/administrator/components/com_banners/views/banner/tmpl/edit.php +++ b/administrator/components/com_banners/views/banner/tmpl/edit.php @@ -12,209 +12,79 @@ JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); JHtml::_('behavior.formvalidation'); JHtml::_('formbehavior.chosen', 'select'); + +$app = JFactory::getApplication(); + +$script = " + jQuery(document).ready(function ($){ + $('#jform_type').change(function(){ + if($(this).val() == 1) { + $('#image').css('display', 'none'); + $('#custom').css('display', 'block'); + } else { + $('#image').css('display', 'block'); + $('#custom').css('display', 'none'); + } + }).trigger('change'); + });"; +// Add the script to the document head. +JFactory::getDocument()->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->getLabel('clickurl'); ?> -
-
- form->getInput('clickurl'); ?> -
+ form->getControlGroups('image'); ?>
-
-
- form->getLabel('description'); ?> -
-
- form->getInput('description'); ?> -
+
+ form->getControlGroup('custombannercode'); ?>
-
-
- form->getLabel('id'); ?> -
-
- form->getInput('id'); ?> -
-
- - - - form->getFieldset('publish') as $field) : ?> -
-
- label; ?> -
-
- input; ?> -
-
- - + 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'); ?> -
-
-
-
- diff --git a/administrator/components/com_banners/views/client/tmpl/edit.php b/administrator/components/com_banners/views/client/tmpl/edit.php index 33963564fa5e6..14571fad3ef99 100644 --- a/administrator/components/com_banners/views/client/tmpl/edit.php +++ b/administrator/components/com_banners/views/client/tmpl/edit.php @@ -25,114 +25,37 @@ } -
+ - + + +
+ 'general')); ?> - 'general')); ?> item->id) ? JText::_('COM_BANNERS_NEW_CLIENT', true) : JText::sprintf('COM_BANNERS_EDIT_CLIENT', $this->item->id, true)); ?> -
-
- 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_cache/config.xml b/administrator/components/com_cache/config.xml index fede1c88e1bd9..3aacd1a6a2601 100644 --- a/administrator/components/com_cache/config.xml +++ b/administrator/components/com_cache/config.xml @@ -3,11 +3,9 @@
+ description="JConfig_Permissions_Desc"> - +
diff --git a/administrator/components/com_cache/controller.php b/administrator/components/com_cache/controller.php index 6d96cc9daccca..8157b6dc8e0f4 100644 --- a/administrator/components/com_cache/controller.php +++ b/administrator/components/com_cache/controller.php @@ -56,9 +56,6 @@ public function display($cachable = false, $urlparams = false) // Push document object into the view. $view->document = $document; - // Load the submenu. - CacheHelper::addSubmenu($this->input->get('view', 'cache')); - $view->display(); } } diff --git a/administrator/components/com_cache/helpers/cache.php b/administrator/components/com_cache/helpers/cache.php index 2fbd8895bd88f..2f74fed661da6 100644 --- a/administrator/components/com_cache/helpers/cache.php +++ b/administrator/components/com_cache/helpers/cache.php @@ -35,10 +35,11 @@ public static function getClientOptions() /** * Configure the Linkbar. * - * @param string The name of the active view. + * @param string The name of the active view. * - * @return void - * @since 1.6 + * @return void + * @since 1.6 + * @deprecated 3.2 */ public static function addSubmenu($vName) { diff --git a/administrator/components/com_categories/controller.php b/administrator/components/com_categories/controller.php index 2ee0f40159d99..4732b649867bc 100644 --- a/administrator/components/com_categories/controller.php +++ b/administrator/components/com_categories/controller.php @@ -91,7 +91,6 @@ public function display($cachable = false, $urlparams = false) // Load the submenu. require_once JPATH_COMPONENT . '/helpers/categories.php'; - CategoriesHelper::addSubmenu($model->getState('filter.extension')); $view->display(); } diff --git a/administrator/components/com_categories/helpers/categories.php b/administrator/components/com_categories/helpers/categories.php index ffe8116b847e8..6cae7ecbcfa9b 100644 --- a/administrator/components/com_categories/helpers/categories.php +++ b/administrator/components/com_categories/helpers/categories.php @@ -22,11 +22,12 @@ class CategoriesHelper /** * Configure the Submenu links. * - * @param string $extension The extension being used for the categories. + * @param string $extension The extension being used for the categories. * - * @return void + * @return void * - * @since 1.6 + * @since 1.6 + * @deprecated 3.2 */ public static function addSubmenu($extension) { diff --git a/administrator/components/com_categories/models/forms/category.xml b/administrator/components/com_categories/models/forms/category.xml index 1e5c7d3fe89f0..8d34c6152836c 100644 --- a/administrator/components/com_categories/models/forms/category.xml +++ b/administrator/components/com_categories/models/forms/category.xml @@ -1,111 +1,96 @@ - - - + + + readonly="true" /> - + filter="unset" /> - + description="COM_CATEGORIES_FIELD_PARENT_DESC" /> - + filter="unset" /> - + filter="unset" /> - + filter="unset" /> - + readonly="true" /> - + - + required="true" /> - - - + + + description="JGLOBAL_FIELD_VERSION_NOTE_DESC" + class="inputbox span12" + size="45" /> - + class="inputbox span12" + size="40" /> - + hide="readmore,pagebreak" /> - JARCHIVED - - + filter="unset" /> - + filter="unset" /> - + class="span12" /> - + cols="40" /> - + cols="40" /> - + desc="JGLOBAL_FIELD_CREATED_BY_DESC" /> - - + filter="unset" /> - - + class="span12"> @@ -197,13 +172,11 @@ type="tag" label="JTAG" description="JTAG_DESC" - class="inputbox span12 small" - multiple="true" - > + class="inputbox span12" + multiple="true"> - + section="category" />
- + useglobal="true" /> - +
+ +
- - + size="30" /> + + description="JFIELD_METADATA_ROBOTS_DESC"> +
+ diff --git a/administrator/components/com_categories/views/category/tmpl/edit.php b/administrator/components/com_categories/views/category/tmpl/edit.php index 46e1924efdf6f..1f9cae65ec656 100644 --- a/administrator/components/com_categories/views/category/tmpl/edit.php +++ b/administrator/components/com_categories/views/category/tmpl/edit.php @@ -12,14 +12,14 @@ // Include the component HTML helpers. JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); -$app = JFactory::getApplication(); -$input = $app->input; - JHtml::_('behavior.formvalidation'); JHtml::_('behavior.keepalive'); JHtml::_('formbehavior.chosen', 'select'); -$saveHistory = JComponentHelper::getParams($input->getCmd('extension', 'com_content'))->get('save_history', 0); +$app = JFactory::getApplication(); +$input = $app->input; + +$assoc = isset($app->item_associations); ?> -
- - - -
- -
- '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'); ?> -
-
- - - - + description="JCONFIG_PERMISSIONS_DESC"> - +
diff --git a/administrator/components/com_config/config.php b/administrator/components/com_config/config.php index d4b609276571c..16056093447f6 100644 --- a/administrator/components/com_config/config.php +++ b/administrator/components/com_config/config.php @@ -13,7 +13,7 @@ // Access checks are done internally because of different requirements for the two controllers. // Tell the browser not to cache this page. -JFactory::getApplication()->setHeader('Expires', 'Mon, 26 Jul 1997 05:00:00 GMT', true); +JResponse::setHeader('Expires', 'Mon, 26 Jul 1997 05:00:00 GMT', true); $controller = JControllerLegacy::getInstance('Config'); $controller->execute(JFactory::getApplication()->input->get('task')); diff --git a/administrator/components/com_config/controllers/application.php b/administrator/components/com_config/controllers/application.php index 03714275cdb33..c31eade66b0ef 100644 --- a/administrator/components/com_config/controllers/application.php +++ b/administrator/components/com_config/controllers/application.php @@ -50,8 +50,8 @@ public function save() // Check if the user is authorized to do this. if (!JFactory::getUser()->authorise('core.admin')) { - $this->setRedirect('index.php', JText::_('JERROR_ALERTNOAUTHOR')); - $this->redirect(); + JFactory::getApplication()->redirect('index.php', JText::_('JERROR_ALERTNOAUTHOR')); + return; } // Set FTP credentials, if given. @@ -135,8 +135,8 @@ public function cancel() // Check if the user is authorized to do this. if (!JFactory::getUser()->authorise('core.admin', 'com_config')) { - $this->setRedirect('index.php', JText::_('JERROR_ALERTNOAUTHOR')); - $this->redirect(); + JFactory::getApplication()->redirect('index.php', JText::_('JERROR_ALERTNOAUTHOR')); + return; } // Set FTP credentials, if given @@ -164,8 +164,8 @@ public function removeroot() // Check if the user is authorized to do this. if (!JFactory::getUser()->authorise('core.admin')) { - $this->setRedirect('index.php', JText::_('JERROR_ALERTNOAUTHOR')); - $this->redirect(); + JFactory::getApplication()->redirect('index.php', JText::_('JERROR_ALERTNOAUTHOR')); + return; } // Initialise model. diff --git a/administrator/components/com_config/controllers/component.php b/administrator/components/com_config/controllers/component.php index fdf86fce88bda..78a4f5c79b34a 100644 --- a/administrator/components/com_config/controllers/component.php +++ b/administrator/components/com_config/controllers/component.php @@ -79,8 +79,8 @@ public function save() // Check if the user is authorized to do this. if (!JFactory::getUser()->authorise('core.admin', $option)) { - $this->setRedirect('index.php', JText::_('JERROR_ALERTNOAUTHOR')); - $this->redirect(); + JFactory::getApplication()->redirect('index.php', JText::_('JERROR_ALERTNOAUTHOR')); + return; } $returnUri = $this->input->post->get('return', null, 'base64'); diff --git a/administrator/components/com_config/models/forms/application.xml b/administrator/components/com_config/models/forms/application.xml index 5c8fcf4b8d0a8..a66b3fec47ff0 100644 --- a/administrator/components/com_config/models/forms/application.xml +++ b/administrator/components/com_config/models/forms/application.xml @@ -3,8 +3,8 @@
- COM_CONFIG_FIELD_VALUE_CACHE_CONSERVATIVE - - +
- JNO - JNO - - +
- - - - - - JNO - JYES +
- JNO - - - - - +
- +
- - - + + - COM_CONFIG_FIELD_VALUE_SMTP - - - - JNO - COM_CONFIG_FIELD_VALUE_TLS - - - - +
- - + default=""> - - JYES - - JNO - JNO - JNO - JNO - - - JNO - COM_CONFIG_FIELD_VALUE_DEVELOPMENT - COM_CONFIG_FIELD_VALUE_ADMINISTRATOR_ONLY +
- - +
- - JNO - COM_CONFIG_FIELD_VALUE_DISPLAY_OFFLINE_MESSAGE_LANGUAGE - - - - JOPTION_DO_NOT_USE - - J30 + + - J100 - COM_CONFIG_FIELD_VALUE_NO_EMAIL +
- - +
- - +
- + description="COM_CONFIG_TEXT_FILTERS_DESC"> - +
- +
diff --git a/administrator/components/com_contact/config.xml b/administrator/components/com_contact/config.xml index 4524ca659b5fa..f29d4c8d2bcc1 100644 --- a/administrator/components/com_contact/config.xml +++ b/administrator/components/com_contact/config.xml @@ -3,61 +3,48 @@
+ description="COM_CONTACT_FIELD_CONFIG_INDIVIDUAL_CONTACT_DESC"> - + view="contact" /> + description="COM_CONTACT_FIELD_CONTACT_SHOW_CATEGORY_DESC"> - - - - - COM_CONTACT_FIELD_VALUE_NO_LINK + + + + - - - - - + + + + + + default="5" /> + label="COM_CONTACT_FIELD_CONTACT_SHOW_LIST_LABEL"> @@ -65,8 +52,7 @@ + label="COM_CONTACT_FIELD_PRESENTATION_LABEL"> @@ -74,189 +60,173 @@ + description="COM_CONTACT_FIELD_PARAMS_NAME_DESC"> + description="COM_CONTACT_FIELD_PARAMS_CONTACT_POSITION_DESC"> + description="COM_CONTACT_FIELD_PARAMS_CONTACT_E_MAIL_DESC"> + description="COM_CONTACT_FIELD_PARAMS_STREET_ADDRESS_DESC"> + description="COM_CONTACT_FIELD_PARAMS_TOWN-SUBURB_DESC"> + description="COM_CONTACT_FIELD_PARAMS_STATE-COUNTY_DESC"> + description="COM_CONTACT_FIELD_PARAMS_POST-ZIP_CODE_DESC"> + description="COM_CONTACT_FIELD_PARAMS_COUNTRY_DESC"> + description="COM_CONTACT_FIELD_PARAMS_TELEPHONE_DESC"> + description="COM_CONTACT_FIELD_PARAMS_MOBILE_DESC"> + description="COM_CONTACT_FIELD_PARAMS_FAX_DESC"> + description="COM_CONTACT_FIELD_PARAMS_WEBPAGE_DESC"> + description="COM_CONTACT_FIELD_PARAMS_MISC_INFO_DESC"> + label="COM_CONTACT_FIELD_PARAMS_SHOW_IMAGE_LABEL" description="COM_CONTACT_FIELD_PARAMS_SHOW_IMAGE_DESC"> + + description="COM_CONTACT_FIELD_PARAMS_IMAGE_DESC"> + + description="COM_CONTACT_FIELD_PARAMS_VCARD_DESC"> + description="COM_CONTACT_FIELD_ARTICLES_SHOW_DESC"> + label="COM_CONTACT_FIELD_PROFILE_SHOW_LABEL" description="COM_CONTACT_FIELD_PROFILE_SHOW_DESC"> @@ -265,9 +235,8 @@ label="COM_CONTACT_FIELD_SHOW_LINKS_LABEL" description="COM_CONTACT_FIELD_SHOW_LINKS_LABEL" type="radio" - class="btn-group" - default="1" - > + class="btn-group btn-group-yesno" + default="1"> @@ -278,16 +247,14 @@ label="COM_CONTACT_FIELD_LINKA_NAME_LABEL" description="COM_CONTACT_FIELD_LINK_NAME_DESC" class="inputbox" - size="30" - /> + size="30" /> + size="30" /> + size="30" /> + class="inputbox" size="30" /> - @@ -321,6 +285,7 @@
+
- - - + description="COM_CONTACT_FIELD_ICONS_SETTINGS_DESC"> + + + +
+ description="COM_CONTACT_FIELD_CONFIG_CATEGORY_DESC"> - + view="category" /> + description="JGLOBAL_SHOW_CATEGORY_TITLE_DESC"> + label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"> + label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL"> @@ -420,8 +376,7 @@ + label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"> @@ -433,30 +388,27 @@ + description="COM_CONTACT_SHOW_EMPTY_CATEGORIES_DESC"> + description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"> + description="COM_CONTACT_FIELD_SHOW_CAT_ITEMS_DESC"> @@ -464,25 +416,23 @@ + class="btn-group btn-group-yesno" + default="1"> +
+ description="COM_CONTACT_FIELD_CONFIG_CATEGORIES_DESC"> + - + description="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_DESC"> @@ -490,8 +440,7 @@ + label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"> @@ -502,33 +451,27 @@ - + description="COM_CONTACT_SHOW_EMPTY_CATEGORIES_DESC"> - + description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"> - + description="COM_CONTACT_FIELD_SHOW_CAT_ITEMS_DESC"> @@ -537,130 +480,108 @@
- + + + label="JGLOBAL_FILTER_FIELD_LABEL"> - + label="JGLOBAL_DISPLAY_SELECT_LABEL"> - + label="JGLOBAL_SHOW_HEADINGS_LABEL"> - + description="COM_CONTACT_FIELD_CONFIG_POSITION_DESC"> - + description="COM_CONTACT_FIELD_CONFIG_EMAIL_DESC"> - + description="COM_CONTACT_FIELD_CONFIG_PHONE_DESC"> - + description="COM_CONTACT_FIELD_CONFIG_MOBILE_DESC"> - + description="COM_CONTACT_FIELD_CONFIG_FAX_DESC"> - + description="COM_CONTACT_FIELD_CONFIG_SUBURB_DESC"> - + description="COM_CONTACT_FIELD_CONFIG_STATE_DESC"> - + description="COM_CONTACT_FIELD_CONFIG_COUNTRY_DESC"> @@ -668,23 +589,18 @@ - + label="JGLOBAL_PAGINATION_LABEL"> - - + description="JGLOBAL_PAGINATION_RESULTS_DESC"> @@ -693,51 +609,45 @@ description="COM_CONTACT_FIELD_INITIAL_SORT_DESC" label="COM_CONTACT_FIELD_INITIAL_SORT_LABEL" validate="options" - default="ordering" - > + default="ordering"> +
+ description="COM_CONTACT_FIELD_CONFIG_INDIVIDUAL_CONTACT_DESC"> - - - + + + description="COM_CONTACT_FIELD_EMAIL_SHOW_FORM_DESC"> + description="COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_DESC"> @@ -747,43 +657,38 @@ label="COM_CONTACT_FIELD_CONFIG_BANNED_EMAIL_LABEL" rows="3" cols="30" - description="COM_CONTACT_FIELD_CONFIG_BANNED_EMAIL_DESC" - /> + description="COM_CONTACT_FIELD_CONFIG_BANNED_EMAIL_DESC" /> + description="COM_CONTACT_FIELD_CONFIG_BANNED_SUBJECT_DESC" /> + description="COM_CONTACT_FIELD_CONFIG_BANNED_TEXT_DESC" /> + description="COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_DESC"> + description="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_DESC"> @@ -793,17 +698,16 @@ size="30" label="COM_CONTACT_FIELD_CONFIG_REDIRECT_LABEL" description="COM_CONTACT_FIELD_CONFIG_REDIRECT_DESC" /> +
+ description="COM_CONTACT_CONFIG_INTEGRATION_SETTINGS_DESC"> - @@ -815,8 +719,7 @@
+ description="JCONFIG_PERMISSIONS_DESC"> +
diff --git a/administrator/components/com_contact/helpers/contact.php b/administrator/components/com_contact/helpers/contact.php index 08711cd972b6d..fd032a56803be 100644 --- a/administrator/components/com_contact/helpers/contact.php +++ b/administrator/components/com_contact/helpers/contact.php @@ -16,16 +16,16 @@ * @subpackage com_contact * @since 1.6 */ -class ContactHelper extends JHelperContent +class ContactHelper { /** * Configure the Linkbar. * - * @param string $vName The name of the active view. + * @param string $vName The name of the active view. * - * @return void - * - * @since 1.6 + * @return void + * @since 1.6 + * @deprecated 3.2 */ public static function addSubmenu($vName) { @@ -48,4 +48,43 @@ public static function addSubmenu($vName) } } + /** + * Gets a list of the actions that can be performed. + * + * @param integer The category ID. + * @param integer The contact ID. + * + * @return JObject + * @since 1.6 + */ + public static function getActions($categoryId = 0, $contactId = 0) + { + $user = JFactory::getUser(); + $result = new JObject; + + if (empty($contactId) && empty($categoryId)) + { + $assetName = 'com_contact'; + $level = 'component'; + } + elseif (empty($contactId)) + { + $assetName = 'com_contact.category.'.(int) $categoryId; + $level = 'category'; + } + else + { + $assetName = 'com_contact.contact.'.(int) $contactId; + $level = 'category'; + } + + $actions = JAccess::getActions('com_contact', $level); + + foreach ($actions as $action) + { + $result->set($action->name, $user->authorise($action->name, $assetName)); + } + + return $result; + } } diff --git a/administrator/components/com_contact/models/contact.php b/administrator/components/com_contact/models/contact.php index da773c1c0f868..15b99f6ee2f5d 100644 --- a/administrator/components/com_contact/models/contact.php +++ b/administrator/components/com_contact/models/contact.php @@ -606,10 +606,7 @@ protected function prepareTable($table) if (empty($table->ordering)) { $db = JFactory::getDbo(); - $query = $db->getQuery(true); - $query->select('MAX(ordering)'); - $query->from('#__contact_details'); - $db->setQuery($query); + $db->setQuery('SELECT MAX(ordering) FROM #__contact_details'); $max = $db->loadResult(); $table->ordering = $max + 1; @@ -711,12 +708,11 @@ public function featured($pks, $value = 0) { $db = $this->getDbo(); - $query = $db->getQuery(true); - $query->update('#__contact_details'); - $query->set('featured = ' . (int) $value); - $query->where('id IN (' . implode(',', $pks) . ')'); - $db->setQuery($query); - + $db->setQuery( + 'UPDATE #__contact_details' . + ' SET featured = ' . (int) $value . + ' WHERE id IN (' . implode(',', $pks) . ')' + ); $db->execute(); } catch (Exception $e) diff --git a/administrator/components/com_contact/models/forms/contact.xml b/administrator/components/com_contact/models/forms/contact.xml index 5ac37ac4eef95..7cd7c8e07df50 100644 --- a/administrator/components/com_contact/models/forms/contact.xml +++ b/administrator/components/com_contact/models/forms/contact.xml @@ -1,6 +1,8 @@ - +
-
+ +
+ + class="readonly" /> + class="inputbox input-xxlarge input-large-text" + size="40" + required="true" /> - - + + + description="JGLOBAL_FIELD_VERSION_NOTE_DESC" + class="inputbox" + size="45" + labelclass="control-label" /> + description="COM_CONTACT_FIELD_LINKED_USER_DESC" /> - - - - + default="1"> + + + + @@ -68,183 +62,94 @@ label="JCATEGORY" description="JFIELD_CATEGORY_DESC" class="inputbox" - required="true" - /> + required="true" /> - - - - - - - - - - - - - - - - + size="1" /> - - - - - - - - - - - - - - - - + hide="readmore,pagebreak" /> - - - + - + - + + + + filter="unset" /> + filter="unset" /> - - + table="#__contact_details" /> - + + + + cols="30" /> + cols="30" /> - + + default="0"> - + class="inputbox" + multiple="true"> - - - + description="COM_CONTACT_FIELD_ICONS_SETTINGS_DESC"> + + + + description="COM_CONTACT_FIELD_ICONS_ADDRESS_DESC" /> + hide_none="1" + label="COM_CONTACT_FIELD_ICONS_EMAIL_LABEL" + description="COM_CONTACT_FIELD_ICONS_EMAIL_DESC" /> @@ -326,64 +225,176 @@ type="media" hide_none="1" label="COM_CONTACT_FIELD_ICONS_MOBILE_LABEL" - description="COM_CONTACT_FIELD_ICONS_MOBILE_DESC" - /> + description="COM_CONTACT_FIELD_ICONS_MOBILE_DESC" /> + hide_none="1" + label="COM_CONTACT_FIELD_ICONS_FAX_LABEL" + description="COM_CONTACT_FIELD_ICONS_FAX_DESC" /> + hide_none="1" + label="COM_CONTACT_FIELD_ICONS_MISC_LABEL" + description="COM_CONTACT_FIELD_ICONS_MISC_DESC" /> +
-
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + description="COM_CONTACT_FIELD_SHOW_CATEGORY_DESC"> - - + + - - - - + type="list" + class="chzn-color" + label="COM_CONTACT_FIELD_CONTACT_SHOW_LIST_LABEL" + description="COM_CONTACT_FIELD_CONTACT_SHOW_LIST_DESC"> + + + + - + label="COM_CONTACT_FIELD_PRESENTATION_LABEL"> - + description="COM_CONTACT_FIELD_SHOW_TAGS_DESC"> @@ -391,63 +402,69 @@ + class="chzn-color" + label="COM_CONTACT_FIELD_PARAMS_NAME_LABEL" + description="COM_CONTACT_FIELD_PARAMS_NAME_DESC"> - + description="COM_CONTACT_FIELD_PARAMS_CONTACT_POSITION_DESC"> - + description="COM_CONTACT_FIELD_PARAMS_CONTACT_E_MAIL_DESC"> - + description="COM_CONTACT_FIELD_PARAMS_STREET_ADDRESS_DESC"> - + description="COM_CONTACT_FIELD_PARAMS_TOWN-SUBURB_DESC"> - + description="COM_CONTACT_FIELD_PARAMS_STATE-COUNTY_DESC"> - + description="COM_CONTACT_FIELD_PARAMS_POST-ZIP_CODE_DESC"> @@ -455,9 +472,9 @@ + description="COM_CONTACT_FIELD_PARAMS_COUNTRY_DESC"> @@ -465,9 +482,9 @@ + description="COM_CONTACT_FIELD_PARAMS_TELEPHONE_DESC"> @@ -475,227 +492,236 @@ + description="COM_CONTACT_FIELD_PARAMS_MOBILE_DESC"> - + description="COM_CONTACT_FIELD_PARAMS_FAX_DESC"> - + description="COM_CONTACT_FIELD_PARAMS_WEBPAGE_DESC"> - + description="COM_CONTACT_FIELD_PARAMS_MISC_INFO_DESC"> - + description="COM_CONTACT_FIELD_PARAMS_SHOW_IMAGE_DESC"> - + description="COM_CONTACT_FIELD_PARAMS_VCARD_DESC"> - + - + description="COM_CONTACT_FIELD_PROFILE_SHOW_DESC"> + type="list" + class="chzn-color" + label="COM_CONTACT_FIELD_SHOW_LINKS_LABEL" + description="COM_CONTACT_FIELD_SHOW_LINKS_DESC"> - + size="30" /> - + size="30" /> - + size="30" /> - + size="30" /> + size="30" /> + size="30" /> + size="30" /> + size="30" /> + size="30" /> - + + -
+ useglobal="true" /> -
+
- + + description="COM_CONTACT_FIELD_EMAIL_SHOW_FORM_DESC"> - + description="COM_CONTACT_FIELD_EMAIL_EMAIL_COPY_DESC"> - - - + - - - + + description="COM_CONTACT_FIELD_CONFIG_SESSION_CHECK_DESC"> - + description="COM_CONTACT_FIELD_CONFIG_CUSTOM_REPLY_DESC"> @@ -705,41 +731,53 @@ type="text" size="30" label="COM_CONTACT_FIELD_CONFIG_REDIRECT_LABEL" - description="COM_CONTACT_FIELD_CONFIG_REDIRECT_DESC" /> + description="COM_CONTACT_FIELD_CONFIG_REDIRECT_DESC" /> +
+ + -
- + +
+ + description="JFIELD_METADATA_ROBOTS_DESC"> - -
+ - - + + + + diff --git a/administrator/components/com_contact/views/contact/tmpl/edit.php b/administrator/components/com_contact/views/contact/tmpl/edit.php index 4e3c6700843d1..f0717c2cc480c 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 = isset($app->item_associations) ? $app->item_associations : 0; ?> -
+ - + -
- -
-
- '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_content/config.xml b/administrator/components/com_content/config.xml index 8b9670807db2f..fb9bd8a5d4683 100644 --- a/administrator/components/com_content/config.xml +++ b/administrator/components/com_content/config.xml @@ -1,60 +1,47 @@ -
- + + + view="article" /> - - - + + - - - + + - - - + + - COM_CONTENT_FIELD_OPTION_SPLIT - - - + + - - - + + - - - + + - - - + + - + hr="true" /> - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - + + - + default="100" /> - @@ -258,77 +202,61 @@ - - + + - - + + - - - + + - - - + + - - - + + - - - + + - COM_CONTENT_FIELD_OPTION_ABOVE +
+
- + + - - + description="COM_CONTENT_SHOW_PUBLISHING_OPTIONS_DESC"> + + - - - + description="COM_CONTENT_SHOW_ARTICLE_OPTIONS_DESC"> + + - - - - - + + + + + - + + - - + description="COM_CONTENT_SHOW_IMAGES_URLS_FRONT_DESC"> + + - - - - - + + + + + - + + - - - - + + + + - - - - - + + + + - - - - - - - JBROWSERTARGET_PARENT + + + + + + + hr="true" /> - - - - + + + - - - - + + +
+ description="COM_CONTENT_CONFIG_CATEGORY_SETTINGS_DESC"> - - + + - - - + + + + - - + default="1"> + + - - + + - - + + - - - - - - - - + + + + + + + + - - + default="0"> + + - - + default="1"> + + - - + default="1"> + + - - + default="1"> + + - + class="btn-group btn-group-yesno" + default="1">
-
+
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + description="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_DESC"> + + + + + + + + + + + + + + + + + + + + + + + + + + +
-
+
- - + + - - - - - - - - - - - -
- -
+ hr="true" /> + + + + + + + + + + + + + +
+ +
- - + + - - - - + + + + - - + + - - - - + + + + - - + + - - + +
-
- + + - - - - + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - + + + - - + +
-
+
- - - + + - - - + + - - - + +
+ name="permissions" label="JCONFIG_PERMISSIONS_LABEL" description="JCONFIG_PERMISSIONS_DESC"> - +
diff --git a/administrator/components/com_content/controllers/articles.php b/administrator/components/com_content/controllers/articles.php index 3142a5d393483..eb7ba5b30667d 100644 --- a/administrator/components/com_content/controllers/articles.php +++ b/administrator/components/com_content/controllers/articles.php @@ -85,7 +85,7 @@ public function featured() } } - $this->setRedirect('index.php?option=com_content&view=articles'); + $this->setRedirect(JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list, false)); } /** diff --git a/administrator/components/com_content/helpers/content.php b/administrator/components/com_content/helpers/content.php index 369b4f6ca357e..5aba39f487c55 100644 --- a/administrator/components/com_content/helpers/content.php +++ b/administrator/components/com_content/helpers/content.php @@ -16,18 +16,18 @@ * @subpackage com_content * @since 1.6 */ -class ContentHelper extends JHelperContent +class ContentHelper { public static $extension = 'com_content'; /** * Configure the Linkbar. * - * @param string $vName The name of the active view. + * @param string $vName The name of the active view. * - * @return void - * - * @since 1.6 + * @return void + * @since 1.6 + * @deprecated 3.2 */ public static function addSubmenu($vName) { @@ -47,6 +47,46 @@ public static function addSubmenu($vName) ); } + /** + * Gets a list of the actions that can be performed. + * + * @param integer The category ID. + * @param integer The article ID. + * + * @return JObject + * @since 1.6 + */ + public static function getActions($categoryId = 0, $articleId = 0) + { + // Reverted a change for version 2.5.6 + $user = JFactory::getUser(); + $result = new JObject; + + if (empty($articleId) && empty($categoryId)) + { + $assetName = 'com_content'; + } + elseif (empty($articleId)) + { + $assetName = 'com_content.category.'.(int) $categoryId; + } + else + { + $assetName = 'com_content.article.'.(int) $articleId; + } + + $actions = array( + 'core.admin', 'core.manage', 'core.create', 'core.edit', 'core.edit.own', 'core.edit.state', 'core.delete' + ); + + foreach ($actions as $action) + { + $result->set($action, $user->authorise($action, $assetName)); + } + + return $result; + } + /** * Applies the content tag filters to arbitrary text as per settings for current user group * diff --git a/administrator/components/com_content/models/articles.php b/administrator/components/com_content/models/articles.php index 215ffb0c12c0f..657e8ede915e8 100644 --- a/administrator/components/com_content/models/articles.php +++ b/administrator/components/com_content/models/articles.php @@ -49,9 +49,7 @@ public function __construct($config = array()) 'publish_down', 'a.publish_down', ); - $app = JFactory::getApplication(); - $assoc = isset($app->item_associations) ? $app->item_associations : 0; - if ($assoc) + if(isset(JFactory::getApplication()->item_associations)) { $config['filter_fields'][] = 'association'; } @@ -155,7 +153,6 @@ protected function getListQuery() $db = $this->getDbo(); $query = $db->getQuery(true); $user = JFactory::getUser(); - $app = JFactory::getApplication(); // Select the required fields from the table. $query->select( @@ -189,8 +186,7 @@ protected function getListQuery() ->join('LEFT', '#__users AS ua ON ua.id = a.created_by'); // Join over the associations. - $assoc = isset($app->item_associations) ? $app->item_associations : 0; - if ($assoc) + if (isset(JFactory::getApplication()->item_associations)) { $query->select('COUNT(asso2.id)>1 as association') ->join('LEFT', '#__associations AS asso ON asso.id = a.id AND asso.context=' . $db->quote('com_content.item')) @@ -352,8 +348,7 @@ public function getAuthors() public function getItems() { $items = parent::getItems(); - $app = JFactory::getApplication(); - if ($app->isSite()) + if (JFactory::getApplication()->isSite()) { $user = JFactory::getUser(); $groups = $user->getAuthorisedViewLevels(); diff --git a/administrator/components/com_content/models/featured.php b/administrator/components/com_content/models/featured.php index d77f7e75012b9..1e33abb25e2ea 100644 --- a/administrator/components/com_content/models/featured.php +++ b/administrator/components/com_content/models/featured.php @@ -50,6 +50,11 @@ public function __construct($config = array()) 'publish_down', 'a.publish_down', 'fp.ordering', ); + + if (JFactory::getApplication()->item_associations) + { + $config['filter_fields'][] = 'association'; + } } parent::__construct($config); @@ -65,13 +70,15 @@ protected function getListQuery($resolveFKs = true) // Create a new query object. $db = $this->getDbo(); $query = $db->getQuery(true); + $user = JFactory::getUser(); // Select the required fields from the table. $query->select( $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.id, a.title, a.alias, a.checked_out, a.checked_out_time, a.catid' . + ', a.state, a.access, a.created, a.created_by, a.created_by_alias, a.ordering, a.featured, a.language, a.hits' . + ', a.publish_up, a.publish_down' ) ); $query->from('#__content AS a'); @@ -100,12 +107,28 @@ protected function getListQuery($resolveFKs = true) $query->select('ua.name AS author_name') ->join('LEFT', '#__users AS ua ON ua.id = a.created_by'); + // Join over the associations. + if (isset(JFactory::getApplication()->item_associations)) + { + $query->select('COUNT(asso2.id)>1 as association') + ->join('LEFT', '#__associations AS asso ON asso.id = a.id AND asso.context=' . $db->quote('com_content.item')) + ->join('LEFT', '#__associations AS asso2 ON asso2.key = asso.key') + ->group('a.id'); + } + // Filter by access level. if ($access = $this->getState('filter.access')) { $query->where('a.access = ' . (int) $access); } + // Implement View Level Access + if (!$user->authorise('core.admin')) + { + $groups = implode(',', $user->getAuthorisedViewLevels()); + $query->where('a.access IN (' . $groups . ')'); + } + // Filter by published state $published = $this->getState('filter.published'); if (is_numeric($published)) @@ -143,7 +166,15 @@ protected function getListQuery($resolveFKs = true) $query->where('c.level <= ' . ((int) $level + (int) $baselevel - 1)); } - // Filter by search in title + // Filter by author + $authorId = $this->getState('filter.author_id'); + if (is_numeric($authorId)) + { + $type = $this->getState('filter.author_id.include', true) ? '= ' : '<>'; + $query->where('a.created_by ' . $type . (int) $authorId); + } + + // Filter by search in title. $search = $this->getState('filter.search'); if (!empty($search)) { @@ -151,10 +182,15 @@ protected function getListQuery($resolveFKs = true) { $query->where('a.id = ' . (int) substr($search, 3)); } + elseif (stripos($search, 'author:') === 0) + { + $search = $db->quote('%' . $db->escape(substr($search, 7), true) . '%'); + $query->where('(ua.name LIKE ' . $search . ' OR ua.username LIKE ' . $search . ')'); + } else { $search = $db->quote('%' . $db->escape($search, true) . '%'); - $query->where('a.title LIKE ' . $search . ' OR a.alias LIKE ' . $search); + $query->where('(a.title LIKE ' . $search . ' OR a.alias LIKE ' . $search . ')'); } } @@ -164,10 +200,37 @@ protected function getListQuery($resolveFKs = true) $query->where('a.language = ' . $db->quote($language)); } + // Filter by a single tag. + $tagId = $this->getState('filter.tag'); + if (is_numeric($tagId)) + { + $query->where($db->quoteName('tagmap.tag_id') . ' = ' . (int) $tagId) + ->join( + 'LEFT', $db->quoteName('#__contentitem_tag_map', 'tagmap') + . ' ON ' . $db->quoteName('tagmap.content_item_id') . ' = ' . $db->quoteName('a.id') + . ' AND ' . $db->quoteName('tagmap.type_alias') . ' = ' . $db->quote('com_content.article') + ); + } + // Add the list ordering clause. - $query->order($db->escape($this->getState('list.ordering', 'a.title')) . ' ' . $db->escape($this->getState('list.direction', 'ASC'))); + $orderCol = $this->state->get('list.ordering', 'a.title'); + $orderDirn = $this->state->get('list.direction', 'asc'); + if ($orderCol == 'a.ordering' || $orderCol == 'category_title') + { + $orderCol = 'c.title ' . $orderDirn . ', a.ordering'; + } + //sqlsrv change + if ($orderCol == 'language') + { + $orderCol = 'l.title'; + } + if ($orderCol == 'access_level') + { + $orderCol = 'ag.title'; + } + $query->order($db->escape($orderCol . ' ' . $orderDirn)); - //echo nl2br(str_replace('#__','jos_',(string)$query)); + // echo nl2br(str_replace('#__','jos_',$query)); return $query; } } diff --git a/administrator/components/com_content/models/forms/article.xml b/administrator/components/com_content/models/forms/article.xml index 1b01eb9fbe715..2476f97fe68bf 100644 --- a/administrator/components/com_content/models/forms/article.xml +++ b/administrator/components/com_content/models/forms/article.xml @@ -1,193 +1,272 @@
-
- + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + default="0"> - - - - +
-
- + + + description="JGLOBAL_SHOW_TITLE_DESC"> - + description="JGLOBAL_LINKED_TITLES_DESC"> - + - + description="COM_CONTENT_FIELD_SHOW_TAGS_DESC"> + label="JGLOBAL_SHOW_INTRO_LABEL"> - COM_CONTENT_FIELD_OPTION_SPLIT - + description="JGLOBAL_SHOW_CATEGORY_DESC"> - - + + - + description="JGLOBAL_LINK_CATEGORY_DESC"> - - + + - - - - + description="JGLOBAL_SHOW_PARENT_CATEGORY_DESC"> + + + - + description="JGLOBAL_LINK_PARENT_CATEGORY_DESC"> - - + + - - - - + description="JGLOBAL_SHOW_AUTHOR_DESC"> + + + - - - - + description="JGLOBAL_LINK_AUTHOR_DESC"> + + + - - - - + description="JGLOBAL_SHOW_CREATE_DATE_DESC"> + + + - - - - + description="JGLOBAL_SHOW_MODIFY_DATE_DESC"> + + + - + description="JGLOBAL_SHOW_PUBLISH_DATE_DESC"> - - + + - + description="JGLOBAL_SHOW_NAVIGATION_DESC"> - + - + description="JGLOBAL_SHOW_ICONS_DESC"> - - + + - + description="JGLOBAL_SHOW_PRINT_ICON_DESC"> - - + + - - - - + description="JGLOBAL_SHOW_EMAIL_ICON_DESC"> + + + - + description="JGLOBAL_SHOW_VOTE_DESC"> - + - - - - + description="JGLOBAL_SHOW_HITS_DESC"> + + + - - - - + description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC"> + + + - + description="COM_CONTENT_FIELD_URLSPOSITION_DESC"> - + hr="true" /> - + class="inputbox" + size="25" /> - -
- -
- - - - - - - - - - + extension="com_content" + view="article" /> - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - + - - + - - + - - + + + + + + + + - - + + + + + + + + + + + + + + - - + - - + - - + - - + - - - - - - + + + + + + + + + + + - - + + + + + + + + + + + + + - + + + + + + + + + + + + + - -
- + - - - - - - - - - - - - - - - - - - - - - - - - - + + + label="JFIELD_METADATA_ROBOTS_LABEL" + description="JFIELD_METADATA_ROBOTS_DESC"> - - - - + + + + - - - - - - - - - - - - - + + + + - - - - - - - - - - -
- - - - - - - - - - - - - + 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 e0d02b5641dcd..f0c93ab38555d 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 = isset($app->item_associations) ? $app->item_associations : 0; - -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)) : ?> + + loadTemplate('associations'); ?> + + + + canDo->get('core.admin')) : ?> + + form->getInput('rules'); ?> + + + + show_options = $params->get('show_article_options'); ?> + + + + + + +
diff --git a/administrator/components/com_contenthistory/contenthistory.xml b/administrator/components/com_contenthistory/contenthistory.xml index 393d5ce902cd2..960e1ceff7a86 100644 --- a/administrator/components/com_contenthistory/contenthistory.xml +++ b/administrator/components/com_contenthistory/contenthistory.xml @@ -17,6 +17,7 @@ + config.xml controller.php index.html contenthistory.php diff --git a/administrator/components/com_contenthistory/controller.php b/administrator/components/com_contenthistory/controller.php index 2fcc534b78038..2e23add0d4347 100644 --- a/administrator/components/com_contenthistory/controller.php +++ b/administrator/components/com_contenthistory/controller.php @@ -14,8 +14,26 @@ * * @package Joomla.Administrator * @subpackage com_contenthistory - * @since 3.2 + * @since 1.5 */ class ContenthistoryController extends JControllerLegacy { + /** + * Method to display a view. + * + * @param boolean $cachable If true, the view output will be cached + * @param array $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. + * @since 1.5 + */ + public function display($cachable = false, $urlparams = false) + { + $view = $this->input->get('view', 'history'); + $layout = $this->input->get('layout', 'modal'); + + parent::display(); + + return $this; + } } diff --git a/administrator/components/com_contenthistory/controllers/history.php b/administrator/components/com_contenthistory/controllers/history.php index 46837097833f5..e24af025b2418 100644 --- a/administrator/components/com_contenthistory/controllers/history.php +++ b/administrator/components/com_contenthistory/controllers/history.php @@ -30,7 +30,7 @@ public function delete() JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN')); // Get items to remove from the request. - $cid = $this->input->get('cid', array(), 'array'); + $cid = $this->input->get('cid', array(), 'array'); if (!is_array($cid) || count($cid) < 1) { @@ -78,7 +78,9 @@ public function delete() */ public function getModel($name = 'History', $prefix = 'ContenthistoryModel', $config = array('ignore_request' => true)) { - return parent::getModel($name, $prefix, $config); + $model = parent::getModel($name, $prefix, $config); + + return $model; } /** diff --git a/administrator/components/com_contenthistory/controllers/preview.php b/administrator/components/com_contenthistory/controllers/preview.php index 311700c8ffb82..ff2780b0f8935 100644 --- a/administrator/components/com_contenthistory/controllers/preview.php +++ b/administrator/components/com_contenthistory/controllers/preview.php @@ -20,17 +20,26 @@ class ContenthistoryControllerPreview extends JControllerLegacy { /** * Proxy for getModel. + * @since 1.6 + */ + public function getModel($name = 'Preview', $prefix = 'ContenthistoryModel', $config = array('ignore_request' => true)) + { + $model = parent::getModel($name, $prefix, $config); + return $model; + } + + /** + * Method to provide child classes the opportunity to process after the delete task. * - * @param string $name The name of the model - * @param string $prefix The prefix for the model - * @param array $config An additional array of parameters + * @param JModelLegacy $model The model for the component + * @param mixed $ids array of ids deleted. * - * @return JModelLegacy The model + * @return void * - * @since 3.2 + * @since 3.1 */ - public function getModel($name = 'Preview', $prefix = 'ContenthistoryModel', $config = array('ignore_request' => true)) + protected function postDeleteHook(JModelLegacy $model, $ids = null) { - return parent::getModel($name, $prefix, $config); } + } diff --git a/administrator/components/com_contenthistory/helpers/contenthistory.php b/administrator/components/com_contenthistory/helpers/contenthistory.php index d0b1d67d6a90d..bb40686e61d71 100644 --- a/administrator/components/com_contenthistory/helpers/contenthistory.php +++ b/administrator/components/com_contenthistory/helpers/contenthistory.php @@ -93,10 +93,10 @@ public static function getFormValues($object, JTableContenttype $typesTable) { $labels = array(); $values = array(); - $expandedObjectArray = static::createObjectArray($object); - static::loadLanguageFiles($typesTable->type_alias); + $expandedObjectArray = self::createObjectArray($object); + self::loadLanguageFiles($typesTable->type_alias); - if ($formFile = static::getFormFile($typesTable)) + if ($formFile = self::getFormFile($typesTable)) { if ($xml = simplexml_load_file($formFile)) { @@ -141,7 +141,7 @@ public static function getFormValues($object, JTableContenttype $typesTable) * * @param JTableContenttype $typesTable Table object with content history options. * - * @return mixed JModel object if successful, false if no model found. + * @return mixed JModel object if successful, false if no model found. * * @since 3.2 */ @@ -180,7 +180,7 @@ public static function getFormFile(JTableContenttype $typesTable) * @param stdClass $lookup The std object with the values needed to do the query. * @param mixed $value The value used to find the matching title or name. Typically the id. * - * @return mixed Value from database (for example, name or title) on success, false on failure. + * @return mixed Value from database (for example, name or title) on success, false on failure. * * @since 3.2 */ @@ -242,7 +242,7 @@ public static function hideFields($object, JTableContenttype $typeTable) * * @param string $typeAlias The type alias, for example 'com_content.article'. * - * @return void + * @return null * * @since 3.2 */ @@ -254,7 +254,6 @@ public static function loadLanguageFiles($typeAlias) { $component = ($aliasArray[1] == 'category') ? 'com_categories' : $aliasArray[0]; $lang = JFactory::getLanguage(); - /** * Loading language file from the administrator/language directory then * loading language file from the administrator/components/extension/language directory @@ -278,7 +277,7 @@ public static function loadLanguageFiles($typeAlias) * @param stdClass $object The std object from the JSON string. Can be nested 1 level deep. * @param stdClass $formValues Standard class of label and value in an associative array. * - * @return stdClass Object with translated labels where available + * @return stdClass Object with translated labels where available * * @since 3.2 */ @@ -319,19 +318,19 @@ public static function mergeLabels($object, $formValues) * * @param JTableContenthistory $table Table object loaded with data. * - * @return stdClass Object ready for the views. + * @return stdClass Object ready for the views. * * @since 3.2 */ public static function prepareData(JTableContenthistory $table) { - $object = static::decodeFields($table->version_data); + $object = self::decodeFields($table->version_data); $typesTable = JTable::getInstance('Contenttype'); $typesTable->load(array('type_id' => $table->ucm_type_id)); - $formValues = static::getFormValues($object, $typesTable); - $object = static::mergeLabels($object, $formValues); - $object = static::hideFields($object, $typesTable); - $object = static::processLookupFields($object, $typesTable); + $formValues = self::getFormValues($object, $typesTable); + $object = self::mergeLabels($object, $formValues); + $object = self::hideFields($object, $typesTable); + $object = self::processLookupFields($object, $typesTable); return $object; } @@ -343,7 +342,7 @@ public static function prepareData(JTableContenthistory $table) * @param stdClass $object The std object from the JSON string. Can be nested 1 level deep. * @param JTableContenttype $typesTable Table object loaded with data. * - * @return stdClass Object with lookup values inserted. + * @return stdClass Object with lookup values inserted. * * @since 3.2 */ @@ -358,7 +357,7 @@ public static function processLookupFields($object, JTableContenttype $typesTabl $sourceColumn = isset($lookup->source_column) ? $lookup->source_column : false; $sourceValue = isset($object->$sourceColumn->value) ? $object->$sourceColumn->value : false; - if ($sourceColumn && $sourceValue && ($lookupValue = static::getLookupValue($lookup, $sourceValue))) + if ($sourceColumn && $sourceValue && ($lookupValue = self::getLookupValue($lookup, $sourceValue))) { $object->$sourceColumn->value = $lookupValue; } diff --git a/administrator/components/com_contenthistory/models/history.php b/administrator/components/com_contenthistory/models/history.php index 8681cb1130266..265245677d6e9 100644 --- a/administrator/components/com_contenthistory/models/history.php +++ b/administrator/components/com_contenthistory/models/history.php @@ -14,7 +14,7 @@ * * @package Joomla.Administrator * @subpackage com_contenthistory - * @since 3.2 + * @since 1.6 */ class ContenthistoryModelHistory extends JModelList { @@ -23,8 +23,8 @@ class ContenthistoryModelHistory extends JModelList * * @param array $config An optional associative array of configuration settings. * - * @see JControllerLegacy - * @since 3.2 + * @see JController + * @since 1.6 */ public function __construct($config = array()) { @@ -227,10 +227,11 @@ public function keep(&$pks) * * @return void * - * @since 3.2 + * @since 1.6 */ protected function populateState($ordering = null, $direction = null) { + $app = JFactory::getApplication('administrator'); $input = JFactory::getApplication()->input; $itemId = $input->get('item_id', 0, 'integer'); $typeId = $input->get('type_id', 0, 'integer'); @@ -254,7 +255,7 @@ protected function populateState($ordering = null, $direction = null) * * @return JDatabaseQuery * - * @since 3.2 + * @since 1.6 */ protected function getListQuery() { @@ -264,18 +265,18 @@ protected function getListQuery() // Select the required fields from the table. $query->select( - $this->getState( - 'list.select', - 'h.version_id, h.ucm_item_id, h.ucm_type_id, h.version_note, h.save_date, h.editor_user_id,' . - 'h.character_count, h.sha1_hash, h.version_data, h.keep_forever' - ) - ) - ->from($db->quoteName('#__ucm_history') . ' AS h') - ->where($db->quoteName('h.ucm_item_id') . ' = ' . $this->getState('item_id')) - ->where($db->quoteName('h.ucm_type_id') . ' = ' . $this->getState('type_id')) + $this->getState( + 'list.select', + 'h.version_id, h.ucm_item_id, h.ucm_type_id, h.version_note, h.save_date, h.editor_user_id,' . + 'h.character_count, h.sha1_hash, h.version_data, h.keep_forever' + ) + ); + $query->from($db->quoteName('#__ucm_history') . ' AS h'); + $query->where($db->quoteName('h.ucm_item_id') . ' = ' . $this->getState('item_id')); + $query->where($db->quoteName('h.ucm_type_id') . ' = ' . $this->getState('type_id')); // Join over the users for the editor - ->select('uc.name AS editor') + $query->select('uc.name AS editor') ->join('LEFT', '#__users AS uc ON uc.id = h.editor_user_id'); // Add the list ordering clause. @@ -306,7 +307,7 @@ protected function getSha1Hash() if ($contentTable && $contentTable->load($keyValue)) { - $helper = new JHelper; + $helper = new JHelperContenthistory; $dataObject = $helper->getDataObject($contentTable); $result = $this->getTable('Contenthistory', 'JTable')->getSha1(json_encode($dataObject)); diff --git a/administrator/components/com_contenthistory/models/preview.php b/administrator/components/com_contenthistory/models/preview.php index 7b4e1499a8f1f..56d9780fedca1 100644 --- a/administrator/components/com_contenthistory/models/preview.php +++ b/administrator/components/com_contenthistory/models/preview.php @@ -16,7 +16,7 @@ * * @package Joomla.Administrator * @subpackage com_contenthistory - * @since 3.2 + * @since 1.6 */ class ContenthistoryModelPreview extends JModelItem { diff --git a/administrator/components/com_finder/config.xml b/administrator/components/com_finder/config.xml index 1508d2af03def..a9d1cc178b378 100644 --- a/administrator/components/com_finder/config.xml +++ b/administrator/components/com_finder/config.xml @@ -4,102 +4,105 @@ name="search" label="COM_FINDER_FIELDSET_SEARCH_OPTIONS_LABEL" description="COM_FINDER_FIELDSET_SEARCH_OPTIONS_DESCRIPTION" > - - - + - - - + - - + COM_FINDER_CONFIG_SORT_OPTION_START_DATE + COM_FINDER_CONFIG_SORT_OPTION_DESCENDING - - - + + + cols="30" rows="2" /> +
- J250 - - - - - - - - COM_FINDER_CONFIG_STEMMER_FR - +
- +
diff --git a/administrator/components/com_finder/controllers/indexer.json.php b/administrator/components/com_finder/controllers/indexer.json.php index 86a39efec40a7..1a269e5b248c1 100644 --- a/administrator/components/com_finder/controllers/indexer.json.php +++ b/administrator/components/com_finder/controllers/indexer.json.php @@ -168,6 +168,7 @@ public function batch() $admin = clone(JFactory::getApplication()); // Get the site app. + include_once JPATH_SITE . '/includes/application.php'; $site = JApplication::getInstance('site'); // Swap the app. @@ -281,10 +282,9 @@ public static function sendResponse($data = null) // Send the assigned error code if we are catching an exception. if ($data instanceof Exception) { - $app = JFactory::getApplication(); JLog::add($data->getMessage(), JLog::ERROR); - $app->setHeader('status', $data->getCode()); - $app->sendHeaders(); + JResponse::setHeader('status', $data->getCode()); + JResponse::sendHeaders(); } // Create the response object. diff --git a/administrator/components/com_finder/helpers/finder.php b/administrator/components/com_finder/helpers/finder.php index f06deed21a8c7..738ae43796b6f 100644 --- a/administrator/components/com_finder/helpers/finder.php +++ b/administrator/components/com_finder/helpers/finder.php @@ -27,11 +27,12 @@ class FinderHelper /** * Configure the Linkbar. * - * @param string $vName The name of the active view. + * @param string $vName The name of the active view. * - * @return void + * @return void * - * @since 2.5 + * @since 2.5 + * @deprecated 3.2 */ public static function addSubmenu($vName) { diff --git a/administrator/components/com_finder/helpers/indexer/helper.php b/administrator/components/com_finder/helpers/indexer/helper.php index ee0dae1eef65d..58c9defb20508 100644 --- a/administrator/components/com_finder/helpers/indexer/helper.php +++ b/administrator/components/com_finder/helpers/indexer/helper.php @@ -405,6 +405,8 @@ public static function getContentPath($url) // Only get the router once. if (!($router instanceof JRouter)) { + include_once JPATH_SITE . '/includes/application.php'; + // Get and configure the site router. $config = JFactory::getConfig(); $router = JRouter::getInstance('site'); diff --git a/administrator/components/com_finder/models/forms/filter.xml b/administrator/components/com_finder/models/forms/filter.xml index cbf7481f683fd..547fb3ce9f825 100644 --- a/administrator/components/com_finder/models/forms/filter.xml +++ b/administrator/components/com_finder/models/forms/filter.xml @@ -1,93 +1,149 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - -
- - + + - - - - + required="true" /> + + + + + + + + + + + + + + + + + + + + - + - - - - - - +
+ + - +
+ + + + + + + + + + + + + + + + + + + +
diff --git a/administrator/components/com_finder/views/filter/tmpl/edit.php b/administrator/components/com_finder/views/filter/tmpl/edit.php index 992cfdefb04a3..08d85aa0d6a0e 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_installer/config.xml b/administrator/components/com_installer/config.xml index c741282ab4970..85e3e3cd4ab07 100644 --- a/administrator/components/com_installer/config.xml +++ b/administrator/components/com_installer/config.xml @@ -3,32 +3,30 @@
- + + + default="6" /> +
+ description="JCONFIG_PERMISSIONS_DESC"> - +
diff --git a/administrator/components/com_installer/views/languages/tmpl/default_filter.php b/administrator/components/com_installer/views/languages/tmpl/default_filter.php index eb6616c69ffd1..823af2d72d65a 100644 --- a/administrator/components/com_installer/views/languages/tmpl/default_filter.php +++ b/administrator/components/com_installer/views/languages/tmpl/default_filter.php @@ -24,4 +24,6 @@
-
+ +
+ diff --git a/administrator/components/com_joomlaupdate/config.xml b/administrator/components/com_joomlaupdate/config.xml index eaa1899edf4d8..57324b53ad33a 100644 --- a/administrator/components/com_joomlaupdate/config.xml +++ b/administrator/components/com_joomlaupdate/config.xml @@ -3,16 +3,13 @@
+ description="COM_JOOMLAUPDATE_CONFIG_SOURCES_DESC"> - + description="COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_DESC"> @@ -20,29 +17,27 @@ - + description="COM_JOOMLAUPDATE_CONFIG_CUSTOMURL_DESC" /> +
+ description="JCONFIG_PERMISSIONS_DESC"> - +
diff --git a/administrator/components/com_languages/config.xml b/administrator/components/com_languages/config.xml index 5453162acf872..08a4212c8d4c2 100644 --- a/administrator/components/com_languages/config.xml +++ b/administrator/components/com_languages/config.xml @@ -3,11 +3,9 @@
+ description="JConfig_Permissions_Desc"> - - - + + + +
diff --git a/administrator/components/com_languages/models/forms/language.xml b/administrator/components/com_languages/models/forms/language.xml index 7e8247d63838d..5e1fc44b9c31a 100644 --- a/administrator/components/com_languages/models/forms/language.xml +++ b/administrator/components/com_languages/models/forms/language.xml @@ -1,13 +1,13 @@
+ + readonly="true" /> + size="10" /> + size="40" /> + size="40" /> + size="10" /> + size="10" /> + rows="5" /> + size="1"> - + + description="JFIELD_ACCESS_DESC" /> +
+
+ + cols="30" /> + cols="30" /> +
+
+ + size="50" /> +
diff --git a/administrator/components/com_languages/models/forms/override.xml b/administrator/components/com_languages/models/forms/override.xml index 7f1851cb87f5d..45558c8c997f9 100644 --- a/administrator/components/com_languages/models/forms/override.xml +++ b/administrator/components/com_languages/models/forms/override.xml @@ -1,8 +1,8 @@
- - - - - @@ -55,8 +50,7 @@ filter="unset" readonly="true" class="readonly" - size="50" - /> + size="50" /> + size="50" /> + size="80" /> - +
diff --git a/administrator/components/com_languages/views/override/tmpl/edit.php b/administrator/components/com_languages/views/override/tmpl/edit.php index e046038628a81..9d5458ec2dad6 100644 --- a/administrator/components/com_languages/views/override/tmpl/edit.php +++ b/administrator/components/com_languages/views/override/tmpl/edit.php @@ -15,6 +15,8 @@ JHtml::_('behavior.keepalive'); JHtml::_('formbehavior.chosen', 'select'); +$app = JFactory::getApplication(); +$langs = isset($app->languages_enabled); ?> -
- -
- '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_messages/config.xml b/administrator/components/com_messages/config.xml index 38c31c0719aa1..6ab65943676b6 100644 --- a/administrator/components/com_messages/config.xml +++ b/administrator/components/com_messages/config.xml @@ -3,16 +3,15 @@
+ description="JCONFIG_PERMISSIONS_DESC"> - +
diff --git a/administrator/components/com_messages/controller.php b/administrator/components/com_messages/controller.php index a63b9ab8be81a..68ffdba6818c4 100644 --- a/administrator/components/com_messages/controller.php +++ b/administrator/components/com_messages/controller.php @@ -46,8 +46,6 @@ public function display($cachable = false, $urlparams = false) return false; } - // Load the submenu. - MessagesHelper::addSubmenu($this->input->get('view', 'messages')); parent::display(); } diff --git a/administrator/components/com_messages/helpers/messages.php b/administrator/components/com_messages/helpers/messages.php index 5a18f37374385..e7b308b199ae0 100644 --- a/administrator/components/com_messages/helpers/messages.php +++ b/administrator/components/com_messages/helpers/messages.php @@ -19,10 +19,11 @@ class MessagesHelper /** * Configure the Linkbar. * - * @param string The name of the active view. + * @param string The name of the active view. * - * @return void - * @since 1.6 + * @return void + * @since 1.6 + * @deprecated 3.2 */ public static function addSubmenu($vName) { diff --git a/administrator/components/com_messages/models/forms/config.xml b/administrator/components/com_messages/models/forms/config.xml index 939f7e91d00c4..6742bd1cd97c5 100644 --- a/administrator/components/com_messages/models/forms/config.xml +++ b/administrator/components/com_messages/models/forms/config.xml @@ -1,39 +1,34 @@
- - - + + - - - + + - +
diff --git a/administrator/components/com_messages/models/forms/message.xml b/administrator/components/com_messages/models/forms/message.xml index c4a9b4115904e..ede5b0944694c 100644 --- a/administrator/components/com_messages/models/forms/message.xml +++ b/administrator/components/com_messages/models/forms/message.xml @@ -1,23 +1,21 @@
- - - +
diff --git a/administrator/components/com_modules/models/forms/module.xml b/administrator/components/com_modules/models/forms/module.xml index d6b7f89c8b6c5..458360492d4e6 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); ?>

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

+ + + +

- -
- -
-
-
-
- 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_newsfeeds/config.xml b/administrator/components/com_newsfeeds/config.xml index 2717dc8826afa..602bc4fc019d1 100644 --- a/administrator/components/com_newsfeeds/config.xml +++ b/administrator/components/com_newsfeeds/config.xml @@ -6,43 +6,34 @@ label="COM_NEWSFEEDS_FIELD_CONFIG_NEWSFEED_SETTINGS_LABEL" description="COM_NEWSFEEDS_FIELD_CONFIG_NEWSFEED_SETTINGS_DESC"> - - - + + - - + description="JGLOBAL_SAVE_HISTORY_OPTIONS_DESC"> + + - - + default="5" /> - @@ -50,11 +41,10 @@ - @@ -62,11 +52,10 @@ - @@ -74,8 +63,7 @@ - - + description="COM_NEWSFEEDS_FIELD_FEED_DISPLAY_ORDER_DESC"> - - @@ -104,8 +89,8 @@ - @@ -114,11 +99,10 @@ - @@ -133,30 +117,26 @@ label="JCATEGORY" description="COM_NEWSFEEDS_FIELD_CONFIG_CATEGORY_SETTINGS_DESC"> - + view="category" /> + default="1"> - @@ -164,14 +144,12 @@ - + description="JGLOBAL_SHOW_CATEGORY_IMAGE_DESC"> @@ -179,8 +157,7 @@ + default="-1"> @@ -191,34 +168,30 @@ + default="0"> + description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC"> - + description="COM_NEWSFEEDS_FIELD_SHOW_CAT_ITEMS_DESC"> @@ -226,9 +199,8 @@ + class="btn-group btn-group-yesno" + default="1"> @@ -241,10 +213,9 @@ + description="JGLOBAL_FIELD_SHOW_BASE_DESCRIPTION_DESC"> @@ -252,8 +223,7 @@ + label="JGLOBAL_MAXIMUM_CATEGORY_LEVELS_LABEL"> @@ -262,32 +232,30 @@ + + description="COM_NEWSFEEDS_SHOW_EMPTY_CATEGORIES_DESC"> + label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL"> + label="COM_NEWSFEEDS_FIELD_SHOW_CAT_ITEMS_LABEL"> @@ -299,64 +267,54 @@ label="JGLOBAL_LIST_LAYOUT_OPTIONS" description="COM_NEWSFEEDS_FIELD_CONFIG_LIST_SETTINGS_DESC"> - + label="JGLOBAL_FILTER_FIELD_LABEL"> - + description="JGLOBAL_DISPLAY_SELECT_DESC"> - + description="JGLOBAL_SHOW_HEADINGS_DESC"> - + description="COM_NEWSFEEDS_FIELD_NUM_ARTICLES_COLUMN_DESC"> - + description="COM_NEWSFEEDS_FIELD_SHOW_LINKS_DESC"> @@ -365,21 +323,18 @@ type="list" default="2" label="JGLOBAL_PAGINATION_LABEL" - description="JGLOBAL_PAGINATION_DESC" - > + description="JGLOBAL_PAGINATION_DESC"> - + description="JGLOBAL_PAGINATION_RESULTS_DESC"> @@ -389,16 +344,15 @@
+ description="JCONFIG_PERMISSIONS_DESC"> - +
diff --git a/administrator/components/com_newsfeeds/helpers/newsfeeds.php b/administrator/components/com_newsfeeds/helpers/newsfeeds.php index 76c435e6a005c..de081679a18db 100644 --- a/administrator/components/com_newsfeeds/helpers/newsfeeds.php +++ b/administrator/components/com_newsfeeds/helpers/newsfeeds.php @@ -16,16 +16,15 @@ * @subpackage com_newsfeeds * @since 1.6 */ -class NewsfeedsHelper extends JHelperContent +class NewsfeedsHelper { public static $extension = 'com_newsfeeds'; /** * Configure the Linkbar. * - * @param string $vName The name of the active view. - * - * @return void + * @param string The name of the active view. + * @deprecated 3.2 */ public static function addSubmenu($vName) { @@ -39,7 +38,6 @@ public static function addSubmenu($vName) 'index.php?option=com_categories&extension=com_newsfeeds', $vName == 'categories' ); - if ($vName == 'categories') { JToolbarHelper::title( @@ -48,4 +46,36 @@ public static function addSubmenu($vName) } } + /** + * Gets a list of the actions that can be performed. + * + * @param integer The category ID. + * + * @return JObject + */ + public static function getActions($categoryId = 0, $newsfeedId = 0) + { + $user = JFactory::getUser(); + $result = new JObject; + + if (empty($categoryId)) + { + $assetName = 'com_newsfeeds'; + $level = 'component'; + } + else + { + $assetName = 'com_newsfeeds.category.'.(int) $categoryId; + $level = 'category'; + } + + $actions = JAccess::getActions('com_newsfeeds', $level); + + foreach ($actions as $action) + { + $result->set($action->name, $user->authorise($action->name, $assetName)); + } + + return $result; + } } diff --git a/administrator/components/com_newsfeeds/models/forms/newsfeed.xml b/administrator/components/com_newsfeeds/models/forms/newsfeed.xml index a7f8b608a29b8..e6cf5cf46d877 100644 --- a/administrator/components/com_newsfeeds/models/forms/newsfeed.xml +++ b/administrator/components/com_newsfeeds/models/forms/newsfeed.xml @@ -1,279 +1,380 @@
-
- + + - - - - - - - + + + + + - + - + - + class="inputbox" + multiple="true"> - - + description="JGLOBAL_FIELD_VERSION_NOTE_DESC" + class="inputbox" + size="45" + labelclass="control-label" /> - - - - - - - + + - - - - - - - - - + + - + - + - + - + - + - - + readonly="true" + filter="unset" /> - - - + - + - + - +
- - + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + - - - - - + + + + + + - - + + - - - - - + + + + + + - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - -
+ +
+ type="list" + label="JFIELD_METADATA_ROBOTS_LABEL" + description="JFIELD_METADATA_ROBOTS_DESC"> @@ -281,15 +382,22 @@ - + +
diff --git a/administrator/components/com_newsfeeds/models/newsfeed.php b/administrator/components/com_newsfeeds/models/newsfeed.php index aaf4c1e70d355..ee7f56c95e2ee 100644 --- a/administrator/components/com_newsfeeds/models/newsfeed.php +++ b/administrator/components/com_newsfeeds/models/newsfeed.php @@ -316,9 +316,7 @@ public function save($data) if (parent::save($data)) { - - $assoc = isset($app->item_associations) ? $app->item_associations : 0; - if ($assoc) + if (isset($app->item_associations)) { $id = (int) $this->getState($this->getName() . '.id'); $item = $this->getItem($id); @@ -412,10 +410,7 @@ public function getItem($pk = null) } // Load associated newsfeeds items - $app = JFactory::getApplication(); - $assoc = isset($app->item_associations) ? $app->item_associations : 0; - - if ($assoc) + if (isset(JFactory::getApplication()->item_associations)) { $item->associations = array(); @@ -517,9 +512,7 @@ protected function getReorderConditions($table) protected function preprocessForm(JForm $form, $data, $group = 'content') { // Association newsfeeds items - $app = JFactory::getApplication(); - $assoc = isset($app->item_associations) ? $app->item_associations : 0; - if ($assoc) + if (isset(JFactory::getApplication()->item_associations)) { $languages = JLanguageHelper::getLanguages('lang_code'); diff --git a/administrator/components/com_newsfeeds/models/newsfeeds.php b/administrator/components/com_newsfeeds/models/newsfeeds.php index d801f04ed9877..76cf13eb9db06 100644 --- a/administrator/components/com_newsfeeds/models/newsfeeds.php +++ b/administrator/components/com_newsfeeds/models/newsfeeds.php @@ -48,9 +48,7 @@ public function __construct($config = array()) 'numarticles', ); - $app = JFactory::getApplication(); - $assoc = isset($app->item_associations) ? $app->item_associations : 0; - if ($assoc) + if (isset(JFactory::getApplication()->item_associations)) { $config['filter_fields'][] = 'association'; } @@ -144,7 +142,6 @@ protected function getListQuery() $db = $this->getDbo(); $query = $db->getQuery(true); $user = JFactory::getUser(); - $app = JFactory::getApplication(); // Select the required fields from the table. $query->select( @@ -174,8 +171,7 @@ protected function getListQuery() ->join('LEFT', '#__categories AS c ON c.id = a.catid'); // Join over the associations. - $assoc = isset($app->item_associations) ? $app->item_associations : 0; - if ($assoc) + if (isset(JFactory::getApplication()->item_associations)) { $query->select('COUNT(asso2.id)>1 as association') ->join('LEFT', '#__associations AS asso ON asso.id = a.id AND asso.context=' . $db->quote('com_newsfeeds.item')) diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php index 387b1d90a142e..bac7c526acd95 100644 --- a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php +++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php @@ -18,186 +18,59 @@ $app = JFactory::getApplication(); $input = $app->input; - -$assoc = isset($app->item_associations) ? $app->item_associations : 0; +$assoc = isset($app->item_associations); ?> - - - + -
- -
+ -
- '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'); ?>
+
+
+
- form->getFieldsets('params'); ?> - $fieldSet) : ?> - - label, true)); ?> - loadTemplate('params'); ?> - - + - form->getFieldsets('metadata'); ?> - $fieldSet) : ?> - - label, true)); ?> - loadTemplate('metadata'); ?> - - - - + item_associations)) : ?> - loadTemplate('associations'); ?> + loadTemplate('associations'); ?> -
- - - -
- - - -
+ + diff --git a/administrator/components/com_plugins/config.xml b/administrator/components/com_plugins/config.xml index 1be01d303eb54..579c1ea83d6cf 100644 --- a/administrator/components/com_plugins/config.xml +++ b/administrator/components/com_plugins/config.xml @@ -5,13 +5,13 @@ label="JCONFIG_PERMISSIONS_LABEL" description="JCONFIG_PERMISSIONS_DESC"> - +
diff --git a/administrator/components/com_plugins/models/forms/plugin.xml b/administrator/components/com_plugins/models/forms/plugin.xml index 5ee153274380e..5e808e0dcdf8b 100644 --- a/administrator/components/com_plugins/models/forms/plugin.xml +++ b/administrator/components/com_plugins/models/forms/plugin.xml @@ -1,67 +1,59 @@
-
- +
- + - - - - + - + + + + - + - + - + -
+ + +
diff --git a/administrator/components/com_plugins/views/plugin/tmpl/edit.php b/administrator/components/com_plugins/views/plugin/tmpl/edit.php index 0795e116f82e1..ddda13822b428 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,87 @@ -
-
- '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); ?>

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

+ + + +

+
-
- -
+
+ 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_redirect/config.xml b/administrator/components/com_redirect/config.xml index fa9f7325f7b17..4141e6e9a503a 100644 --- a/administrator/components/com_redirect/config.xml +++ b/administrator/components/com_redirect/config.xml @@ -5,13 +5,13 @@ label="JCONFIG_PERMISSIONS_LABEL" description="JCONFIG_PERMISSIONS_DESC"> - +
diff --git a/administrator/components/com_redirect/controller.php b/administrator/components/com_redirect/controller.php index c99282c3f7092..534e455bda974 100644 --- a/administrator/components/com_redirect/controller.php +++ b/administrator/components/com_redirect/controller.php @@ -37,9 +37,6 @@ public function display($cachable = false, $urlparams = false) { require_once JPATH_COMPONENT.'/helpers/redirect.php'; - // Load the submenu. - RedirectHelper::addSubmenu($this->input->get('view', 'links')); - $view = $this->input->get('view', 'links'); $layout = $this->input->get('layout', 'default'); $id = $this->input->getInt('id'); diff --git a/administrator/components/com_redirect/models/forms/link.xml b/administrator/components/com_redirect/models/forms/link.xml index 54033f7d91b7d..ddb289feced72 100644 --- a/administrator/components/com_redirect/models/forms/link.xml +++ b/administrator/components/com_redirect/models/forms/link.xml @@ -1,8 +1,8 @@
- - - - - - - - - - - - - +
diff --git a/administrator/components/com_search/config.xml b/administrator/components/com_search/config.xml index bebb37f5eb1c8..3d3a9b6ef61f4 100644 --- a/administrator/components/com_search/config.xml +++ b/administrator/components/com_search/config.xml @@ -1,72 +1,63 @@ +
- - - + + + label="COM_SEARCH_FIELD_SEARCH_AREAS_LABEL"> - - - + + - + description="COM_SEARCH_CONFIG_FIELD_OPENSEARCH_NAME_DESC" /> - + cols="30" rows="2" /> +
+ description="JCONFIG_PERMISSIONS_DESC"> - +
diff --git a/administrator/components/com_search/controller.php b/administrator/components/com_search/controller.php index c417e006efc65..3ad5819708c5e 100644 --- a/administrator/components/com_search/controller.php +++ b/administrator/components/com_search/controller.php @@ -37,9 +37,6 @@ public function display($cachable = false, $urlparams = false) { require_once JPATH_COMPONENT.'/helpers/search.php'; - // Load the submenu. - SearchHelper::addSubmenu($this->input->get('view', 'searches')); - parent::display(); } } diff --git a/administrator/components/com_tags/config.xml b/administrator/components/com_tags/config.xml index ef782a4512d6e..c27b378a4fcd3 100644 --- a/administrator/components/com_tags/config.xml +++ b/administrator/components/com_tags/config.xml @@ -5,69 +5,57 @@ label="COM_TAGS_CONFIG_TAG_SETTINGS_LABEL" description="COM_TAGS_CONFIG_TAG_SETTINGS_DESC"> - - - + + + default="0"> - + default="1"> - + default="1"> - - - + + + default="0"> - + JGLOBAL_PUBLISHED_DATE - + default="ASC"> - - + label="JGLOBAL_SHOW_HEADINGS_LABEL"> - + description="JGLOBAL_SHOW_DATE_DESC"> - - + default="1"> - - + description="COM_TAGS_TAG_LIST_SHOW_ITEM_DESCRIPTION_DESC"> - -
- +
- - + default="1"> - - + default="0"> - - - - JCURRENT - -
+ +
- + view="tags" /> - + description="JGLOBAL_FIELD_FIELD_ORDERING_DESC"> @@ -230,58 +197,48 @@ - + default="ASC"> - + default="1"> - + default="1"> - - - - + + + default="0"> @@ -291,88 +248,77 @@ name="shared" label="COM_TAGS_CONFIG_SHARED_SETTINGS_LABEL" description="COM_TAGS_CONFIG_SHARED_SETTINGS_DESC"> - - + label="JGLOBAL_FILTER_FIELD_LABEL"> - + label="JGLOBAL_DISPLAY_SELECT_LABEL"> - - + label="JGLOBAL_PAGINATION_LABEL"> - + description="JGLOBAL_PAGINATION_RESULTS_DESC"> - +
- +
- - + default="1"> - - - + + +
- -
+ description="COM_TAGS_CONFIG_INTEGRATION_SETTINGS_DESC"> - @@ -385,16 +331,15 @@
+ description="JCONFIG_PERMISSIONS_DESC"> - +
diff --git a/administrator/components/com_tags/models/forms/tag.xml b/administrator/components/com_tags/models/forms/tag.xml index 2e2314148c7c9..8f0850b4098e0 100644 --- a/administrator/components/com_tags/models/forms/tag.xml +++ b/administrator/components/com_tags/models/forms/tag.xml @@ -1,365 +1,298 @@
+ - + + + - + readonly="true" /> - + readonly="true" /> - + parent="parent"> - + filter="unset" /> - + filter="unset" /> - + filter="unset" /> - + readonly="true" /> - + required="true" /> - + size="40" /> - + hide="readmore,pagebreak" /> - + size="1"> - + filter="unset" /> - + filter="unset" /> - + class="" /> - + cols="40" /> - + cols="40" /> - + placeholder="JFIELD_ALIAS_PLACEHOLDER" + size="40" /> - - - + + + size="20" /> - + readonly="true" /> - + filter="unset" /> - + readonly="true" /> - + description="COM_TAGS_FIELD_LANGUAGE_DESC"> -
- + + + view="tag" /> - + default="label label-info" />
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
- - - + + + description="JFIELD_METADATA_ROBOTS_DESC"> +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/administrator/components/com_tags/views/tag/tmpl/edit.php b/administrator/components/com_tags/views/tag/tmpl/edit.php index d2aa20031a950..eb56a7d4c7b73 100644 --- a/administrator/components/com_tags/views/tag/tmpl/edit.php +++ b/administrator/components/com_tags/views/tag/tmpl/edit.php @@ -10,10 +10,10 @@ defined('_JEXEC') or die; // Include the component HTML helpers. -JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html'); +JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); $app = JFactory::getApplication(); -$input = $app->input; +$langs = isset($app->languages_enabled); JHtml::_('behavior.formvalidation'); JHtml::_('behavior.keepalive'); @@ -22,7 +22,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'); ?> -
-
- + - item->version) : ?> -
- form->getLabel('version'); ?> -
- form->getInput('version'); ?> -
-
- +
+ 'details')); ?> - 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_templates/config.xml b/administrator/components/com_templates/config.xml index 37a229bce09ed..0c5eca797b2e0 100644 --- a/administrator/components/com_templates/config.xml +++ b/administrator/components/com_templates/config.xml @@ -5,32 +5,30 @@ label="COM_TEMPLATES_SUBMENU_TEMPLATES" description="COM_TEMPLATES_CONFIG_FIELDSET_DESC"> - - - + + +
- + + +
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..6cf5530c25753 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_users/config.xml b/administrator/components/com_users/config.xml index f11f8826e7413..6cf19e98956cd 100644 --- a/administrator/components/com_users/config.xml +++ b/administrator/components/com_users/config.xml @@ -1,127 +1,104 @@ +
- - - + + - - - - - + + - - - - + + + - - - + + - - - + + - - - + + - - - + + - - - + + - - - - - - +
- + description="COM_USERS_CONFIG_FIELD_SUBJECT_PREFIX_DESC" /> - + description="COM_USERS_CONFIG_FIELD_MAILBODY_SUFFIX_DESC" />
+ description="JCONFIG_PERMISSIONS_DESC"> - +
diff --git a/administrator/components/com_users/models/forms/group.xml b/administrator/components/com_users/models/forms/group.xml index ef047be40f4b3..41d0d913c3dba 100644 --- a/administrator/components/com_users/models/forms/group.xml +++ b/administrator/components/com_users/models/forms/group.xml @@ -1,35 +1,32 @@
+ + readonly="true" /> + size="40" /> + required="true" /> + multiple="true" /> + filter="unset" /> + + filter="unset" /> +
diff --git a/administrator/components/com_users/models/forms/level.xml b/administrator/components/com_users/models/forms/level.xml index 99a9522aa297d..7835fd0274136 100644 --- a/administrator/components/com_users/models/forms/level.xml +++ b/administrator/components/com_users/models/forms/level.xml @@ -1,27 +1,25 @@
+ + required="true" /> + size="50" /> + label="JFIELD_ORDERING_LABEL" /> + filter="int_array" /> +
diff --git a/administrator/components/com_users/models/forms/mail.xml b/administrator/components/com_users/models/forms/mail.xml index 3687606aaa94f..d9175232b51df 100644 --- a/administrator/components/com_users/models/forms/mail.xml +++ b/administrator/components/com_users/models/forms/mail.xml @@ -5,27 +5,23 @@ + value="1" /> - + value="1" /> + + value="1" /> + size="10"> @@ -33,23 +29,21 @@ default="1" description="COM_USERS_MAIL_FIELD_SEND_AS_BLIND_CARBON_COPY_DESC" label="COM_USERS_MAIL_FIELD_SEND_AS_BLIND_CARBON_COPY_LABEL" - value="1" - /> + value="1" /> + size="30" /> + rows="20" /> +
diff --git a/administrator/components/com_users/models/forms/note.xml b/administrator/components/com_users/models/forms/note.xml index 0c5843c04aadc..4e89e68b7eb8d 100644 --- a/administrator/components/com_users/models/forms/note.xml +++ b/administrator/components/com_users/models/forms/note.xml @@ -1,27 +1,23 @@
- + label="COM_USERS_FIELD_ID_LABEL" /> - + label="COM_USERS_FIELD_USER_ID_LABEL" /> - - + description="COM_USERS_FIELD_SUBJECT_DESC" /> - + description="COM_USERS_FIELD_NOTEBODY_DESC" /> - - - - - + + + + - + format="%Y-%m-%d" /> - + filter="unset" /> - + filter="unset" /> - + filter="unset" /> - + filter="unset" /> - + filter="unset" /> - - + filter="unset" /> + + filter="user_utc" /> +
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">