diff --git a/layouts/joomla/html/batch/access.php b/layouts/joomla/html/batch/access.php new file mode 100644 index 0000000000000..a583054a200b2 --- /dev/null +++ b/layouts/joomla/html/batch/access.php @@ -0,0 +1,32 @@ + '.modal-body')); + +?> + + + JText::_('JLIB_HTML_BATCH_NOCHANGE'), + 'id' => 'batch-access' + ) + ); ?> diff --git a/layouts/joomla/html/batch/item.php b/layouts/joomla/html/batch/item.php new file mode 100644 index 0000000000000..5947333853093 --- /dev/null +++ b/layouts/joomla/html/batch/item.php @@ -0,0 +1,37 @@ + + +
+ +
+
' + + +
diff --git a/layouts/joomla/html/batch/language.php b/layouts/joomla/html/batch/language.php new file mode 100644 index 0000000000000..5607228556c97 --- /dev/null +++ b/layouts/joomla/html/batch/language.php @@ -0,0 +1,46 @@ + '.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(); + } + }); + } + }); + ' +); +?> + + diff --git a/layouts/joomla/html/batch/tag.php b/layouts/joomla/html/batch/tag.php new file mode 100644 index 0000000000000..a4e9cd2554c83 --- /dev/null +++ b/layouts/joomla/html/batch/tag.php @@ -0,0 +1,27 @@ + '.modal-body')); +?> + + diff --git a/layouts/joomla/html/batch/user.php b/layouts/joomla/html/batch/user.php new file mode 100644 index 0000000000000..7efba9c0aaa40 --- /dev/null +++ b/layouts/joomla/html/batch/user.php @@ -0,0 +1,38 @@ + '.modal-body')); + +$optionNo = ''; + +if ($noUser) +{ + $optionNo = ''; +} +?> + + diff --git a/libraries/cms/html/batch.php b/libraries/cms/html/batch.php index 93eb1a5628971..eb326319b5535 100644 --- a/libraries/cms/html/batch.php +++ b/libraries/cms/html/batch.php @@ -12,7 +12,9 @@ /** * Extended Utility class for batch processing widgets. * - * @since 1.7 + * @since 1.7 + * + * @deprecated 4.0 Use JLayout directly */ abstract class JHtmlBatch { @@ -21,27 +23,15 @@ abstract class JHtmlBatch * * @return string The necessary HTML for the widget. * - * @since 1.7 + * @since 1.7 + * + * @deprecated 4.0 instead of JHtml::_('batch.access'); use JLayoutHelper::render('joomla.html.batch.access', array()); */ public static function access() { - JHtml::_('bootstrap.tooltip', '.modalTooltip', array('container' => '.modal-body')); + JLog::add('The use of JHtml::_("batch.access") is deprecated use JLayout instead.', JLog::WARNING, 'deprecated'); - // Create the batch selector to change an access level on a selection list. - return - '' - . JHtml::_( - 'access.assetgrouplist', - 'batch[assetgroup_id]', '', - 'class="inputbox"', - array( - 'title' => JText::_('JLIB_HTML_BATCH_NOCHANGE'), - 'id' => 'batch-access' - ) - ); + return JLayoutHelper::render('joomla.html.batch.access', array()); } /** @@ -51,29 +41,17 @@ public static function access() * * @return string The necessary HTML for the widget. * - * @since 1.7 + * @since 1.7 + * + * @deprecated 4.0 instead of JHtml::_('batch.item'); use JLayoutHelper::render('joomla.html.batch.item', array('extension' => 'com_XXX')); */ public static function item($extension) { - // Create the copy/move options. - $options = array( - JHtml::_('select.option', 'c', JText::_('JLIB_HTML_BATCH_COPY')), - JHtml::_('select.option', 'm', JText::_('JLIB_HTML_BATCH_MOVE')) - ); + $displayData = array('extension' => $extension); - // Create the batch selector to change select the category by which to move or copy. - return - '' - . '
' - . '' - . '
' - . '
' - . JText::_('JLIB_HTML_BATCH_MOVE_QUESTION') - . JHtml::_('select.radiolist', $options, 'batch[move_copy]', '', 'value', 'text', 'm') - . '
'; + JLog::add('The use of JHtml::_("batch.item") is deprecated use JLayout instead.', JLog::WARNING, 'deprecated'); + + return JLayoutHelper::render('joomla.html.batch.item', $displayData); } /** @@ -81,42 +59,15 @@ public static function item($extension) * * @return string The necessary HTML for the widget. * - * @since 2.5 + * @since 2.5 + * + * @deprecated 4.0 instead of JHtml::_('batch.language'); use JLayoutHelper::render('joomla.html.batch.language', array()); */ public static function language() { - JHtml::_('bootstrap.tooltip', '.modalTooltip', array('container' => '.modal-body')); + JLog::add('The use of JHtml::_("batch.language") is deprecated use JLayout instead.', JLog::WARNING, 'deprecated'); - 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 - '' - . ''; + return JLayoutHelper::render('joomla.html.batch.language', array()); } /** @@ -126,30 +77,17 @@ public static function language() * * @return string The necessary HTML for the widget. * - * @since 2.5 + * @since 2.5 + * + * @deprecated 4.0 instead of JHtml::_('batch.user'); use JLayoutHelper::render('joomla.html.batch.user', array()); */ public static function user($noUser = true) { - JHtml::_('bootstrap.tooltip', '.modalTooltip', array('container' => '.modal-body')); + $displayData = array('noUser' => $noUser); - $optionNo = ''; + JLog::add('The use of JHtml::_("batch.user") is deprecated use JLayout instead.', JLog::WARNING, 'deprecated'); - if ($noUser) - { - $optionNo = ''; - } - - // Create the batch selector to select a user on a selection list. - return - '' - . ''; + return JLayoutHelper::render('joomla.html.batch.user', $displayData); } /** @@ -157,21 +95,14 @@ public static function user($noUser = true) * * @return string The necessary HTML for the widget. * - * @since 3.1 + * @since 3.1 + * + * @deprecated 4.0 instead of JHtml::_('batch.tag'); use JLayoutHelper::render('joomla.html.batch.tag', array()); */ public static function tag() { - JHtml::_('bootstrap.tooltip', '.modalTooltip', array('container' => '.modal-body')); + JLog::add('The use of JHtml::_("batch.tag") is deprecated use JLayout instead.', JLog::WARNING, 'deprecated'); - // Create the batch selector to tag items on a selection list. - return - '' - . ''; + return JLayoutHelper::render('joomla.html.batch.tag', array()); } }