diff --git a/administrator/components/com_banners/views/banners/tmpl/default_batch_body.php b/administrator/components/com_banners/views/banners/tmpl/default_batch_body.php index 708673688cb96..d24864eb90199 100644 --- a/administrator/components/com_banners/views/banners/tmpl/default_batch_body.php +++ b/administrator/components/com_banners/views/banners/tmpl/default_batch_body.php @@ -12,7 +12,6 @@ $published = $this->state->get('filter.published'); ?> -

diff --git a/administrator/components/com_categories/views/categories/tmpl/default_batch.php b/administrator/components/com_categories/views/categories/tmpl/default_batch.php old mode 100644 new mode 100755 index 4cf5a49231163..846a992246283 --- a/administrator/components/com_categories/views/categories/tmpl/default_batch.php +++ b/administrator/components/com_categories/views/categories/tmpl/default_batch.php @@ -53,7 +53,7 @@
-
+
diff --git a/administrator/components/com_categories/views/categories/tmpl/default_batch_body.php b/administrator/components/com_categories/views/categories/tmpl/default_batch_body.php index 8a7b6427a48c2..2be505d17e21d 100644 --- a/administrator/components/com_categories/views/categories/tmpl/default_batch_body.php +++ b/administrator/components/com_categories/views/categories/tmpl/default_batch_body.php @@ -18,7 +18,6 @@ $extension = $this->escape($this->state->get('filter.extension')); ?> -

@@ -40,12 +39,13 @@
-
+
+
diff --git a/administrator/components/com_contact/views/contacts/tmpl/default_batch_body.php b/administrator/components/com_contact/views/contacts/tmpl/default_batch_body.php index 3160d7ebb551d..fe5531d26cb99 100644 --- a/administrator/components/com_contact/views/contacts/tmpl/default_batch_body.php +++ b/administrator/components/com_contact/views/contacts/tmpl/default_batch_body.php @@ -10,7 +10,6 @@ $published = $this->state->get('filter.published'); ?> -

diff --git a/administrator/components/com_content/views/articles/tmpl/default_batch_body.php b/administrator/components/com_content/views/articles/tmpl/default_batch_body.php index 269fceb66c469..339700b176991 100644 --- a/administrator/components/com_content/views/articles/tmpl/default_batch_body.php +++ b/administrator/components/com_content/views/articles/tmpl/default_batch_body.php @@ -10,7 +10,6 @@ $published = $this->state->get('filter.published'); ?> -

diff --git a/administrator/components/com_menus/views/items/tmpl/default_batch_body.php b/administrator/components/com_menus/views/items/tmpl/default_batch_body.php index 5c3a21a9e547e..ee54115349e77 100644 --- a/administrator/components/com_menus/views/items/tmpl/default_batch_body.php +++ b/administrator/components/com_menus/views/items/tmpl/default_batch_body.php @@ -15,7 +15,6 @@ $published = $this->state->get('filter.published'); ?> -

@@ -36,12 +35,13 @@
+
diff --git a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch_body.php b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch_body.php index e10703582afe3..e0c3ae2cad6bf 100644 --- a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch_body.php +++ b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch_body.php @@ -10,7 +10,6 @@ $published = $this->state->get('filter.published'); ?> -

diff --git a/administrator/components/com_redirect/views/links/tmpl/default_batch_body.php b/administrator/components/com_redirect/views/links/tmpl/default_batch_body.php index c9100b7f2c466..17fb0c1ce9bfc 100644 --- a/administrator/components/com_redirect/views/links/tmpl/default_batch_body.php +++ b/administrator/components/com_redirect/views/links/tmpl/default_batch_body.php @@ -10,7 +10,6 @@ $published = $this->state->get('filter.published'); ?> -

diff --git a/administrator/components/com_tags/views/tags/tmpl/default_batch_body.php b/administrator/components/com_tags/views/tags/tmpl/default_batch_body.php index a4085944854c3..b99d5b896af66 100644 --- a/administrator/components/com_tags/views/tags/tmpl/default_batch_body.php +++ b/administrator/components/com_tags/views/tags/tmpl/default_batch_body.php @@ -10,7 +10,6 @@ $published = $this->state->get('filter.published'); ?> -

diff --git a/administrator/language/en-GB/en-GB.com_categories.ini b/administrator/language/en-GB/en-GB.com_categories.ini index 31b9fc177e726..639c32b31ccf1 100644 --- a/administrator/language/en-GB/en-GB.com_categories.ini +++ b/administrator/language/en-GB/en-GB.com_categories.ini @@ -13,7 +13,7 @@ COM_CATEGORIES_ACCESS_EDITSTATE_DESC="New setting for edit state actions COM_CATEGORIES_BASIC_FIELDSET_LABEL="Options" COM_CATEGORIES_BATCH_CANNOT_CREATE="You are not allowed to create new categories in this category." COM_CATEGORIES_BATCH_CANNOT_EDIT="You are not allowed to edit one or more of these categories." -COM_CATEGORIES_BATCH_CATEGORY_LABEL="Select Category for Move/Copy" +COM_CATEGORIES_BATCH_CATEGORY_LABEL="To Move or Copy your selection please select a Category." COM_CATEGORIES_BATCH_OPTIONS="Batch process the selected categories." COM_CATEGORIES_BATCH_TIP="If a category is selected for move/copy, any actions selected will be applied to the copied or moved categories. Otherwise, all actions are applied to the selected categories." COM_CATEGORIES_CATEGORIES_BASE_TITLE="Category Manager" diff --git a/administrator/language/en-GB/en-GB.com_contact.ini b/administrator/language/en-GB/en-GB.com_contact.ini index 8235141054385..26f37a32b8875 100644 --- a/administrator/language/en-GB/en-GB.com_contact.ini +++ b/administrator/language/en-GB/en-GB.com_contact.ini @@ -5,7 +5,7 @@ COM_CONTACT="Contacts" COM_CONTACT_BASIC_OPTIONS_FIELDSET_LABEL="Contact Display Options" -COM_CONTACT_BATCH_MENU_LABEL="Select Category for Move/Copy" +COM_CONTACT_BATCH_MENU_LABEL="To Move or Copy your selection please select a Category." COM_CONTACT_BATCH_OPTIONS="Batch process the selected contacts" COM_CONTACT_BATCH_TIP="If a category is selected for move/copy, any actions selected will be applied to the copied or moved contacts. Otherwise, all actions are applied to the selected contacts." COM_CONTACT_CATEGORIES_VIEW_DEFAULT_DESC="Shows a list of contact categories within a category." diff --git a/administrator/language/en-GB/en-GB.com_content.ini b/administrator/language/en-GB/en-GB.com_content.ini index 40a7b619a02ac..c1a45ba50df52 100644 --- a/administrator/language/en-GB/en-GB.com_content.ini +++ b/administrator/language/en-GB/en-GB.com_content.ini @@ -13,7 +13,7 @@ COM_CONTENT_ARTICLE_DETAILS="Article Details" COM_CONTENT_ARTICLES_TITLE="Articles" COM_CONTENT_ATTRIBS_ARTICLE_SETTINGS_LABEL="Options" COM_CONTENT_ATTRIBS_FIELDSET_LABEL="Options" -COM_CONTENT_BATCH_MENU_LABEL="Select Category for Move/Copy" +COM_CONTENT_BATCH_MENU_LABEL="To Move or Copy your selection please select a Category." COM_CONTENT_BATCH_OPTIONS="Batch process the selected articles" COM_CONTENT_BATCH_TIP="If a category is selected for move/copy, any actions selected will be applied to the copied or moved articles. Otherwise, all actions are applied to the selected articles." COM_CONTENT_CHANGE_ARTICLE="Select or Change article" diff --git a/administrator/language/en-GB/en-GB.com_menus.ini b/administrator/language/en-GB/en-GB.com_menus.ini index da95cb9291f95..57eba6671b530 100644 --- a/administrator/language/en-GB/en-GB.com_menus.ini +++ b/administrator/language/en-GB/en-GB.com_menus.ini @@ -9,7 +9,7 @@ COM_MENUS_ADVANCED_FIELDSET_LABEL="Advanced" COM_MENUS_BASIC_FIELDSET_LABEL="Options" COM_MENUS_BATCH_MENU_ITEM_CANNOT_CREATE="You are not allowed to create new menu items." COM_MENUS_BATCH_MENU_ITEM_CANNOT_EDIT="You are not allowed to edit menu items." -COM_MENUS_BATCH_MENU_LABEL="Select Menu or Parent for Move/Copy" +COM_MENUS_BATCH_MENU_LABEL="To Move or Copy your selection please select a Menu or parent item." COM_MENUS_BATCH_OPTIONS="Batch process the selected menu items" COM_MENUS_BATCH_TIP="If a menu or parent is selected for move/copy, any actions selected will be applied to the copied or moved menu items. Otherwise, all actions are applied to the selected menu items." COM_MENUS_CONFIGURATION="Menus: Options" diff --git a/administrator/language/en-GB/en-GB.com_newsfeeds.ini b/administrator/language/en-GB/en-GB.com_newsfeeds.ini index b7e7da4fd252f..a1d96a3648bb7 100644 --- a/administrator/language/en-GB/en-GB.com_newsfeeds.ini +++ b/administrator/language/en-GB/en-GB.com_newsfeeds.ini @@ -4,7 +4,7 @@ ; Note : All ini files need to be saved as UTF-8 COM_NEWSFEEDS="News Feeds" -COM_NEWSFEEDS_BATCH_MENU_LABEL="Select Category for Move/Copy" +COM_NEWSFEEDS_BATCH_MENU_LABEL="To Move or Copy your selection please select a Category." COM_NEWSFEEDS_BATCH_OPTIONS="Batch process the selected news feeds" COM_NEWSFEEDS_BATCH_TIP="If a category is selected for move/copy, any actions selected will be applied to the copied or moved news feeds. Otherwise, all actions are applied to the selected news feeds." COM_NEWSFEEDS_CACHE_TIME_HEADING="Cache Time" diff --git a/administrator/language/en-GB/en-GB.lib_joomla.ini b/administrator/language/en-GB/en-GB.lib_joomla.ini index df47a3956b6f6..e4f78b42fa1f3 100644 --- a/administrator/language/en-GB/en-GB.lib_joomla.ini +++ b/administrator/language/en-GB/en-GB.lib_joomla.ini @@ -337,8 +337,10 @@ JLIB_HTML_BATCH_COPY="Copy" JLIB_HTML_BATCH_LANGUAGE_LABEL="Set Language" JLIB_HTML_BATCH_LANGUAGE_LABEL_DESC="Not making a selection will keep the original language when processing." JLIB_HTML_BATCH_LANGUAGE_NOCHANGE="- Keep original Language -" -JLIB_HTML_BATCH_MENU_LABEL="Select Category for Move/Copy" -JLIB_HTML_BATCH_MOVE="Move." +JLIB_HTML_BATCH_MENU_LABEL="To Move or Copy your selection please select a Category." +JLIB_HTML_BATCH_MOVE="Move" +JLIB_HTML_BATCH_MOVE_QUESTION="Do you want to move the items or make a copy of them?" +JLIB_HTML_BATCH_NO_CATEGORY="- Don't move or copy -" JLIB_HTML_BATCH_NOCHANGE="- Keep original Access Levels -" JLIB_HTML_BATCH_TAG_LABEL="Add Tag" JLIB_HTML_BATCH_TAG_LABEL_DESC="Add a tag to selected items." diff --git a/language/en-GB/en-GB.lib_joomla.ini b/language/en-GB/en-GB.lib_joomla.ini index 01b7bdc595213..d84b7e6947c43 100644 --- a/language/en-GB/en-GB.lib_joomla.ini +++ b/language/en-GB/en-GB.lib_joomla.ini @@ -337,7 +337,7 @@ JLIB_HTML_BATCH_COPY="Copy" JLIB_HTML_BATCH_LANGUAGE_LABEL="Set Language" JLIB_HTML_BATCH_LANGUAGE_LABEL_DESC="Not making a selection will keep the original language when processing." JLIB_HTML_BATCH_LANGUAGE_NOCHANGE="- Keep original Language -" -JLIB_HTML_BATCH_MENU_LABEL="Select Category for Move/Copy" +JLIB_HTML_BATCH_MENU_LABEL="To Move or Copy your selection please select a Category." JLIB_HTML_BATCH_MOVE="Move" JLIB_HTML_BATCH_NOCHANGE="- Keep original Access Levels -" JLIB_HTML_BATCH_TAG_LABEL="Add Tag" diff --git a/libraries/cms/html/batch.php b/libraries/cms/html/batch.php index ac9ee0aba8d75..93eb1a5628971 100644 --- a/libraries/cms/html/batch.php +++ b/libraries/cms/html/batch.php @@ -66,11 +66,12 @@ public static function item($extension) '' . '
' . '' . '
' - . '
' + . '
' + . JText::_('JLIB_HTML_BATCH_MOVE_QUESTION') . JHtml::_('select.radiolist', $options, 'batch[move_copy]', '', 'value', 'text', 'm') . '
'; } @@ -86,6 +87,26 @@ public static function language() { JHtml::_('bootstrap.tooltip', '.modalTooltip', array('container' => '.modal-body')); + JFactory::getDocument()->addScriptDeclaration( + ' + jQuery(document).ready(function($){ + if ($("#batch-category-id").length){var batchSelector = $("#batch-category-id");} + if ($("#batch-menu-id").length){var batchSelector = $("#batch-menu-id");} + if ($("#batch-position-id").length){var batchSelector = $("#batch-position-id");} + if ($("#batch-copy-move").length) { + $("#batch-copy-move").hide(); + batchSelector.on("change", function(){ + if (batchSelector.val() != 0 || batchSelector.val() != "") { + $("#batch-copy-move").show(); + } else { + $("#batch-copy-move").hide(); + } + }); + } + }); + ' + ); + // Create the batch selector to change the language on a selection list. return '