Permalink
Browse files

BUGFIX show scroll bar on menu and side panels in adminstration secti…

…on rather than hiding
  • Loading branch information...
wilr committed Oct 29, 2011
1 parent b70bc85 commit 6b880064567ebf6a21eeea02c7ea05216a2b5fe0
View
@@ -44,6 +44,7 @@
Object::useCustomClass('Datetime', 'SS_Datetime', true);
+
/**
* The root directory of TinyMCE
*/
View
0 admin/css/_old/Image_iframe.css 100644 → 100755
No changes.
View
No changes.
View
No changes.
View
0 admin/css/_old/ModelAdmin.css 100644 → 100755
No changes.
View
0 admin/css/_old/SecurityAdmin.css 100644 → 100755
No changes.
View
0 admin/css/_old/cms_left.css 100644 → 100755
No changes.
View
0 admin/css/_old/cms_right.css 100644 → 100755
No changes.
View
0 admin/css/_old/editor.css 100644 → 100755
No changes.
View
0 admin/css/_old/layout.css 100644 → 100755
No changes.
View
No changes.
View
0 admin/css/_old/typography.css 100644 → 100755
No changes.
View
0 admin/css/_old/unjquery.css 100644 → 100755
No changes.
View
355 admin/css/screen.css 100644 → 100755

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -42,7 +42,7 @@
// Select default element (which might reveal children in hidden parents)
this.find('li.current').select();
-
+
this._super();
}
});
@@ -18,8 +18,10 @@
* <div class="cms-panel">
* <div class="cms-panel-header">your header</div>
* <div class="cms-panel-content">your content here</div>
- * <a href="#" class="toggle-expande">your toggle text</a>
- * <a href="#" class="toggle-collapse">your toggle text</a>
+ * <div class="cms-panel-toggle">
+ * <a href="#" class="toggle-expande">your toggle text</a>
+ * <a href="#" class="toggle-collapse">your toggle text</a>
+ * </div>
* </div>
*/
$('.cms-panel').entwine({
@@ -31,10 +33,16 @@
onmatch: function() {
if(!this.find('.cms-panel-content').length) throw new Exception('Content panel for ".cms-panel" not found');
- // Create default controls unless they already exist
- if(!this.find('.toggle-expand').length) this.append('<a class="toggle-expand" href="#"><span>&raquo;</span></a>');
- if(!this.find('.toggle-collapse').length) this.append('<a class="toggle-collapse" href="#"><span>&laquo;</span></a>');
-
+ // Create default controls unless they already exist.
+
+ if(!this.find('.cms-panel-toggle').length) {
+ var container = $("<div class='cms-panel-toggle south'></div>")
+ .append('<a class="toggle-expand" href="#"><span>&raquo;</span></a>')
+ .append('<a class="toggle-collapse" href="#"><span>&laquo;</span></a>');
+
+ this.append(container);
+ }
+
// Set panel width same as the content panel it contains. Assumes the panel has overflow: hidden.
this.setWidthExpanded(this.find('.cms-panel-content').innerWidth());
@@ -92,11 +92,14 @@
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');
},
/**
@@ -316,6 +319,13 @@
this._super();
}
});
+
+ $(".cms-panel-layout").entwine({
+ redraw: function() {
+ console.log('adding layout');
+ this.layout({resize: false});
+ }
+ });
});
}(jQuery));
View
@@ -10,6 +10,35 @@
* Basic form fields
* ---------------------------------------------------- */
+/* CMS action button sprite mix-in (used for all the buttons in the bottom row */
+@mixin actionButtonSprite($horizontalOffset, $verticalOffset) {
+ padding-left: 24px;
+ padding-right: 6px;
+ @include background(image-url("../images/btn_icons_sprite.png") no-repeat $horizontalOffset $verticalOffset,
+ linear-gradient(color-stops(
+ lighten($color-button-generic, 10%),
+ darken($color-button-generic, 5%)
+ ))
+ );
+ &.ui-state-hover {
+ @include background(image-url("../images/btn_icons_sprite.png") no-repeat $horizontalOffset $verticalOffset,
+ linear-gradient(color-stops(
+ lighten($color-button-generic, 20%),
+ $color-button-generic
+ ))
+ );
+ }
+ &.ui-state-disabled {
+ background-image: none;
+ @include background(image-url("../images/btn_icons_sprite_disabled.png") no-repeat $horizontalOffset $verticalOffset,
+ linear-gradient(color-stops(
+ lighten($color-button-generic, 20%),
+ $color-button-generic
+ ))
+ );
+ }
+}
+
form.nostyle {
@include clear-form-field-styles();
}
@@ -257,35 +286,6 @@ form.nostyle {
);
}
- /* CMS action button sprite mix-in (used for all the buttons in the bottom row */
- @mixin actionButtonSprite($horizontalOffset, $verticalOffset) {
- padding-left: 24px;
- padding-right: 6px;
- @include background(image-url("../images/btn_icons_sprite.png") no-repeat $horizontalOffset $verticalOffset,
- linear-gradient(color-stops(
- lighten($color-button-generic, 10%),
- darken($color-button-generic, 5%)
- ))
- );
- &.ui-state-hover {
- @include background(image-url("../images/btn_icons_sprite.png") no-repeat $horizontalOffset $verticalOffset,
- linear-gradient(color-stops(
- lighten($color-button-generic, 20%),
- $color-button-generic
- ))
- );
- }
- &.ui-state-disabled {
- background-image: none;
- @include background(image-url("../images/btn_icons_sprite_disabled.png") no-repeat $horizontalOffset $verticalOffset,
- linear-gradient(color-stops(
- lighten($color-button-generic, 20%),
- $color-button-generic
- ))
- );
- }
- }
-
/* constructive */
&.ss-ui-action-constructive {
background-image: none;
View
@@ -1,19 +1,90 @@
/**
- * Styles for the left hand side menu
+ * Styles for the left hand side menu and header for the admin panels.
+ *
+ * Take into consideration CSS selector performance.
*
* @package sapphire
* @subpackage admin
*/
-/** -------------------------------------------------------
- * CMS Menu Bar
- * -------------------------------------------------------- */
+.cms-logo-header {
+ background-color: darken($color-dark-bg, 10%);
+ position: relative;
+ padding: $grid-vertical * 2 8px 0 4px;
+ line-height: 24px;
+
+ @include background-image(
+ linear-gradient(darken($color-dark-bg, 10%), $color-dark-bg, darken($color-dark-bg, 10%)
+ ));
+
+ span {
+ color: $color-text-light;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ display: block;
+
+ a {
+ color: $color-text-dark-link;
+ display: inline;
+ }
+ }
+}
+
+.cms-logo {
+ border-bottom: 1px solid darken($color-dark-separator, 20%);
+ height: 31px;
+ overflow: hidden;
+ padding: 0 0 0 4px;
+ vertical-align: middle;
+ font-size: $font-base-size;
+
+ .version {
+ display: none;
+ }
+
+ a {
+ display: inline-block;
+ height: 24px;
+ width: 24px;
+ float: left;
+ margin-right: 8px;
+ background: $application-logo-small no-repeat;
+ text-indent: -9999em;
+ padding-right: 7px;
+ border-right: 1px solid $color-dark-separator;
+ }
+
+ span {
+ font-weight: bold;
+ font-size: 14px;
+ @include hide-text-overflow();
+ }
+}
+
+.cms-login-status {
+ border-top: 1px solid $color-dark-separator;
+ height: 24px;
+ padding: 7px 4px 0 4px;
+ overflow: hidden;
+ line-height: 16px;
+ font-size: $font-base-size - 1;
+
+ .logout-link {
+ display: inline-block;
+ height: 16px;
+ width: 16px;
+ float: left;
+ margin: 0 8px 0 3px;
+ background: url(../images/logout.png) no-repeat;
+ text-indent: -9999em;
+ }
+}
+
.cms-menu {
z-index: 80;
background: $color-menu-background;
border-right: 1px solid $color-menu-border;
width: ($grid-horizontal * 24) - 1; /* 8x24 - 1 */
- overflow: auto;
@include box-shadow($color-shadow-dark 0 0 $grid-horizontal);
@@ -23,15 +94,16 @@
.cms-panel-content {
width: ($grid-horizontal * 24) - 1; /* 8x24 - 1 */
- overflow: hidden
+ overflow-x: hidden;
+ overflow-y: scroll;
}
&.collapsed {
width: 40px;
cursor: auto;
z-index: 1000;
- .cms-header {
+ .cms-panel-header {
width: 30px;
span {
Oops, something went wrong.

4 comments on commit 6b88006

Owner

chillu replied Oct 29, 2011

Tsktsk William, file permission changes in a commit - aren't you looking at the stage before committing? ;) Thanks for fixing those backend niggles though!

Owner

wilr replied Oct 29, 2011

How the fuck do you get compass to work with 644? I ended up just rage quitting. Webserver is running as 'www', files are owned by 'www'. Need to look into it but I assume exec() shell also runs as www in that case. You don't have any issues with 644 while building css files?

Owner

chillu replied Oct 29, 2011

Oh, so it did have a reason ;) I guess just note that in the commit message. From my perspective, having sass files as 755 is not really a big deal. I'm building from CLI, not through the compass mobile, on OSX as the same user that I'm running apache on (my OSX user).

Owner

wilr replied Oct 29, 2011

Ah might try cli, been using the compass module and permissions have been driving me up with wall.

Please sign in to comment.