Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

MINOR remove console.log. MINOR clean up for icon sprites in the cms …

…and content toolbars
  • Loading branch information...
commit aba6b441635deb5a2586e54ad59cd8cbf45f4cd3 1 parent 3d77214
@wilr wilr authored
View
10 admin/css/screen.css
@@ -189,7 +189,7 @@ html article, html aside, html details, html figcaption, html figure, html foote
.cms-preview, .cms-menu, .cms-content, .cms-content-header, .cms-content-tools, .cms-content-fields, .cms-edit-form, .cms-preview, .cms-preview iframe, .cms-preview-controls { display: -moz-inline-box; -moz-box-orient: vertical; display: inline-block; vertical-align: middle; *vertical-align: auto; }
.cms-preview, .cms-menu, .cms-content, .cms-content-header, .cms-content-tools, .cms-content-fields, .cms-edit-form, .cms-preview, .cms-preview iframe, .cms-preview-controls { *display: inline; }
-.cms-content-header { background-color: #b0bec7; padding: 8px 8px 6px 16px; height: 32px; z-index: 60; border-bottom: 2px solid #8399a7; -moz-box-shadow: #eceff1 0 8px 16px; -webkit-box-shadow: #eceff1 0 8px 16px; -o-box-shadow: #eceff1 0 8px 16px; box-shadow: #eceff1 0 8px 16px; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ced7dc), color-stop(100%, #92a5b2)); background-image: -webkit-linear-gradient(#ced7dc, #92a5b2); background-image: -moz-linear-gradient(#ced7dc, #92a5b2); background-image: -o-linear-gradient(#ced7dc, #92a5b2); background-image: -ms-linear-gradient(#ced7dc, #92a5b2); background-image: linear-gradient(#ced7dc, #92a5b2); }
+.cms-content-header { background-color: #b0bec7; padding: 8px 8px 6px; height: 32px; z-index: 60; border-bottom: 2px solid #8399a7; -moz-box-shadow: #eceff1 0 8px 16px; -webkit-box-shadow: #eceff1 0 8px 16px; -o-box-shadow: #eceff1 0 8px 16px; box-shadow: #eceff1 0 8px 16px; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ced7dc), color-stop(100%, #92a5b2)); background-image: -webkit-linear-gradient(#ced7dc, #92a5b2); background-image: -moz-linear-gradient(#ced7dc, #92a5b2); background-image: -o-linear-gradient(#ced7dc, #92a5b2); background-image: -ms-linear-gradient(#ced7dc, #92a5b2); background-image: linear-gradient(#ced7dc, #92a5b2); }
.cms-content-header h2 { float: left; padding: 8px 8px 0 0; font-size: 14px; line-height: 24px; font-weight: bold; text-shadow: #bfcad2 1px 1px 0; width: 176px; margin: 0; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; o-text-overflow: ellipsis; }
.cms-content-header > div { width: 9999em; overflow: hidden; }
.cms-content-header .cms-content-header-tabs { float: left; }
@@ -244,8 +244,8 @@ html article, html aside, html details, html figcaption, html figure, html foote
/* -------------------------------------------------------- Content Tools is the sidebar on the left of the main content panel */
.cms-content-tools { background-color: #dde3e7; width: 192px; border-right: 1px solid #bfcad2; overflow-y: auto; overflow-x: hidden; z-index: 70; /* buttons now need to line with with reduced input sizes */ }
-.cms-content-tools .cms-panel-header { padding: 0 4px; margin: 8px 12px 0; line-height: 24px; border-bottom: 1px solid rgba(201, 205, 206, 0.8); -webkit-box-shadow: 0 1px 0 rgba(228, 230, 230, 0.8); -moz-box-shadow: 0 1px 0 rgba(228, 230, 230, 0.8); -o-box-shadow: 0 1px 0 rgba(228, 230, 230, 0.8); box-shadow: 0 1px 0 rgba(228, 230, 230, 0.8); }
-.cms-content-tools .cms-panel-content { width: 168px; padding: 8px 16px; }
+.cms-content-tools .cms-panel-header { padding: 0; margin: 0 0 7px; line-height: 24px; border-bottom: 1px solid rgba(201, 205, 206, 0.8); -webkit-box-shadow: 0 1px 0 rgba(228, 230, 230, 0.8); -moz-box-shadow: 0 1px 0 rgba(228, 230, 230, 0.8); -o-box-shadow: 0 1px 0 rgba(228, 230, 230, 0.8); box-shadow: 0 1px 0 rgba(228, 230, 230, 0.8); }
+.cms-content-tools .cms-panel-content { width: 176px; padding: 8px 8px; overflow-x: hidden; overflow-y: scroll; }
.cms-content-tools .cms-content-header { background-color: #748d9d; border-bottom: 2px solid #5c7382; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #b0bec7), color-stop(100%, #748d9d)); background-image: -webkit-linear-gradient(#b0bec7, #748d9d); background-image: -moz-linear-gradient(#b0bec7, #748d9d); background-image: -o-linear-gradient(#b0bec7, #748d9d); background-image: -ms-linear-gradient(#b0bec7, #748d9d); background-image: linear-gradient(#b0bec7, #748d9d); }
.cms-content-tools .cms-content-header h2 { text-shadow: #5c7382 -1px -1px 0; width: 176px; color: white; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; o-text-overflow: ellipsis; }
.cms-content-tools h3, .cms-content-tools h4, .cms-content-tools h5 { font-weight: bold; line-height: 16px; }
@@ -255,7 +255,7 @@ html article, html aside, html details, html figcaption, html figure, html foote
.cms-content-tools .field label { float: none; width: auto; font-size: 11px; padding: 0 8px 4px 0; }
.cms-content-tools .field .middleColumn { margin: 0; }
.cms-content-tools .field input.text, .cms-content-tools .field select, .cms-content-tools .field textarea { padding: 5px; font-size: 11px; }
-.cms-content-tools .field.checkbox { padding: 0 8px 7px; }
+.cms-content-tools .field.checkbox { padding: 0 8px 0; }
.cms-content-tools .field.checkbox input { margin: 2px 0; }
.cms-content-tools .field .chzn-container-single .chzn-single { height: 24px; line-height: 24px; font-size: 11px; }
.cms-content-tools .field .chzn-container-single .chzn-single div b { background-position: 4px 0; }
@@ -429,7 +429,7 @@ form.member-profile-form .formattingHelpText li { font-size: 11px; color: #333;
.cms-tree.jstree-apple span.comment-count:after { content: ""; position: absolute; bottom: -3px; /* value = - border-top-width - border-bottom-width */ left: 4px; /* value = (:before left) + (:before border-left) - (:after border-left) */ border-width: 3px 3px 0; border-style: solid; border-color: #FFF0BC transparent; /* reduce the damage in FF3.0 */ display: block; width: 0; }
.cms-tree.jstree-apple .jstree-hovered { text-shadow: none; text-decoration: none; }
.cms-tree.jstree-apple li { padding: 0px; clear: left; }
-.cms-tree.jstree-apple li, .cms-tree.jstree-apple ins { background-color: transparent; background-image: url(../images/sitetree_ss_default_icons.png); }
+.cms-tree.jstree-apple ins { background-color: transparent; background-image: url(../images/sitetree_ss_default_icons.png); }
.cms-tree.jstree-apple li.jstree-checked a, .cms-tree.jstree-apple li.jstree-checked a:link { background-color: #efe999; }
.jstree-apple #record-0.jstree-open > ins { display: none; }
View
1  admin/javascript/LeftAndMain.Panel.js
@@ -85,7 +85,6 @@
},
togglePanel: function(bool) {
- // if((!bool && this.hasClass('collapsed')) || (bool && !this.hasClass('collapsed'))) return;
//apply or unapply the flyout formatting
$('.cms-menu-list').children('li').each(function(){
View
20 admin/javascript/LeftAndMain.js
@@ -74,9 +74,17 @@
// Monitor window resizes, panel changes and edit form loads for layout changes.
// Also triggers redraw through handleStateChange()
- $(window).resize(function() {self.redraw()});
- $('.cms-panel').live('toggle', function() {self.redraw();});
- $('.cms-edit-form').live('reloadeditform', function() {self.redraw()});
+ $(window).resize(function() {
+ self.redraw();
+ });
+
+ $('.cms-panel').live('toggle', function() {
+ self.redraw();
+ });
+
+ $('.cms-edit-form').live('reloadeditform', function() {
+ self.redraw()
+ });
// Remove loading screen
$('.ss-loading-screen').hide();
@@ -92,14 +100,13 @@
redraw: function() {
// Move from inner to outer layouts. Some of the elements might not exist.
- this.find('.cms-panel-layout').redraw(); // sidebar.
-
this.find('.cms-edit-form[data-layout]').redraw(); // Not all edit forms are layouted
this.find('.cms-preview').redraw();
this.find('.cms-content').redraw();
this.layout({resize: false});
- console.log('resizing page');
+
+ this.find('.cms-panel-layout').redraw(); // sidebar panels.
},
/**
@@ -322,7 +329,6 @@
$(".cms-panel-layout").entwine({
redraw: function() {
- console.log('adding layout');
this.layout({resize: false});
}
});
View
18 admin/scss/_style.scss
@@ -87,7 +87,7 @@ html,body {
.cms-content-header {
background-color: darken($color-widget-bg, 20%);
- padding: $grid-vertical $grid-horizontal ($grid-vertical - 2) $grid-horizontal * 2;
+ padding: $grid-vertical $grid-horizontal ($grid-vertical - 2);
height: $grid-vertical * 4;
z-index: 60;
border-bottom: 2px solid darken($color-widget-bg, 35%);
@@ -368,22 +368,22 @@ html,body {
z-index: 70;
.cms-panel-header {
- padding: 0 $grid-horizontal / 2;
- margin: $grid-vertical $grid-horizontal * 1.5 0;
+ padding: 0;
+ margin: 0 0 $grid-vertical - 1;
line-height: $grid-vertical * 3;
@include doubleborder(bottom, $color-light-separator, lighten($color-light-separator, 10%))
-
}
.cms-panel-content {
- width: ($grid-horizontal * 21);
- padding: $grid-vertical $grid-horizontal * 2;
+ width: ($grid-horizontal * 22);
+ padding: $grid-vertical $grid-horizontal;
+ overflow-x: hidden;
+ overflow-y: scroll;
}
.cms-content-header {
- background-color: darken($color-widget-bg, 40%);
-
+ background-color: darken($color-widget-bg, 40%);
border-bottom: 2px solid darken($color-widget-bg, 50%);
@include background-image(
@@ -437,7 +437,7 @@ html,body {
}
&.checkbox {
- padding: 0 8px 7px;
+ padding: 0 8px 0;
input {
margin: 2px 0;
View
2  admin/scss/_tree.scss
@@ -496,7 +496,7 @@
clear: left;
}
- & li, ins {
+ & ins {
background-color: transparent;
background-image: url(../images/sitetree_ss_default_icons.png);
}
View
10 admin/templates/Includes/ModelAdmin_Content.ss
@@ -6,11 +6,13 @@
</div>
</div>
- <div class="cms-content-tools west cms-panel" data-expandOnClick="true">
+ <div class="cms-content-tools west cms-panel cms-panel-layout" data-expandOnClick="true" data-layout="{type: 'border'}">
- <h3 class="cms-panel-header">Filter</h3>
-
- <div class="cms-panel-content">
+ <div class="north">
+ <h3 class="cms-panel-header">Filter</h3>
+ <div>
+
+ <div class="cms-panel-content center">
<div id="SearchForm_holder" class="leftbottom ss-tabset">
<% if SearchClassSelector = tabs %>
<ul>
Please sign in to comment.
Something went wrong with that request. Please try again.