FIX: Update references to ID values from 79c9433

admin/css/screen.css

@@ -462,18 +462,18 @@ body.cms { overflow: hidden; }
 .cms-add-form ul.SelectionGroup { padding-left: 28px; }
 .cms-add-form .parent-mode { padding: 8px; overflow: auto; }
 
-#PageType ul { padding-left: 20px; }
+#Form_AddForm_PageType_Holder ul { padding-left: 20px; }
-#PageType ul li { float: none; width: 100%; padding: 9px 0 9px 15px; overflow: hidden; border-bottom-width: 2px; border-bottom: 2px groove rgba(255, 255, 255, 0.8); -webkit-border-image: url(../images/textures/bg_fieldset_elements_border.png) 2 stretch stretch; border-image: url(../images/textures/bg_fieldset_elements_border.png) 2 stretch stretch; }
+#Form_AddForm_PageType_Holder ul li { float: none; width: 100%; padding: 9px 0 9px 15px; overflow: hidden; border-bottom-width: 2px; border-bottom: 2px groove rgba(255, 255, 255, 0.8); -webkit-border-image: url(../images/textures/bg_fieldset_elements_border.png) 2 stretch stretch; border-image: url(../images/textures/bg_fieldset_elements_border.png) 2 stretch stretch; }
-#PageType ul li:last-child { border-bottom: none; }
+#Form_AddForm_PageType_Holder ul li:last-child { border-bottom: none; }
-#PageType ul li:hover, #PageType ul li.selected { background-color: rgba(255, 255, 102, 0.3); }
+#Form_AddForm_PageType_Holder ul li:hover, #Form_AddForm_PageType_Holder ul li.selected { background-color: rgba(255, 255, 102, 0.3); }
-#PageType ul li.disabled { color: #aaaaaa; filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50); opacity: 0.5; }
+#Form_AddForm_PageType_Holder ul li.disabled { color: #aaaaaa; filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=50); opacity: 0.5; }
-#PageType ul li.disabled:hover { background: none; }
+#Form_AddForm_PageType_Holder ul li.disabled:hover { background: none; }
-#PageType ul li input { margin: inherit; }
+#Form_AddForm_PageType_Holder ul li input { margin: inherit; }
-#PageType ul li label { padding-left: 0; padding-bottom: 0; }
+#Form_AddForm_PageType_Holder ul li label { padding-left: 0; padding-bottom: 0; }
-#PageType ul li input, #PageType ul li label, #PageType ul li .page-icon, #PageType ul li .title { float: left; line-height: 1.3em; }
+#Form_AddForm_PageType_Holder ul li input, #Form_AddForm_PageType_Holder ul li label, #Form_AddForm_PageType_Holder ul li .page-icon, #Form_AddForm_PageType_Holder ul li .title { float: left; line-height: 1.3em; }
-#PageType ul li .page-icon { margin: 0 4px; }
+#Form_AddForm_PageType_Holder ul li .page-icon { margin: 0 4px; }
-#PageType ul li .title { width: 120px; font-weight: bold; padding-right: 10px; }
+#Form_AddForm_PageType_Holder ul li .title { width: 120px; font-weight: bold; padding-right: 10px; }
-#PageType ul li .description { font-style: italic; display: inline; clear: none; margin: 0; }
+#Form_AddForm_PageType_Holder ul li .description { font-style: italic; display: inline; clear: none; margin: 0; }
 
 /** -------------------------------------------- Content toolbar -------------------------------------------- */
 .cms-content-toolbar { min-height: 29px; display: block; margin: 0 0 8px 0; border-bottom: 1px solid #d0d3d5; -webkit-box-shadow: 0 1px 0 rgba(248, 248, 248, 0.9); -moz-box-shadow: 0 1px 0 rgba(248, 248, 248, 0.9); -o-box-shadow: 0 1px 0 rgba(248, 248, 248, 0.9); box-shadow: 0 1px 0 rgba(248, 248, 248, 0.9); *zoom: 1; /* smaller treedropdown */ }
@@ -1014,8 +1014,8 @@ visible. Added and removed with js in TabSet.js  */ /***************************
 .cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel.first { left: 0; width: 203px; }
 .cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .ui-icon { padding-right: 0; }
 .cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .tab-nav-link, .cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel .ss-ui-button { font-size: 12px; }
-.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel #PageType ul { padding: 0; }
+.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel #Form_AddForm_PageType_Holder ul { padding: 0; }
-.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel #PageType ul li { padding: 4px 5px; }
+.cms .ss-ui-action-tabset.multi .ss-ui-action-tab.ui-tabs-panel #Form_AddForm_PageType_Holder ul li { padding: 4px 5px; }
 .cms .ss-ui-action-tabset.tabset-open ul.ui-tabs-nav, .cms .ss-ui-action-tabset.tabset-open ul.ui-tabs-nav li.first { -moz-border-radius-bottomleft: 0; -webkit-border-bottom-left-radius: 0; border-bottom-left-radius: 0; }
 .cms .ss-ui-action-tabset.tabset-open-last ul.ui-tabs-nav li.last { -moz-border-radius-bottomright: 0; -webkit-border-bottom-right-radius: 0; border-bottom-right-radius: 0; }
 .cms .ss-ui-action-tabset .batch-check, .cms .ss-ui-action-tabset .ui-icon { display: inline-block; float: left; margin-left: -2px; padding-right: 6px; }

admin/javascript/SecurityAdmin.js

@@ -37,7 +37,7 @@
 		 * As they're disabled, any changes won't be submitted (which is intended behaviour),
 		 * checking all boxes is purely presentational.
 		 */
-		$('#Permissions .checkbox[value=ADMIN]').entwine({
+		$('.permissioncheckboxset .checkbox[value=ADMIN]').entwine({
 			onmatch: function() {
 				this.toggleCheckboxes();
 
@@ -56,7 +56,8 @@
 			 * Function: toggleCheckboxes
 			 */
 			toggleCheckboxes: function() {
-				var self = this, checkboxes = this.parents('.field:eq(0)').find('.checkbox').not(this);
+				var self = this,
+					checkboxes = this.parents('.field:eq(0)').find('.checkbox').not(this);
 				
 				if(this.is(':checked')) {
 					checkboxes.each(function() {

admin/scss/_actionTabs.scss

@@ -124,8 +124,10 @@ $border: 1px solid darken(#D9D9D9, 15%);
 				.tab-nav-link, .ss-ui-button {
 					font-size: 12px;
 				}	
-				#PageType ul{
+
-					padding:0;
+				#Form_AddForm_PageType_Holder ul {
+					padding: 0;
+
 					li{
 						padding:4px 5px;
 					}

admin/scss/_style.scss

@@ -531,7 +531,7 @@ body.cms {
 	}	
 }
 
-#PageType {
+#Form_AddForm_PageType_Holder {
 	ul {
 		padding-left: 20px;
 		li {

css/AssetUploadField.css

@@ -17,8 +17,6 @@ Used in side panels and action tabs
 
 .backlink { padding-left: 12px; }
 
-#Form_EditorToolbarMediaForm .ui-tabs-panel { padding-left: 0px; }
-
 body.cms.ss-uploadfield-edit-iframe, .composite.ss-assetuploadfield .details fieldset { padding: 16px; overflow: auto; background: #E2E2E2; }
 body.cms.ss-uploadfield-edit-iframe span.readonly, .composite.ss-assetuploadfield .details fieldset span.readonly { font-style: italic; color: #777777; text-shadow: 0px 1px 0px #fff; }
 body.cms.ss-uploadfield-edit-iframe .fieldholder-small label, .composite.ss-assetuploadfield .details fieldset .fieldholder-small label { margin-left: 0; }

javascript/HtmlEditorField.js

@@ -515,35 +515,51 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
 			redraw: function() {
 				this._super();
 
-				var linkType = this.find(':input[name=LinkType]:checked').val(), list = ['internal', 'external', 'file', 'email'];
+				var linkType = this.find(':input[name=LinkType]:checked').val(),
+					list = ['internal', 'external', 'file', 'email'];
 
 				this.addAnchorSelector();
 
 				// Toggle field visibility depending on the link type.
 				this.find('div.content .field').hide();
-				this.find('.field#LinkType').show();
+				this.find('.field[id$="LinkType_Holder"]').show();
-				this.find('.field#' + linkType).show();
+				this.find('.field[id$="' + linkType +'_Holder"]').show();
-				if(linkType == 'internal' || linkType == 'anchor') this.find('.field#Anchor').show();
+
-				if(linkType !== 'email') this.find('.field#TargetBlank').show();
+				if(linkType == 'internal' || linkType == 'anchor') {
+					this.find('.field[id$="Anchor_Holder"]').show();
+				}
+
+				if(linkType !== 'email') {
+					this.find('.field[id$="TargetBlank_Holder"]').show();
+				}
+
 				if(linkType == 'anchor') {
-					this.find('.field#AnchorSelector').show();
+					this.find('.field[id$="AnchorSelector_Holder"]').show();
-					this.find('.field#AnchorRefresh').show();
+					this.find('.field[id$="AnchorRefresh_Holder"]').show();
 				}
 			},
 			/**
 			 * @return Object Keys: 'href', 'target', 'title'
 			 */
 			getLinkAttributes: function() {
-				var href, target = null, anchor = this.find(':input[name=Anchor]').val();
+				var href,
+					target = null,
+					anchor = this.find(':input[name=Anchor]').val();
 				
 				// Determine target
-				if(this.find(':input[name=TargetBlank]').is(':checked')) target = '_blank';
+				if(this.find(':input[name=TargetBlank]').is(':checked')) {
-				
+					target = '_blank';
+				}
+
 				// All other attributes
 				switch(this.find(':input[name=LinkType]:checked').val()) {
 					case 'internal':
 						href = '[sitetree_link,id=' + this.find(':input[name=internal]').val() + ']';
-						if(anchor) href += '#' + anchor;
+
+						if(anchor) {
+							href += '#' + anchor;
+						}
+
 						break;
 
 					case 'anchor':
@@ -578,12 +594,14 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
 				this.modifySelection(function(ed){
 					ed.insertLink(this.getLinkAttributes());
 				});
+
 				this.updateFromEditor();
 			},
 			removeLink: function() {
 				this.modifySelection(function(ed){
 					ed.removeLink();
 				});
+
 				this.close();
 			},
 			addAnchorSelector: function() {
@@ -1229,7 +1247,9 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
 				this.setOrigVal(parseInt(this.val(), 10));
 
 				// Default to a managable size for the HTML view. Can be overwritten by user after initialization
-				if(this.attr('name') == 'Width') this.closest('.ss-htmleditorfield-file').updateDimensions('Width', 600);
+				if(this.attr('name') == 'Width') {
+					this.closest('.ss-htmleditorfield-file').updateDimensions('Width', 600);
+				}
 
 			},
 			onunmatch: function() {
@@ -1307,7 +1327,7 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE;
 		});
 
 
-		$('form.htmleditorfield-mediaform #ParentID .TreeDropdownField').entwine({
+		$('form.htmleditorfield-mediaform .field[id$="ParentID_Holder"] .TreeDropdownField').entwine({
 			onadd: function() {
 				this._super();
 

javascript/UploadField.js

@@ -350,8 +350,11 @@
 			},
 			toggleEditForm: function() {
 				var itemInfo = this.prev('.ss-uploadfield-item-info'), status = itemInfo.find('.ss-uploadfield-item-status');
-				var iframe = this.find('iframe').contents(), saved=iframe.find('#Form_EditForm_error');
+
-				var text="";
+				var iframe = this.find('iframe').contents(),
+					saved = iframe.find('#Form_EditForm_error');
+
+				var text = "";
 
 				if(this.height() === 0) {
 					text = ss.i18n._t('UploadField.Editing', "Editing ...");

javascript/UploadField_select.js

@@ -1,7 +1,7 @@
 (function($) {
 	$.entwine('ss', function($) {
 		// Install the directory selection handler
-		$('form.uploadfield-form #ParentID .TreeDropdownField').entwine({
+		$('form.uploadfield-form .TreeDropdownField').entwine({
 			onmatch: function() {
 				this._super();
 

scss/AssetUploadField.scss

@@ -7,7 +7,7 @@
 @import "_elementMixins";
 
 // Temporary. To be hidden and replaced with javascript tooltip
-.ss-uploadfield-view-allowed-extensions{
+.ss-uploadfield-view-allowed-extensions {
 	padding-top:5px;
 	clear:both;
 	max-width:750px;
@@ -19,20 +19,10 @@
 	}
 }
 
-#AssetUploadField {
-	border-bottom: 0;
-	@include box-shadow(none);
-}
 .backlink {
 	padding-left: 12px;
 }
 
-#Form_EditorToolbarMediaForm {
-	.ui-tabs-panel {
-		padding-left: 0px;
-	}
-}
-
 body.cms.ss-uploadfield-edit-iframe, .composite.ss-assetuploadfield .details fieldset {
 	padding: $grid-x*2;
 	overflow: auto;
@@ -52,6 +42,9 @@ body.cms.ss-uploadfield-edit-iframe, .composite.ss-assetuploadfield .details fie
 }
 
 .ss-assetuploadfield {
+	border-bottom: 0;
+	@include box-shadow(none);
+
 	h3 {
 		border-bottom: 1px solid $color-shadow-light;
 		@include box-shadow(0 1px 0 lighten($color-shadow-light, 95%));