ENHANCEMENT Added children toggle actions to CMS menu, fixed menu lin…

…k update behaviour when records change

admin/css/ie7.css

@@ -1 +1,3 @@
+html { overflow: hidden; }
+
 .field input.text, .field textarea, .field .TreeDropdownField { padding-left: 0; padding-right: 0; }

admin/javascript/LeftAndMain.EditForm.js

@@ -243,7 +243,8 @@
 			isChanged: function() {
 				if(typeof tinyMCE == 'undefined') return;
 
-				return tinyMCE.getInstanceById(this.attr('id')).isDirty();
+				var inst = tinyMCE.getInstanceById(this.attr('id'));
+				return inst ? inst.isDirty() : false;
 			},
 
 			resetChanged: function() {

admin/javascript/LeftAndMain.Menu.js

@@ -82,16 +82,27 @@
 		});
 
 		$('.cms-menu-list li').entwine({
+			onmatch: function() {
+				if(this.find('ul').length) {
+					this.find('a:first').append('<span class="toggle-children"><span class="toggle-children-icon"></span></span>');
+				}
+			},
 			toggle: function() {
 				this[this.hasClass('opened') ? 'close' : 'open']();
 			},
+			/**
+			 * "Open" is just a visual state, and unrelated to "current".
+			 * More than one item can be open at the same time.
+			 */
 			open: function() {
 				var parent = this.getMenuItem();
 				if(parent) parent.open();
 				this.addClass('opened').find('ul').show();
+				this.find('.toggle-children').addClass('opened');
 			},
 			close: function() {
 				this.removeClass('opened').find('ul').hide();
+				this.find('.toggle-children').removeClass('opened');
 			},
 			select: function() {
 				var parent = this.getMenuItem();
@@ -100,7 +111,13 @@
 				// Remove "current" class from all siblings and their children
 				this.siblings().removeClass('current').close();
 				this.siblings().find('li').removeClass('current');
-				if(parent) parent.addClass('current').siblings().removeClass('current');
+				if(parent) {
+					var parentSiblings = parent.siblings();
+					parent.addClass('current');
+					parentSiblings.removeClass('current').close();
+					parentSiblings.find('li').removeClass('current').close();
+				}
+
 				this.getMenu().updateItems();
 
 				this.trigger('select');
@@ -148,9 +165,19 @@
 			}
 		});
 
+		$('.cms-menu-list li .toggle-children').entwine({
+			onclick: function(e) {
+				var li = this.closest('li');
+				li.toggle();
+				return false; // prevent wrapping link event to fire
+			}
+		});
 
 		$('.cms-menu-list #Menu-CMSPageSettingsController, .cms-menu-list #Menu-CMSPageHistoryController, .cms-menu-list #Menu-CMSPageEditController').entwine({
 			setRecordID: function(id) {
+				// Only applies to edit forms relating to page elements
+				if(!$('.cms-content').is('.CMSMain')) return;
+
 				var link = this.find('a:first'), href = link.attr("href").split('/')
 				// Assumes that current ID will always be the last URL segment (and not a query parameter)
 				href[href.length -1] = id;
@@ -160,8 +187,12 @@
 
 		$('.cms-menu-list #Menu-CMSPageAddController').entwine({
 			setRecordID: function(id) {
-				var link = this.find('a:first');
-				link.attr('href', link.attr('href').replace('/\?.*/', '?ParentID=' . id));
+				// Only applies to edit forms relating to page elements
+				if(!$('.cms-content').is('.CMSMain')) return;
+
+				var link = this.find('a:first'), href = link.attr('href');
+				if(!href.match(/\?/)) href += '?';
+				link.attr('href', href.replace(/\?.*$/, '?ParentID=' + id));
 			}
 		});
 

admin/scss/_menu.scss

@@ -178,15 +178,38 @@
 			}
 
 			.icon {
-				display: block;
+				display: inline-block;
 				float: left;
 				margin: 4px 10px 0 4px;
-				
+
 				@include opacity(0.7);
 			}
 
 			.text {
-				display: block;
+				display: inline-block;
+				float: left;
+			}
+
+			.toggle-children {
+				display: inline-block;
+				float: right;
+				width: 20px;
+				height: 100%;
+				cursor: pointer;
+
+				.toggle-children-icon {
+					display: inline-block;
+					width: 8px;
+					height: 8px;
+					background: sprite($sprites32, menu-arrow-down) no-repeat;
+					vertical-align: middle;
+				}
+
+				&.opened {
+					.toggle-children-icon {
+						background: sprite($sprites32, menu-arrow-up) no-repeat;
+					}
+				}
 			}
 		}
 
@@ -280,8 +303,10 @@
 	}
 
 	&.collapsed {
-		li .text {
-			display: none;
+		li {
+			.text, .toggle-children {
+				display: none;
+			}
 		}
 
 		li > li {

admin/scss/ie7.scss

@@ -1,3 +1,7 @@
+html {
+	overflow: hidden;
+}
+
 .field {
 	input.text, 
 	textarea,

admin/templates/Includes/LeftAndMain_Menu.ss

@@ -57,7 +57,7 @@
 							</a>
 						</li>
 						<li class="first <% if Top.class == 'CMSPageAddController' %>current<% end_if %>" id="Menu-CMSPageAddController">
-							<a href="admin/page/add/show/$Top.CurrentPageID">
+							<a href="admin/page/add/?ParentID=$Top.CurrentPageID">
 								<span class="text">Add pages</span>
 							</a>
 						</li>