diff --git a/css/cms_left.css b/css/cms_left.css index cbf23251..26d52a9d 100644 --- a/css/cms_left.css +++ b/css/cms_left.css @@ -10,18 +10,20 @@ #TreeActions li.action { float: left; margin: 0; - padding: 0; - padding-right: 7px; + padding: 2px; list-style-type: none; } -#TreeActions li.action a { - padding: 0.3em; - display: block; +#TreeActions li.action button { + margin-left: 0; + margin-right: 0; + padding: 0pt 0.1em; + overflow: visible; + width: auto; } -#TreeActions li.action a:hover { +#TreeActions li.selected { background-color: #CCC; } -#TreeActions li.selected a { +#TreeActions li.action:hover { background-color: #CCC; } diff --git a/javascript/AssetAdmin.js b/javascript/AssetAdmin.js index a03c7e04..7b6e8545 100755 --- a/javascript/AssetAdmin.js +++ b/javascript/AssetAdmin.js @@ -91,7 +91,7 @@ addfolder.applyTo('#addpage'); addfolder.prototype = { initialize: function () { Observable.applyTo($(this.id + '_options')); - this.getElementsByTagName('a')[0].onclick = returnFalse; + this.getElementsByTagName('button')[0].onclick = returnFalse; $(this.id + '_options').onsubmit = this.form_submit; }, diff --git a/javascript/CMSMain_left.js b/javascript/CMSMain_left.js index 909f7585..939ff36e 100755 --- a/javascript/CMSMain_left.js +++ b/javascript/CMSMain_left.js @@ -14,7 +14,7 @@ addpage.applyTo('#addpage'); addpage.prototype = { initialize: function () { Observable.applyTo($(_HANDLER_FORMS[this.id])); - this.getElementsByTagName('a')[0].onclick = returnFalse; + this.getElementsByTagName('button')[0].onclick = returnFalse; $(_HANDLER_FORMS[this.id]).onsubmit = this.form_submit; }, @@ -205,7 +205,7 @@ deletepage = { } }); - $('deletepage').getElementsByTagName('a')[0].onclick(); + $('deletepage').getElementsByTagName('button')[0].onclick(); } } else { @@ -232,7 +232,7 @@ appendLoader(function () { Observable.applyTo($(_HANDLER_FORMS.deletepage)); $('deletepage').onclick = deletepage.button_onclick; - $('deletepage').getElementsByTagName('a')[0].onclick = function() { return false; }; + $('deletepage').getElementsByTagName('button')[0].onclick = function() { return false; }; $(_HANDLER_FORMS.deletepage).onsubmit = deletepage.form_submit; }); diff --git a/javascript/LeftAndMain_left.js b/javascript/LeftAndMain_left.js index cc8de246..d0b71d4f 100755 --- a/javascript/LeftAndMain_left.js +++ b/javascript/LeftAndMain_left.js @@ -378,7 +378,7 @@ SiteTreeNode.prototype = { */ treeactions = { toggleSelection : function(li) { - li = (li.tagName.toLowerCase() == 'a') ? li.parentNode : li; + li = (li.tagName.toLowerCase() == 'button') ? li.parentNode : li; // Deselect if(li.selected) this.closeSelection(li, true); @@ -388,7 +388,7 @@ treeactions = { return li.selected; }, closeSelection : function(li, nested) { - li = (li.tagName.toLowerCase() == 'a') ? li.parentNode : li; + li = (li.tagName.toLowerCase() == 'button') ? li.parentNode : li; Element.hide(_HANDLER_FORMS[li.id]); removeClass(li, 'selected'); @@ -399,7 +399,7 @@ treeactions = { if(typeof nested == 'undefined') fixHeight_left(); }, openSelection: function(li, nested) { - li = (li.tagName.toLowerCase() == 'a') ? li.parentNode : li; + li = (li.tagName.toLowerCase() == 'button') ? li.parentNode : li; addClass(li, 'selected'); Element.show(_HANDLER_FORMS[li.id]); @@ -432,7 +432,7 @@ ReorganiseAction = Class.create(); ReorganiseAction.applyTo('#sortitems'); ReorganiseAction.prototype = { initialize: function () { - this.getElementsByTagName('a')[0].onclick = returnFalse; + this.getElementsByTagName('button')[0].onclick = returnFalse; Observable.applyTo($(_HANDLER_FORMS[this.id])); }, diff --git a/javascript/NewsletterAdmin_left.js b/javascript/NewsletterAdmin_left.js index 66e22f0e..38efa9f5 100755 --- a/javascript/NewsletterAdmin_left.js +++ b/javascript/NewsletterAdmin_left.js @@ -148,7 +148,7 @@ deletedraft = { } }); - $('deletedrafts').getElementsByTagName('a')[0].onclick(); + $('deletedrafts').getElementsByTagName('button')[0].onclick(); } else { alert("Please select at least 1 page."); @@ -250,7 +250,7 @@ AddForm.applyTo('#addtype'); AddForm.prototype = { initialize: function () { Observable.applyTo($(_HANDLER_FORMS[this.id])); - this.getElementsByTagName('a')[0].onclick = returnFalse; + this.getElementsByTagName('button')[0].onclick = returnFalse; $(_HANDLER_FORMS[this.id]).onsubmit = this.form_submit; }, @@ -374,7 +374,7 @@ Behaviour.addLoader(function () { if( deleteDrafts ) { deleteDrafts.onclick = deletedraft.button_onclick; - deleteDrafts.getElementsByTagName('a')[0].onclick = function() {return false;}; + deleteDrafts.getElementsByTagName('button')[0].onclick = function() {return false;}; $('deletedrafts_options').onsubmit = deletedraft.form_submit; } }); \ No newline at end of file diff --git a/javascript/SecurityAdmin_left.js b/javascript/SecurityAdmin_left.js index 25ccafba..e27b9188 100755 --- a/javascript/SecurityAdmin_left.js +++ b/javascript/SecurityAdmin_left.js @@ -119,7 +119,7 @@ deletegroup = { } }); - $('deletegroup').getElementsByTagName('a')[0].onclick(); + $('deletegroup').getElementsByTagName('button')[0].onclick(); } else { alert("Please select at least 1 page."); @@ -137,12 +137,12 @@ Behaviour.addLoader(function () { // Set up add page Observable.applyTo($('addgroup_options')); $('addgroup').onclick = addgroup.button_onclick; - $('addgroup').getElementsByTagName('a')[0].onclick = function() {return false;}; + $('addgroup').getElementsByTagName('button')[0].onclick = function() {return false;}; $('addgroup_options').onsubmit = addgroup.form_submit; // Set up delete page Observable.applyTo($('deletegroup_options')); $('deletegroup').onclick = deletegroup.button_onclick; - $('deletegroup').getElementsByTagName('a')[0].onclick = function() {return false;}; + $('deletegroup').getElementsByTagName('button')[0].onclick = function() {return false;}; $('deletegroup_options').onsubmit = deletegroup.form_submit; }); \ No newline at end of file diff --git a/templates/Includes/AssetAdmin_left.ss b/templates/Includes/AssetAdmin_left.ss index 61a73c0b..91778def 100755 --- a/templates/Includes/AssetAdmin_left.ss +++ b/templates/Includes/AssetAdmin_left.ss @@ -11,9 +11,9 @@