diff --git a/css/cms_left.css b/css/cms_left.css index f564c4ca..8b01a698 100644 --- a/css/cms_left.css +++ b/css/cms_left.css @@ -204,44 +204,6 @@ ul.tree span.modified, text-decoration : none; } -/** - * Side tabs - */ -#SideTabs { - float: left; - margin: 0; - padding: 0; - width: 18px; - height: 80%; -} -#SideTabs li { - clear: left; - width: 16px; - text-indent: -100em; - height: 70px; - overflow: hidden; - margin: 5px 0 5px 2px; - background-repeat: no-repeat; - cursor: pointer; -} -#SideTabs li#sidetab_versions { background-image: url(../images/sidetabs/versions.gif); } -#SideTabs li#sidetab_sitetree { background-image: url(../images/sidetabs/sitemap.gif); } -#SideTabs li#sidetab_tasklist { background-image: url(../images/sidetabs/tasklist.gif); } -#SideTabs li#sidetab_waitingon { background-image: url(../images/sidetabs/waitingon.gif); } -#SideTabs li#sidetab_comments { background-image: url(../images/sidetabs/comments.gif); } -#SideTabs li#sidetab_reports { background-image: url(../images/sidetabs/reports.gif); } -#SideTabs li#sidetab_search { background-image: url(../images/sidetabs/search.gif); } -#SideTabs li#sidetab_advertisements { background-image: url(../images/sidetabs/advertisements.gif); } - -#SideTabs li#sidetab_versions.selected { background-image: url(../images/sidetabs/versions_over.gif); } -#SideTabs li#sidetab_sitetree.selected { background-image: url(../images/sidetabs/sitemap_over.gif); } -#SideTabs li#sidetab_tasklist.selected { background-image: url(../images/sidetabs/tasklist_over.gif); } -#SideTabs li#sidetab_waitingon.selected { background-image: url(../images/sidetabs/waitingon_over.gif); } -#SideTabs li#sidetab_comments.selected { background-image: url(../images/sidetabs/comments_over.gif); } -#SideTabs li#sidetab_reports.selected { background-image: url(../images/sidetabs/reports_over.gif); } -#SideTabs li#sidetab_search.selected { background-image: url(../images/sidetabs/search_over.gif); } -#SideTabs li#sidetab_advertisements.selected { background-image: url(../images/sidetabs/advertisements_over.gif); } - #left { background-color: #EEE; } @@ -250,6 +212,12 @@ ul.tree span.modified, background-color: #FFF; border-left: 1px #ccc solid; } +#treepanes h2 { + cursor: pointer; +} +#treepanes h2 img { + float:right; +} .listpane p { margin: 3px 3px 7px 3px; diff --git a/css/layout.css b/css/layout.css index fc39d4e8..226cbe5c 100644 --- a/css/layout.css +++ b/css/layout.css @@ -95,9 +95,6 @@ body.stillLoading select { #left.hidden form, #left.hidden .title, #left.hidden #TreeActions { display: none; } -#left.hidden #SideTabs { - margin-top: 47px; -} #left.hidden { width: 18px; diff --git a/images/panels/toggle-closed.gif b/images/panels/toggle-closed.gif new file mode 100644 index 00000000..cac5ac03 Binary files /dev/null and b/images/panels/toggle-closed.gif differ diff --git a/images/panels/toggle-open.gif b/images/panels/toggle-open.gif new file mode 100644 index 00000000..00f0a6e4 Binary files /dev/null and b/images/panels/toggle-open.gif differ diff --git a/images/sidetabs/advertisements.gif b/images/sidetabs/advertisements.gif deleted file mode 100644 index 0b7cebc7..00000000 Binary files a/images/sidetabs/advertisements.gif and /dev/null differ diff --git a/images/sidetabs/advertisements_over.gif b/images/sidetabs/advertisements_over.gif deleted file mode 100644 index 5673cd9a..00000000 Binary files a/images/sidetabs/advertisements_over.gif and /dev/null differ diff --git a/images/sidetabs/associations.gif b/images/sidetabs/associations.gif deleted file mode 100644 index 5efe59a4..00000000 Binary files a/images/sidetabs/associations.gif and /dev/null differ diff --git a/images/sidetabs/associations_over.gif b/images/sidetabs/associations_over.gif deleted file mode 100644 index 7e91d8a3..00000000 Binary files a/images/sidetabs/associations_over.gif and /dev/null differ diff --git a/images/sidetabs/categories.gif b/images/sidetabs/categories.gif deleted file mode 100644 index 39ccaa72..00000000 Binary files a/images/sidetabs/categories.gif and /dev/null differ diff --git a/images/sidetabs/categories_over.gif b/images/sidetabs/categories_over.gif deleted file mode 100644 index 3adb1805..00000000 Binary files a/images/sidetabs/categories_over.gif and /dev/null differ diff --git a/images/sidetabs/comments.gif b/images/sidetabs/comments.gif deleted file mode 100755 index 7d4c913a..00000000 Binary files a/images/sidetabs/comments.gif and /dev/null differ diff --git a/images/sidetabs/comments_over.gif b/images/sidetabs/comments_over.gif deleted file mode 100755 index 66d8aac7..00000000 Binary files a/images/sidetabs/comments_over.gif and /dev/null differ diff --git a/images/sidetabs/reports.gif b/images/sidetabs/reports.gif deleted file mode 100755 index aa479e66..00000000 Binary files a/images/sidetabs/reports.gif and /dev/null differ diff --git a/images/sidetabs/reports_over.gif b/images/sidetabs/reports_over.gif deleted file mode 100755 index a3776465..00000000 Binary files a/images/sidetabs/reports_over.gif and /dev/null differ diff --git a/images/sidetabs/search.gif b/images/sidetabs/search.gif deleted file mode 100755 index 8b4e14c1..00000000 Binary files a/images/sidetabs/search.gif and /dev/null differ diff --git a/images/sidetabs/search_over.gif b/images/sidetabs/search_over.gif deleted file mode 100755 index 7733de1d..00000000 Binary files a/images/sidetabs/search_over.gif and /dev/null differ diff --git a/images/sidetabs/sitemap.gif b/images/sidetabs/sitemap.gif deleted file mode 100755 index 38f428f5..00000000 Binary files a/images/sidetabs/sitemap.gif and /dev/null differ diff --git a/images/sidetabs/sitemap_over.gif b/images/sidetabs/sitemap_over.gif deleted file mode 100755 index d122af78..00000000 Binary files a/images/sidetabs/sitemap_over.gif and /dev/null differ diff --git a/images/sidetabs/tasklist.gif b/images/sidetabs/tasklist.gif deleted file mode 100755 index 48330bd8..00000000 Binary files a/images/sidetabs/tasklist.gif and /dev/null differ diff --git a/images/sidetabs/tasklist_over.gif b/images/sidetabs/tasklist_over.gif deleted file mode 100755 index ae291460..00000000 Binary files a/images/sidetabs/tasklist_over.gif and /dev/null differ diff --git a/images/sidetabs/template normal.psd b/images/sidetabs/template normal.psd deleted file mode 100755 index 7f7723d8..00000000 Binary files a/images/sidetabs/template normal.psd and /dev/null differ diff --git a/images/sidetabs/template over.psd b/images/sidetabs/template over.psd deleted file mode 100755 index 0d3e8cfd..00000000 Binary files a/images/sidetabs/template over.psd and /dev/null differ diff --git a/images/sidetabs/versions.gif b/images/sidetabs/versions.gif deleted file mode 100755 index f7546046..00000000 Binary files a/images/sidetabs/versions.gif and /dev/null differ diff --git a/images/sidetabs/versions_over.gif b/images/sidetabs/versions_over.gif deleted file mode 100755 index 89db3648..00000000 Binary files a/images/sidetabs/versions_over.gif and /dev/null differ diff --git a/images/sidetabs/waitingon.gif b/images/sidetabs/waitingon.gif deleted file mode 100755 index 0957bf2a..00000000 Binary files a/images/sidetabs/waitingon.gif and /dev/null differ diff --git a/images/sidetabs/waitingon_over.gif b/images/sidetabs/waitingon_over.gif deleted file mode 100755 index 8e5c6f9e..00000000 Binary files a/images/sidetabs/waitingon_over.gif and /dev/null differ diff --git a/javascript/GenericDataAdmin_left.js b/javascript/GenericDataAdmin_left.js index 402f8bfa..963c311c 100755 --- a/javascript/GenericDataAdmin_left.js +++ b/javascript/GenericDataAdmin_left.js @@ -180,8 +180,8 @@ ResultTable.prototype = { function fixHeight_left() { fitToParent('LeftPane'); fitToParent('Search_holder',12); - if($('SideTabs')) { - $('SideTabs').resize(); + if($('treepanes')) { + $('treepanes').resize(); } } diff --git a/javascript/LeftAndMain_left.js b/javascript/LeftAndMain_left.js index 564b62f6..9e191031 100755 --- a/javascript/LeftAndMain_left.js +++ b/javascript/LeftAndMain_left.js @@ -414,8 +414,8 @@ treeactions = { function fixHeight_left() { if($('treepanes')) fitToParent('treepanes'); - var st = $('SideTabs'); - if(st) st.resize(); + var st = $('treepanes'); + if(st.resize) st.resize(); else fitToParent('sitetree_holder'); } diff --git a/javascript/SideTabs.js b/javascript/SideTabs.js index 21ffb479..fd4814cb 100755 --- a/javascript/SideTabs.js +++ b/javascript/SideTabs.js @@ -5,7 +5,7 @@ SideTabs.prototype = { * from the HTML. */ initialize: function() { - this.tabs = this.getElementsByTagName('li'); + this.tabs = this.getElementsByTagName('h2'); this.resize(); $('Form_EditForm').observeMethod('PageLoaded',this.onpagechanged.bind(this)); }, @@ -60,11 +60,11 @@ SideTabItem.prototype = { * Set up one of the side tabs */ initialize: function() { - var holderID = this.id.replace('sidetab_','') + '_holder'; + var holderID = this.id.replace('heading_','') + '_holder'; this.linkedPane = $(holderID); if(!this.linkedPane) throw("Can't find item: " + holderID); this.selected = (this.className && this.className.indexOf('selected') > -10); - this.holder = this.parentNode; + this.holder = $('treepanes'); this.linkedPane.style.display = this.selected ? '' : 'none'; }, @@ -75,10 +75,13 @@ SideTabItem.prototype = { }, /** - * Handler for
  • click + * Handler for

    click */ onclick: function(event) { Event.stop(event); + var toggleID = this.id.replace('heading_','') + '_toggle'; + Element.toggle(toggleID + '_closed'); + Element.toggle(toggleID + '_open'); this.toggle(); }, toggle: function() { @@ -109,8 +112,8 @@ SideTabItem.prototype = { } // Application order is important - the Items must be created before the SideTabs object. -SideTabItem.applyTo('#SideTabs li'); -SideTabs.applyTo('#SideTabs'); +SideTabItem.applyTo('#treepanes h2'); +SideTabs.applyTo('#treepanes'); /** * Generic base class for all side panels diff --git a/templates/Includes/AssetAdmin_left.ss b/templates/Includes/AssetAdmin_left.ss index ccea5f39..61a73c0b 100755 --- a/templates/Includes/AssetAdmin_left.ss +++ b/templates/Includes/AssetAdmin_left.ss @@ -35,18 +35,6 @@

    To reorganise your folders, drag them around as desired.

    - - - $SiteTreeAsUL \ No newline at end of file diff --git a/templates/Includes/CMSMain_left.ss b/templates/Includes/CMSMain_left.ss index df580e02..7be8e99d 100755 --- a/templates/Includes/CMSMain_left.ss +++ b/templates/Includes/CMSMain_left.ss @@ -1,21 +1,11 @@
    My Site
    - -
    - +

    + + - + Site Tree +

      @@ -87,20 +77,31 @@
    --> <% if EnterpriseCMS %> -