From 18131ae64a801e80dc6df0920a3a5ea9bf7ad6ec Mon Sep 17 00:00:00 2001 From: jbridson Date: Fri, 17 Feb 2012 12:40:19 +1300 Subject: [PATCH 01/72] MINOR:fixed bug with tabs - created more specific styling for the page view tabs so that they do not affect the tabs sitewide. --- admin/css/screen.css | 32 +++++++++------ admin/scss/_style.scss | 90 +++++++++++++++++++++++++++++++----------- 2 files changed, 86 insertions(+), 36 deletions(-) diff --git a/admin/css/screen.css b/admin/css/screen.css index d5dd4fb95..931933cdc 100644 --- a/admin/css/screen.css +++ b/admin/css/screen.css @@ -235,20 +235,25 @@ body.cms { overflow: hidden; } .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; max-width: 400px; 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 { position: fixed; right: 40px; } +.cms-content-header .cms-content-header-tabs .ui-tabs-nav li a { font-weight: bold; line-height: 16px; padding: 12px 20px 11px; text-indent: -9999em; } +.cms-content-header .cms-content-header-tabs .ui-tabs-nav li a.content-treeview { background: url(../images/content-header-tabs-sprite.png) no-repeat 2px 0px; } +.cms-content-header .cms-content-header-tabs .ui-tabs-nav li a.content-galleryview { background: url(../images/content-header-tabs-sprite.png) no-repeat -87px 0px; } +.cms-content-header .cms-content-header-tabs .ui-tabs-nav li a.content-listview { background: url(../images/content-header-tabs-sprite.png) no-repeat -38px 0px; } +.cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-state-default, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-widget-content .ui-state-default, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-widget-header .ui-state-default { border-top: none; } +.cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-state-active, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-widget-content .ui-state-active, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-widget-header .ui-state-active { border-top: none; } +.cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-state-active a.content-treeview, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-widget-content .ui-state-active a.content-treeview, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-widget-header .ui-state-active a.content-treeview { background: url(../images/content-header-tabs-sprite.png) no-repeat 2px -40px; } +.cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-state-active a.content-galleryview, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-widget-content .ui-state-active a.content-galleryview, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-widget-header .ui-state-active a.content-galleryview { background: url(../images/content-header-tabs-sprite.png) no-repeat -87px -40px; } +.cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-state-active a.content-listview, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-widget-content .ui-state-active a.content-listview, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-widget-header .ui-state-active a.content-listview { background: url(../images/content-header-tabs-sprite.png) no-repeat -38px -40px; } -.ui-tabs .cms-content-header .ui-tabs-nav li, .cms-dialog .ui-tabs-nav .ui-tabs-nav li { margin: 0; } -.ui-tabs .cms-content-header .ui-tabs-nav li a, .cms-dialog .ui-tabs-nav .ui-tabs-nav li a { font-weight: bold; line-height: 16px; padding: 12px 20px 11px; } -.ui-tabs .cms-content-header .ui-tabs-nav li a.content-treeview, .cms-dialog .ui-tabs-nav .ui-tabs-nav li a.content-treeview { background: url(../images/content-header-tabs-sprite.png) no-repeat 2px 0px; } -.ui-tabs .cms-content-header .ui-tabs-nav li a.content-galleryview, .cms-dialog .ui-tabs-nav .ui-tabs-nav li a.content-galleryview { background: url(../images/content-header-tabs-sprite.png) no-repeat -87px 0px; } -.ui-tabs .cms-content-header .ui-tabs-nav li a.content-listview, .cms-dialog .ui-tabs-nav .ui-tabs-nav li a.content-listview { background: url(../images/content-header-tabs-sprite.png) no-repeat -38px 0px; } -.ui-tabs .cms-content-header .ui-state-default, .ui-tabs .cms-content-header .ui-widget-content .ui-state-default, .ui-tabs .cms-content-header .ui-widget-header .ui-state-default, .cms-dialog .ui-tabs-nav .ui-state-default, .cms-dialog .ui-tabs-nav .ui-widget-content .ui-state-default, .cms-dialog .ui-tabs-nav .ui-widget-header .ui-state-default { background-color: #b0bec7; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #b0bec7), color-stop(100%, #8ca1ae)); background-image: -webkit-linear-gradient(#b0bec7, #8ca1ae); background-image: -moz-linear-gradient(#b0bec7, #8ca1ae); background-image: -o-linear-gradient(#b0bec7, #8ca1ae); background-image: -ms-linear-gradient(#b0bec7, #8ca1ae); background-image: linear-gradient(#b0bec7, #8ca1ae); border-right-color: #a6a6a6; border-left-color: #d9d9d9; border-top: none; border-bottom: none; text-shadow: white 0 1px 0; } -.ui-tabs .cms-content-header .ui-state-active, .ui-tabs .cms-content-header .ui-widget-content .ui-state-active, .ui-tabs .cms-content-header .ui-widget-header .ui-state-active, .cms-dialog .ui-tabs-nav .ui-state-active, .cms-dialog .ui-tabs-nav .ui-widget-content .ui-state-active, .cms-dialog .ui-tabs-nav .ui-widget-header .ui-state-active { background: #eceff1; border-right-color: #a6a6a6; border-left-color: #a6a6a6; border-top: none; margin-right: -1px; margin-left: -1px; z-index: 2; } -.ui-tabs .cms-content-header .ui-state-active a, .ui-tabs .cms-content-header .ui-widget-content .ui-state-active a, .ui-tabs .cms-content-header .ui-widget-header .ui-state-active a, .cms-dialog .ui-tabs-nav .ui-state-active a, .cms-dialog .ui-tabs-nav .ui-widget-content .ui-state-active a, .cms-dialog .ui-tabs-nav .ui-widget-header .ui-state-active a { border-bottom: none; } -.ui-tabs .cms-content-header .ui-state-active a.content-treeview, .ui-tabs .cms-content-header .ui-widget-content .ui-state-active a.content-treeview, .ui-tabs .cms-content-header .ui-widget-header .ui-state-active a.content-treeview, .cms-dialog .ui-tabs-nav .ui-state-active a.content-treeview, .cms-dialog .ui-tabs-nav .ui-widget-content .ui-state-active a.content-treeview, .cms-dialog .ui-tabs-nav .ui-widget-header .ui-state-active a.content-treeview { background: url(../images/content-header-tabs-sprite.png) no-repeat 2px -40px; } -.ui-tabs .cms-content-header .ui-state-active a.content-galleryview, .ui-tabs .cms-content-header .ui-widget-content .ui-state-active a.content-galleryview, .ui-tabs .cms-content-header .ui-widget-header .ui-state-active a.content-galleryview, .cms-dialog .ui-tabs-nav .ui-state-active a.content-galleryview, .cms-dialog .ui-tabs-nav .ui-widget-content .ui-state-active a.content-galleryview, .cms-dialog .ui-tabs-nav .ui-widget-header .ui-state-active a.content-galleryview { background: url(../images/content-header-tabs-sprite.png) no-repeat -87px -40px; } -.ui-tabs .cms-content-header .ui-state-active a.content-listview, .ui-tabs .cms-content-header .ui-widget-content .ui-state-active a.content-listview, .ui-tabs .cms-content-header .ui-widget-header .ui-state-active a.content-listview, .cms-dialog .ui-tabs-nav .ui-state-active a.content-listview, .cms-dialog .ui-tabs-nav .ui-widget-content .ui-state-active a.content-listview, .cms-dialog .ui-tabs-nav .ui-widget-header .ui-state-active a.content-listview { background: url(../images/content-header-tabs-sprite.png) no-repeat -38px -40px; } -.ui-tabs .cms-content-header .ui-corner-all, .ui-tabs .cms-content-header .ui-corner-top, .ui-tabs .cms-content-header .ui-corner-right, .ui-tabs .cms-content-header .ui-corner-tr, .cms-dialog .ui-tabs-nav .ui-corner-all, .cms-dialog .ui-tabs-nav .ui-corner-top, .cms-dialog .ui-tabs-nav .ui-corner-right, .cms-dialog .ui-tabs-nav .ui-corner-tr { border-radius: 0; } -.ui-tabs .cms-content-header .ui-corner-all, .ui-tabs .cms-content-header .ui-corner-top, .ui-tabs .cms-content-header .ui-corner-left, .ui-tabs .cms-content-header .ui-corner-tl, .cms-dialog .ui-tabs-nav .ui-corner-all, .cms-dialog .ui-tabs-nav .ui-corner-top, .cms-dialog .ui-tabs-nav .ui-corner-left, .cms-dialog .ui-tabs-nav .ui-corner-tl { border-radius: 0; } +.cms-edit-form .cms-content-header-tabs .ui-tabs-nav li a { text-indent: 0; } + +.ui-tabs .ui-tabs-nav li, .cms-dialog .ui-tabs-nav .ui-tabs-nav li { margin: 0; } +.ui-tabs .ui-tabs-nav li a, .cms-dialog .ui-tabs-nav .ui-tabs-nav li a { font-weight: bold; line-height: 16px; padding: 12px 20px 11px; } +.ui-tabs .ui-state-default, .ui-tabs .ui-widget-content .ui-state-default, .ui-tabs .ui-widget-header .ui-state-default, .cms-dialog .ui-tabs-nav .ui-state-default, .cms-dialog .ui-tabs-nav .ui-widget-content .ui-state-default, .cms-dialog .ui-tabs-nav .ui-widget-header .ui-state-default { background-color: #b0bec7; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #b0bec7), color-stop(100%, #8ca1ae)); background-image: -webkit-linear-gradient(#b0bec7, #8ca1ae); background-image: -moz-linear-gradient(#b0bec7, #8ca1ae); background-image: -o-linear-gradient(#b0bec7, #8ca1ae); background-image: -ms-linear-gradient(#b0bec7, #8ca1ae); background-image: linear-gradient(#b0bec7, #8ca1ae); border-right-color: #a6a6a6; border-left-color: #d9d9d9; border-bottom: none; text-shadow: white 0 1px 0; } +.ui-tabs .ui-state-active, .ui-tabs .ui-widget-content .ui-state-active, .ui-tabs .ui-widget-header .ui-state-active, .cms-dialog .ui-tabs-nav .ui-state-active, .cms-dialog .ui-tabs-nav .ui-widget-content .ui-state-active, .cms-dialog .ui-tabs-nav .ui-widget-header .ui-state-active { background: #eceff1; border-right-color: #a6a6a6; border-left-color: #a6a6a6; margin-right: -1px; margin-left: -1px; z-index: 2; } +.ui-tabs .ui-state-active a, .ui-tabs .ui-widget-content .ui-state-active a, .ui-tabs .ui-widget-header .ui-state-active a, .cms-dialog .ui-tabs-nav .ui-state-active a, .cms-dialog .ui-tabs-nav .ui-widget-content .ui-state-active a, .cms-dialog .ui-tabs-nav .ui-widget-header .ui-state-active a { border-bottom: none; } +.ui-tabs .ui-corner-all, .ui-tabs .ui-corner-top, .ui-tabs .ui-corner-right, .ui-tabs .ui-corner-tr, .cms-dialog .ui-tabs-nav .ui-corner-all, .cms-dialog .ui-tabs-nav .ui-corner-top, .cms-dialog .ui-tabs-nav .ui-corner-right, .cms-dialog .ui-tabs-nav .ui-corner-tr { border-radius: 0; } +.ui-tabs .ui-corner-all, .ui-tabs .ui-corner-top, .ui-tabs .ui-corner-left, .ui-tabs .ui-corner-tl, .cms-dialog .ui-tabs-nav .ui-corner-all, .cms-dialog .ui-tabs-nav .ui-corner-top, .cms-dialog .ui-tabs-nav .ui-corner-left, .cms-dialog .ui-tabs-nav .ui-corner-tl { border-radius: 0; } /** ------------------------------------------------------- Loading Interface ------------------------------------------------------- */ .cms-content-loading-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: 9998; } @@ -374,6 +379,7 @@ form.member-profile-form .formattingHelpText li { font-size: 11px; color: #333; form.member-profile-form #Groups .middleColumn { margin-left: 0; width: 100%; } form.member-profile-form #Groups .middleColumn .TreeDropdownField { width: 90%; max-width: 90%; } form.member-profile-form #Permissions .optionset li { float: none; width: auto; } +form.member-profile-form .ui-tabs-nav li { margin: 0 0 -1px 0; } .cms .cms-content { border-right: 1px solid rgba(201, 205, 206, 0.8); -moz-box-shadow: 3px 0 4px rgba(0, 0, 0, 0.15); -webkit-box-shadow: 3px 0 4px rgba(0, 0, 0, 0.15); -o-box-shadow: 3px 0 4px rgba(0, 0, 0, 0.15); box-shadow: 3px 0 4px rgba(0, 0, 0, 0.15); -moz-border-radius: 0; -webkit-border-radius: 0; -o-border-radius: 0; -ms-border-radius: 0; -khtml-border-radius: 0; border-radius: 0; } .cms .cms-content-fields { /* always show a y scroll bar as popups like TreeDropdowns can trigger longer pages and the extra scroll bar doesn't fire our sizing bar */ overflow-y: auto; overflow-x: auto; background: none; -moz-box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px; -webkit-box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px; -o-box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px; box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px; } diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss index 6945d4753..c6ed48e69 100644 --- a/admin/scss/_style.scss +++ b/admin/scss/_style.scss @@ -132,26 +132,76 @@ body.cms { .cms-content-header-tabs { position:fixed; right:40px; + .ui-tabs-nav { + li { + a { + font-weight: bold; + line-height: $grid-y * 2; + padding: ($grid-y * 2 - 4) ($grid-x * 2 + 4) $grid-y + 3; + text-indent:-9999em; + + &.content-treeview { + background:url(../images/content-header-tabs-sprite.png) no-repeat 2px 0px; + } + &.content-galleryview { + background:url(../images/content-header-tabs-sprite.png) no-repeat -87px 0px; + } + &.content-listview { + background:url(../images/content-header-tabs-sprite.png) no-repeat -38px 0px; + } + } + } + + .ui-state-default, + .ui-widget-content .ui-state-default, + .ui-widget-header .ui-state-default { + border: { + top:none; + } + } + + .ui-state-active, + .ui-widget-content .ui-state-active, + .ui-widget-header .ui-state-active { + border: { + top:none; + } + + a { + &.content-treeview { + background:url(../images/content-header-tabs-sprite.png) no-repeat 2px -40px; + } + &.content-galleryview { + background:url(../images/content-header-tabs-sprite.png) no-repeat -87px -40px; + } + &.content-listview { + background:url(../images/content-header-tabs-sprite.png) no-repeat -38px -40px; + } + } + } + } } } -.ui-tabs .cms-content-header, .cms-dialog .ui-tabs-nav { +.cms-edit-form { + .cms-content-header-tabs { + .ui-tabs-nav { + li { + a { + text-indent:0; + } + } + } + } +} + +.ui-tabs, .cms-dialog .ui-tabs-nav { .ui-tabs-nav li { margin:0; a { font-weight: bold; line-height: $grid-y * 2; padding: ($grid-y * 2 - 4) ($grid-x * 2 + 4) $grid-y + 3; - - &.content-treeview { - background:url(../images/content-header-tabs-sprite.png) no-repeat 2px 0px; - } - &.content-galleryview { - background:url(../images/content-header-tabs-sprite.png) no-repeat -87px 0px; - } - &.content-listview { - background:url(../images/content-header-tabs-sprite.png) no-repeat -38px 0px; - } } } @@ -166,7 +216,6 @@ body.cms { border: { right-color: darken($color-tab, 20%); left-color: $color-tab; - top:none; bottom:none; } @@ -180,7 +229,6 @@ body.cms { border: { right-color: darken($color-tab, 20%); left-color: darken($color-tab, 20%); - top:none; } margin-right:-1px; margin-left:-1px; @@ -188,16 +236,6 @@ body.cms { a { border-bottom:none; - - &.content-treeview { - background:url(../images/content-header-tabs-sprite.png) no-repeat 2px -40px; - } - &.content-galleryview { - background:url(../images/content-header-tabs-sprite.png) no-repeat -87px -40px; - } - &.content-listview { - background:url(../images/content-header-tabs-sprite.png) no-repeat -38px -40px; - } } } @@ -834,6 +872,12 @@ form.member-profile-form { } } } + + .ui-tabs-nav { + li { + margin:0 0 -1px 0; + } + } } .cms { From 76ddb3c53bd2ea9eb72fb37f0355af5fef14e7fe Mon Sep 17 00:00:00 2001 From: jbridson Date: Fri, 17 Feb 2012 17:00:29 +1300 Subject: [PATCH 02/72] BUGFIX:fixed various styling issues in cms (raised in SSF-188) --- admin/css/ie7.css | 2 + admin/css/screen.css | 195 +++++++++++++++++++++------------------ admin/scss/_menu.scss | 48 ++++++++-- admin/scss/_style.scss | 70 ++++++++++---- admin/scss/_tree.scss | 4 +- admin/scss/_uitheme.scss | 7 +- 6 files changed, 204 insertions(+), 122 deletions(-) diff --git a/admin/css/ie7.css b/admin/css/ie7.css index 94f149c21..2b264bae4 100644 --- a/admin/css/ie7.css +++ b/admin/css/ie7.css @@ -12,3 +12,5 @@ html { overflow: hidden; } .cms-content-toolbar { border-bottom: 1px solid #c9cdce; padding-bottom: 5px; } .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { background-image: none; } + +.jstree li a .ui-icon { text-indent: 0px !important; } diff --git a/admin/css/screen.css b/admin/css/screen.css index 931933cdc..f80ec2642 100644 --- a/admin/css/screen.css +++ b/admin/css/screen.css @@ -70,7 +70,7 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, .cms .ui-tabs .ui-tabs-nav.ui-state-active { border-color: gray; } .cms .ui-tabs .ui-tabs-panel { background: transparent; padding: 16px 40px 16px 25px; } .cms .ui-widget-content, .cms .ui-widget { color: #444444; font-size: 12px; font-family: Arial, sans-serif; border: 0; } -.cms .ui-widget-header { background-color: #b0bec7; padding: 8px 8px 6px 8px; border-bottom: 2px solid #8399a7; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #dde3e7), color-stop(100%, #92a5b2)); background-image: -webkit-linear-gradient(top, #dde3e7, #92a5b2); background-image: -moz-linear-gradient(top, #dde3e7, #92a5b2); background-image: -o-linear-gradient(top, #dde3e7, #92a5b2); background-image: -ms-linear-gradient(top, #dde3e7, #92a5b2); background-image: linear-gradient(top, #dde3e7, #92a5b2); border-bottom: 3px solid #5c7382; padding: 8px; -moz-border-radius: 0; -webkit-border-radius: 0; -o-border-radius: 0; -ms-border-radius: 0; -khtml-border-radius: 0; border-radius: 0; } +.cms .ui-widget-header { background-color: #b0bec7; padding: 8px 8px 6px 8px; border-bottom: 2px solid #8399a7; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #dde3e7), color-stop(100%, #92a5b2)); background-image: -webkit-linear-gradient(#dde3e7, #92a5b2); background-image: -moz-linear-gradient(#dde3e7, #92a5b2); background-image: -o-linear-gradient(#dde3e7, #92a5b2); background-image: -ms-linear-gradient(#dde3e7, #92a5b2); background-image: linear-gradient(#dde3e7, #92a5b2); border-bottom: 3px solid #5c7382; padding: 8px; -moz-border-radius: 0; -webkit-border-radius: 0; -o-border-radius: 0; -ms-border-radius: 0; -khtml-border-radius: 0; border-radius: 0; } .cms .ui-widget-header .ui-dialog-title { padding: 6px 0; text-shadow: #ced7dc 1px 1px 0; } .cms .ui-widget-header a.ui-dialog-titlebar-close { position: absolute; top: -8px; right: -15px; width: 30px; height: 30px; z-index: 100000; } .cms .ui-widget-header a.ui-state-hover { border-color: transparent; background: transparent; } @@ -244,6 +244,8 @@ body.cms { overflow: hidden; } .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-state-active a.content-treeview, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-widget-content .ui-state-active a.content-treeview, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-widget-header .ui-state-active a.content-treeview { background: url(../images/content-header-tabs-sprite.png) no-repeat 2px -40px; } .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-state-active a.content-galleryview, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-widget-content .ui-state-active a.content-galleryview, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-widget-header .ui-state-active a.content-galleryview { background: url(../images/content-header-tabs-sprite.png) no-repeat -87px -40px; } .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-state-active a.content-listview, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-widget-content .ui-state-active a.content-listview, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-widget-header .ui-state-active a.content-listview { background: url(../images/content-header-tabs-sprite.png) no-repeat -38px -40px; } +.cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-corner-all, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-corner-top, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-corner-right, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-corner-tr { border-radius: 0; } +.cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-corner-all, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-corner-top, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-corner-left, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-corner-tl { border-radius: 0; } .cms-edit-form .cms-content-header-tabs .ui-tabs-nav li a { text-indent: 0; } @@ -252,8 +254,6 @@ body.cms { overflow: hidden; } .ui-tabs .ui-state-default, .ui-tabs .ui-widget-content .ui-state-default, .ui-tabs .ui-widget-header .ui-state-default, .cms-dialog .ui-tabs-nav .ui-state-default, .cms-dialog .ui-tabs-nav .ui-widget-content .ui-state-default, .cms-dialog .ui-tabs-nav .ui-widget-header .ui-state-default { background-color: #b0bec7; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #b0bec7), color-stop(100%, #8ca1ae)); background-image: -webkit-linear-gradient(#b0bec7, #8ca1ae); background-image: -moz-linear-gradient(#b0bec7, #8ca1ae); background-image: -o-linear-gradient(#b0bec7, #8ca1ae); background-image: -ms-linear-gradient(#b0bec7, #8ca1ae); background-image: linear-gradient(#b0bec7, #8ca1ae); border-right-color: #a6a6a6; border-left-color: #d9d9d9; border-bottom: none; text-shadow: white 0 1px 0; } .ui-tabs .ui-state-active, .ui-tabs .ui-widget-content .ui-state-active, .ui-tabs .ui-widget-header .ui-state-active, .cms-dialog .ui-tabs-nav .ui-state-active, .cms-dialog .ui-tabs-nav .ui-widget-content .ui-state-active, .cms-dialog .ui-tabs-nav .ui-widget-header .ui-state-active { background: #eceff1; border-right-color: #a6a6a6; border-left-color: #a6a6a6; margin-right: -1px; margin-left: -1px; z-index: 2; } .ui-tabs .ui-state-active a, .ui-tabs .ui-widget-content .ui-state-active a, .ui-tabs .ui-widget-header .ui-state-active a, .cms-dialog .ui-tabs-nav .ui-state-active a, .cms-dialog .ui-tabs-nav .ui-widget-content .ui-state-active a, .cms-dialog .ui-tabs-nav .ui-widget-header .ui-state-active a { border-bottom: none; } -.ui-tabs .ui-corner-all, .ui-tabs .ui-corner-top, .ui-tabs .ui-corner-right, .ui-tabs .ui-corner-tr, .cms-dialog .ui-tabs-nav .ui-corner-all, .cms-dialog .ui-tabs-nav .ui-corner-top, .cms-dialog .ui-tabs-nav .ui-corner-right, .cms-dialog .ui-tabs-nav .ui-corner-tr { border-radius: 0; } -.ui-tabs .ui-corner-all, .ui-tabs .ui-corner-top, .ui-tabs .ui-corner-left, .ui-tabs .ui-corner-tl, .cms-dialog .ui-tabs-nav .ui-corner-all, .cms-dialog .ui-tabs-nav .ui-corner-top, .cms-dialog .ui-tabs-nav .ui-corner-left, .cms-dialog .ui-tabs-nav .ui-corner-tl { border-radius: 0; } /** ------------------------------------------------------- Loading Interface ------------------------------------------------------- */ .cms-content-loading-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: 9998; } @@ -302,20 +302,21 @@ body.cms { overflow: hidden; } .cms-content-toolbar { display: block; margin: 0 0 15px 0; border-bottom: 1px solid rgba(201, 205, 206, 0.8); -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -o-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); *zoom: 1; /* smaller treedropdown */ } .cms-content-toolbar:after { content: "\0020"; display: block; height: 0; clear: both; overflow: hidden; visibility: hidden; } .cms-content-toolbar > * { float: right; } +.cms-content-toolbar .cms-tree-view-modes { padding-top: 5px; } .cms-content-toolbar .cms-tree-view-modes * { display: inline-block; } .cms-content-toolbar .cms-tree-view-modes * label { color: #1556b2; } .cms-content-toolbar .chzn-container-single .chzn-single { height: 26px; line-height: 26px; padding-left: 25px; color: #576468; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #e6e6e6), color-stop(100%, #cdcdcd)); background-image: -webkit-linear-gradient(#e6e6e6, #cdcdcd); background-image: -moz-linear-gradient(#e6e6e6, #cdcdcd); background-image: -o-linear-gradient(#e6e6e6, #cdcdcd); background-image: -ms-linear-gradient(#e6e6e6, #cdcdcd); background-image: linear-gradient(#e6e6e6, #cdcdcd); font-size: 13px; font-weight: bold; text-shadow: #e6e6e6 0 -1px 1px; box-shadow: none; } .cms-content-toolbar .chzn-container-single .chzn-single:hover { -moz-box-shadow: 0 0 5px #b3b3b3; -webkit-box-shadow: 0 0 5px #b3b3b3; -o-box-shadow: 0 0 5px #b3b3b3; box-shadow: 0 0 5px #b3b3b3; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ebebeb), color-stop(100%, #d2d2d2)); background-image: -webkit-linear-gradient(#ebebeb, #d2d2d2); background-image: -moz-linear-gradient(#ebebeb, #d2d2d2); background-image: -o-linear-gradient(#ebebeb, #d2d2d2); background-image: -ms-linear-gradient(#ebebeb, #d2d2d2); background-image: linear-gradient(#ebebeb, #d2d2d2); } .cms-content-toolbar .chzn-container-single .chzn-single:active { -moz-box-shadow: inset 0 1px 3px #4d4d4d; -webkit-box-shadow: inset 0 1px 3px #4d4d4d; -o-box-shadow: inset 0 1px 3px #4d4d4d; box-shadow: inset 0 1px 3px #4d4d4d; } .cms-content-toolbar .chzn-container-single .chzn-single span { padding-top: 1px; } -.cms-content-toolbar .chzn-container-single .chzn-single div { background: url(../images/btn_icons/settings.png) 5px 4px no-repeat; border-left: none; width: 100%; } +.cms-content-toolbar .chzn-container-single .chzn-single div { background: url(../images/btn_icons/settings.png) 5px 6px no-repeat; border-left: none; width: 100%; } .cms-content-toolbar .chzn-container-single .chzn-single div b { background: url(../images/sprites_32x32/menu-arrow-deselected-down.png) no-repeat 9px 11px; float: right; width: 24px; } /* -------------------------------------------------------- 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; -moz-box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px; -webkit-box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px; -o-box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px; box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px; float: left; position: relative; /* buttons now need to line with with reduced input sizes */ } -.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: auto; } -.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-panel-header { 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: auto; height: 100%; } +.cms-content-tools .cms-content-header { background-color: #748d9d; 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; } .cms-content-tools h3 { font-size: 13px; } @@ -380,6 +381,8 @@ form.member-profile-form #Groups .middleColumn { margin-left: 0; width: 100%; } form.member-profile-form #Groups .middleColumn .TreeDropdownField { width: 90%; max-width: 90%; } form.member-profile-form #Permissions .optionset li { float: none; width: auto; } form.member-profile-form .ui-tabs-nav li { margin: 0 0 -1px 0; } +form.member-profile-form .ui-corner-all, form.member-profile-form .ui-corner-top, form.member-profile-form .ui-corner-right, form.member-profile-form .ui-corner-tr { border-radius: 0; } +form.member-profile-form .ui-corner-all, form.member-profile-form .ui-corner-top, form.member-profile-form .ui-corner-left, form.member-profile-form .ui-corner-tl { border-radius: 0; } .cms .cms-content { border-right: 1px solid rgba(201, 205, 206, 0.8); -moz-box-shadow: 3px 0 4px rgba(0, 0, 0, 0.15); -webkit-box-shadow: 3px 0 4px rgba(0, 0, 0, 0.15); -o-box-shadow: 3px 0 4px rgba(0, 0, 0, 0.15); box-shadow: 3px 0 4px rgba(0, 0, 0, 0.15); -moz-border-radius: 0; -webkit-border-radius: 0; -o-border-radius: 0; -ms-border-radius: 0; -khtml-border-radius: 0; border-radius: 0; } .cms .cms-content-fields { /* always show a y scroll bar as popups like TreeDropdowns can trigger longer pages and the extra scroll bar doesn't fire our sizing bar */ overflow-y: auto; overflow-x: auto; background: none; -moz-box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px; -webkit-box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px; -o-box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px; box-shadow: rgba(107, 120, 123, 0.5) 0 0 4px; } @@ -394,8 +397,12 @@ form.member-profile-form .ui-tabs-nav li { margin: 0 0 -1px 0; } .cms-panel.collapsed .cms-panel-header * { display: none; } .cms-panel.collapsed .cms-panel-content { display: none; } .cms-panel .cms-panel-header { width: 100%; } +.cms-panel#cms-content-tools-CMSPageEditController .cms-panel-content-collapsed { width: 40px; display: none; } +.cms-panel#cms-content-tools-CMSPageEditController .cms-panel-content-collapsed h2, .cms-panel#cms-content-tools-CMSPageEditController .cms-panel-content-collapsed h3 { border-bottom: 0; margin-left: 8px; -moz-transform-origin: bottom right; -webkit-transform-origin: bottom right; -o-transform-origin: bottom right; -ms-transform-origin: bottom right; transform-origin: bottom right; -moz-transform: rotate(270deg); -webkit-transform: rotate(270deg); -o-transform: rotate(270deg); -ms-transform: rotate(270deg); transform: rotate(270deg); } +.cms-panel#cms-content-tools-CMSPageEditController .cms-panel-content-collapsed .cms-panel-header { width: 600px; position: relative; top: 24px; right: 577px; text-align: right; } .cms-panel .cms-panel-content-collapsed { width: 40px; display: none; } -.cms-panel .cms-panel-content-collapsed h2, .cms-panel .cms-panel-content-collapsed h3 { border-bottom: 0; margin-left: 8px; -moz-transform-origin: bottom left; -webkit-transform-origin: bottom left; -o-transform-origin: bottom left; -ms-transform-origin: bottom left; transform-origin: bottom left; -moz-transform: rotate(90deg); -webkit-transform: rotate(90deg); -o-transform: rotate(90deg); -ms-transform: rotate(90deg); transform: rotate(90deg); } +.cms-panel .cms-panel-content-collapsed h2, .cms-panel .cms-panel-content-collapsed h3 { border-bottom: 0; margin-left: 8px; -moz-transform-origin: bottom right; -webkit-transform-origin: bottom right; -o-transform-origin: bottom right; -ms-transform-origin: bottom right; transform-origin: bottom right; -moz-transform: rotate(270deg); -webkit-transform: rotate(270deg); -o-transform: rotate(270deg); -ms-transform: rotate(270deg); transform: rotate(270deg); } +.cms-panel .cms-panel-content-collapsed .cms-panel-header { width: 600px; position: relative; right: 577px; text-align: right; } .cms-panel .child-flyout-indicator { width: 0; height: 0; border-right: 3px dashed #1f1f1f; border-top: 3px solid transparent; border-left: 3px solid transparent; border-bottom: 3px dashed #1f1f1f; position: absolute; right: 1px; margin-top: -8px; display: none; /* To be shown by javascript, see LeftAndMain.Panel.js */ } .cms-panel .collapsed-flyout { display: block !important; left: 41px; margin-top: -40px; position: fixed; width: 191px; } .cms-panel .collapsed-flyout li a span { display: block !important; } @@ -450,93 +457,93 @@ body.cms-dialog { overflow: auto; background: url("../images/textures/bg_cms_mai .step-label .title { height: 18px; padding: 4px; } /** This file defines the jstree base styling (see http://jstree.com), as well as any customizations (see bottom of file). The styles are usually added through jstree.js on DOM load, but we need it earlier in order to correctly display the uninitialized tree. */ -.cms .jstree ul { display: block; margin: 0; padding: 0; background: none; list-style-type: none; } -.cms .jstree li { display: block; margin: 0; padding: 0; list-style-type: none; display: block; min-height: 18px; line-height: 18px; white-space: nowrap; margin-left: 18px; min-width: 18px; } -.cms .jstree ins { display: inline-block; text-decoration: none; width: 18px; height: 18px; margin: 0 0 0 0; padding: 0; float: left; } -.cms .jstree a { display: inline-block; line-height: 16px; height: 16px; color: black; white-space: nowrap; text-decoration: none; padding: 1px 2px; margin: 0; border: 1px solid #fff; } -.cms .jstree a:focus, .cms .jstree a:active, .cms .jstree a:hover { outline: none; text-decoration: none; cursor: pointer; text-shadow: none; } -.cms .jstree a > ins { height: 16px; width: 16px; } -.cms .jstree a > .jstree-icon { margin-right: 3px; } -.cms .jstree li.jstree-open > ul { display: block; } -.cms .jstree li.jstree-closed > ul { display: none; } -.cms .jstree li.disabled a { color: #aaaaaa; } -.cms .jstree-rtl a > .jstree-icon { margin-left: 3px; margin-right: 0; } -.cms .jstree-rtl li { margin-left: 0; margin-right: 18px; } -.cms .jstree-rtl > ul > li { margin-right: 0px; } -.cms .jstree > ul > li { margin-left: 0px; } -.cms #vakata-dragged { display: block; margin: 0 0 0 0; padding: 4px 4px 4px 24px; position: absolute; top: -2000px; line-height: 16px; z-index: 10000; } -.cms #vakata-contextmenu { display: block; visibility: hidden; left: 0; top: -200px; position: absolute; margin: 0; padding: 0; min-width: 180px; background: #ebebeb; border: 1px solid silver; z-index: 10000; *width: 180px; } -.cms #vakata-contextmenu ul { min-width: 180px; *width: 180px; } -.cms #vakata-contextmenu ul, .cms #vakata-contextmenu li { margin: 0; padding: 0; list-style-type: none; display: block; } -.cms #vakata-contextmenu li { line-height: 20px; min-height: 20px; position: relative; padding: 0px; } -.cms #vakata-contextmenu li a { padding: 1px 6px; line-height: 17px; display: block; text-decoration: none; margin: 1px 1px 0 1px; } -.cms #vakata-contextmenu li ins { float: left; width: 16px; height: 16px; text-decoration: none; margin-right: 2px; } -.cms #vakata-contextmenu li a:hover, .cms #vakata-contextmenu li.vakata-hover > a { background: gray; color: white; } -.cms #vakata-contextmenu li ul { display: none; position: absolute; top: -2px; left: 100%; background: #ebebeb; border: 1px solid gray; } -.cms #vakata-contextmenu .right { right: 100%; left: auto; } -.cms #vakata-contextmenu .bottom { bottom: -1px; top: auto; } -.cms #vakata-contextmenu li.vakata-separator { min-height: 0; height: 1px; line-height: 1px; font-size: 1px; overflow: hidden; margin: 0 2px; background: silver; /* border-top:1px solid #fefefe; */ padding: 0; } -.cms .jstree ul, .cms .jstree li { display: block; margin: 0 0 0 0; padding: 0 0 0 0; list-style-type: none; } -.cms .jstree li { display: block; min-height: 18px; line-height: 18px; white-space: nowrap; margin-left: 18px; min-width: 18px; } -.cms .jstree-rtl li { margin-left: 0; margin-right: 18px; } -.cms .jstree > ul > li { margin-left: 0px; } -.cms .jstree-rtl > ul > li { margin-right: 0px; } -.cms .jstree ins { display: inline-block; text-decoration: none; width: 18px; height: 18px; margin: 0 0 0 0; padding: 0; } -.cms .jstree a { display: inline-block; line-height: 16px; height: 16px; color: black; white-space: nowrap; text-decoration: none; padding: 1px 2px; margin: 0; } -.cms .jstree a:focus { outline: none; } -.cms .jstree a > ins { height: 16px; width: 16px; } -.cms .jstree a > .jstree-icon { margin-right: 3px; } -.cms .jstree-rtl a > .jstree-icon { margin-left: 3px; margin-right: 0; } -.cms li.jstree-open > ul { display: block; margin-left: -13px; } -.cms li.jstree-open > ul li ul { margin-left: 2px; } -.cms li.jstree-closed > ul { display: none; } -.cms #vakata-dragged ins { display: block; text-decoration: none; width: 16px; height: 16px; margin: 0 0 0 0; padding: 0; position: absolute; top: 4px; left: 4px; -moz-border-radius: 4px; border-radius: 4px; -webkit-border-radius: 4px; } -.cms #vakata-dragged .jstree-ok { background: green; } -.cms #vakata-dragged .jstree-invalid { background: red; } -.cms #jstree-marker { padding: 0; margin: 0; font-size: 12px; overflow: hidden; height: 12px; width: 8px; position: absolute; top: -30px; z-index: 10001; background-repeat: no-repeat; display: none; background-color: transparent; text-shadow: 1px 1px 1px white; color: black; line-height: 10px; } -.cms #jstree-marker-line { padding: 0; margin: 0; line-height: 0%; font-size: 1px; overflow: hidden; height: 1px; width: 100px; position: absolute; top: -30px; z-index: 10000; background-repeat: no-repeat; display: none; background-color: #456c43; cursor: pointer; border: 1px solid #eeeeee; border-left: 0; -moz-box-shadow: 0px 0px 2px #666; -webkit-box-shadow: 0px 0px 2px #666; box-shadow: 0px 0px 2px #666; -moz-border-radius: 1px; border-radius: 1px; -webkit-border-radius: 1px; } -.cms .jstree .jstree-real-checkbox { display: none; } -.cms .jstree-themeroller .ui-icon { overflow: visible; } -.cms .jstree-themeroller a { padding: 0 2px; } -.cms .jstree-themeroller .jstree-no-icon { display: none; } -.cms .jstree .jstree-wholerow-real { position: relative; z-index: 1; } -.cms .jstree .jstree-wholerow-real li { cursor: pointer; } -.cms .jstree .jstree-wholerow-real a { border-left-color: transparent !important; border-right-color: transparent !important; } -.cms .jstree .jstree-wholerow { position: relative; z-index: 0; height: 0; } -.cms .jstree .jstree-wholerow ul, .cms .jstree .jstree-wholerow li { width: 100%; } -.cms .jstree .jstree-wholerow, .cms .jstree .jstree-wholerow ul, .cms .jstree .jstree-wholerow li, .cms .jstree .jstree-wholerow a { margin: 0 !important; padding: 0 !important; } -.cms .jstree .jstree-wholerow, .cms .jstree .jstree-wholerow ul, .cms .jstree .jstree-wholerow li { background: transparent !important; } -.cms .jstree .jstree-wholerow ins, .cms .jstree .jstree-wholerow span, .cms .jstree .jstree-wholerow input { display: none !important; } -.cms .jstree .jstree-wholerow a, .cms .jstree .jstree-wholerow a:hover { text-indent: -9999px !important; width: 100%; padding: 0 !important; border-right-width: 0px !important; border-left-width: 0px !important; } -.cms .jstree .jstree-wholerow-span { position: absolute; left: 0; margin: 0px; padding: 0; height: 18px; border-width: 0; padding: 0; z-index: 0; } -.cms .jstree-apple.jstree-focused { background: none; } -.cms .jstree-apple.jstree-focused .jstree-apple > ul { background: none; } -.cms .jstree li { line-height: 25px; } +.cms .jstree ul, .TreeDropdownField .treedropdownfield-panel .jstree ul { display: block; margin: 0; padding: 0; background: none; list-style-type: none; } +.cms .jstree li, .TreeDropdownField .treedropdownfield-panel .jstree li { display: block; margin: 0; padding: 0; list-style-type: none; display: block; min-height: 18px; line-height: 18px; white-space: nowrap; margin-left: 18px; min-width: 18px; } +.cms .jstree ins, .TreeDropdownField .treedropdownfield-panel .jstree ins { display: inline-block; text-decoration: none; width: 18px; height: 18px; margin: 0 0 0 0; padding: 0; float: left; } +.cms .jstree a, .TreeDropdownField .treedropdownfield-panel .jstree a { display: inline-block; line-height: 16px; height: 16px; color: black; white-space: nowrap; text-decoration: none; padding: 1px 2px; margin: 0; border: 1px solid #fff; } +.cms .jstree a:focus, .cms .jstree a:active, .cms .jstree a:hover, .TreeDropdownField .treedropdownfield-panel .jstree a:focus, .TreeDropdownField .treedropdownfield-panel .jstree a:active, .TreeDropdownField .treedropdownfield-panel .jstree a:hover { outline: none; text-decoration: none; cursor: pointer; text-shadow: none; } +.cms .jstree a > ins, .TreeDropdownField .treedropdownfield-panel .jstree a > ins { height: 16px; width: 16px; } +.cms .jstree a > .jstree-icon, .TreeDropdownField .treedropdownfield-panel .jstree a > .jstree-icon { margin-right: 3px; } +.cms .jstree li.jstree-open > ul, .TreeDropdownField .treedropdownfield-panel .jstree li.jstree-open > ul { display: block; } +.cms .jstree li.jstree-closed > ul, .TreeDropdownField .treedropdownfield-panel .jstree li.jstree-closed > ul { display: none; } +.cms .jstree li.disabled a, .TreeDropdownField .treedropdownfield-panel .jstree li.disabled a { color: #aaaaaa; } +.cms .jstree-rtl a > .jstree-icon, .TreeDropdownField .treedropdownfield-panel .jstree-rtl a > .jstree-icon { margin-left: 3px; margin-right: 0; } +.cms .jstree-rtl li, .TreeDropdownField .treedropdownfield-panel .jstree-rtl li { margin-left: 0; margin-right: 18px; } +.cms .jstree-rtl > ul > li, .TreeDropdownField .treedropdownfield-panel .jstree-rtl > ul > li { margin-right: 0px; } +.cms .jstree > ul > li, .TreeDropdownField .treedropdownfield-panel .jstree > ul > li { margin-left: 0px; } +.cms #vakata-dragged, .TreeDropdownField .treedropdownfield-panel #vakata-dragged { display: block; margin: 0 0 0 0; padding: 4px 4px 4px 24px; position: absolute; top: -2000px; line-height: 16px; z-index: 10000; } +.cms #vakata-contextmenu, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu { display: block; visibility: hidden; left: 0; top: -200px; position: absolute; margin: 0; padding: 0; min-width: 180px; background: #ebebeb; border: 1px solid silver; z-index: 10000; *width: 180px; } +.cms #vakata-contextmenu ul, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu ul { min-width: 180px; *width: 180px; } +.cms #vakata-contextmenu ul, .cms #vakata-contextmenu li, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu ul, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li { margin: 0; padding: 0; list-style-type: none; display: block; } +.cms #vakata-contextmenu li, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li { line-height: 20px; min-height: 20px; position: relative; padding: 0px; } +.cms #vakata-contextmenu li a, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li a { padding: 1px 6px; line-height: 17px; display: block; text-decoration: none; margin: 1px 1px 0 1px; } +.cms #vakata-contextmenu li ins, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li ins { float: left; width: 16px; height: 16px; text-decoration: none; margin-right: 2px; } +.cms #vakata-contextmenu li a:hover, .cms #vakata-contextmenu li.vakata-hover > a, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li a:hover, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li.vakata-hover > a { background: gray; color: white; } +.cms #vakata-contextmenu li ul, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li ul { display: none; position: absolute; top: -2px; left: 100%; background: #ebebeb; border: 1px solid gray; } +.cms #vakata-contextmenu .right, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .right { right: 100%; left: auto; } +.cms #vakata-contextmenu .bottom, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu .bottom { bottom: -1px; top: auto; } +.cms #vakata-contextmenu li.vakata-separator, .TreeDropdownField .treedropdownfield-panel #vakata-contextmenu li.vakata-separator { min-height: 0; height: 1px; line-height: 1px; font-size: 1px; overflow: hidden; margin: 0 2px; background: silver; /* border-top:1px solid #fefefe; */ padding: 0; } +.cms .jstree ul, .cms .jstree li, .TreeDropdownField .treedropdownfield-panel .jstree ul, .TreeDropdownField .treedropdownfield-panel .jstree li { display: block; margin: 0 0 0 0; padding: 0 0 0 0; list-style-type: none; } +.cms .jstree li, .TreeDropdownField .treedropdownfield-panel .jstree li { display: block; min-height: 18px; line-height: 18px; white-space: nowrap; margin-left: 18px; min-width: 18px; } +.cms .jstree-rtl li, .TreeDropdownField .treedropdownfield-panel .jstree-rtl li { margin-left: 0; margin-right: 18px; } +.cms .jstree > ul > li, .TreeDropdownField .treedropdownfield-panel .jstree > ul > li { margin-left: 0px; } +.cms .jstree-rtl > ul > li, .TreeDropdownField .treedropdownfield-panel .jstree-rtl > ul > li { margin-right: 0px; } +.cms .jstree ins, .TreeDropdownField .treedropdownfield-panel .jstree ins { display: inline-block; text-decoration: none; width: 18px; height: 18px; margin: 0 0 0 0; padding: 0; } +.cms .jstree a, .TreeDropdownField .treedropdownfield-panel .jstree a { display: inline-block; line-height: 16px; height: 16px; color: black; white-space: nowrap; text-decoration: none; padding: 1px 2px; margin: 0; } +.cms .jstree a:focus, .TreeDropdownField .treedropdownfield-panel .jstree a:focus { outline: none; } +.cms .jstree a > ins, .TreeDropdownField .treedropdownfield-panel .jstree a > ins { height: 16px; width: 16px; } +.cms .jstree a > .jstree-icon, .TreeDropdownField .treedropdownfield-panel .jstree a > .jstree-icon { margin-right: 3px; } +.cms .jstree-rtl a > .jstree-icon, .TreeDropdownField .treedropdownfield-panel .jstree-rtl a > .jstree-icon { margin-left: 3px; margin-right: 0; } +.cms li.jstree-open > ul, .TreeDropdownField .treedropdownfield-panel li.jstree-open > ul { display: block; margin-left: -13px; } +.cms li.jstree-open > ul li ul, .TreeDropdownField .treedropdownfield-panel li.jstree-open > ul li ul { margin-left: 2px; } +.cms li.jstree-closed > ul, .TreeDropdownField .treedropdownfield-panel li.jstree-closed > ul { display: none; } +.cms #vakata-dragged ins, .TreeDropdownField .treedropdownfield-panel #vakata-dragged ins { display: block; text-decoration: none; width: 16px; height: 16px; margin: 0 0 0 0; padding: 0; position: absolute; top: 4px; left: 4px; -moz-border-radius: 4px; border-radius: 4px; -webkit-border-radius: 4px; } +.cms #vakata-dragged .jstree-ok, .TreeDropdownField .treedropdownfield-panel #vakata-dragged .jstree-ok { background: green; } +.cms #vakata-dragged .jstree-invalid, .TreeDropdownField .treedropdownfield-panel #vakata-dragged .jstree-invalid { background: red; } +.cms #jstree-marker, .TreeDropdownField .treedropdownfield-panel #jstree-marker { padding: 0; margin: 0; font-size: 12px; overflow: hidden; height: 12px; width: 8px; position: absolute; top: -30px; z-index: 10001; background-repeat: no-repeat; display: none; background-color: transparent; text-shadow: 1px 1px 1px white; color: black; line-height: 10px; } +.cms #jstree-marker-line, .TreeDropdownField .treedropdownfield-panel #jstree-marker-line { padding: 0; margin: 0; line-height: 0%; font-size: 1px; overflow: hidden; height: 1px; width: 100px; position: absolute; top: -30px; z-index: 10000; background-repeat: no-repeat; display: none; background-color: #456c43; cursor: pointer; border: 1px solid #eeeeee; border-left: 0; -moz-box-shadow: 0px 0px 2px #666; -webkit-box-shadow: 0px 0px 2px #666; box-shadow: 0px 0px 2px #666; -moz-border-radius: 1px; border-radius: 1px; -webkit-border-radius: 1px; } +.cms .jstree .jstree-real-checkbox, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-real-checkbox { display: none; } +.cms .jstree-themeroller .ui-icon, .TreeDropdownField .treedropdownfield-panel .jstree-themeroller .ui-icon { overflow: visible; } +.cms .jstree-themeroller a, .TreeDropdownField .treedropdownfield-panel .jstree-themeroller a { padding: 0 2px; } +.cms .jstree-themeroller .jstree-no-icon, .TreeDropdownField .treedropdownfield-panel .jstree-themeroller .jstree-no-icon { display: none; } +.cms .jstree .jstree-wholerow-real, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow-real { position: relative; z-index: 1; } +.cms .jstree .jstree-wholerow-real li, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow-real li { cursor: pointer; } +.cms .jstree .jstree-wholerow-real a, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow-real a { border-left-color: transparent !important; border-right-color: transparent !important; } +.cms .jstree .jstree-wholerow, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow { position: relative; z-index: 0; height: 0; } +.cms .jstree .jstree-wholerow ul, .cms .jstree .jstree-wholerow li, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow ul, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow li { width: 100%; } +.cms .jstree .jstree-wholerow, .cms .jstree .jstree-wholerow ul, .cms .jstree .jstree-wholerow li, .cms .jstree .jstree-wholerow a, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow ul, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow li, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow a { margin: 0 !important; padding: 0 !important; } +.cms .jstree .jstree-wholerow, .cms .jstree .jstree-wholerow ul, .cms .jstree .jstree-wholerow li, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow ul, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow li { background: transparent !important; } +.cms .jstree .jstree-wholerow ins, .cms .jstree .jstree-wholerow span, .cms .jstree .jstree-wholerow input, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow ins, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow span, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow input { display: none !important; } +.cms .jstree .jstree-wholerow a, .cms .jstree .jstree-wholerow a:hover, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow a, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow a:hover { text-indent: -9999px !important; width: 100%; padding: 0 !important; border-right-width: 0px !important; border-left-width: 0px !important; } +.cms .jstree .jstree-wholerow-span, .TreeDropdownField .treedropdownfield-panel .jstree .jstree-wholerow-span { position: absolute; left: 0; margin: 0px; padding: 0; height: 18px; border-width: 0; padding: 0; z-index: 0; } +.cms .jstree-apple.jstree-focused, .TreeDropdownField .treedropdownfield-panel .jstree-apple.jstree-focused { background: none; } +.cms .jstree-apple.jstree-focused .jstree-apple > ul, .TreeDropdownField .treedropdownfield-panel .jstree-apple.jstree-focused .jstree-apple > ul { background: none; } +.cms .jstree li, .TreeDropdownField .treedropdownfield-panel .jstree li { line-height: 25px; } .jstree-apple li, .jstree-apple .jstree-apple ins { background: none; } .jstree-apple .jstree-unchecked > a > .jstree-checkbox { margin-right: 3px; } .jstree-apple .jstree-checked > a > .jstree-checkbox { margin-right: 3px; } .jstree-apple .jstree-undetermined > a > .jstree-checkbox { margin-right: 3px; } -.cms-tree.jstree-apple { /* comment speech bubble - ccs3 only - source: http://nicolasgallagher.com/pure-css-speech-bubbles/demo/ */ } -.cms-tree.jstree-apple li.Root strong { font-weight: bold; padding-left: 1px; } -.cms-tree.jstree-apple li.Root > a .jstree-icon { background-position: -56px -36px; } -.cms-tree.jstree-apple a, .cms-tree.jstree-apple a:link { color: #1556b2; padding: 3px 6px 3px 3px; border: none; display: inline-block; margin-right: 5px; } -.cms-tree.jstree-apple span.badge { clear: both; text-transform: uppercase; display: inline-block; padding: 0px 3px; font-size: 0.75em; line-height: 1em; margin-left: 3px; margin-right: 6px; margin-top: -1px; -webkit-border-radius: 2px 2px; -moz-border-radius: 2px / 2px; -o-border-radius: 2px / 2px; -ms-border-radius: 2px / 2px; -khtml-border-radius: 2px / 2px; border-radius: 2px / 2px; } -.cms-tree.jstree-apple span.badge.modified { color: #7E7470; border: 1px solid #C9B800; background-color: #FFF0BC; } -.cms-tree.jstree-apple span.badge.addedtodraft { color: #7E7470; border: 1px solid #C9B800; background-color: #FFF0BC; } -.cms-tree.jstree-apple span.badge.deletedonlive { color: #636363; border: 1px solid #E49393; background-color: #F2DADB; } -.cms-tree.jstree-apple span.badge.removedfromdraft { color: #636363; border: 1px solid #E49393; background-color: #F2DADB; } -.cms-tree.jstree-apple span.badge.workflow-approval { color: #56660C; border: 1px solid #7C8816; background-color: #DAE79A; } -.cms-tree.jstree-apple span.comment-count { clear: both; position: relative; text-transform: uppercase; display: inline-block; overflow: visible; padding: 0px 3px; font-size: 0.75em; line-height: 1em; margin-left: 3px; margin-right: 6px; -webkit-border-radius: 2px 2px; -moz-border-radius: 2px / 2px; -o-border-radius: 2px / 2px; -ms-border-radius: 2px / 2px; -khtml-border-radius: 2px / 2px; border-radius: 2px / 2px; color: #7E7470; border: 1px solid #C9B800; background-color: #FFF0BC; } -.cms-tree.jstree-apple span.comment-count:before { content: ""; position: absolute; bottom: -4px; /* value = - border-top-width - border-bottom-width */ left: 3px; /* controls horizontal position */ border-width: 4px 4px 0; border-style: solid; border-color: #C9B800 transparent; /* reduce the damage in FF3.0 */ display: block; width: 0; } -.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 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; } -.cms-tree.jstree-apple .jstree-closed > ins { background-position: 0 0; } -.cms-tree.jstree-apple .jstree-open > ins { background-position: -20px 0; } +.tree-holder.jstree-apple, .cms-tree.jstree-apple { /* comment speech bubble - ccs3 only - source: http://nicolasgallagher.com/pure-css-speech-bubbles/demo/ */ } +.tree-holder.jstree-apple li.Root strong, .cms-tree.jstree-apple li.Root strong { font-weight: bold; padding-left: 1px; } +.tree-holder.jstree-apple li.Root > a .jstree-icon, .cms-tree.jstree-apple li.Root > a .jstree-icon { background-position: -56px -36px; } +.tree-holder.jstree-apple a, .tree-holder.jstree-apple a:link, .cms-tree.jstree-apple a, .cms-tree.jstree-apple a:link { color: #1556b2; padding: 3px 6px 3px 3px; border: none; display: inline-block; margin-right: 5px; } +.tree-holder.jstree-apple span.badge, .cms-tree.jstree-apple span.badge { clear: both; text-transform: uppercase; display: inline-block; padding: 0px 3px; font-size: 0.75em; line-height: 1em; margin-left: 3px; margin-right: 6px; margin-top: -1px; -webkit-border-radius: 2px 2px; -moz-border-radius: 2px / 2px; -o-border-radius: 2px / 2px; -ms-border-radius: 2px / 2px; -khtml-border-radius: 2px / 2px; border-radius: 2px / 2px; } +.tree-holder.jstree-apple span.badge.modified, .cms-tree.jstree-apple span.badge.modified { color: #7E7470; border: 1px solid #C9B800; background-color: #FFF0BC; } +.tree-holder.jstree-apple span.badge.addedtodraft, .cms-tree.jstree-apple span.badge.addedtodraft { color: #7E7470; border: 1px solid #C9B800; background-color: #FFF0BC; } +.tree-holder.jstree-apple span.badge.deletedonlive, .cms-tree.jstree-apple span.badge.deletedonlive { color: #636363; border: 1px solid #E49393; background-color: #F2DADB; } +.tree-holder.jstree-apple span.badge.removedfromdraft, .cms-tree.jstree-apple span.badge.removedfromdraft { color: #636363; border: 1px solid #E49393; background-color: #F2DADB; } +.tree-holder.jstree-apple span.badge.workflow-approval, .cms-tree.jstree-apple span.badge.workflow-approval { color: #56660C; border: 1px solid #7C8816; background-color: #DAE79A; } +.tree-holder.jstree-apple span.comment-count, .cms-tree.jstree-apple span.comment-count { clear: both; position: relative; text-transform: uppercase; display: inline-block; overflow: visible; padding: 0px 3px; font-size: 0.75em; line-height: 1em; margin-left: 3px; margin-right: 6px; -webkit-border-radius: 2px 2px; -moz-border-radius: 2px / 2px; -o-border-radius: 2px / 2px; -ms-border-radius: 2px / 2px; -khtml-border-radius: 2px / 2px; border-radius: 2px / 2px; color: #7E7470; border: 1px solid #C9B800; background-color: #FFF0BC; } +.tree-holder.jstree-apple span.comment-count:before, .cms-tree.jstree-apple span.comment-count:before { content: ""; position: absolute; bottom: -4px; /* value = - border-top-width - border-bottom-width */ left: 3px; /* controls horizontal position */ border-width: 4px 4px 0; border-style: solid; border-color: #C9B800 transparent; /* reduce the damage in FF3.0 */ display: block; width: 0; } +.tree-holder.jstree-apple span.comment-count:after, .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; } +.tree-holder.jstree-apple .jstree-hovered, .cms-tree.jstree-apple .jstree-hovered { text-shadow: none; text-decoration: none; } +.tree-holder.jstree-apple li, .cms-tree.jstree-apple li { padding: 0px; clear: left; } +.tree-holder.jstree-apple ins, .cms-tree.jstree-apple ins { background-color: transparent; background-image: url(../images/sitetree_ss_default_icons.png); } +.tree-holder.jstree-apple li.jstree-checked a, .tree-holder.jstree-apple li.jstree-checked a:link, .cms-tree.jstree-apple li.jstree-checked a, .cms-tree.jstree-apple li.jstree-checked a:link { background-color: #efe999; } +.tree-holder.jstree-apple .jstree-closed > ins, .cms-tree.jstree-apple .jstree-closed > ins { background-position: 0 0; } +.tree-holder.jstree-apple .jstree-open > ins, .cms-tree.jstree-apple .jstree-open > ins { background-position: -20px 0; } .jstree-apple #record-0.jstree-open > ins { display: none; } @@ -560,7 +567,7 @@ li.class-ErrorPage > a .jstree-pageicon { background-position: 0 -112px; } .cms-logo { border-bottom: 1px solid #03090c; height: 31px; overflow: hidden; padding: 0 0 0 4px; vertical-align: middle; font-size: 12px; } .cms-logo .version { display: none; } .cms-logo a { display: inline-block; height: 24px; width: 24px; float: left; margin-right: 8px; background: url("../images/logo_small.png") no-repeat; text-indent: -9999em; padding-right: 7px; border-right: 1px solid #19435c; } -.cms-logo span { font-weight: bold; font-size: 14px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; o-text-overflow: ellipsis; } +.cms-logo span { font-weight: bold; font-size: 14px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; o-text-overflow: ellipsis; padding-top: 1px; } .cms-login-status { border-top: 1px solid #19435c; height: 24px; padding: 7px 4px 0 4px; overflow: hidden; line-height: 16px; font-size: 11px; } .cms-login-status .logout-link { display: inline-block; height: 16px; width: 16px; float: left; margin: 0 8px 0 3px; background: url('../images/sprites_32x32-s98eda4974b.png') 0 -81px no-repeat; text-indent: -9999em; } @@ -577,7 +584,7 @@ li.class-ErrorPage > a .jstree-pageicon { background-position: 0 -112px; } .cms-menu.collapsed.cms-panel .cms-panel-content { display: block; } .cms-menu-list li { /* Style applied to the menu flyout only when the collapsed setting */ } -.cms-menu-list li a { display: block; height: 24px; line-height: 24px; font-size: 12px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; text-shadow: #bfcad2 1px 1px 0; color: #1f1f1f; padding: 7px 5px 7px 8px; background-color: #b0bec7; cursor: pointer; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #b0bec7), color-stop(100%, #8ca1ae)); background-image: -webkit-linear-gradient(#b0bec7, #8ca1ae); background-image: -moz-linear-gradient(#b0bec7, #8ca1ae); background-image: -o-linear-gradient(#b0bec7, #8ca1ae); background-image: -ms-linear-gradient(#b0bec7, #8ca1ae); background-image: linear-gradient(#b0bec7, #8ca1ae); border-top: 1px solid #ced7dc; border-bottom: 1px solid #748d9d; } +.cms-menu-list li a { display: block; height: 24px; line-height: 24px; font-size: 12px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; text-shadow: #bfcad2 1px 1px 0; color: #1f1f1f; padding: 7px 5px 7px 8px; background-color: #8ca1ae; cursor: pointer; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #b0bec7), color-stop(100%, #8ca1ae)); background-image: -webkit-linear-gradient(#b0bec7, #8ca1ae); background-image: -moz-linear-gradient(#b0bec7, #8ca1ae); background-image: -o-linear-gradient(#b0bec7, #8ca1ae); background-image: -ms-linear-gradient(#b0bec7, #8ca1ae); background-image: linear-gradient(#b0bec7, #8ca1ae); border-top: 1px solid #ced7dc; border-bottom: 1px solid #748d9d; } .cms-menu-list li a:hover { text-decoration: none; background-color: #b6c3cb; border-bottom: 1px solid #8399a7; color: #2c2c2c; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #bfcad2), color-stop(100%, #b0bec7)); background-image: -webkit-linear-gradient(#bfcad2, #b0bec7); background-image: -moz-linear-gradient(#bfcad2, #b0bec7); background-image: -o-linear-gradient(#bfcad2, #b0bec7); background-image: -ms-linear-gradient(#bfcad2, #b0bec7); background-image: linear-gradient(#bfcad2, #b0bec7); } .cms-menu-list li a:focus, .cms-menu-list li a:active { border-top: 1px solid #a1b2bc; text-decoration: none; background-color: #a1b2bc; color: #393939; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #92a5b2), color-stop(100%, #a1b2bc)); background-image: -webkit-linear-gradient(#92a5b2, #a1b2bc); background-image: -moz-linear-gradient(#92a5b2, #a1b2bc); background-image: -o-linear-gradient(#92a5b2, #a1b2bc); background-image: -ms-linear-gradient(#92a5b2, #a1b2bc); background-image: linear-gradient(#92a5b2, #a1b2bc); } .cms-menu-list li a .icon { display: inline-block; float: left; margin: 4px 10px 0 4px; filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=70); opacity: 0.7; } @@ -585,7 +592,6 @@ li.class-ErrorPage > a .jstree-pageicon { background-position: 0 -112px; } .cms-menu-list li a .toggle-children { display: inline-block; float: right; width: 20px; height: 100%; cursor: pointer; } .cms-menu-list li a .toggle-children .toggle-children-icon { display: inline-block; width: 8px; height: 8px; background: url('../images/sprites_32x32-s98eda4974b.png') 0 -107px no-repeat; vertical-align: middle; } .cms-menu-list li a .toggle-children.opened .toggle-children-icon { background: url('../images/sprites_32x32-s98eda4974b.png') 0 -123px no-repeat; } -.cms-menu-list li ul { display: none; } .cms-menu-list li.current a { color: white; text-shadow: #1e5270 0 -1px 0; border-top: 1px solid #55a4d2; border-bottom: 1px solid #1e5270; background-color: #338dc1; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #338dc1), color-stop(100%, #287099)); background-image: -webkit-linear-gradient(#338dc1, #287099); background-image: -moz-linear-gradient(#338dc1, #287099); background-image: -o-linear-gradient(#338dc1, #287099); background-image: -ms-linear-gradient(#338dc1, #287099); background-image: linear-gradient(#338dc1, #287099); } .cms-menu-list li.current a .toggle-children .toggle-children-icon { background: url('../images/sprites_32x32-s98eda4974b.png') 0 -139px no-repeat; } .cms-menu-list li.current a .toggle-children.opened .toggle-children-icon { background: url('../images/sprites_32x32-s98eda4974b.png') 0 -155px no-repeat; } @@ -596,6 +602,11 @@ li.class-ErrorPage > a .jstree-pageicon { background-position: 0 -112px; } .cms-menu-list li.current li a:focus { background: #236184; border-top: 1px solid #1e5270; color: white; } .cms-menu-list li.current li.current a { font-weight: bold; color: white; } .cms-menu-list li.current li.first a { border-top: none; } +.cms-menu-list li ul { display: none; } +.cms-menu-list li ul #Menu-CMSPagesController a { background-image: none; font-size: 11px; padding: 0 10px 0 40px; height: 32px; line-height: 32px; } +.cms-menu-list li ul #Menu-CMSPageAddController a { background-image: none; font-size: 11px; padding: 0 10px 0 40px; height: 32px; line-height: 32px; } +.cms-menu-list li ul #Menu-AssetAdmin a { background-image: none; font-size: 11px; padding: 0 10px 0 40px; height: 32px; line-height: 32px; } +.cms-menu-list li ul #Menu-CMSFileAddController a { background-image: none; font-size: 11px; padding: 0 10px 0 40px; height: 32px; line-height: 32px; } .cms-menu-list li ul.collapsed-flyout { display: block; } .cms-menu-list li ul.collapsed-flyout li a { font-size: 11px; padding: 0 10px 0 40px; height: 32px; line-height: 32px; } .cms-menu-list li ul.collapsed-flyout li a.current, .cms-menu-list li ul.collapsed-flyout li a:hover { font-weight: bold; } diff --git a/admin/scss/_menu.scss b/admin/scss/_menu.scss index dd9ade99f..22ab0f209 100644 --- a/admin/scss/_menu.scss +++ b/admin/scss/_menu.scss @@ -58,6 +58,7 @@ font-weight: bold; font-size: 14px; @include hide-text-overflow(); + padding-top:1px; } } @@ -142,7 +143,7 @@ text-shadow: lighten($color-base, 5%) 1px 1px 0; color: $color-text-dark; padding: ($grid-y - 1) 5px ($grid-y - 1) 8px; - background-color: $color-base; + background-color: darken($color-base, 12%); cursor: pointer; @include background-image(linear-gradient( @@ -212,10 +213,6 @@ } } } - - ul { - display: none; - } &.current { //need to apply current stlye to flyout also (at least line height) a { @@ -249,7 +246,6 @@ li { background-color: darken($color-menu-button, 10%); - a { font-size: $font-base-size - 1; padding: 0 10px 0 40px; @@ -286,6 +282,46 @@ } } + ul { + display: none; + #Menu-CMSPagesController { + a { + background-image:none; + font-size: 11px; + padding: 0 10px 0 40px; + height: 32px; + line-height: 32px; + } + } + #Menu-CMSPageAddController { + a { + background-image:none; + font-size: 11px; + padding: 0 10px 0 40px; + height: 32px; + line-height: 32px; + } + } + #Menu-AssetAdmin { + a { + background-image:none; + font-size: 11px; + padding: 0 10px 0 40px; + height: 32px; + line-height: 32px; + } + } + #Menu-CMSFileAddController { + a { + background-image:none; + font-size: 11px; + padding: 0 10px 0 40px; + height: 32px; + line-height: 32px; + } + } + } + /* Style applied to the menu flyout only when the collapsed setting */ ul.collapsed-flyout { display: block; diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss index c6ed48e69..19d8069ff 100644 --- a/admin/scss/_style.scss +++ b/admin/scss/_style.scss @@ -179,6 +179,13 @@ body.cms { } } } + .ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { + border-radius:0; + } + + .ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { + border-radius:0; + } } } } @@ -238,14 +245,6 @@ body.cms { border-bottom:none; } } - - .ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { - border-radius:0; - } - - .ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { - border-radius:0; - } } /** ------------------------------------------------------- @@ -480,10 +479,13 @@ body.cms { float: right; } - .cms-tree-view-modes * { - display: inline-block; - label { - color:$color-text-blue-link; + .cms-tree-view-modes { + padding-top:5px; + * { + display: inline-block; + label { + color:$color-text-blue-link; + } } } @@ -518,7 +520,7 @@ body.cms { } div { - background:url(../images/btn_icons/settings.png) 5px 4px no-repeat; + background:url(../images/btn_icons/settings.png) 5px 6px no-repeat; border-left:none; width:100%; } @@ -548,7 +550,6 @@ body.cms { position: relative; .cms-panel-header { - padding: 0; margin: 0 0 $grid-y - 1; line-height: $grid-y * 3; @@ -559,12 +560,11 @@ body.cms { width: ($grid-x * 22); padding: $grid-y $grid-x; overflow: auto; + height:100%; } .cms-content-header { background-color: darken($color-widget-bg, 40%); - border-bottom: 2px solid darken($color-widget-bg, 50%); - @include background-image( linear-gradient(darken($color-widget-bg, 20%), darken($color-widget-bg, 40%)) ); @@ -878,6 +878,13 @@ form.member-profile-form { margin:0 0 -1px 0; } } + .ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { + border-radius:0; + } + + .ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { + border-radius:0; + } } .cms { @@ -960,6 +967,27 @@ form.member-profile-form { width: 100%; } + &#cms-content-tools-CMSPageEditController { + .cms-panel-content-collapsed { + width: 40px; + display: none; // Avoids FOUC + + h2, h3 { + border-bottom: 0; + margin-left: $grid-y; + @include transform-origin(bottom, right); + @include rotate(270deg); + } + .cms-panel-header { + width: 600px; + position:relative; + top:24px; + right:577px; + text-align:right; + } + } + } + .cms-panel-content-collapsed { width: 40px; display: none; // Avoids FOUC @@ -967,8 +995,14 @@ form.member-profile-form { h2, h3 { border-bottom: 0; margin-left: $grid-y; - @include transform-origin(bottom, left); - @include rotate(90deg); + @include transform-origin(bottom, right); + @include rotate(270deg); + } + .cms-panel-header { + width: 600px; + position:relative; + right:577px; + text-align:right; } } diff --git a/admin/scss/_tree.scss b/admin/scss/_tree.scss index 316aa9d91..dfa5e1f56 100644 --- a/admin/scss/_tree.scss +++ b/admin/scss/_tree.scss @@ -6,7 +6,7 @@ * but we need it earlier in order to correctly display the uninitialized tree. */ -.cms { +.cms, .TreeDropdownField .treedropdownfield-panel { .jstree { ul { display: block; @@ -397,7 +397,7 @@ } } -.cms-tree.jstree-apple { +.tree-holder.jstree-apple, .cms-tree.jstree-apple { & li.Root { & strong { diff --git a/admin/scss/_uitheme.scss b/admin/scss/_uitheme.scss index 2b87e6631..70e8ad510 100644 --- a/admin/scss/_uitheme.scss +++ b/admin/scss/_uitheme.scss @@ -55,10 +55,9 @@ background-color: darken($color-widget-bg, 20%); padding: 8px 8px 6px 8px; border-bottom: 2px solid darken($color-widget-bg, 35%); - @include linear-gradient(color-stops( - darken($color-widget-bg, 5%), - darken($color-widget-bg, 30%) - )); + @include background-image( + linear-gradient(darken($color-widget-bg, 5%), darken($color-widget-bg, 30%)) + ); border-bottom: 3px solid darken($color-widget-bg, 50%); padding: 8px; @include border-radius(0); From 587d195647eb6480d2e75fb0fbcc4e1bb9922f48 Mon Sep 17 00:00:00 2001 From: Normann Lou Date: Fri, 24 Feb 2012 16:46:46 +1300 Subject: [PATCH 03/72] BUGFIX: Page tree node reflects any changes made to page (title, publication status) in its edit view --- admin/javascript/LeftAndMain.Content.js | 8 ++++++-- admin/javascript/LeftAndMain.Tree.js | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/admin/javascript/LeftAndMain.Content.js b/admin/javascript/LeftAndMain.Content.js index 2c98be0a8..055c0fc5e 100644 --- a/admin/javascript/LeftAndMain.Content.js +++ b/admin/javascript/LeftAndMain.Content.js @@ -194,8 +194,12 @@ var form = this.replaceForm(oldForm, data); if(typeof(Behaviour) != 'undefined') Behaviour.apply(); // refreshes ComplexTableField - - this.trigger('reloadeditform', {form: form, origData: origData, xmlhttp: xmlhttp}); + + if(this.hasClass('cms-content')){ + this.find('form.cms-edit-form').trigger('reloadeditform', {form: form, origData: origData, xmlhttp: xmlhttp}); + }else{ + this.trigger('reloadeditform', {form: form, origData: origData, xmlhttp: xmlhttp}); + } } // set status message based on response diff --git a/admin/javascript/LeftAndMain.Tree.js b/admin/javascript/LeftAndMain.Tree.js index c72395b84..d3df0d92a 100644 --- a/admin/javascript/LeftAndMain.Tree.js +++ b/admin/javascript/LeftAndMain.Tree.js @@ -154,7 +154,7 @@ }); }); - $('.cms-edit-form').bind('reloadeditform', function(e, data) { + $('.cms-edit-form').live('reloadeditform', function(e, data) { self._onLoadNewPage(e, data); }); }, From f7030c56a5b5801435405ec34148ccf5e8d8e38c Mon Sep 17 00:00:00 2001 From: Normann Lou Date: Mon, 27 Feb 2012 12:47:36 +1300 Subject: [PATCH 04/72] BUGFIX: Page tree node reflects any changes made to page (title, publication status) in its edit view, implemented on the level of cms-content dom element, rather than cms-edit-form level --- admin/javascript/LeftAndMain.Content.js | 6 +----- admin/javascript/LeftAndMain.Tree.js | 13 +++++++------ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/admin/javascript/LeftAndMain.Content.js b/admin/javascript/LeftAndMain.Content.js index 055c0fc5e..32a9cb426 100644 --- a/admin/javascript/LeftAndMain.Content.js +++ b/admin/javascript/LeftAndMain.Content.js @@ -195,11 +195,7 @@ if(typeof(Behaviour) != 'undefined') Behaviour.apply(); // refreshes ComplexTableField - if(this.hasClass('cms-content')){ - this.find('form.cms-edit-form').trigger('reloadeditform', {form: form, origData: origData, xmlhttp: xmlhttp}); - }else{ - this.trigger('reloadeditform', {form: form, origData: origData, xmlhttp: xmlhttp}); - } + this.trigger('reloadeditform', {form: form, origData: origData, xmlhttp: xmlhttp}); } // set status message based on response diff --git a/admin/javascript/LeftAndMain.Tree.js b/admin/javascript/LeftAndMain.Tree.js index d3df0d92a..215f76353 100644 --- a/admin/javascript/LeftAndMain.Tree.js +++ b/admin/javascript/LeftAndMain.Tree.js @@ -154,7 +154,7 @@ }); }); - $('.cms-edit-form').live('reloadeditform', function(e, data) { + this.parents('.cms-content:first').bind('reloadeditform', function(e, data) { self._onLoadNewPage(e, data); }); }, @@ -192,7 +192,7 @@ */ _onLoadNewPage: function(e, eventData) { var self = this; - + // finds a certain value in an array generated by jQuery.serializeArray() var findInSerializedArray = function(arr, name) { for(var i=0; i Date: Tue, 28 Feb 2012 18:07:24 +1300 Subject: [PATCH 05/72] MINOR: Added new spinner --- admin/images/spinner.gif | Bin 8787 -> 3304 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/admin/images/spinner.gif b/admin/images/spinner.gif index 8dc348a4b87364a67749110be84349f1a05f4a9b..14c8d5189c570a74c924ec0075a23f099af4dc6e 100644 GIT binary patch literal 3304 zcmbVNX+TqF7JUg@kWDcGB8wpcDv+I!1tNxoCt4zi5tTh84~US3B*-E#m_z{~YDr`l z6|_>NDpc!M1+^}97p>x2JGORaI@;D*J8J1mAcT&LcAEUi`@Z*m=bn4cy*CRMf=reu z4DbS;f&lvF&-NK6zoIVZ?53Q7hmM(B{409XZ#-w$_4^feru7dccc1mxb8q3jm*G7_ zLApMQ;fSZS!%Mb}P~D42Yjnsoc}QA=R_VG4=R8%I0If${i6Kj|3L)jJo@Z zy5}ZVzMZhXKWx`^;+@y-xov^Ekq? z^f8Sd-vQ4QFj5!dLX49NLT}`+zg~Pj*N^1j<_t26E5X(lj5jEvK;~d0C;PKAPL78 zX+-dEbWEvIBrbq7xEv@?D(B$8KR$rRNhKWoa=L&lQ1YOBX?(c~T3WtXC@wD$vn2SK zdAR6OcBxD$gES&ssjN`0W|wmCB8eggV#CkoZ4w@5Iie}x;JM}(ICD&%LIvUIL^454 zjwItEDMSh_g27;faL9U)9KSwIg&}C zFu_PFmqn-3=qxgq&*NJ$Cc6vLn0y9<#iX<1_!LSUg&P|SvREL9+_pmyHKvy zh~#3(8dnO(9lOhT>s>Za1&K5Yl~AE5v{pb;zCxo==PQ&r-cmYFAQDUE=C#?L(QNsU zO1c`7fGULyXVI4}og_Xr@?Ck4-j)0w%}6jAlDRl06pM8Wu0ZqSc{QA|)|NQjtfBo|xfB)NyAAk7%`Ln-%_m@Ba>D#B@eEsB)Up@Zv(ZdJ#@7*1~ zbNh>1H-~OqzjpP?)5iKkn~4uz%l2y?gh3 z*t7eCT|2wGc5L6)xwWIct+l1OX^Y9&`2OZi8x0Nh8|rFn*00m+v}>#XP*qv6ro61Q zWOcDdttwI~%M>*MW(K~MLbHr2!3 z&DCX!Gs?-)!QKuD517E8>>U6A1j6B21DO8?0H={^a6uGfUPVo9-G=&x4f7aL3&3~= zCz{DDZ)@+^+PSU0C7Q#CkK!;{>@~d~?c0B#Z$C_dqmO3Iul)4H$$`OBr{=Sw*D=|Z zRhKSbxq9vT^-4B#efgS;H}2gZT2o$g=k9|i_bVSg9=@6pAeuf6@%4kJUsil|B^%{L zb(`XczT&VUq3A`!X-t@)Dx$q+amP##Cw;vA{BDfGDB5sUQn z49=+?biH^!IA?y2*XNGc zg&%labW{1m(f13Q51ijzgVEjMZ3)WQrMa}c;0-iaa@9|yK5EOW;=g@cH z=0+c9`(F!;0AR_T?5e@FwtW=f1fbwA;KZ&5FJbvA5LRV)@Qk6J z*x(SO(Gf#wZKENCv`}MMFdA*==}1dWtF6Lf5a`-T!9uF5v^u?)a{@x=Ro1|b(WW#s z@U@AJWyx9xZbO1ThVP*7)=s!;uBXY;^&C%^HO3FE4R$PCtrUV8j=4Nur~(^IHkt4k zN?ZH%G~p_#X-<}fpo*Rb_QM2gCyHl7gR`}W2WpXXy>b4j=&ZT0cq9x`W;7OO1h%$8 zndx~YMqGedJGs9?SZk4PVzxH0sA_PuG{J0?n(7wr2L`BPO@Ip@6=X8`Oe4)~kF{U! z84j4-P#A>5#U~t<3W71&(^7v$?l(zbb=*Q4d>834!}}%(ZDVZ}6dV(@>YakV>9`GT z)NzNnrHgej+%iL5Rg%GwsI_Y>i_^s!xCp(FAEWQCnn2`#rRzWLxV0i-$Ki@x1v?H` zWC2`}tBppQxgv=Op(@m7|2EtP24`zEyvW-f4;!BEYAhY?7P+Nc=47V( zi;c6)-7?+WEpIw*L!0QhWekA%Yb?WRS1d8C)Fb$&-{!b&q*?i) d$7Ybl@wd&OHyyWuO>o>YAJOlekK>L<{Q}6*1|9$a literal 8787 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 From b53a32ae3483be1988ced21d8f71c1d9de54f555 Mon Sep 17 00:00:00 2001 From: jbridson Date: Wed, 29 Feb 2012 09:42:32 +1300 Subject: [PATCH 06/72] MINOR:SSF-30 changed measures to be multiples of grid-x and grid-y --- admin/css/screen.css | 2 +- admin/scss/_style.scss | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/admin/css/screen.css b/admin/css/screen.css index cafe1cf14..90ff081c5 100644 --- a/admin/css/screen.css +++ b/admin/css/screen.css @@ -466,7 +466,7 @@ body.cms-dialog { overflow: auto; background: url("../images/textures/bg_cms_mai /** -------------------------------------------- Item Edit Form -------------------------------------------- */ #Form_ItemEditForm .field { width: 100%; } -#Form_ItemEditForm .field .fieldgroup { height: 230px; float: left; } +#Form_ItemEditForm .field .fieldgroup { height: 240px; float: left; } #Form_ItemEditForm .field .fieldgroup .fieldgroup-field.first { position: relative; margin-left: 0px; } #Form_ItemEditForm .field .fieldgroup .fieldgroup-field { clear: both; width: 500px; margin-left: 420px; } #Form_ItemEditForm .field .fieldgroup .fieldgroup-field img { -moz-border-radius: 8px; -webkit-border-radius: 8px; -o-border-radius: 8px; -ms-border-radius: 8px; -khtml-border-radius: 8px; border-radius: 8px; border-width: 3px; border-style: dashed; border-color: #8c99a1; position: absolute; top: 8px; } diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss index d480ece68..71eda803c 100644 --- a/admin/scss/_style.scss +++ b/admin/scss/_style.scss @@ -1238,7 +1238,7 @@ body.cms-dialog { .field { width:100%; .fieldgroup { - height:230px; + height:$grid-y * 30; float:left; .fieldgroup-field.first { position:relative; @@ -1246,28 +1246,28 @@ body.cms-dialog { } .fieldgroup-field { clear:both; - width:500px; - margin-left:420px; + width:$grid-x * 62.5; + margin-left:$grid-x * 52.5; img { @include border-radius (8px); border: { - width:3px; + width:$grid-x - 5; style:dashed; color:$color-menu-border; } position:absolute; - top:8px; + top:$grid-y; } label { font-weight:bold; float:left; - padding-top:8px; - line-height:16px; + padding-top:$grid-y; + line-height:$grid-y * 2; text-shadow: $color-text-light 1px 1px 0; } span { float:left; - padding-left:8px; + padding-left:$grid-x; font-style:italic; color:lighten($color-text, 20%); } From af59228036e1a288e269d09eaa95184480853e4e Mon Sep 17 00:00:00 2001 From: jbridson Date: Wed, 29 Feb 2012 09:44:11 +1300 Subject: [PATCH 07/72] MINOR:fixed the positioning of the viewmode (drag and drop, mulitiselect) on the pages treeview --- admin/css/screen.css | 3 +-- admin/scss/_style.scss | 7 ++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/admin/css/screen.css b/admin/css/screen.css index 90ff081c5..983becb2e 100644 --- a/admin/css/screen.css +++ b/admin/css/screen.css @@ -313,8 +313,7 @@ body.cms { overflow: hidden; } /** -------------------------------------------- Content toolbar -------------------------------------------- */ .cms-content-toolbar { display: block; margin: 0 0 15px 0; border-bottom: 1px solid rgba(201, 205, 206, 0.8); -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -o-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); *zoom: 1; /* smaller treedropdown */ } .cms-content-toolbar:after { content: "\0020"; display: block; height: 0; clear: both; overflow: hidden; visibility: hidden; } -.cms-content-toolbar > * { float: right; } -.cms-content-toolbar .cms-tree-view-modes { padding-top: 5px; } +.cms-content-toolbar .cms-tree-view-modes { float: right; padding-top: 5px; } .cms-content-toolbar .cms-tree-view-modes * { display: inline-block; } .cms-content-toolbar .cms-tree-view-modes * label { color: #1556b2; } .cms-content-toolbar .chzn-container-single .chzn-single { height: 26px; line-height: 26px; padding-left: 25px; color: #576468; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #e6e6e6), color-stop(100%, #cdcdcd)); background-image: -webkit-linear-gradient(#e6e6e6, #cdcdcd); background-image: -moz-linear-gradient(#e6e6e6, #cdcdcd); background-image: -o-linear-gradient(#e6e6e6, #cdcdcd); background-image: -ms-linear-gradient(#e6e6e6, #cdcdcd); background-image: linear-gradient(#e6e6e6, #cdcdcd); font-size: 13px; font-weight: bold; text-shadow: #e6e6e6 0 -1px 1px; box-shadow: none; } diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss index 71eda803c..d0bf246fe 100644 --- a/admin/scss/_style.scss +++ b/admin/scss/_style.scss @@ -466,13 +466,10 @@ body.cms { @include doubleborder(bottom, $color-light-separator, lighten($color-light-separator, 50%)); @include legacy-pie-clearfix(); - - & > * { - float: right; - } .cms-tree-view-modes { - padding-top:5px; + float:right; + padding-top:$grid-y - 3; * { display: inline-block; label { From 59df00d302e40c93146fbbe4bc169412d6343a76 Mon Sep 17 00:00:00 2001 From: jbridson Date: Wed, 29 Feb 2012 11:06:42 +1300 Subject: [PATCH 08/72] BUGFIX:fixed position of back button in the cms-content-header - adapted design to work around the inclusion of tabs. --- admin/css/screen.css | 3 ++- admin/scss/_style.scss | 7 ++++++- admin/templates/Includes/LeftAndMain_EditForm.ss | 13 +++++++------ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/admin/css/screen.css b/admin/css/screen.css index 983becb2e..97e858137 100644 --- a/admin/css/screen.css +++ b/admin/css/screen.css @@ -243,7 +243,8 @@ body.cms { overflow: hidden; } .cms-content-header { padding: 0px 8px 8px; height: 32px; z-index: 60; background-image: url(../images/textures/cms_content_header.png); background-repeat: repeat; } .cms-content-header a { color: #1556b2; } -.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; max-width: 400px; margin: 0; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; o-text-overflow: ellipsis; } +.cms-content-header .backlink { float: left; margin-top: 7px; } +.cms-content-header h2 { float: left; padding: 8px 8px 0 8px; font-size: 14px; line-height: 24px; font-weight: bold; text-shadow: #bfcad2 1px 1px 0; max-width: 400px; 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 { position: fixed; right: 40px; } .cms-content-header .cms-content-header-tabs .ui-tabs-nav li a { font-weight: bold; line-height: 16px; padding: 12px 20px 11px; text-indent: -9999em; } diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss index d0bf246fe..aa9d052ec 100644 --- a/admin/scss/_style.scss +++ b/admin/scss/_style.scss @@ -102,9 +102,14 @@ body.cms { color: $color-text-blue-link; } + .backlink { + float:left; + margin-top:$grid-x - 1; + } + h2 { float: left; - padding: $grid-y $grid-x 0 0; + padding: $grid-y $grid-x 0 $grid-x; font-size: $font-base-size + 2; line-height: $grid-x * 3; font-weight: bold; diff --git a/admin/templates/Includes/LeftAndMain_EditForm.ss b/admin/templates/Includes/LeftAndMain_EditForm.ss index d86dae7bf..92dccd0a0 100644 --- a/admin/templates/Includes/LeftAndMain_EditForm.ss +++ b/admin/templates/Includes/LeftAndMain_EditForm.ss @@ -3,6 +3,13 @@ <% end_if %>
+ + <% if Backlink %> + + <% _t('Back', 'Back') %> + + <% end_if %> +

<% control Controller %> <% include CMSBreadcrumbs %> @@ -22,12 +29,6 @@ - <% if Backlink %> - - <% _t('Back', 'Back') %> - - <% end_if %> -

From fea1a9357dc05336a6e64ba7955861e00f010145 Mon Sep 17 00:00:00 2001 From: Felipe Skroski Date: Wed, 29 Feb 2012 13:46:10 +1300 Subject: [PATCH 09/72] MINOR: (SSF-106) tidied up the datagrid header styling --- css/GridField.css | 9 ++++++--- scss/GridField.scss | 25 +++++++++++++++++++------ 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/css/GridField.css b/css/GridField.css index 1f92e5941..a8b4ee2ae 100644 --- a/css/GridField.css +++ b/css/GridField.css @@ -11,9 +11,10 @@ .cms table.ss-gridfield-table tfoot tr td { background: #95a5ab; padding: .7em; border-bottom: 1px solid rgba(0, 0, 0, 0.1); } .cms table.ss-gridfield-table tr.title { -moz-border-radius-topleft: 7px; -webkit-border-top-left-radius: 7px; -o-border-top-left-radius: 7px; -ms-border-top-left-radius: 7px; -khtml-border-top-left-radius: 7px; border-top-left-radius: 7px; -moz-border-radius-topright: 7px; -webkit-border-top-right-radius: 7px; -o-border-top-right-radius: 7px; -ms-border-top-right-radius: 7px; -khtml-border-top-right-radius: 7px; border-top-right-radius: 7px; } .cms table.ss-gridfield-table tr.title th { position: relative; background: #7f9198; border-top: 1px solid rgba(0, 0, 0, 0.1); padding: 5px; min-height: 40px; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #b1c0c5), color-stop(100%, #7f9198)); background-image: -webkit-linear-gradient(#b1c0c5, #7f9198); background-image: -moz-linear-gradient(#b1c0c5, #7f9198); background-image: -o-linear-gradient(#b1c0c5, #7f9198); background-image: -ms-linear-gradient(#b1c0c5, #7f9198); background-image: linear-gradient(#b1c0c5, #7f9198); -moz-border-radius-topleft: 7px; -webkit-border-top-left-radius: 7px; -o-border-top-left-radius: 7px; -ms-border-top-left-radius: 7px; -khtml-border-top-left-radius: 7px; border-top-left-radius: 7px; -moz-border-radius-topright: 7px; -webkit-border-top-right-radius: 7px; -o-border-top-right-radius: 7px; -ms-border-top-right-radius: 7px; -khtml-border-top-right-radius: 7px; border-top-right-radius: 7px; text-shadow: rgba(0, 0, 0, 0.3) 0px -1px 0; } -.cms table.ss-gridfield-table tr.title th h2 { padding: 0px; font-size: 16px; color: #fff; margin: 0; display: inline; } -.cms table.ss-gridfield-table tr.title th .new { font-size: 14px; border-color: rgba(0, 0, 0, 0.1); float: right; } +.cms table.ss-gridfield-table tr.title th h2 { padding: 0px; font-size: 16.8px; color: #fff; margin: 3px 8px 0; display: inline-block; } +.cms table.ss-gridfield-table tr.title th .new { font-size: 14.4px; border-color: rgba(0, 0, 0, 0.1); float: right; } .cms table.ss-gridfield-table tr.sortable-header { background: #bac8ce; } +.cms table.ss-gridfield-table tr.sortable-header th { padding: 0px; } .cms table.ss-gridfield-table tr:hover { background: #FFFAD6 !important; } .cms table.ss-gridfield-table tr:first-child { background: transparent; } .cms table.ss-gridfield-table tr.ss-gridfield-even { background: #f0f4f7; } @@ -34,7 +35,9 @@ .cms table.ss-gridfield-table tr th.last { -moz-border-radius-topright: 7px; -webkit-border-top-right-radius: 7px; -o-border-top-right-radius: 7px; -ms-border-top-right-radius: 7px; -khtml-border-top-right-radius: 7px; border-top-right-radius: 7px; } .cms table.ss-gridfield-table tr th button:hover { color: #ccc !important; /* Not sure why IE think it needs this */ } .cms table.ss-gridfield-table tr th button.ss-gridfield-sort:hover { color: #fff !important; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; } -.cms table.ss-gridfield-table tr th button.ss-gridfield-sort { background: transparent url(../images/arrows-01.png) no-repeat right 2px; border: none; width: 100%; text-align: left; padding: 4px 0; text-shadow: rgba(0, 0, 0, 0.3) 0px -1px 0; color: #fff; -moz-border-radius: 0; -webkit-border-radius: 0; -o-border-radius: 0; -ms-border-radius: 0; -khtml-border-radius: 0; border-radius: 0; } +.cms table.ss-gridfield-table tr th button.ss-gridfield-sort { background: transparent url(../images/arrows.png) no-repeat right 6px; border: none; width: 100%; text-align: left; padding: 4px 0; text-shadow: rgba(0, 0, 0, 0.3) 0px -1px 0; color: #fff; -moz-border-radius: 0; -webkit-border-radius: 0; -o-border-radius: 0; -ms-border-radius: 0; -khtml-border-radius: 0; border-radius: 0; } +.cms table.ss-gridfield-table tr th button.ss-gridfield-sort:hover { background-position: right -34px; } +.cms table.ss-gridfield-table tr th button.ss-gridfield-sort.ss-gridfield-sorted { background-position: right -116px; } .cms table.ss-gridfield-table tr th input.ss-gridfield-sort { padding: 2px; } .cms table.ss-gridfield-table tr th input.ss-gridfield-sort:focus { -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; } .cms table.ss-gridfield-table tr td { border-right: 1px solid rgba(0, 0, 0, 0.1); padding: 7px 12px; color: #666666; } diff --git a/scss/GridField.scss b/scss/GridField.scss index bb006289f..1a8111175 100644 --- a/scss/GridField.scss +++ b/scss/GridField.scss @@ -23,6 +23,8 @@ $gf_colour_font: #666; $gf_colour_text_shadow: rgba(0,0,0,.3); $gf_border_radius: 7px; +$gf_grid_y: 12px; +$gf_grid_x: 16px; @mixin box-shadow-none { -moz-box-shadow: none; @@ -100,13 +102,13 @@ $gf_border_radius: 7px; @include single-text-shadow($gf_colour_text_shadow, 0px, -1px, 0); h2{ padding: 0px; - font-size: 16px; + font-size: $gf_grid_y*1.4; color:#fff; - margin:0; - display:inline; + margin:3px $gf_grid_x/2 0; + display:inline-block; } .new{ - font-size: 14px; + font-size: $gf_grid_y*1.2; border-color: $gf_colour_border; float: right; } @@ -114,6 +116,10 @@ $gf_border_radius: 7px; } &.sortable-header { background: $gf_colour_subheader; + th{ + padding: 0px; + } + } &:hover { background: #FFFAD6 !important; @@ -134,7 +140,7 @@ $gf_border_radius: 7px; th { font-weight: bold; - font-size: 12px; + font-size: $gf_grid_y; color: #FFF; padding: 5px; border-right: 1px solid $gf_colour_border; @@ -210,7 +216,7 @@ $gf_border_radius: 7px; @include box-shadow-none; } &.ss-gridfield-sort { - background: transparent url(../images/arrows-01.png) no-repeat right 2px; + background: transparent url(../images/arrows.png) no-repeat right 6px; border:none; width:100%; text-align: left; @@ -218,6 +224,12 @@ $gf_border_radius: 7px; @include single-text-shadow($gf_colour_text_shadow, 0px, -1px, 0); color: #fff; @include border-radius(0); + &:hover { + background-position: right -34px; + } + &.ss-gridfield-sorted { + background-position: right -116px; + } } } input { @@ -226,6 +238,7 @@ $gf_border_radius: 7px; &:focus { @include box-shadow-none; } + } } } From be114b418e1ba39dcc2d6e144f7ea89167aef840 Mon Sep 17 00:00:00 2001 From: Felipe Skroski Date: Wed, 29 Feb 2012 13:55:48 +1300 Subject: [PATCH 10/72] MINOR: (SSF-106) Added the images of the previous commit --- admin/images/arrows.png | Bin 0 -> 1951 bytes admin/images/btn_icons-sb716480a9a.png | Bin 0 -> 9534 bytes admin/images/btn_icons/document--pencil.png | Bin 0 -> 693 bytes admin/images/spinner.psd | Bin 0 -> 62464 bytes css/GridField.css | 2 +- images/arrows-01 copy.png | Bin 0 -> 3361 bytes images/arrows.png | Bin 0 -> 1851 bytes images/icons/decline.png | Bin 0 -> 732 bytes images/icons/document--pencil.png | Bin 0 -> 693 bytes scss/GridField.scss | 2 +- 10 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 admin/images/arrows.png create mode 100644 admin/images/btn_icons-sb716480a9a.png create mode 100755 admin/images/btn_icons/document--pencil.png create mode 100644 admin/images/spinner.psd create mode 100644 images/arrows-01 copy.png create mode 100644 images/arrows.png create mode 100644 images/icons/decline.png create mode 100755 images/icons/document--pencil.png diff --git a/admin/images/arrows.png b/admin/images/arrows.png new file mode 100644 index 0000000000000000000000000000000000000000..69f48c5e9c91ac63898e1cbeeff20fff3f2a794b GIT binary patch literal 1951 zcmah~3s4j17G9MGhQ|P65k%-3Yc&P38v+Rl1PBSy2tgsC#R}+>ESM{KkSr#kqR0iL zS^*IWprDj8VCCg2#UQ;AEkzwbu(T3iSVU~8id3;sdhdpU?Q}Z5JG1-$=gj%e`ObIF z%;s;5Tx(~&%o+dyJN`OuG=AFS?+Ggc{_Q_TOT`aYEG!liDv~e_qCx?-M3IPsd>N9A zMx%%%J+%uB1b{_EsVEkU6+|$_3K$N)EbBx-LV73Ns=_;*9NLhJ+X#1O{rEcmf%UA)r>4B3CoDEaGflCVn@& zAtE>%f^BCJeLJI54NNq3+Uo=PDDXSHEU|5D$~9j5rh6bjuJ zru)D&e+tE)NAqDb{QRhX44BR3aEWtR$=~$-f3Xlw1~L!!PlKL!;oD=rzFAw`c(eGZ z9N%^ozSbFcr@8>Z!impii?oAdWu|Zu+vPu#aTnq>rnb|1U)eVyUEIDJQxe_l;^C=6 zC~U(e5g0YIfW6@oH>{V#b`G-$qkn8ge19L<(sv~;ej-;_`}vRex*HV3n*(+R?nJT+ z%NM<)PD;*HCv|JKW*$0Ny(U)z4Lr9jCGUED!k_6b1x zZ=P_|`ftc<`mib63vtZ4%YqQ`K!vNKbcTE6EsQ zXV72_>lb;8H=S+P%YW3Lk13g{iPqn~eRg+0fqv&&)KbBV)A{EN_En8peW&`J9d8CL z_Pi3&rk@GUM3&UTIiz2EjLl+?bpsvcC$)uN1C9X%VDkxWjt9+7cD|XeznZfE1D?D7 za6!3J8*4dw#EGCg_y~~#LDAWx$fE~{cYcJy@p5B-p3Z1y7|Vz0 z-^KK<{_?91g0bVH#pBJJA0SI(JVq?-4S>h1ccV(K8FtN#+~ss`AnBh4w_By{^eX9_ zZdn*OW_{$4gmoipi}Op^TBy5>vwWJ|dAFznC<2#@j1vp_Hu2=Xu^y}P663X^HPT~*hzO}k<$S*iD)auxjvoyT2>T0{bXY#GVdytTuWkdfs`{~bR znw}jNhM@C3~uQ%WK&CLjSeEcQp@YlIISTP4m{x!Eg6jx?bn|9P@HUH$e zHt%RNX`rya?V>3zVYlU=sio>f4(Gex);h@}79ceKN?SH@puNI#;2sQnF;=@7=?$YK zs%z@8p--v=o*%>)UlOu*MP@>!MKjBG2RK~UcSv1_N}Z=t!fi}SUV<&7@=0DiweH$k s$^P*@`~+bsg?p-CR+BbxXv;!dfIMiu_LFh98uKrc9~Q}N4Bfi#f2m0rDF6Tf literal 0 HcmV?d00001 diff --git a/admin/images/btn_icons-sb716480a9a.png b/admin/images/btn_icons-sb716480a9a.png new file mode 100644 index 0000000000000000000000000000000000000000..a914d6757ef5616a2e23578e4c0c7051db55f544 GIT binary patch literal 9534 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 literal 0 HcmV?d00001 diff --git a/admin/images/btn_icons/document--pencil.png b/admin/images/btn_icons/document--pencil.png new file mode 100755 index 0000000000000000000000000000000000000000..775dfcd7682fb79e65fbe7e5fefc93e90dfb3280 GIT binary patch literal 693 zcmV;m0!safP))kxHaI5K8V zrdvDd+4uFnXFKy?;0w>bv-7>r^F8nL9qo2|JGeAWYonzad)Ip@<$^30p_Ib+SPVKp zaM2p}tnTNW%5&SWxp5se~TSNF0z8huPV&ujs? zBOsV8Y#IC~5)Oy$ar}NiM&j}H3dtgYGAPHAfCCoU=k=mW*P#o+L6`KXmpNA_CTIjw z-#vo6b~|Aa;%N8#`*ARpf?$C%N+ZxoVh<-C`hO~!3>{CU`e^uT!s3uh5RQYrMAp-3 zNiiDoL0edZJWrPW8QNQHyh9 z%Cs!?S4zdb%waAcbchi28O9Ca^Bs1lo=+qm-f7)G_bnTkUfS?4JMU$ouv$naN9pnB bKLG{+rsz%9ZOVz500000NkvXXu0mjfQ5`;D literal 0 HcmV?d00001 diff --git a/admin/images/spinner.psd b/admin/images/spinner.psd new file mode 100644 index 0000000000000000000000000000000000000000..f151eb1ad41371e5f088fb99854a98328be6902c GIT binary patch literal 62464 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 KbO6Pi%=teEbhf+z literal 0 HcmV?d00001 diff --git a/css/GridField.css b/css/GridField.css index a8b4ee2ae..830e33de3 100644 --- a/css/GridField.css +++ b/css/GridField.css @@ -40,7 +40,7 @@ .cms table.ss-gridfield-table tr th button.ss-gridfield-sort.ss-gridfield-sorted { background-position: right -116px; } .cms table.ss-gridfield-table tr th input.ss-gridfield-sort { padding: 2px; } .cms table.ss-gridfield-table tr th input.ss-gridfield-sort:focus { -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; } -.cms table.ss-gridfield-table tr td { border-right: 1px solid rgba(0, 0, 0, 0.1); padding: 7px 12px; color: #666666; } +.cms table.ss-gridfield-table tr td { border-right: 1px solid rgba(0, 0, 0, 0.1); padding: 6.4px 12px; color: #666666; } .cms table.ss-gridfield-table tr td.bottom-all { -moz-border-radius-bottomleft: 7px; -webkit-border-bottom-left-radius: 7px; -o-border-bottom-left-radius: 7px; -ms-border-bottom-left-radius: 7px; -khtml-border-bottom-left-radius: 7px; border-bottom-left-radius: 7px; -moz-border-radius-bottomright: 7px; -webkit-border-bottom-right-radius: 7px; -o-border-bottom-right-radius: 7px; -ms-border-bottom-right-radius: 7px; -khtml-border-bottom-right-radius: 7px; border-bottom-right-radius: 7px; background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #b1c0c5), color-stop(100%, #7f9198)); background-image: -webkit-linear-gradient(#b1c0c5, #7f9198); background-image: -moz-linear-gradient(#b1c0c5, #7f9198); background-image: -o-linear-gradient(#b1c0c5, #7f9198); background-image: -ms-linear-gradient(#b1c0c5, #7f9198); background-image: linear-gradient(#b1c0c5, #7f9198); } .cms table.ss-gridfield-table tr.last td { border-bottom: 0 none; } .cms table.ss-gridfield-table td:first-child, .cms table.ss-gridfield-table th:first-child { border-left: 1px solid rgba(0, 0, 0, 0.1); } diff --git a/images/arrows-01 copy.png b/images/arrows-01 copy.png new file mode 100644 index 0000000000000000000000000000000000000000..e03f0f831f96e08e830e71d2a0058ccb2b4dd574 GIT binary patch literal 3361 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 literal 0 HcmV?d00001 diff --git a/images/arrows.png b/images/arrows.png new file mode 100644 index 0000000000000000000000000000000000000000..a24f44db60f32852f60b2dd2f77d4cddcbcf7a29 GIT binary patch literal 1851 zcmah~2~ZPP7>gPpyIk7M1^EGA*V(OIZV)CNKh&DU`-Z@u-T9-5-uwW3F@e5 zL9n1=5l@P!)k+}>DiuY=1GOrs#agLSQSiWeb%UUtj$?Ob_r3qk_x=C(A8&T0GIW}| zn~xiXLUEVN#42+2Am1VvC-Qr_kR4Ah-h?EAP~*`=B4R`-LM^@!1>_jA2vwnoHYxrz zI+;T03+lonhzP|Dz6Qr=h#f;SV+N8p_f~G)A3) z(BXQ(?h#ptClCUVRQf&z%%D(waI81=6pAbv-HaIMFb$$(m_4szWS;uz3f8@}#8@$K3nm-$5aZ%QDi`H?McU14qWk{40AvduMlrUt?NPTT!0 zrr%Pz#g4-4%vZ(eu_xbVytrBzG2C;&oe*kAuskRwJ(9|}$dZIzSFUq+wXAicbTlXA z*ST1bt2Jp!L0$<#fWyf(!%ywjeRux3v-a^O=eTC4vdD9m5E_!p*yI5JaY{7xu3-SsBea=jp zRKKeK?Xq)cy`;G~sx#L_H)ITIsTrjQcmF$Z_hocU@nYt8l z90#SlzHX=~*KD*tM4YI6k^Ihn4Mj<*9omM>j;XiWUP_c+K_e(O<(!IPH7EWK+G!k> zK0e#3qg44h?YEYsTUk~{n_Cul<&?SszU${*x_071ah77}-nccsDs=~^dC#Q!n^=hfpH<}OGT&i6R&mo1_dwC0A}&9R zr(PvG7k)X0dUE9~bHV)B`7{$;Jd6h8@bi7fjXF1n5#IeYe6@@uA4a?Z48;=mup z`%bsl%)D2!adFPP?5^;Gdv~1P9Ocxsq>j2^%dLJ_M!h~-l@pSdX?8Cvx)o0}H7)(C z=z#3@sF`w!-&)%sjkzP$qL`JIUtxU;c{ZdD@cn}u>hHQrF>=!_PF0})e6`;6(YRWp=#pji7V{7fdGr1>oxR){2xxd+=l=F literal 0 HcmV?d00001 diff --git a/images/icons/decline.png b/images/icons/decline.png new file mode 100644 index 0000000000000000000000000000000000000000..b76cef717e4ed00ed801b4ee1a21e5b5a0b2984a GIT binary patch literal 732 zcmV<20wev2P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipu4 z1}_zDR;<(j000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0006vNklE+dqIcft5#9?1NbmK@*W4;CYtWxMnSkj@-=W#>Udt`SS@8!EH7@`|Fqb z*7nCuU);juDyzo;%Nb@<#=z3#-TUKWnwC=P=&Ghk*zw%;H?K-gxVJQ4W3>l(meq27 zTHo^2od=U{5Li(d{a3H1YnT$bAJ$&K_oXxcq$;)v5DIg{!xQ=6t(Mj4bWSua7K>Sf z*{k{Qzc%K8rzU_Brq5+F=~}(s8w`Sgw&T!t9DLtLh2g#w!yq$oA+3bzLjVj#x{**y zF;gsJ+cu3x1H&-r@9!s-N)eC80a(2@is!Zy3Wj>ms3K57fZu9SE|*bC5sSr+T?Vjp zFam{&{>niBJFQCPmh9D%<$JeJ^dO}}ARRA&ox=@;Vr6%C`jQz-CiURd^z8&*T?s`1 zy$e{`?$o}4<|cJGsUkvmH}E!|tVDd;2zhG@6`%^#L_{3`bRgL+^Arz5zyaDK5@~1s5B>m_I3ianeXhO$ O0000)kxHaI5K8V zrdvDd+4uFnXFKy?;0w>bv-7>r^F8nL9qo2|JGeAWYonzad)Ip@<$^30p_Ib+SPVKp zaM2p}tnTNW%5&SWxp5se~TSNF0z8huPV&ujs? zBOsV8Y#IC~5)Oy$ar}NiM&j}H3dtgYGAPHAfCCoU=k=mW*P#o+L6`KXmpNA_CTIjw z-#vo6b~|Aa;%N8#`*ARpf?$C%N+ZxoVh<-C`hO~!3>{CU`e^uT!s3uh5RQYrMAp-3 zNiiDoL0edZJWrPW8QNQHyh9 z%Cs!?S4zdb%waAcbchi28O9Ca^Bs1lo=+qm-f7)G_bnTkUfS?4JMU$ouv$naN9pnB bKLG{+rsz%9ZOVz500000NkvXXu0mjfQ5`;D literal 0 HcmV?d00001 diff --git a/scss/GridField.scss b/scss/GridField.scss index 1a8111175..68c906446 100644 --- a/scss/GridField.scss +++ b/scss/GridField.scss @@ -244,7 +244,7 @@ $gf_grid_x: 16px; } td { border-right: 1px solid $gf_colour_border; - padding: 7px 12px; + padding: $gf_grid_x/2.5 $gf_grid_y; color: $gf_colour_font; &.bottom-all { @include border-bottom-radius($gf_border_radius); From 98f047ebfac2aa06444d7d03dd4bc62006e0a48a Mon Sep 17 00:00:00 2001 From: Andrew O'Neil Date: Wed, 29 Feb 2012 14:34:06 +1300 Subject: [PATCH 11/72] MINOR: Add asc and desc classes to sorted header --- forms/gridfield/GridFieldSortableHeader.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/forms/gridfield/GridFieldSortableHeader.php b/forms/gridfield/GridFieldSortableHeader.php index 732c3cc10..e1dd7d6a0 100644 --- a/forms/gridfield/GridFieldSortableHeader.php +++ b/forms/gridfield/GridFieldSortableHeader.php @@ -33,6 +33,11 @@ class GridFieldSortableHeader implements GridField_HTMLProvider, GridField_DataM $field->addExtraClass('ss-gridfield-sort'); if($state->SortColumn == $columnField){ $field->addExtraClass('ss-gridfield-sorted'); + + if($state->SortDirection == 'asc') + $field->addExtraClass('ss-gridfield-sorted-asc'); + else + $field->addExtraClass('ss-gridfield-sorted-desc'); } } else { $field = new LiteralField($columnField, $title); From 2dffac7398c100370572429174bad0b28695ff8f Mon Sep 17 00:00:00 2001 From: Andrew O'Neil Date: Wed, 29 Feb 2012 14:59:11 +1300 Subject: [PATCH 12/72] MINOR: SSF-106 Add classes for gridfield buttons --- forms/gridfield/GridFieldAction.php | 1 + forms/gridfield/GridFieldFilter.php | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/forms/gridfield/GridFieldAction.php b/forms/gridfield/GridFieldAction.php index 6cfe77039..ca9f30205 100644 --- a/forms/gridfield/GridFieldAction.php +++ b/forms/gridfield/GridFieldAction.php @@ -170,6 +170,7 @@ class GridFieldAction_Delete implements GridField_ColumnProvider, GridField_Acti "deleterecord", array('RecordID' => $record->ID) ); + $field->addExtraClass('gridfield-button-delete'); $output = $field->Field(); return $output; } diff --git a/forms/gridfield/GridFieldFilter.php b/forms/gridfield/GridFieldFilter.php index 1368f6cda..c1b1d2dd2 100644 --- a/forms/gridfield/GridFieldFilter.php +++ b/forms/gridfield/GridFieldFilter.php @@ -80,9 +80,12 @@ class GridFieldFilter implements GridField_HTMLProvider, GridField_DataManipulat if($currentColumn == count($columns)) { $field = new FieldGroup( $field, - new GridField_Action($gridField, 'filter', _t('GridField.Filter', "Filter"), 'filter', null), - new GridField_Action($gridField, 'reset', _t('GridField.ResetFilter', "Reset"), 'reset', null) + $filterbutton = new GridField_Action($gridField, 'filter', _t('GridField.Filter', "Filter"), 'filter', null), + $resetbutton = new GridField_Action($gridField, 'reset', _t('GridField.ResetFilter', "Reset"), 'reset', null) ); + + $filterbutton->addExtraClass('gridfield-button-filter'); + $resetbutton->addExtraClass('gridfield-button-reset'); } $field->iteratorProperties($currentColumn-1, count($columns)); From e932be3a9ae2eadb9c2488910ddba56bb8dc22da Mon Sep 17 00:00:00 2001 From: jbridson Date: Wed, 29 Feb 2012 15:15:40 +1300 Subject: [PATCH 13/72] ENHANCEMENT:SSF-30 - partially finish - fixed broken layout on edit files 404error.html --- admin/css/screen.css | 11 +++++++++- admin/scss/_style.scss | 48 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/admin/css/screen.css b/admin/css/screen.css index 97e858137..ebcc3d16c 100644 --- a/admin/css/screen.css +++ b/admin/css/screen.css @@ -466,8 +466,17 @@ body.cms-dialog { overflow: auto; background: url("../images/textures/bg_cms_mai /** -------------------------------------------- Item Edit Form -------------------------------------------- */ #Form_ItemEditForm .field { width: 100%; } -#Form_ItemEditForm .field .fieldgroup { height: 240px; float: left; } +#Form_ItemEditForm .field .fieldgroup { height: 320px; float: left; } #Form_ItemEditForm .field .fieldgroup .fieldgroup-field.first { position: relative; margin-left: 0px; } +#Form_ItemEditForm .field .fieldgroup .fieldgroup-field.first .ss-uploadfield-item { margin: 0; padding: 16px; overflow: auto; } +#Form_ItemEditForm .field .fieldgroup .fieldgroup-field.first .ss-uploadfield-item .ss-uploadfield-item-preview { height: 96px; line-height: 96px; width: 264px; text-align: center; font-weight: bold; font-size: 21.6px; float: left; overflow: hidden; } +#Form_ItemEditForm .field .fieldgroup .fieldgroup-field.first .ss-uploadfield-item .ss-uploadfield-item-preview.ss-uploadfield-dropzone { -moz-box-shadow: #9a9a9a 0 0 3px 3px inset; -webkit-box-shadow: #9a9a9a 0 0 3px 3px inset; -o-box-shadow: #9a9a9a 0 0 3px 3px inset; box-shadow: #9a9a9a 0 0 3px 3px inset; border: 2px dashed gray; background: rgba(201, 205, 206, 0.8); } +#Form_ItemEditForm .field .fieldgroup .fieldgroup-field.first .ss-uploadfield-item .ss-uploadfield-item-name { float: none; display: block; clear: both; padding: 8px 0; } +#Form_ItemEditForm .field .fieldgroup .fieldgroup-field.first .ss-uploadfield-item .ss-uploadfield-fromcomputer { padding-top: 0px; margin-right: 8px; } +#Form_ItemEditForm .field .fieldgroup .fieldgroup-field.first .ss-uploadfield-item .ss-uploadfield-fromcomputer span.ui-button-text { padding-left: 28px; } +#Form_ItemEditForm .field .fieldgroup .fieldgroup-field.first .ss-uploadfield-item .ss-uploadfield-fromcomputer .ss-uploadfield { position: absolute; left: -9999em; } +#Form_ItemEditForm .field .fieldgroup .fieldgroup-field.first .ss-uploadfield-item .ss-uploadfield-fromfiles { padding-top: 0px; margin: 0; } +#Form_ItemEditForm .field .fieldgroup .fieldgroup-field.first .ss-uploadfield-item .ss-uploadfield-fromfiles span.ui-button-text { padding-left: 28px; } #Form_ItemEditForm .field .fieldgroup .fieldgroup-field { clear: both; width: 500px; margin-left: 420px; } #Form_ItemEditForm .field .fieldgroup .fieldgroup-field img { -moz-border-radius: 8px; -webkit-border-radius: 8px; -o-border-radius: 8px; -ms-border-radius: 8px; -khtml-border-radius: 8px; border-radius: 8px; border-width: 3px; border-style: dashed; border-color: #8c99a1; position: absolute; top: 8px; } #Form_ItemEditForm .field .fieldgroup .fieldgroup-field label { font-weight: bold; float: left; padding-top: 8px; line-height: 16px; text-shadow: white 1px 1px 0; } diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss index aa9d052ec..c8e3103eb 100644 --- a/admin/scss/_style.scss +++ b/admin/scss/_style.scss @@ -1240,9 +1240,55 @@ body.cms-dialog { .field { width:100%; .fieldgroup { - height:$grid-y * 30; + height:$grid-y * 40; float:left; .fieldgroup-field.first { + .ss-uploadfield-item { + margin: 0; + padding: $grid-x * 2; + overflow: auto; + .ss-uploadfield-item-preview { + height: $grid-y * 12; + line-height: $grid-y * 12; + width: $grid-x * 33; + text-align: center; + font: { + weight:bold; + size:$font-base-size * 1.8; + } + float: left; + overflow: hidden; + &.ss-uploadfield-dropzone { + @include box-shadow(lighten($color-medium-separator, 10%) 0 0 3px 3px inset); + border: 2px dashed $color-medium-separator; + background: $color-light-separator; + } + } + .ss-uploadfield-item-name { + float:none; + display:block; + clear:both; + padding:$grid-y 0; + } + .ss-uploadfield-fromcomputer { + padding-top:0px; + margin-right:$grid-x; + span.ui-button-text { + padding-left:$grid-x * 3.5; + } + .ss-uploadfield { + position:absolute; + left:-9999em; + } + } + .ss-uploadfield-fromfiles { + padding-top:0px; + margin:0; + span.ui-button-text { + padding-left:$grid-x * 3.5; + } + } + } position:relative; margin-left:0px; } From c0f65bfbba6436538bee999a13d122c64778bf4f Mon Sep 17 00:00:00 2001 From: jbridson Date: Wed, 29 Feb 2012 15:30:40 +1300 Subject: [PATCH 14/72] ENHANCEMENT:SSF-106 - changed the edit and delete buttons to match the icons on the design --- css/GridField.css | 3 +++ scss/GridField.scss | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/css/GridField.css b/css/GridField.css index 830e33de3..59fd5efe8 100644 --- a/css/GridField.css +++ b/css/GridField.css @@ -7,6 +7,9 @@ .cms table.ss-gridfield-table tbody { background: #FFF; } .cms table.ss-gridfield-table tbody td { /* Emulate a link by default */ } .cms table.ss-gridfield-table tbody td button { border: none; background: none; margin: 0 0 0 2px; padding: 0; width: auto; text-shadow: none; } +.cms table.ss-gridfield-table tbody td button.ui-state-hover { background: none; border: none; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; } +.cms table.ss-gridfield-table tbody td button span.ui-button-text { text-indent: -9999em; background: url(../images/icons/decline.png) no-repeat 0px 6px; } +.cms table.ss-gridfield-table tbody td a.edit-link { display: inline-block; height: 20px; width: 20px; text-indent: -9999em; background: url(../images/icons/document--pencil.png) no-repeat 0 0; } .cms table.ss-gridfield-table tfoot { color: #1d2224; } .cms table.ss-gridfield-table tfoot tr td { background: #95a5ab; padding: .7em; border-bottom: 1px solid rgba(0, 0, 0, 0.1); } .cms table.ss-gridfield-table tr.title { -moz-border-radius-topleft: 7px; -webkit-border-top-left-radius: 7px; -o-border-top-left-radius: 7px; -ms-border-top-left-radius: 7px; -khtml-border-top-left-radius: 7px; border-top-left-radius: 7px; -moz-border-radius-topright: 7px; -webkit-border-top-right-radius: 7px; -o-border-top-right-radius: 7px; -ms-border-top-right-radius: 7px; -khtml-border-top-right-radius: 7px; border-top-right-radius: 7px; } diff --git a/scss/GridField.scss b/scss/GridField.scss index 68c906446..f63a98f5a 100644 --- a/scss/GridField.scss +++ b/scss/GridField.scss @@ -73,6 +73,22 @@ $gf_grid_x: 16px; padding: 0; width: auto; text-shadow: none; + &.ui-state-hover { + background:none; + border:none; + @include box-shadow-none; + } + span.ui-button-text { + text-indent:-9999em; + background: url(../images/icons/decline.png) no-repeat 0px 6px; + } + } + a.edit-link { + display:inline-block; + height:20px; + width:20px; + text-indent:-9999em; + background: url(../images/icons/document--pencil.png) no-repeat 0 0; } } } From e4496fefc188a0537cfdde8bd30431962cd3fd05 Mon Sep 17 00:00:00 2001 From: jbridson Date: Wed, 29 Feb 2012 16:00:30 +1300 Subject: [PATCH 15/72] BUGFIX:SSF-106 added fix for no delete icons in ie7 --- admin/css/ie7.css | 2 ++ admin/scss/ie7.scss | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/admin/css/ie7.css b/admin/css/ie7.css index c8259f9a7..7d185239c 100644 --- a/admin/css/ie7.css +++ b/admin/css/ie7.css @@ -14,3 +14,5 @@ html { overflow: hidden; } .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { background-image: none; } .jstree li a .ui-icon { text-indent: 0px !important; } + +.cms table.ss-gridfield-table tbody td button span.ui-button-text { zoom: 1; } diff --git a/admin/scss/ie7.scss b/admin/scss/ie7.scss index 92fd79e76..00788b594 100644 --- a/admin/scss/ie7.scss +++ b/admin/scss/ie7.scss @@ -51,4 +51,18 @@ html { // fix jstree themeroller plugin bug: tree disappear in IE7 .jstree li a .ui-icon { text-indent: 0px !important; +} + +.cms { + table.ss-gridfield-table { + tbody { + td { + button { + span.ui-button-text { + zoom:1; + } + } + } + } + } } \ No newline at end of file From e61a7868fd1fe4a159f5be7e44f5b706e0d59048 Mon Sep 17 00:00:00 2001 From: jbridson Date: Wed, 29 Feb 2012 16:26:52 +1300 Subject: [PATCH 16/72] BUGFIX:changed the colour of the font on the default tabs to match the designs --- admin/css/screen.css | 1 + admin/scss/_style.scss | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/admin/css/screen.css b/admin/css/screen.css index ebcc3d16c..f36c8bc17 100644 --- a/admin/css/screen.css +++ b/admin/css/screen.css @@ -260,6 +260,7 @@ body.cms { overflow: hidden; } .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-corner-all, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-corner-top, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-corner-left, .cms-content-header .cms-content-header-tabs .ui-tabs-nav .ui-corner-tl { border-radius: 0; } .cms-edit-form .cms-content-header-tabs .ui-tabs-nav li a { text-indent: 0; } +.cms-edit-form .cms-content-header-tabs .ui-tabs-nav .ui-state-default a, .cms-edit-form .cms-content-header-tabs .ui-tabs-nav .ui-widget-content .ui-state-default a, .cms-edit-form .cms-content-header-tabs .ui-tabs-nav .ui-widget-header .ui-state-default a { color: #1f1f1f; } /** -------------------------------------------- Tabs -------------------------------------------- */ .ui-tabs .cms-content-header .ui-tabs-nav li, .cms-dialog .ui-tabs-nav li { margin: 0; } diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss index c8e3103eb..51552fa08 100644 --- a/admin/scss/_style.scss +++ b/admin/scss/_style.scss @@ -193,6 +193,13 @@ body.cms { text-indent:0; } } + .ui-state-default, + .ui-widget-content .ui-state-default, + .ui-widget-header .ui-state-default { + a { + color:$color-text-dark; + } + } } } } From a7304f3c3911c891cbc47b1c09a436273d7ac8f0 Mon Sep 17 00:00:00 2001 From: jbridson Date: Wed, 29 Feb 2012 16:38:53 +1300 Subject: [PATCH 17/72] MINOR:SSF-106 made a small change to the positioning of the icons (edit and delete) --- css/GridField.css | 4 ++-- scss/GridField.scss | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/css/GridField.css b/css/GridField.css index 59fd5efe8..39b7fec00 100644 --- a/css/GridField.css +++ b/css/GridField.css @@ -8,8 +8,8 @@ .cms table.ss-gridfield-table tbody td { /* Emulate a link by default */ } .cms table.ss-gridfield-table tbody td button { border: none; background: none; margin: 0 0 0 2px; padding: 0; width: auto; text-shadow: none; } .cms table.ss-gridfield-table tbody td button.ui-state-hover { background: none; border: none; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; } -.cms table.ss-gridfield-table tbody td button span.ui-button-text { text-indent: -9999em; background: url(../images/icons/decline.png) no-repeat 0px 6px; } -.cms table.ss-gridfield-table tbody td a.edit-link { display: inline-block; height: 20px; width: 20px; text-indent: -9999em; background: url(../images/icons/document--pencil.png) no-repeat 0 0; } +.cms table.ss-gridfield-table tbody td button span.ui-button-text { text-indent: -9999em; background: url(../images/icons/decline.png) no-repeat 0 2px; padding: 0; width: 20px; height: 20px; } +.cms table.ss-gridfield-table tbody td a.edit-link { display: inline-block; height: 20px; width: 20px; text-indent: -9999em; background: url(../images/icons/document--pencil.png) no-repeat 0 1px; } .cms table.ss-gridfield-table tfoot { color: #1d2224; } .cms table.ss-gridfield-table tfoot tr td { background: #95a5ab; padding: .7em; border-bottom: 1px solid rgba(0, 0, 0, 0.1); } .cms table.ss-gridfield-table tr.title { -moz-border-radius-topleft: 7px; -webkit-border-top-left-radius: 7px; -o-border-top-left-radius: 7px; -ms-border-top-left-radius: 7px; -khtml-border-top-left-radius: 7px; border-top-left-radius: 7px; -moz-border-radius-topright: 7px; -webkit-border-top-right-radius: 7px; -o-border-top-right-radius: 7px; -ms-border-top-right-radius: 7px; -khtml-border-top-right-radius: 7px; border-top-right-radius: 7px; } diff --git a/scss/GridField.scss b/scss/GridField.scss index f63a98f5a..613031ec0 100644 --- a/scss/GridField.scss +++ b/scss/GridField.scss @@ -80,7 +80,10 @@ $gf_grid_x: 16px; } span.ui-button-text { text-indent:-9999em; - background: url(../images/icons/decline.png) no-repeat 0px 6px; + background: url(../images/icons/decline.png) no-repeat 0 2px; + padding:0; + width:20px; + height:20px; } } a.edit-link { @@ -88,7 +91,7 @@ $gf_grid_x: 16px; height:20px; width:20px; text-indent:-9999em; - background: url(../images/icons/document--pencil.png) no-repeat 0 0; + background: url(../images/icons/document--pencil.png) no-repeat 0 1px; } } } From bc6ea2ec0ee7dcfb182a9617306468e73d42bc73 Mon Sep 17 00:00:00 2001 From: Felipe Skroski Date: Wed, 29 Feb 2012 16:42:57 +1300 Subject: [PATCH 18/72] MINOR: (SSF-106) started on styling the filter bar on the datagrid --- css/GridField.css | 3 ++- forms/gridfield/GridFieldFilter.php | 4 ++-- images/icons/filter-icons.png | Bin 0 -> 1386 bytes scss/GridField.scss | 8 +++++++- 4 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 images/icons/filter-icons.png diff --git a/css/GridField.css b/css/GridField.css index 830e33de3..a0f85745a 100644 --- a/css/GridField.css +++ b/css/GridField.css @@ -37,7 +37,8 @@ .cms table.ss-gridfield-table tr th button.ss-gridfield-sort:hover { color: #fff !important; -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; } .cms table.ss-gridfield-table tr th button.ss-gridfield-sort { background: transparent url(../images/arrows.png) no-repeat right 6px; border: none; width: 100%; text-align: left; padding: 4px 0; text-shadow: rgba(0, 0, 0, 0.3) 0px -1px 0; color: #fff; -moz-border-radius: 0; -webkit-border-radius: 0; -o-border-radius: 0; -ms-border-radius: 0; -khtml-border-radius: 0; border-radius: 0; } .cms table.ss-gridfield-table tr th button.ss-gridfield-sort:hover { background-position: right -34px; } -.cms table.ss-gridfield-table tr th button.ss-gridfield-sort.ss-gridfield-sorted { background-position: right -116px; } +.cms table.ss-gridfield-table tr th button.ss-gridfield-sort.ss-gridfield-sorted-desc { background-position: right -72px; } +.cms table.ss-gridfield-table tr th button.ss-gridfield-sort.ss-gridfield-sorted-asc { background-position: right -116px; } .cms table.ss-gridfield-table tr th input.ss-gridfield-sort { padding: 2px; } .cms table.ss-gridfield-table tr th input.ss-gridfield-sort:focus { -moz-box-shadow: none; -webkit-box-shadow: none; box-shadow: none; } .cms table.ss-gridfield-table tr td { border-right: 1px solid rgba(0, 0, 0, 0.1); padding: 6.4px 12px; color: #666666; } diff --git a/forms/gridfield/GridFieldFilter.php b/forms/gridfield/GridFieldFilter.php index c1b1d2dd2..acf2c4859 100644 --- a/forms/gridfield/GridFieldFilter.php +++ b/forms/gridfield/GridFieldFilter.php @@ -84,8 +84,8 @@ class GridFieldFilter implements GridField_HTMLProvider, GridField_DataManipulat $resetbutton = new GridField_Action($gridField, 'reset', _t('GridField.ResetFilter', "Reset"), 'reset', null) ); - $filterbutton->addExtraClass('gridfield-button-filter'); - $resetbutton->addExtraClass('gridfield-button-reset'); + $filterbutton->addExtraClass('ss-gridfield-button-filter'); + $resetbutton->addExtraClass('ss-gridfield-button-reset'); } $field->iteratorProperties($currentColumn-1, count($columns)); diff --git a/images/icons/filter-icons.png b/images/icons/filter-icons.png new file mode 100644 index 0000000000000000000000000000000000000000..8ccd35f6f85cec05179b72c1246bf56fa6df4bbf GIT binary patch literal 1386 zcmeAS@N?(olHy`uVBq!ia0vp^Dj+ro8<0G>_)Hp*k}PqJC<)F_D=AMbN@Z|N$xljE z@XSq2PYp^XQ2>tmIipR1P$QlnRqTL9F}z+huvQIMFNom!%h zl$xHIXRGvn_kJaX%oJOta8q9c-vZ~}1OnC3`ysn+hwS0lBFq zi3%0DIeEoa6}C!XbFF}Ekg&dz0$52&wyhGxQ4ziY3eNdOsS2ig2D-@xW(EpohI)p^ zCg$emItoSxh6efuM*4KTB%1XJkii(hGOE?jkSNl+@ny;uz{4yi0i z)elN7&Mz%W21Z<(GRUd|E9aur#FG4?ko^1{SSSW$|Z5PIEk>IEf*+ybD@E~!PCWvMA{Mftf3U@u!`;&zKOPV=C8 zQ*gV*1*cwppkwqw5sMVjFd<;-0Wsmp7RZ4o{M0;PYA*sN>kl6c4>2$>-t%;E45_%4 zl(v9BfFUVefrEpOkFVnEtEty^m%snfkR;#m!5e(NGDMa6~k9lRfA&R}3ov2gowVWD&NggYDMJAOC*u<=>2e*Jp+6@9$R8aX>; z8!GJe+#O|&Z?cthZXKg-IKr%ris^YUJGDx07z zAb;SQhRSgjy@(A98bjD;&Yo@UJX674#$g)sCvk?AtZ&}DiLte{HM`-IWGAq{-I7ac z>i?5HS_Tbn7wZ$E0*|THzq_+DCF6{#Lc4$jgENCji*&;en+v?Z8%r2XQp5r#EN~1w zx?stYC!MZ+Z;y71Ph;_AuzF@^lJYEg*4_p?|Awa;3fIMFEq36Ha10JMmYnw4Z=Ovi zcfZ${4CcTKCQlt&1(+;f*-S91`10c7+NYFVdQ&MBb@02%`4hX4Qo literal 0 HcmV?d00001 diff --git a/scss/GridField.scss b/scss/GridField.scss index 68c906446..cc2267044 100644 --- a/scss/GridField.scss +++ b/scss/GridField.scss @@ -227,9 +227,15 @@ $gf_grid_x: 16px; &:hover { background-position: right -34px; } - &.ss-gridfield-sorted { + &.ss-gridfield-sorted-desc { + background-position: right -72px; + } + &.ss-gridfield-sorted-asc { background-position: right -116px; } + } + &.ss-gridfield-button-filter{ + background: transparent url(../images/icons/filter-icons.png) no-repeat right 6px; } } input { From 726b9cac46e38c5a624841995474170e5aaa88fa Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Wed, 29 Feb 2012 09:53:22 +0100 Subject: [PATCH 19/72] MINOR Create valid HTML attributes in GridFieldDefaultColumns->getColumnAttributes() --- forms/gridfield/GridFieldDefaultColumns.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forms/gridfield/GridFieldDefaultColumns.php b/forms/gridfield/GridFieldDefaultColumns.php index b3a632b8c..1c058a615 100644 --- a/forms/gridfield/GridFieldDefaultColumns.php +++ b/forms/gridfield/GridFieldDefaultColumns.php @@ -59,7 +59,7 @@ class GridFieldDefaultColumns implements GridField_ColumnProvider { } public function getColumnAttributes($gridField, $item, $column) { - return array('class' => 'col-' . $column); + return array('class' => 'col-' . preg_replace('/[^\w]/', '-', $column)); } public function getColumnMetadata($gridField, $column) { From b92676cc86ed7ee7ef4cf1ca460222501c9c630c Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Wed, 29 Feb 2012 16:59:07 +0100 Subject: [PATCH 20/72] MINOR Fixed DatetimeField_Readonly config retrieval --- forms/DatetimeField.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forms/DatetimeField.php b/forms/DatetimeField.php index f44108cd7..4b196036f 100644 --- a/forms/DatetimeField.php +++ b/forms/DatetimeField.php @@ -298,7 +298,7 @@ class DatetimeField_Readonly extends DatetimeField { $format = sprintf( $this->getConfig('datetimeorder'), $this->dateField->getConfig('dateformat'), - $this->dateField->getConfig('timeformat') + $this->timeField->getConfig('timeformat') ); $valueObj = new Zend_Date( sprintf($this->getConfig('datetimeorder'), $valDate, $valTime), From 7d10ff790c441984c2e1b42ac4627951d97d63b1 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Wed, 29 Feb 2012 17:15:52 +0100 Subject: [PATCH 21/72] MINOR Fixed JS notice/alerts in CMS --- admin/code/LeftAndMain.php | 1 + admin/javascript/LeftAndMain.js | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/admin/code/LeftAndMain.php b/admin/code/LeftAndMain.php index fbce677cd..3d49791bc 100644 --- a/admin/code/LeftAndMain.php +++ b/admin/code/LeftAndMain.php @@ -283,6 +283,7 @@ class LeftAndMain extends Controller { )) ); + Requirements::css(SAPPHIRE_ADMIN_DIR . '/thirdparty/jquery-notice/jquery.notice.css'); Requirements::css(THIRDPARTY_DIR . '/jquery-ui-themes/smoothness/jquery-ui.css'); Requirements::css(SAPPHIRE_ADMIN_DIR .'/thirdparty/chosen/chosen/chosen.css'); Requirements::css(THIRDPARTY_DIR . '/jstree/themes/apple/style.css'); diff --git a/admin/javascript/LeftAndMain.js b/admin/javascript/LeftAndMain.js index 038b817fd..7622ec2c2 100644 --- a/admin/javascript/LeftAndMain.js +++ b/admin/javascript/LeftAndMain.js @@ -242,6 +242,7 @@ jQuery.noConflict(); }, error: function(xhr, status, e) { contentEl.removeClass('loading'); + errorMessage(e); } }); @@ -504,15 +505,10 @@ jQuery.noConflict(); }); }(jQuery)); -// Backwards compatibility var statusMessage = function(text, type) { jQuery.noticeAdd({text: text, type: type}); }; var errorMessage = function(text) { jQuery.noticeAdd({text: text, type: 'error'}); -}; - -returnFalse = function() { - return false; }; \ No newline at end of file From da879da94078fe547ff8ea5419b4f4bba7076c12 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 28 Feb 2012 18:07:55 +0100 Subject: [PATCH 22/72] MINOR Styling and structural fixes for File/Image->getCMSFields() and relates usage in UploadField/HTMLEditorField. --- admin/css/screen.css | 38 +++------- admin/scss/_style.scss | 142 ++++++++++++------------------------ admin/scss/_typography.scss | 6 ++ filesystem/File.php | 68 +++++++++-------- forms/HtmlEditorField.php | 24 ++++++ forms/UploadField.php | 1 - model/Image.php | 19 +---- 7 files changed, 128 insertions(+), 170 deletions(-) diff --git a/admin/css/screen.css b/admin/css/screen.css index f36c8bc17..0b454944d 100644 --- a/admin/css/screen.css +++ b/admin/css/screen.css @@ -88,6 +88,8 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, /** ----------------------------- CMS Components ------------------------------ */ /** File: typography.scss Contains the basic typography related styles for the admin interface. */ +body, html { font-size: 12px; line-height: 16px; font-family: Arial, sans-serif; color: #444444; } + .cms h2, .cms h3, .cms h4, .cms h5 { font-weight: bold; margin: 16px 0 16px 0; line-height: 16px; } .cms h2 { font-size: 18px; line-height: 24px; } .cms h3 { font-size: 16px; } @@ -214,16 +216,7 @@ input.radio { margin-left: 0; } * (see _tree.scss and _menu.scss). */ /** ---------------------------------------------------- Core Styles. ---------------------------------------------------- */ -html, body { width: 100%; height: 100%; font-size: 12px; line-height: 16px; font-family: Arial, sans-serif; color: #444444; } -html html, html body, html div, html span, html applet, html object, html iframe, html h1, html h2, html h3, html h4, html h5, html h6, html p, html blockquote, html pre, html a, html abbr, html acronym, html address, html big, html cite, html code, html del, html dfn, html em, html img, html ins, html kbd, html q, html s, html samp, html small, html strike, html strong, html sub, html sup, html tt, html var, html b, html u, html i, html center, html dl, html dt, html dd, html ol, html ul, html li, html fieldset, html form, html label, html legend, html table, html caption, html tbody, html tfoot, html thead, html tr, html th, html td, html article, html aside, html canvas, html details, html embed, html figure, html figcaption, html footer, html header, html hgroup, html menu, html nav, html output, html ruby, html section, html summary, html time, html mark, html audio, html video, body html, body body, body div, body span, body applet, body object, body iframe, body h1, body h2, body h3, body h4, body h5, body h6, body p, body blockquote, body pre, body a, body abbr, body acronym, body address, body big, body cite, body code, body del, body dfn, body em, body img, body ins, body kbd, body q, body s, body samp, body small, body strike, body strong, body sub, body sup, body tt, body var, body b, body u, body i, body center, body dl, body dt, body dd, body ol, body ul, body li, body fieldset, body form, body label, body legend, body table, body caption, body tbody, body tfoot, body thead, body tr, body th, body td, body article, body aside, body canvas, body details, body embed, body figure, body figcaption, body footer, body header, body hgroup, body menu, body nav, body output, body ruby, body section, body summary, body time, body mark, body audio, body video { margin: 0; padding: 0; border: 0; font-size: 100%; font: inherit; vertical-align: baseline; } -html body, body body { line-height: 1; } -html ol, html ul, body ol, body ul { list-style: none; } -html table, body table { border-collapse: collapse; border-spacing: 0; } -html caption, html th, html td, body caption, body th, body td { text-align: left; font-weight: normal; vertical-align: middle; } -html q, html blockquote, body q, body blockquote { quotes: none; } -html q:before, html q:after, html blockquote:before, html blockquote:after, body q:before, body q:after, body blockquote:before, body blockquote:after { content: ""; content: none; } -html a img, body a img { border: none; } -html article, html aside, html details, html figcaption, html figure, html footer, html header, html hgroup, html menu, html nav, html section, html summary, body article, body aside, body details, body figcaption, body figure, body footer, body header, body hgroup, body menu, body nav, body section, body summary { display: block; } +html, body { width: 100%; height: 100%; } body.cms { overflow: hidden; } @@ -458,6 +451,9 @@ body.cms-dialog { overflow: auto; background: url("../images/textures/bg_cms_mai .htmleditorfield-mediaform .ss-htmleditorfield-file .overview .title { display: inline-block; vertical-align: middle; background: #fff; border: 1px solid #b3b3b3; -moz-border-radius: 5px; -webkit-border-radius: 5px; -o-border-radius: 5px; -ms-border-radius: 5px; -khtml-border-radius: 5px; border-radius: 5px; margin-left: 16px; padding: 4px; } .htmleditorfield-mediaform .ss-htmleditorfield-file .overview .action-delete { display: inline-block; } .htmleditorfield-mediaform .ss-htmleditorfield-file .details { padding: 16px; } +.htmleditorfield-mediaform .cms-file-info-data { max-width: 350px; } +.htmleditorfield-mediaform .cms-file-info-data .field label { width: 104px; } +.htmleditorfield-mediaform .cms-file-info-data .field .middleColumn { margin-left: 112px; } /** -------------------------------------------- Step labels -------------------------------------------- */ .step-label > * { display: inline-block; vertical-align: top; } @@ -466,22 +462,12 @@ body.cms-dialog { overflow: auto; background: url("../images/textures/bg_cms_mai .step-label .title { height: 18px; padding: 4px; } /** -------------------------------------------- Item Edit Form -------------------------------------------- */ -#Form_ItemEditForm .field { width: 100%; } -#Form_ItemEditForm .field .fieldgroup { height: 320px; float: left; } -#Form_ItemEditForm .field .fieldgroup .fieldgroup-field.first { position: relative; margin-left: 0px; } -#Form_ItemEditForm .field .fieldgroup .fieldgroup-field.first .ss-uploadfield-item { margin: 0; padding: 16px; overflow: auto; } -#Form_ItemEditForm .field .fieldgroup .fieldgroup-field.first .ss-uploadfield-item .ss-uploadfield-item-preview { height: 96px; line-height: 96px; width: 264px; text-align: center; font-weight: bold; font-size: 21.6px; float: left; overflow: hidden; } -#Form_ItemEditForm .field .fieldgroup .fieldgroup-field.first .ss-uploadfield-item .ss-uploadfield-item-preview.ss-uploadfield-dropzone { -moz-box-shadow: #9a9a9a 0 0 3px 3px inset; -webkit-box-shadow: #9a9a9a 0 0 3px 3px inset; -o-box-shadow: #9a9a9a 0 0 3px 3px inset; box-shadow: #9a9a9a 0 0 3px 3px inset; border: 2px dashed gray; background: rgba(201, 205, 206, 0.8); } -#Form_ItemEditForm .field .fieldgroup .fieldgroup-field.first .ss-uploadfield-item .ss-uploadfield-item-name { float: none; display: block; clear: both; padding: 8px 0; } -#Form_ItemEditForm .field .fieldgroup .fieldgroup-field.first .ss-uploadfield-item .ss-uploadfield-fromcomputer { padding-top: 0px; margin-right: 8px; } -#Form_ItemEditForm .field .fieldgroup .fieldgroup-field.first .ss-uploadfield-item .ss-uploadfield-fromcomputer span.ui-button-text { padding-left: 28px; } -#Form_ItemEditForm .field .fieldgroup .fieldgroup-field.first .ss-uploadfield-item .ss-uploadfield-fromcomputer .ss-uploadfield { position: absolute; left: -9999em; } -#Form_ItemEditForm .field .fieldgroup .fieldgroup-field.first .ss-uploadfield-item .ss-uploadfield-fromfiles { padding-top: 0px; margin: 0; } -#Form_ItemEditForm .field .fieldgroup .fieldgroup-field.first .ss-uploadfield-item .ss-uploadfield-fromfiles span.ui-button-text { padding-left: 28px; } -#Form_ItemEditForm .field .fieldgroup .fieldgroup-field { clear: both; width: 500px; margin-left: 420px; } -#Form_ItemEditForm .field .fieldgroup .fieldgroup-field img { -moz-border-radius: 8px; -webkit-border-radius: 8px; -o-border-radius: 8px; -ms-border-radius: 8px; -khtml-border-radius: 8px; border-radius: 8px; border-width: 3px; border-style: dashed; border-color: #8c99a1; position: absolute; top: 8px; } -#Form_ItemEditForm .field .fieldgroup .fieldgroup-field label { font-weight: bold; float: left; padding-top: 8px; line-height: 16px; text-shadow: white 1px 1px 0; } -#Form_ItemEditForm .field .fieldgroup .fieldgroup-field span { float: left; padding-left: 8px; font-style: italic; color: #777777; } +.cms-file-info { overflow: auto; border-bottom: 1px solid rgba(201, 205, 206, 0.8); -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); -o-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); margin-bottom: 8px; } +.cms-file-info .cms-file-info-preview { float: left; width: 176px; margin-right: 8px; } +.cms-file-info .cms-file-info-preview img { max-width: 176px; } +.cms-file-info .cms-file-info-data { float: left; } +.cms-file-info .cms-file-info-data .field { margin-bottom: 0; padding-bottom: 8px; border: none; box-shadow: none; } +.cms-file-info .cms-file-info-data .field label, .cms-file-info .cms-file-info-data .field span { padding: 0; } /** This file defines the jstree base styling (see http://jstree.com), as well as any customizations (see bottom of file). The styles are usually added through jstree.js on DOM load, but we need it earlier in order to correctly display the uninitialized tree. */ .cms .jstree ul, .TreeDropdownField .treedropdownfield-panel .jstree ul { display: block; margin: 0; padding: 0; background: none; list-style-type: none; } diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss index 51552fa08..cc19ca321 100644 --- a/admin/scss/_style.scss +++ b/admin/scss/_style.scss @@ -18,16 +18,9 @@ * Core Styles. * ---------------------------------------------------- */ -html,body { +html,body { width: 100%; height: 100%; - - @include global-reset; - - font-size: $font-base-size; - line-height: $grid-y * 2; - font-family: $font-family; - color: $color-text; } body.cms { @@ -1199,6 +1192,21 @@ body.cms-dialog { padding: $grid-x*2; } } + + .cms-file-info-data { + // Ensure it fits beside the image preview + max-width: 350px; + + // Reduced label widths to fit everything in smaller space + .field { + label { + width: $grid-x*13; + } + .middleColumn { + margin-left: $grid-x*14; + } + } + } } @@ -1243,90 +1251,36 @@ body.cms-dialog { * Item Edit Form * -------------------------------------------- */ -#Form_ItemEditForm { - .field { - width:100%; - .fieldgroup { - height:$grid-y * 40; - float:left; - .fieldgroup-field.first { - .ss-uploadfield-item { - margin: 0; - padding: $grid-x * 2; - overflow: auto; - .ss-uploadfield-item-preview { - height: $grid-y * 12; - line-height: $grid-y * 12; - width: $grid-x * 33; - text-align: center; - font: { - weight:bold; - size:$font-base-size * 1.8; - } - float: left; - overflow: hidden; - &.ss-uploadfield-dropzone { - @include box-shadow(lighten($color-medium-separator, 10%) 0 0 3px 3px inset); - border: 2px dashed $color-medium-separator; - background: $color-light-separator; - } - } - .ss-uploadfield-item-name { - float:none; - display:block; - clear:both; - padding:$grid-y 0; - } - .ss-uploadfield-fromcomputer { - padding-top:0px; - margin-right:$grid-x; - span.ui-button-text { - padding-left:$grid-x * 3.5; - } - .ss-uploadfield { - position:absolute; - left:-9999em; - } - } - .ss-uploadfield-fromfiles { - padding-top:0px; - margin:0; - span.ui-button-text { - padding-left:$grid-x * 3.5; - } - } - } - position:relative; - margin-left:0px; - } - .fieldgroup-field { - clear:both; - width:$grid-x * 62.5; - margin-left:$grid-x * 52.5; - img { - @include border-radius (8px); - border: { - width:$grid-x - 5; - style:dashed; - color:$color-menu-border; - } - position:absolute; - top:$grid-y; - } - label { - font-weight:bold; - float:left; - padding-top:$grid-y; - line-height:$grid-y * 2; - text-shadow: $color-text-light 1px 1px 0; - } - span { - float:left; - padding-left:$grid-x; - font-style:italic; - color:lighten($color-text, 20%); - } - } +.cms-file-info { + overflow: auto; + // Emulate .field bottom border styling without applying .field class, + // as it messes up the nested .field element styling (blocklevel labels) + border-bottom: 1px solid $color-shadow-light; + @include box-shadow(0 1px 0 lighten($color-shadow-light, 95%)); + margin-bottom: $grid-x; + + // Preview might not always be available + .cms-file-info-preview { + float: left; + width: $grid-x * 22; // Same as ".field label" + margin-right: $grid-x; + + img { + max-width: $grid-x * 22; // Same as ".field label" } - } -} + } + .cms-file-info-data { + float: left; + + .field { + // Unsetting styles from .field, make it more compact visually + margin-bottom: 0; + padding-bottom: $grid-x; + border: none; + box-shadow: none; + label, span { + padding: 0; + } + } + } +} \ No newline at end of file diff --git a/admin/scss/_typography.scss b/admin/scss/_typography.scss index 8060bc774..7d95fca21 100644 --- a/admin/scss/_typography.scss +++ b/admin/scss/_typography.scss @@ -3,6 +3,12 @@ * * Contains the basic typography related styles for the admin interface. */ +body, html { + font-size: $font-base-size; + line-height: $grid-y * 2; + font-family: $font-family; + color: $color-text; +} .cms { h2, h3, h4, h5 { diff --git a/filesystem/File.php b/filesystem/File.php index 53473b44a..62c0a9d67 100644 --- a/filesystem/File.php +++ b/filesystem/File.php @@ -120,8 +120,6 @@ class File extends DataObject { 'xml','pdf', ); - protected static $labelSeparator = ':'; - /** * @var If this is true, then restrictions set in {@link $allowed_max_file_size} and * {@link $allowed_extensions} will be applied to users with admin privileges as @@ -257,57 +255,63 @@ class File extends DataObject { return $this->canEdit($member); } - /* - * Generate and return the preview image / file upload / replace field for this File - * @return FormField + /** + * Returns the fields to power the edit screen of files in the CMS + * @return FieldList */ - protected function getFilePreview() { - //file upload + function getCMSFields() { + // Preview + if($this instanceof Image) { + $formattedImage = $this->getFormattedImage('SetWidth', Image::$asset_preview_width); + $thumbnail = $formattedImage ? $formattedImage->URL : ''; + $previewField = new LiteralField("ImageFull", + "{$this->Name}\n" + ); + } else { + $previewField = new LiteralField("ImageFull", $this->CMSThumbnail()); + } + + // Upload $uploadField = new UploadField('UploadField','Upload Field'); $uploadField->setConfig('previewMaxWidth', 40); $uploadField->setConfig('previewMaxHeight', 30); + $uploadField->setConfig('allowedMaxFileNumber', 1); //$uploadField->setTemplate('FileEditUploadField'); if ($this->ParentID) { $parent = $this->Parent(); if ($parent) { //set the parent that the Upload field should use for uploads $uploadField->setFolderName($parent->getFilename()); $uploadField->setRecord($parent); - //TODO: make the uploadField replace the existing file } } - return $uploadField; - } - - /** - * Returns the fields to power the edit screen of files in the CMS - * @return FieldList - */ - function getCMSFields() { - $urlLink = "
"; - $urlLink .= ""; - $urlLink .= "{$this->RelativeLink()}"; - $urlLink .= "
"; - //create the file attributes in a FieldGroup - $filePreview = new FieldGroup( - $this->getFilePreview(), - new ReadonlyField("FileType", _t('AssetTableField.TYPE','File type').self::$labelSeparator), - new ReadonlyField("Filename", _t('AssetTableField.FILENAME','File name').self::$labelSeparator), - new ReadonlyField("Size", _t('AssetTableField.SIZE','File size').self::$labelSeparator, $this->getSize()), - new DateField_Disabled("Created", _t('AssetTableField.CREATED','First uploaded').self::$labelSeparator), - new DateField_Disabled("LastEdited", _t('AssetTableField.LASTEDIT','Last changed').self::$labelSeparator) - ); - $filePreview->setTitle("File preview"); - $filePreview->setName("FilePreview"); + $filePreview = FormField::create('CompositeField', + FormField::create('CompositeField', + $previewField + )->setName("FilePreviewImage")->addExtraClass('cms-file-info-preview'), + FormField::create('CompositeField', + FormField::create('CompositeField', + new ReadonlyField("FileType", _t('AssetTableField.TYPE','File type') . ':'), + new ReadonlyField("Size", _t('AssetTableField.SIZE','File size') . ':', $this->getSize()), + $urlField = new ReadonlyField('ClickableURL', _t('AssetTableField.URL','URL'), + sprintf('%s', $this->Link(), $this->RelativeLink()) + ), + new DateField_Disabled("Created", _t('AssetTableField.CREATED','First uploaded') . ':'), + new DateField_Disabled("LastEdited", _t('AssetTableField.LASTEDIT','Last changed') . ':') + ) + )->setName("FilePreviewData")->addExtraClass('cms-file-info-data') + )->setName("FilePreview")->addExtraClass('cms-file-info'); + $urlField->dontEscape = true; return new FieldList( new TabSet('Root', new Tab('Main', $filePreview, + //TODO: make the uploadField replace the existing file + // $uploadField, new TextField("Title", _t('AssetTableField.TITLE','Title')), new TextField("Name", _t('AssetTableField.FILENAME','Filename')), - new LiteralField("AbsoluteURL", $urlLink), //TODO: replace this is a proper preview new DropdownField("OwnerID", _t('AssetTableField.OWNER','Owner'), Member::mapInCMSGroups()) ) ) diff --git a/forms/HtmlEditorField.php b/forms/HtmlEditorField.php index 7f697bfc2..83b4c7d93 100644 --- a/forms/HtmlEditorField.php +++ b/forms/HtmlEditorField.php @@ -497,7 +497,29 @@ class HtmlEditorField_Toolbar extends RequestHandler { * @return FieldList */ protected function getFieldsForImage($url, $file) { + $formattedImage = $file->getFormattedImage('SetWidth', Image::$asset_preview_width); + $thumbnail = $formattedImage ? $formattedImage->URL : ''; + $previewField = new LiteralField("ImageFull", + "{$file->Name}\n" + ); + $fields = new FieldList( + $filePreview = FormField::create('CompositeField', + FormField::create('CompositeField', + $previewField + )->setName("FilePreviewImage")->addExtraClass('cms-file-info-preview'), + FormField::create('CompositeField', + FormField::create('CompositeField', + new ReadonlyField("FileType", _t('AssetTableField.TYPE','File type') . ':', $file->FileType), + new ReadonlyField("Size", _t('AssetTableField.SIZE','File size') . ':', $file->getSize()), + $urlField = new ReadonlyField('ClickableURL', _t('AssetTableField.URL','URL'), + sprintf('%s', $file->Link(), $file->RelativeLink()) + ), + new DateField_Disabled("Created", _t('AssetTableField.CREATED','First uploaded') . ':', $file->Created), + new DateField_Disabled("LastEdited", _t('AssetTableField.LASTEDIT','Last changed') . ':', $file->LastEdited) + ) + )->setName("FilePreviewData")->addExtraClass('cms-file-info-data') + )->setName("FilePreview")->addExtraClass('cms-file-info'), new TextField( 'AltText', _t('HtmlEditorField.IMAGEALTTEXT', 'Alternative text (alt) - shown if image cannot be displayed'), @@ -524,6 +546,7 @@ class HtmlEditorField_Toolbar extends RequestHandler { $heightField = new TextField('Height', " x " . _t('HtmlEditorField.IMAGEHEIGHTPX', 'Height'), $file->Height) ) ); + $urlField->dontEscape = true; $dimensionsField->addExtraClass('dimensions'); $widthField->setMaxLength(5); $heightField->setMaxLength(5); @@ -583,6 +606,7 @@ class HtmlEditorField_File extends ViewableData { function __construct($url, $file = null) { $this->url = $url; $this->file = $file; + $this->failover = $file; parent::__construct(); } diff --git a/forms/UploadField.php b/forms/UploadField.php index 8043b18d8..276da3a77 100644 --- a/forms/UploadField.php +++ b/forms/UploadField.php @@ -755,7 +755,6 @@ class UploadField_ItemHandler extends RequestHandler { $validator ); $form->loadDataFrom($file); - $form->addExtraClass('small'); return $form; } diff --git a/model/Image.php b/model/Image.php index 0761a0386..c19714a9c 100644 --- a/model/Image.php +++ b/model/Image.php @@ -73,21 +73,6 @@ class Image extends File { parent::defineMethods(); } - /* - * Generate and return the preview image / file upload / replace field for this File - * @return FormField - */ - protected function getFilePreview() { - $formattedImage = $this->getFormattedImage('AssetLibraryPreview'); - $thumbnail = $formattedImage ? $formattedImage->URL : ''; - - $previewField = new LiteralField("ImageFull", - "{$this->Name}\n" - ); - - return $previewField; - } - function getCMSFields() { $fields = parent::getCMSFields(); @@ -97,8 +82,8 @@ class Image extends File { $urlLink .= ""; //attach the addition file information for an image to the existing FieldGroup create in the parent class - $fileAttributes = $fields->FieldByName('Root.Main.FilePreview'); - $fileAttributes->push(new ReadonlyField("Dimensions", _t('AssetTableField.DIM','Dimensions').self::$labelSeparator)); + $fileAttributes = $fields->fieldByName('Root.Main.FilePreview')->fieldByName('FilePreviewData'); + $fileAttributes->push(new ReadonlyField("Dimensions", _t('AssetTableField.DIM','Dimensions') . ':')); return $fields; } From 68914efb8dcc19a2af5a0476eda08316509da99c Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Wed, 29 Feb 2012 20:35:48 +0100 Subject: [PATCH 23/72] MINOR SSViewer->testCastingHelpers() --- tests/view/SSViewerTest.php | 65 +++++++++++++++++++++++++++++++++ tests/view/ViewableDataTest.php | 3 ++ 2 files changed, 68 insertions(+) diff --git a/tests/view/SSViewerTest.php b/tests/view/SSViewerTest.php index b86950923..cc647dfab 100644 --- a/tests/view/SSViewerTest.php +++ b/tests/view/SSViewerTest.php @@ -363,6 +363,65 @@ after') function assertEqualIgnoringWhitespace($a, $b) { $this->assertEquals(preg_replace('/\s+/', '', $a), preg_replace('/\s+/', '', $b)); } + + /** + * See {@link ViewableDataTest} for more extensive casting tests, + * this test just ensures that basic casting is correctly applied during template parsing. + */ + function testCastingHelpers() { + $vd = new SSViewerTest_ViewableData(); + $vd->TextValue = 'html'; + $vd->HTMLValue = 'html'; + $vd->UncastedValue = 'html'; + + // Value casted as "Text" + $this->assertEquals( + '<b>html</b>', + $t = SSViewer::fromString('$TextValue')->process($vd) + ); + $this->assertEquals( + 'html', + $t = SSViewer::fromString('$TextValue.RAW')->process($vd) + ); + $this->assertEquals( + '<b>html</b>', + $t = SSViewer::fromString('$TextValue.XML')->process($vd) + ); + + // Value casted as "HTMLText" + $this->assertEquals( + 'html', + $t = SSViewer::fromString('$HTMLValue')->process($vd) + ); + $this->assertEquals( + 'html', + $t = SSViewer::fromString('$HTMLValue.RAW')->process($vd) + ); + $this->assertEquals( + '<b>html</b>', + $t = SSViewer::fromString('$HTMLValue.XML')->process($vd) + ); + + // Uncasted value (falls back to ViewableData::$default_cast="HTMLText") + $vd = new SSViewerTest_ViewableData(); // TODO Fix caching + $vd->UncastedValue = 'html'; + $this->assertEquals( + 'html', + $t = SSViewer::fromString('$UncastedValue')->process($vd) + ); + $vd = new SSViewerTest_ViewableData(); // TODO Fix caching + $vd->UncastedValue = 'html'; + $this->assertEquals( + 'html', + $t = SSViewer::fromString('$UncastedValue.RAW')->process($vd) + ); + $vd = new SSViewerTest_ViewableData(); // TODO Fix caching + $vd->UncastedValue = 'html'; + $this->assertEquals( + '<b>html</b>', + $t = SSViewer::fromString('$UncastedValue.XML')->process($vd) + ); + } /** * Test $Up works when the scope $Up refers to was entered with a "with" block @@ -677,6 +736,12 @@ class SSViewerTestFixture extends ViewableData { } class SSViewerTest_ViewableData extends ViewableData implements TestOnly { + + public static $casting = array( + 'TextValue' => 'Text', + 'HTMLValue' => 'HTMLText' + ); + function methodWithOneArgument($arg1) { return "arg1:{$arg1}"; } diff --git a/tests/view/ViewableDataTest.php b/tests/view/ViewableDataTest.php index dfc9b1850..c011280ce 100644 --- a/tests/view/ViewableDataTest.php +++ b/tests/view/ViewableDataTest.php @@ -1,5 +1,8 @@ testCastingHelpers()} for more tests related to casting and ViewableData behaviour, + * from a template-parsing perspective. + * * @package sapphire * @subpackage tests */ From a50fc5180ac3e7889c0be1169e80f3aa24e1d79a Mon Sep 17 00:00:00 2001 From: Andrew O'Neil Date: Thu, 1 Mar 2012 10:59:29 +1300 Subject: [PATCH 24/72] MINOR: SSF-106 Dont hide filter buttons when search isnt selected --- forms/gridfield/GridFieldFilter.php | 7 +++---- javascript/GridField.js | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/forms/gridfield/GridFieldFilter.php b/forms/gridfield/GridFieldFilter.php index acf2c4859..0b08a8d2c 100644 --- a/forms/gridfield/GridFieldFilter.php +++ b/forms/gridfield/GridFieldFilter.php @@ -76,8 +76,7 @@ class GridFieldFilter implements GridField_HTMLProvider, GridField_DataManipulat $field = new LiteralField('', ''); } - // Last column, inject action buttons - if($currentColumn == count($columns)) { + if($columnField != 'Actions') { $field = new FieldGroup( $field, $filterbutton = new GridField_Action($gridField, 'filter', _t('GridField.Filter', "Filter"), 'filter', null), @@ -85,9 +84,9 @@ class GridFieldFilter implements GridField_HTMLProvider, GridField_DataManipulat ); $filterbutton->addExtraClass('ss-gridfield-button-filter'); - $resetbutton->addExtraClass('ss-gridfield-button-reset'); - + $resetbutton->addExtraClass('ss-gridfield-button-reset'); } + $field->iteratorProperties($currentColumn-1, count($columns)); $forTemplate->Fields->push($field); } diff --git a/javascript/GridField.js b/javascript/GridField.js index f3d6a2ec7..843e5a9d8 100644 --- a/javascript/GridField.js +++ b/javascript/GridField.js @@ -79,7 +79,7 @@ * ToDo ensure filter-button state is maintained after filtering (see resetState param) * ToDo get working in IE 6-7 */ - $('.ss-gridfield input.ss-gridfield-sort').entwine({ + /*$('.ss-gridfield input.ss-gridfield-sort').entwine({ onfocusin: function(e) { // Dodgy results in IE <=7 & ignore if only one filter-field countfields = $('.ss-gridfield input.ss-gridfield-sort').length; @@ -112,7 +112,7 @@ ).css({'position':'relative','margin':'0 auto','width':'65%'}).appendTo(eleInput.closest('th')); } } - }); + });*/ $('fieldset.ss-gridfield .new-link').entwine({ onclick: function(e) { From 7f7d6b3beaffb84560e6b3b68fe9dc4129ce0549 Mon Sep 17 00:00:00 2001 From: Andrew O'Neil Date: Thu, 1 Mar 2012 11:08:05 +1300 Subject: [PATCH 25/72] MINOR: Remove commented code --- javascript/GridField.js | 40 ---------------------------------------- 1 file changed, 40 deletions(-) diff --git a/javascript/GridField.js b/javascript/GridField.js index 843e5a9d8..2c474324e 100644 --- a/javascript/GridField.js +++ b/javascript/GridField.js @@ -73,46 +73,6 @@ else this._super(e); } }); - - /* - * Upon focusing on a filter element, move "filter" and "reset" buttons and display next to the current element - * ToDo ensure filter-button state is maintained after filtering (see resetState param) - * ToDo get working in IE 6-7 - */ - /*$('.ss-gridfield input.ss-gridfield-sort').entwine({ - onfocusin: function(e) { - // Dodgy results in IE <=7 & ignore if only one filter-field - countfields = $('.ss-gridfield input.ss-gridfield-sort').length; - if(($.browser.msie && $.browser.version <= 7) || countfields == 1) { - return false; - } - var eleInput = $(this); - - // Remove existing
and