From d4db96cc64f2d9e9ec7d0b1d743ce73a9d303d8b Mon Sep 17 00:00:00 2001 From: dgt41 Date: Sat, 8 Nov 2014 19:46:20 +0200 Subject: [PATCH 01/10] formvalidator & jquery --- .../com_users/views/group/tmpl/edit.php | 11 ++-- .../com_users/views/groups/tmpl/default.php | 59 ++++++++++--------- .../com_users/views/level/tmpl/edit.php | 20 +++---- .../com_users/views/levels/tmpl/default.php | 14 +++-- .../com_users/views/note/tmpl/edit.php | 20 ++++--- .../com_users/views/notes/tmpl/default.php | 14 +++-- .../com_users/views/user/tmpl/edit.php | 17 +++--- .../com_users/views/users/tmpl/default.php | 14 +++-- 8 files changed, 91 insertions(+), 78 deletions(-) diff --git a/administrator/components/com_users/views/group/tmpl/edit.php b/administrator/components/com_users/views/group/tmpl/edit.php index 1fb26567612f7..e881016057aaf 100644 --- a/administrator/components/com_users/views/group/tmpl/edit.php +++ b/administrator/components/com_users/views/group/tmpl/edit.php @@ -12,19 +12,20 @@ // Include the component HTML helpers. JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html'); -JHtml::_('behavior.formvalidation'); +JHtml::_('behavior.formvalidator'); JHtml::_('formbehavior.chosen', 'select'); -?> - +});"); +?>
diff --git a/administrator/components/com_users/views/groups/tmpl/default.php b/administrator/components/com_users/views/groups/tmpl/default.php index e33ab6f83cb6c..d4c760d5b3d1d 100644 --- a/administrator/components/com_users/views/groups/tmpl/default.php +++ b/administrator/components/com_users/views/groups/tmpl/default.php @@ -22,48 +22,51 @@ $sortFields = $this->getSortFields(); JText::script('COM_USERS_GROUPS_CONFIRM_DELETE'); -?> - - +});'); +?> sidebar)) : ?>
diff --git a/administrator/components/com_users/views/level/tmpl/edit.php b/administrator/components/com_users/views/level/tmpl/edit.php index df018d7326869..b9749688f454d 100644 --- a/administrator/components/com_users/views/level/tmpl/edit.php +++ b/administrator/components/com_users/views/level/tmpl/edit.php @@ -12,17 +12,18 @@ // Include the component HTML helpers. JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html'); -JHtml::_('behavior.formvalidation'); -?> +JHtml::_('behavior.formvalidator'); - - +?>
diff --git a/administrator/components/com_users/views/levels/tmpl/default.php b/administrator/components/com_users/views/levels/tmpl/default.php index c39597d5ab05e..2d2786ddcf9ba 100644 --- a/administrator/components/com_users/views/levels/tmpl/default.php +++ b/administrator/components/com_users/views/levels/tmpl/default.php @@ -28,24 +28,26 @@ $saveOrderingUrl = 'index.php?option=com_users&task=levels.saveOrderAjax&tmpl=component'; JHtml::_('sortablelist.sortable', 'levelList', 'adminForm', strtolower($listDirn), $saveOrderingUrl); } -?> - +});'); +?> sidebar)) : ?>
diff --git a/administrator/components/com_users/views/note/tmpl/edit.php b/administrator/components/com_users/views/note/tmpl/edit.php index cc01fea2a9cbf..1d3665128c954 100644 --- a/administrator/components/com_users/views/note/tmpl/edit.php +++ b/administrator/components/com_users/views/note/tmpl/edit.php @@ -9,18 +9,20 @@ defined('_JEXEC') or die; -JHtml::_('behavior.formvalidation'); +JHtml::_('behavior.formvalidator'); JHtml::_('formbehavior.chosen', 'select'); -?> - +});"); +?>
diff --git a/administrator/components/com_users/views/notes/tmpl/default.php b/administrator/components/com_users/views/notes/tmpl/default.php index 072ec501e5db8..6d84923686d1a 100644 --- a/administrator/components/com_users/views/notes/tmpl/default.php +++ b/administrator/components/com_users/views/notes/tmpl/default.php @@ -18,24 +18,26 @@ $listDirn = $this->escape($this->state->get('list.direction')); $canEdit = $user->authorise('core.edit', 'com_users'); $sortFields = $this->getSortFields(); -?> - +});'); +?> sidebar)) : ?>
diff --git a/administrator/components/com_users/views/user/tmpl/edit.php b/administrator/components/com_users/views/user/tmpl/edit.php index aa1eb4cea3fea..02e5bc836312d 100644 --- a/administrator/components/com_users/views/user/tmpl/edit.php +++ b/administrator/components/com_users/views/user/tmpl/edit.php @@ -12,17 +12,14 @@ // Include the component HTML helpers. JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html'); -JHtml::_('behavior.formvalidation'); +JHtml::_('behavior.formvalidator'); JHtml::_('formbehavior.chosen', 'select'); -// Get the form fieldsets. -$fieldsets = $this->form->getFieldsets(); -?> - - +});"); + +// Get the form fieldsets. +$fieldsets = $this->form->getFieldsets(); +?> diff --git a/administrator/components/com_users/views/users/tmpl/default.php b/administrator/components/com_users/views/users/tmpl/default.php index 85beb978cfcd0..0f2a65d78dfa4 100644 --- a/administrator/components/com_users/views/users/tmpl/default.php +++ b/administrator/components/com_users/views/users/tmpl/default.php @@ -18,24 +18,26 @@ $listDirn = $this->escape($this->state->get('list.direction')); $loggeduser = JFactory::getUser(); $sortFields = $this->getSortFields(); -?> - +});'); +?> sidebar)) : ?>
From f559e11c03f0a21534a0f5d690f1b08a6e00b63f Mon Sep 17 00:00:00 2001 From: dgt41 Date: Sat, 8 Nov 2014 22:03:35 +0200 Subject: [PATCH 02/10] oops mistake --- .../components/com_users/views/groups/tmpl/default.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_users/views/groups/tmpl/default.php b/administrator/components/com_users/views/groups/tmpl/default.php index d4c760d5b3d1d..76b320a1184cd 100644 --- a/administrator/components/com_users/views/groups/tmpl/default.php +++ b/administrator/components/com_users/views/groups/tmpl/default.php @@ -47,7 +47,7 @@ $script[] = ' }'; $script[] = '});'; -JFactory::getDocument()->addScriptDeclaration($script); +JFactory::getDocument()->addScriptDeclaration(implode($script, '')); JFactory::getDocument()->addScriptDeclaration(' jQuery(document).ready(function() { Joomla.orderTable = function() From 7b0a204d30e2fa7e5ad2553105e6ebec1197f35f Mon Sep 17 00:00:00 2001 From: dgt41 Date: Sat, 8 Nov 2014 23:43:20 +0200 Subject: [PATCH 03/10] error on error --- .../components/com_users/views/groups/tmpl/default.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/administrator/components/com_users/views/groups/tmpl/default.php b/administrator/components/com_users/views/groups/tmpl/default.php index 76b320a1184cd..85819010f9a21 100644 --- a/administrator/components/com_users/views/groups/tmpl/default.php +++ b/administrator/components/com_users/views/groups/tmpl/default.php @@ -47,7 +47,7 @@ $script[] = ' }'; $script[] = '});'; -JFactory::getDocument()->addScriptDeclaration(implode($script, '')); +JFactory::getDocument()->addScriptDeclaration(implode('\n', $script)); JFactory::getDocument()->addScriptDeclaration(' jQuery(document).ready(function() { Joomla.orderTable = function() From 2a8d6ae9765f1ff018987a86846bac866db6a185 Mon Sep 17 00:00:00 2001 From: dgt41 Date: Mon, 10 Nov 2014 14:35:48 +0200 Subject: [PATCH 04/10] Quotes --- .../components/com_users/views/groups/tmpl/default.php | 2 +- .../components/com_users/views/levels/tmpl/default.php | 2 +- administrator/components/com_users/views/notes/tmpl/default.php | 2 +- administrator/components/com_users/views/users/tmpl/default.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/administrator/components/com_users/views/groups/tmpl/default.php b/administrator/components/com_users/views/groups/tmpl/default.php index 85819010f9a21..ddef1f3faa87e 100644 --- a/administrator/components/com_users/views/groups/tmpl/default.php +++ b/administrator/components/com_users/views/groups/tmpl/default.php @@ -55,7 +55,7 @@ table = document.getElementById("sortTable"); direction = document.getElementById("directionTable"); order = table.options[table.selectedIndex].value; - if (order != ' . $listOrder . ') + if (order != "' . $listOrder . '") { dirn = "asc"; } diff --git a/administrator/components/com_users/views/levels/tmpl/default.php b/administrator/components/com_users/views/levels/tmpl/default.php index 2d2786ddcf9ba..ce99c321bf861 100644 --- a/administrator/components/com_users/views/levels/tmpl/default.php +++ b/administrator/components/com_users/views/levels/tmpl/default.php @@ -36,7 +36,7 @@ table = document.getElementById("sortTable"); direction = document.getElementById("directionTable"); order = table.options[table.selectedIndex].value; - if (order != ' . $listOrder . ') + if (order != "' . $listOrder . '") { dirn = "asc"; } diff --git a/administrator/components/com_users/views/notes/tmpl/default.php b/administrator/components/com_users/views/notes/tmpl/default.php index 6d84923686d1a..26801894d556a 100644 --- a/administrator/components/com_users/views/notes/tmpl/default.php +++ b/administrator/components/com_users/views/notes/tmpl/default.php @@ -26,7 +26,7 @@ table = document.getElementById("sortTable"); direction = document.getElementById("directionTable"); order = table.options[table.selectedIndex].value; - if (order != ' . $listOrder . ') + if (order != "' . $listOrder . '") { dirn = "asc"; } diff --git a/administrator/components/com_users/views/users/tmpl/default.php b/administrator/components/com_users/views/users/tmpl/default.php index 0f2a65d78dfa4..1455363326fef 100644 --- a/administrator/components/com_users/views/users/tmpl/default.php +++ b/administrator/components/com_users/views/users/tmpl/default.php @@ -26,7 +26,7 @@ table = document.getElementById("sortTable"); direction = document.getElementById("directionTable"); order = table.options[table.selectedIndex].value; - if (order != ' . $listOrder . ') + if (order != "' . $listOrder . '") { dirn = "asc"; } From 6a66dac0989d47f4c718e72c07de0eb43006b1b0 Mon Sep 17 00:00:00 2001 From: dgt41 Date: Tue, 11 Nov 2014 16:08:39 +0200 Subject: [PATCH 05/10] fix --- .../com_users/views/groups/tmpl/default.php | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/administrator/components/com_users/views/groups/tmpl/default.php b/administrator/components/com_users/views/groups/tmpl/default.php index ddef1f3faa87e..51f215b327a62 100644 --- a/administrator/components/com_users/views/groups/tmpl/default.php +++ b/administrator/components/com_users/views/groups/tmpl/default.php @@ -23,31 +23,31 @@ JText::script('COM_USERS_GROUPS_CONFIRM_DELETE'); -$script[] = 'jQuery(document).ready(function() {'; -$script[] = ' Joomla.submitbutton = function(task) {'; -$script[] = ' if (task == "groups.delete")'; -$script[] = ' {'; -$script[] = ' var f = document.adminForm;'; -$script[] = ' var cb="";'; +$script = 'jQuery(document).ready(function() {'; +$script .= ' Joomla.submitbutton = function(task) {'; +$script .= ' if (task == "groups.delete")'; +$script .= ' {'; +$script .= ' var f = document.adminForm;'; +$script .= ' var cb="";'; foreach ($this->items as $i => $item) { if ($item->user_count > 0) { - $script[] = ' cb = f["cb"+' . $i . '];'; - $script[] = ' if (cb && cb.checked) { '; - $script[] = ' if (confirm(Joomla.JText._("COM_USERS_GROUPS_CONFIRM_DELETE"))) { '; - $script[] = ' Joomla.submitform(task);'; - $script[] = ' }'; - $script[] = ' return;'; - $script[] = ' }'; + $script .= ' cb = f["cb"+' . $i . '];'; + $script .= ' if (cb && cb.checked) { '; + $script .= ' if (confirm(Joomla.JText._("COM_USERS_GROUPS_CONFIRM_DELETE"))) { '; + $script .= ' Joomla.submitform(task);'; + $script .= ' }'; + $script .= ' return;'; + $script .= ' }'; } } -$script[] = ' }'; -$script[] = ' Joomla.submitform(task);'; -$script[] = ' }'; -$script[] = '});'; +$script .= ' }'; +$script .= ' Joomla.submitform(task);'; +$script .= ' }'; +$script .= '});'; -JFactory::getDocument()->addScriptDeclaration(implode('\n', $script)); +JFactory::getDocument()->addScriptDeclaration($script); JFactory::getDocument()->addScriptDeclaration(' jQuery(document).ready(function() { Joomla.orderTable = function() From 3a96ce5128541e12bfbb77002e56cf8ac340635f Mon Sep 17 00:00:00 2001 From: dgt41 Date: Wed, 12 Nov 2014 02:51:36 +0200 Subject: [PATCH 06/10] Respect the CS --- .../com_users/views/groups/tmpl/default.php | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/administrator/components/com_users/views/groups/tmpl/default.php b/administrator/components/com_users/views/groups/tmpl/default.php index 51f215b327a62..51a7e842f5304 100644 --- a/administrator/components/com_users/views/groups/tmpl/default.php +++ b/administrator/components/com_users/views/groups/tmpl/default.php @@ -23,29 +23,29 @@ JText::script('COM_USERS_GROUPS_CONFIRM_DELETE'); -$script = 'jQuery(document).ready(function() {'; -$script .= ' Joomla.submitbutton = function(task) {'; -$script .= ' if (task == "groups.delete")'; -$script .= ' {'; -$script .= ' var f = document.adminForm;'; -$script .= ' var cb="";'; +$script = 'jQuery(document).ready(function() {' . PHP_EOL; +$script .= ' Joomla.submitbutton = function(task) {' . PHP_EOL; +$script .= ' if (task == "groups.delete")' . PHP_EOL; +$script .= ' {' . PHP_EOL; +$script .= ' var f = document.adminForm;' . PHP_EOL; +$script .= ' var cb="";' . PHP_EOL; foreach ($this->items as $i => $item) { if ($item->user_count > 0) { - $script .= ' cb = f["cb"+' . $i . '];'; - $script .= ' if (cb && cb.checked) { '; - $script .= ' if (confirm(Joomla.JText._("COM_USERS_GROUPS_CONFIRM_DELETE"))) { '; - $script .= ' Joomla.submitform(task);'; - $script .= ' }'; - $script .= ' return;'; - $script .= ' }'; + $script .= ' cb = f["cb"+' . $i . '];' . PHP_EOL; + $script .= ' if (cb && cb.checked) { ' . PHP_EOL; + $script .= ' if (confirm(Joomla.JText._("COM_USERS_GROUPS_CONFIRM_DELETE"))) { ' . PHP_EOL; + $script .= ' Joomla.submitform(task);' . PHP_EOL; + $script .= ' }' . PHP_EOL; + $script .= ' return;' . PHP_EOL; + $script .= ' }' . PHP_EOL; } } -$script .= ' }'; -$script .= ' Joomla.submitform(task);'; -$script .= ' }'; -$script .= '});'; +$script .= ' }' . PHP_EOL; +$script .= ' Joomla.submitform(task);' . PHP_EOL; +$script .= ' }' . PHP_EOL; +$script .= '});' . PHP_EOL; JFactory::getDocument()->addScriptDeclaration($script); JFactory::getDocument()->addScriptDeclaration(' From 9999882bcbce06b6adc24c13f4b2936c3f24c01a Mon Sep 17 00:00:00 2001 From: dgt41 Date: Thu, 20 Nov 2014 18:52:19 +0200 Subject: [PATCH 07/10] CS --- .../com_users/views/groups/tmpl/default.php | 38 ++++++++++--------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/administrator/components/com_users/views/groups/tmpl/default.php b/administrator/components/com_users/views/groups/tmpl/default.php index 51a7e842f5304..910a87237f492 100644 --- a/administrator/components/com_users/views/groups/tmpl/default.php +++ b/administrator/components/com_users/views/groups/tmpl/default.php @@ -23,29 +23,33 @@ JText::script('COM_USERS_GROUPS_CONFIRM_DELETE'); -$script = 'jQuery(document).ready(function() {' . PHP_EOL; -$script .= ' Joomla.submitbutton = function(task) {' . PHP_EOL; -$script .= ' if (task == "groups.delete")' . PHP_EOL; -$script .= ' {' . PHP_EOL; -$script .= ' var f = document.adminForm;' . PHP_EOL; -$script .= ' var cb="";' . PHP_EOL; +$script = ' +jQuery(document).ready(function() { + Joomla.submitbutton = function(task) { + if (task == "groups.delete") + { + var f = document.adminForm; + var cb="";'; foreach ($this->items as $i => $item) { if ($item->user_count > 0) { - $script .= ' cb = f["cb"+' . $i . '];' . PHP_EOL; - $script .= ' if (cb && cb.checked) { ' . PHP_EOL; - $script .= ' if (confirm(Joomla.JText._("COM_USERS_GROUPS_CONFIRM_DELETE"))) { ' . PHP_EOL; - $script .= ' Joomla.submitform(task);' . PHP_EOL; - $script .= ' }' . PHP_EOL; - $script .= ' return;' . PHP_EOL; - $script .= ' }' . PHP_EOL; + $script .= ' + cb = f["cb"+' . $i . ']; + if (cb && cb.checked) { + if (confirm(Joomla.JText._("COM_USERS_GROUPS_CONFIRM_DELETE"))) { + Joomla.submitform(task); + } + return; + }'; } } -$script .= ' }' . PHP_EOL; -$script .= ' Joomla.submitform(task);' . PHP_EOL; -$script .= ' }' . PHP_EOL; -$script .= '});' . PHP_EOL; +$script .= ' + } + Joomla.submitform(task); + } +});'; + JFactory::getDocument()->addScriptDeclaration($script); JFactory::getDocument()->addScriptDeclaration(' From d58b6ac17a51c58adfb5074170e31e58610bce03 Mon Sep 17 00:00:00 2001 From: dgt41 Date: Sun, 30 Nov 2014 02:01:50 +0200 Subject: [PATCH 08/10] .ready() --- .../com_users/views/group/tmpl/edit.php | 3 +- .../com_users/views/groups/tmpl/default.php | 6 ++-- .../com_users/views/level/tmpl/edit.php | 3 +- .../com_users/views/levels/tmpl/default.php | 3 +- .../com_users/views/note/tmpl/edit.php | 3 +- .../com_users/views/notes/tmpl/default.php | 3 +- .../com_users/views/user/tmpl/edit.php | 35 ++++++++++--------- .../com_users/views/users/tmpl/default.php | 3 +- 8 files changed, 26 insertions(+), 33 deletions(-) diff --git a/administrator/components/com_users/views/group/tmpl/edit.php b/administrator/components/com_users/views/group/tmpl/edit.php index e881016057aaf..d13d5553fa730 100644 --- a/administrator/components/com_users/views/group/tmpl/edit.php +++ b/administrator/components/com_users/views/group/tmpl/edit.php @@ -16,7 +16,6 @@ JHtml::_('formbehavior.chosen', 'select'); JFactory::getDocument()->addScriptDeclaration(" -jQuery(document).ready(function() { Joomla.submitbutton = function(task) { if (task == 'group.cancel' || document.formvalidator.isValid(document.getElementById('group-form'))) @@ -24,7 +23,7 @@ Joomla.submitform(task, document.getElementById('group-form')); } } -});"); +"); ?> diff --git a/administrator/components/com_users/views/groups/tmpl/default.php b/administrator/components/com_users/views/groups/tmpl/default.php index 910a87237f492..2b61fa6020fe4 100644 --- a/administrator/components/com_users/views/groups/tmpl/default.php +++ b/administrator/components/com_users/views/groups/tmpl/default.php @@ -24,7 +24,6 @@ JText::script('COM_USERS_GROUPS_CONFIRM_DELETE'); $script = ' -jQuery(document).ready(function() { Joomla.submitbutton = function(task) { if (task == "groups.delete") { @@ -48,12 +47,11 @@ } Joomla.submitform(task); } -});'; +'; JFactory::getDocument()->addScriptDeclaration($script); JFactory::getDocument()->addScriptDeclaration(' -jQuery(document).ready(function() { Joomla.orderTable = function() { table = document.getElementById("sortTable"); @@ -69,7 +67,7 @@ } Joomla.tableOrdering(order, dirn, ""); } -});'); +'); ?> sidebar)) : ?> diff --git a/administrator/components/com_users/views/level/tmpl/edit.php b/administrator/components/com_users/views/level/tmpl/edit.php index b9749688f454d..bcd4a91835296 100644 --- a/administrator/components/com_users/views/level/tmpl/edit.php +++ b/administrator/components/com_users/views/level/tmpl/edit.php @@ -15,7 +15,6 @@ JHtml::_('behavior.formvalidator'); JFactory::getDocument()->addScriptDeclaration(" -jQuery(document).ready(function() { Joomla.submitbutton = function(task) { if (task == 'level.cancel' || document.formvalidator.isValid(document.getElementById('level-form'))) @@ -23,7 +22,7 @@ Joomla.submitform(task, document.getElementById('level-form')); } } -});"); +"); /* window.addEvent('domready', function(){ document.id('user-groups').getElements('input').each(function(i){ diff --git a/administrator/components/com_users/views/levels/tmpl/default.php b/administrator/components/com_users/views/levels/tmpl/default.php index ce99c321bf861..927fb61a482ed 100644 --- a/administrator/components/com_users/views/levels/tmpl/default.php +++ b/administrator/components/com_users/views/levels/tmpl/default.php @@ -30,7 +30,6 @@ } JFactory::getDocument()->addScriptDeclaration(' -jQuery(document).ready(function() { Joomla.orderTable = function() { table = document.getElementById("sortTable"); @@ -46,7 +45,7 @@ } Joomla.tableOrdering(order, dirn, ""); } -});'); +'); ?> sidebar)) : ?> diff --git a/administrator/components/com_users/views/note/tmpl/edit.php b/administrator/components/com_users/views/note/tmpl/edit.php index 1d3665128c954..c48b87976d453 100644 --- a/administrator/components/com_users/views/note/tmpl/edit.php +++ b/administrator/components/com_users/views/note/tmpl/edit.php @@ -13,7 +13,6 @@ JHtml::_('formbehavior.chosen', 'select'); JFactory::getDocument()->addScriptDeclaration(" -jQuery(document).ready(function() { Joomla.submitbutton = function(task) { if (task == 'note.cancel' || document.formvalidator.isValid(document.getElementById('note-form'))) @@ -21,7 +20,7 @@ Joomla.submitform(task, document.getElementById('note-form')); } } -});"); +"); ?>
diff --git a/administrator/components/com_users/views/notes/tmpl/default.php b/administrator/components/com_users/views/notes/tmpl/default.php index 26801894d556a..45ea8fb4b5c8f 100644 --- a/administrator/components/com_users/views/notes/tmpl/default.php +++ b/administrator/components/com_users/views/notes/tmpl/default.php @@ -20,7 +20,6 @@ $sortFields = $this->getSortFields(); JFactory::getDocument()->addScriptDeclaration(' -jQuery(document).ready(function() { Joomla.orderTable = function() { table = document.getElementById("sortTable"); @@ -36,7 +35,7 @@ } Joomla.tableOrdering(order, dirn, ""); } -});'); +'); ?> sidebar)) : ?> diff --git a/administrator/components/com_users/views/user/tmpl/edit.php b/administrator/components/com_users/views/user/tmpl/edit.php index 02e5bc836312d..d92766378ddbf 100644 --- a/administrator/components/com_users/views/user/tmpl/edit.php +++ b/administrator/components/com_users/views/user/tmpl/edit.php @@ -16,7 +16,6 @@ JHtml::_('formbehavior.chosen', 'select'); JFactory::getDocument()->addScriptDeclaration(" -jQuery(document).ready(function() { Joomla.submitbutton = function(task) { if (task == 'user.cancel' || document.formvalidator.isValid(document.getElementById('user-form'))) @@ -25,22 +24,24 @@ } } - Joomla.twoFactorMethodChange = function(e) - { - var selectedPane = 'com_users_twofactor_' + jQuery('#jform_twofactor_method').val(); - - jQuery.each(jQuery('#com_users_twofactor_forms_container>div'), function(i, el) { - if (el.id != selectedPane) - { - jQuery('#' + el.id).hide(0); - } - else - { - jQuery('#' + el.id).show(0); - } - }); - } -});"); + jQuery(document).ready(function() { + Joomla.twoFactorMethodChange = function(e) + { + var selectedPane = 'com_users_twofactor_' + jQuery('#jform_twofactor_method').val(); + + jQuery.each(jQuery('#com_users_twofactor_forms_container>div'), function(i, el) { + if (el.id != selectedPane) + { + jQuery('#' + el.id).hide(0); + } + else + { + jQuery('#' + el.id).show(0); + } + }); + } + }); +"); // Get the form fieldsets. $fieldsets = $this->form->getFieldsets(); diff --git a/administrator/components/com_users/views/users/tmpl/default.php b/administrator/components/com_users/views/users/tmpl/default.php index 1455363326fef..78ad5fa12834b 100644 --- a/administrator/components/com_users/views/users/tmpl/default.php +++ b/administrator/components/com_users/views/users/tmpl/default.php @@ -20,7 +20,6 @@ $sortFields = $this->getSortFields(); JFactory::getDocument()->addScriptDeclaration(' -jQuery(document).ready(function() { Joomla.orderTable = function() { table = document.getElementById("sortTable"); @@ -36,7 +35,7 @@ } Joomla.tableOrdering(order, dirn, ""); } -});'); +'); ?> sidebar)) : ?> From 34dd8c7edc430668fd6384c584ab77eaea7d877c Mon Sep 17 00:00:00 2001 From: dgt41 Date: Sun, 30 Nov 2014 04:51:14 +0200 Subject: [PATCH 09/10] Roberto's code --- .../com_users/views/group/tmpl/edit.php | 2 +- .../com_users/views/groups/tmpl/default.php | 46 ++++++++++--------- .../com_users/views/level/tmpl/edit.php | 2 +- .../com_users/views/levels/tmpl/default.php | 2 +- .../com_users/views/note/tmpl/edit.php | 2 +- .../com_users/views/notes/tmpl/default.php | 2 +- .../com_users/views/user/tmpl/edit.php | 2 +- .../com_users/views/users/tmpl/default.php | 2 +- 8 files changed, 32 insertions(+), 28 deletions(-) diff --git a/administrator/components/com_users/views/group/tmpl/edit.php b/administrator/components/com_users/views/group/tmpl/edit.php index d13d5553fa730..48c97ab4d2db9 100644 --- a/administrator/components/com_users/views/group/tmpl/edit.php +++ b/administrator/components/com_users/views/group/tmpl/edit.php @@ -22,7 +22,7 @@ { Joomla.submitform(task, document.getElementById('group-form')); } - } + }; "); ?> diff --git a/administrator/components/com_users/views/groups/tmpl/default.php b/administrator/components/com_users/views/groups/tmpl/default.php index 2b61fa6020fe4..1ac791651499d 100644 --- a/administrator/components/com_users/views/groups/tmpl/default.php +++ b/administrator/components/com_users/views/groups/tmpl/default.php @@ -23,34 +23,38 @@ JText::script('COM_USERS_GROUPS_CONFIRM_DELETE'); -$script = ' - Joomla.submitbutton = function(task) { - if (task == "groups.delete") - { - var f = document.adminForm; - var cb="";'; +$groupsWithUsers = array(); + foreach ($this->items as $i => $item) { if ($item->user_count > 0) { - $script .= ' - cb = f["cb"+' . $i . ']; - if (cb && cb.checked) { - if (confirm(Joomla.JText._("COM_USERS_GROUPS_CONFIRM_DELETE"))) { - Joomla.submitform(task); - } - return; - }'; + array_push($groupsWithUsers, $i); } } -$script .= ' - } - Joomla.submitform(task); - } -'; +JText::script('COM_USERS_GROUPS_CONFIRM_DELETE'); + +JFactory::getDocument()->addScriptDeclaration(' + Joomla.submitbutton = function(task) { + if (task == "groups.delete") { + var f = document.adminForm; + var cb = ""; + var groupsWithUsers = [' . implode(',', $groupsWithUsers) . ']; + for (index = 0; index < groupsWithUsers.length; ++index) { + cb = f["cb" + groupsWithUsers[index]]; + if (cb && cb.checked) { + if (confirm(Joomla.JText._("COM_USERS_GROUPS_CONFIRM_DELETE"))) { + Joomla.submitform(task); + } + return; + } + } + } + Joomla.submitform(task); + }; +'); -JFactory::getDocument()->addScriptDeclaration($script); JFactory::getDocument()->addScriptDeclaration(' Joomla.orderTable = function() { @@ -66,7 +70,7 @@ dirn = direction.options[direction.selectedIndex].value; } Joomla.tableOrdering(order, dirn, ""); - } + }; '); ?> diff --git a/administrator/components/com_users/views/level/tmpl/edit.php b/administrator/components/com_users/views/level/tmpl/edit.php index bcd4a91835296..a6e69fd6bcb44 100644 --- a/administrator/components/com_users/views/level/tmpl/edit.php +++ b/administrator/components/com_users/views/level/tmpl/edit.php @@ -21,7 +21,7 @@ { Joomla.submitform(task, document.getElementById('level-form')); } - } + }; "); /* window.addEvent('domready', function(){ diff --git a/administrator/components/com_users/views/levels/tmpl/default.php b/administrator/components/com_users/views/levels/tmpl/default.php index 927fb61a482ed..fe6cc85718dc3 100644 --- a/administrator/components/com_users/views/levels/tmpl/default.php +++ b/administrator/components/com_users/views/levels/tmpl/default.php @@ -44,7 +44,7 @@ dirn = direction.options[direction.selectedIndex].value; } Joomla.tableOrdering(order, dirn, ""); - } + }; '); ?> diff --git a/administrator/components/com_users/views/note/tmpl/edit.php b/administrator/components/com_users/views/note/tmpl/edit.php index c48b87976d453..fb2fbabcd52a8 100644 --- a/administrator/components/com_users/views/note/tmpl/edit.php +++ b/administrator/components/com_users/views/note/tmpl/edit.php @@ -19,7 +19,7 @@ { Joomla.submitform(task, document.getElementById('note-form')); } - } + }; "); ?> diff --git a/administrator/components/com_users/views/notes/tmpl/default.php b/administrator/components/com_users/views/notes/tmpl/default.php index 45ea8fb4b5c8f..265f9daaf81fd 100644 --- a/administrator/components/com_users/views/notes/tmpl/default.php +++ b/administrator/components/com_users/views/notes/tmpl/default.php @@ -34,7 +34,7 @@ dirn = direction.options[direction.selectedIndex].value; } Joomla.tableOrdering(order, dirn, ""); - } + }; '); ?> diff --git a/administrator/components/com_users/views/user/tmpl/edit.php b/administrator/components/com_users/views/user/tmpl/edit.php index d92766378ddbf..081a5ac7b2963 100644 --- a/administrator/components/com_users/views/user/tmpl/edit.php +++ b/administrator/components/com_users/views/user/tmpl/edit.php @@ -22,7 +22,7 @@ { Joomla.submitform(task, document.getElementById('user-form')); } - } + }; jQuery(document).ready(function() { Joomla.twoFactorMethodChange = function(e) diff --git a/administrator/components/com_users/views/users/tmpl/default.php b/administrator/components/com_users/views/users/tmpl/default.php index 78ad5fa12834b..1f4f3ec8a305c 100644 --- a/administrator/components/com_users/views/users/tmpl/default.php +++ b/administrator/components/com_users/views/users/tmpl/default.php @@ -34,7 +34,7 @@ dirn = direction.options[direction.selectedIndex].value; } Joomla.tableOrdering(order, dirn, ""); - } + }; '); ?> From 192ba3688df08dd6f0bc3d33c94a784813683678 Mon Sep 17 00:00:00 2001 From: dgt41 Date: Sun, 30 Nov 2014 05:58:56 +0200 Subject: [PATCH 10/10] .ready() --- .../com_users/views/user/tmpl/edit.php | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/administrator/components/com_users/views/user/tmpl/edit.php b/administrator/components/com_users/views/user/tmpl/edit.php index 081a5ac7b2963..7625ec0f897d8 100644 --- a/administrator/components/com_users/views/user/tmpl/edit.php +++ b/administrator/components/com_users/views/user/tmpl/edit.php @@ -24,23 +24,21 @@ } }; - jQuery(document).ready(function() { - Joomla.twoFactorMethodChange = function(e) - { - var selectedPane = 'com_users_twofactor_' + jQuery('#jform_twofactor_method').val(); - - jQuery.each(jQuery('#com_users_twofactor_forms_container>div'), function(i, el) { - if (el.id != selectedPane) - { - jQuery('#' + el.id).hide(0); - } - else - { - jQuery('#' + el.id).show(0); - } - }); - } - }); + Joomla.twoFactorMethodChange = function(e) + { + var selectedPane = 'com_users_twofactor_' + jQuery('#jform_twofactor_method').val(); + + jQuery.each(jQuery('#com_users_twofactor_forms_container>div'), function(i, el) { + if (el.id != selectedPane) + { + jQuery('#' + el.id).hide(0); + } + else + { + jQuery('#' + el.id).show(0); + } + }); + }; "); // Get the form fieldsets.