From cdc8d8b9764f5f70239d262c3a3d9cc784b57b65 Mon Sep 17 00:00:00 2001
From: Julian Seidenberg <julian@silverstripe.com>
Date: Thu, 29 Sep 2011 15:37:51 +1300
Subject: [PATCH] ENHANCEMENT: merging of Ed Knight's changes from:
 https://github.com/Silverstriper/sapphire/commit/52acf3532fce8e560a6ccd8a1bd235e6315d7316.
 (SSO-12)

---
 admin/images/dialog_close.png   | Bin 0 -> 1582 bytes
 admin/scss/_forms.scss          |   9 ++++
 admin/scss/_style.scss          |  72 ++++++++++++++++++++++++++++----
 admin/scss/_tree.scss           |   8 ++--
 admin/scss/_uitheme.scss        |  48 ++++++++++++++++++---
 admin/scss/themes/_default.scss |   3 +-
 6 files changed, 123 insertions(+), 17 deletions(-)
 create mode 100644 admin/images/dialog_close.png

diff --git a/admin/images/dialog_close.png b/admin/images/dialog_close.png
new file mode 100644
index 0000000000000000000000000000000000000000..439adaf9b15331590f3628eb681dcf1fd2937f82
GIT binary patch
literal 1582
zcmV+}2GRM6P)<h;3K|Lk000e1NJLTq0015U002A)1^@s6aa0PQ0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU%&`Cr=RCwC#SZz#ORTzF-J`2*q!bd4~
zx<rLh9AzQ8Eip4XrYMUzV9_6Df|@9iO~t7Dp@6^=;`}lFGv^dZ{fhfBjoB9dm<e-$
zK?V*OEg&;|73H(gLJJh%b9c|>uD9pXQgln)le{_YxjpAO?>X;1@B35%z9ScHH=2>R
zXuf|Mt(~`@(Y}Wb0GYfTZ3=D0N1NiuM6Z`L*H1!k3&{1Cv^D@jPpkDtpkR<bFYeHX
zhQdn;v9K%Z4oHhoF<0B^n1@TVbMWcdI1IX6;zwVg70MAyNK18EcoWTE92>F1hiEKv
zg~yqmp<mQNL2x?x9x%vwxE8u_2MWx6U|U|MT~E`fSBRo_KpctnhGa+$fRv&e$sg-7
zgXq=ULfRm{;~lie>C@Me5@Fw_7>o=>z!n=4g6=7x8P6UOj^;$WKs}zK-rgA&3XSOo
zrUwHHPS_G2c0=Fd$_m(VJEMbxnd2Vn=z<}qi+UZS<j+>v;=+V@T&dElHQVf9-<!>~
zw9n-RxQIu1B~cGkOK#>^GOy@ZbCvuxDBuBg6yRJE>qk#hE2|;rgJWFVWSavgdfJE&
zpD=v|1z&#yJxO}6W8M6`BJ5W3_pX5Ch)DdQLSpyl<-@l8eC{`-O{=Vede;)<n7)LB
z)Kmypt0DiBlU~OXBlC)2REW=)!2Dn)^PIHrmVx@o9O3(d&BhTDxaVeJu=r(gS}e@*
z$t|rybO(E0=5Co+W2CZzy8|^mIVB|v7=85>SyIpBqx9@?W9YNYiLBq2mvKa5Tx)5D
zhTqy`#}X4m$%nT9j2Exwa<4$svKyYNGYOtjq-5=d^!F>_*O^)7cw!<<EBOSzrpFEp
zj$D%ov=~SP%X4#JYiL-F77V^!N00jIal3^0DqeBkqB2&$8RF0=X@7As47~joOrAX}
zjExNmWkxlbS4>Q<OmZPVLwoL4sUQv0-wG~JY>Sf<U~6s$^^P6T|HkX!=(BMBGmQ-p
zmY4|hy}j^fb){q+wfcz(xHLUOX=)@_rY<ZDe%zh`8;yN!mtn-|6s}B~B#74!lMk~b
zh2e6xYt+ou`)enMhTy{Fl;Ev6Nl4P7DSaE<7a19_rxv>%p6mEsk`|SsjvGpo;;wEm
z+wB1rTVy<$M}$K9`UZ(Qdq`~2yW8b<!<n%$E~jQ_G=AsdQ-eeBo~4(YM^yUM_*LvB
zV!$2H>9_^lE3^H*=;7s=8Tf8w1V*n160_L5Y31!LSJ40K5=L>eM4J+BQQTIG|E*di
zMgEHkaj=u9MU{+NoS%m#R1Bxa{-(wI`qg4dk`4}`r12LY4UfXd!z2Ey#VC{`pQWZi
zN<_rEBeTchfET)ZV0LNAcePlTo{niTBH-7;Vt2s7jt<|{V$tT!@JL+Tn&ql5784qZ
zVo|{*4_URS#Y}WMldUEOF@W?Q0Y=oK11lGej9M&cZ3U~S^pU7VlKxmAs}9<;hpt{A
zZChM~YY7Q3vwD^ii01XK7LAy5S)T5!sDJ}CHC#)`De1Fybx?#g_pp}zUx~-OQnkoR
z^qF~ikhy>V_0QN6@?RDfI8xo#t)N16aqz?mCb7r7#$Zok7RJt<15HK-#Ajy<<ObY!
z6)$I&u*mN|a>UnQHwOE2nOmx>xt5Ys(s>kdJ%<m29gF&Pt3^4GGc}c!aYSPL(b57J
zTU-5lza?r>j+6$H%0n$0va*DL^AS?D$bt*sT^dOAOeY!}SA!4F{L!i^Ux}q^k(8+3
z5U<yBMoF)fl)zOCroYagUsa2EOUaeKvTE@z^vn<yCEe=DNtnX3+=ObetF%-IB;s{A
zszrNWpAdZB@YDD>v`kO4)#6%L=6d1n$|N{We?T7A4i0W8DVfi@sw|Gnrp3>VMp?Py
zE6CXvwYU4O77ulHG6T&YQZkR<YVilFmCL0WjKs0l_LiH?fvH6;uNI9ysKs_(En07@
g#s9rp{6~NR05){Z(eS3Y=Kufz07*qoM6N<$f-98(V*mgE

literal 0
HcmV?d00001

diff --git a/admin/scss/_forms.scss b/admin/scss/_forms.scss
index 51d147b67..eef68b769 100644
--- a/admin/scss/_forms.scss
+++ b/admin/scss/_forms.scss
@@ -16,6 +16,15 @@ form.nostyle {
 
 .field {
 	display: block;
+	padding: 10px 0;
+	border-bottom-width: 2px;
+	border-bottom: 2px groove lighten($color-shadow-light, 95%);
+	-webkit-border-image: url(../images/textures/bg_fieldset_elements_border.png) 2 stretch stretch;
+	border-image: url(../images/textures/bg_fieldset_elements_border.png) 2 stretch stretch;
+	//TODO: use single border line with shadow instead:: http://daverupert.com/2011/06/two-tone-borders-with-css3/
+	//@include border-image(url(../images/textures/bg_fieldset_elements_border.png), 2, stretch); //not yet supported
+	//overflow: hidden;
+
 	
 	// bottom padding accounts for the border and we have a negative
 	// margin with a postive padding to ensure the bottom border extends
diff --git a/admin/scss/_style.scss b/admin/scss/_style.scss
index 7485cbd15..f307ed917 100644
--- a/admin/scss/_style.scss
+++ b/admin/scss/_style.scss
@@ -350,30 +350,59 @@ html,body {
 
 .cms-page-add-form-dialog {
 	#PageType li {
-		clear: left;
-		height: 40px;
-		border-bottom: 1px solid $color-shadow-dark;
-		
+		padding: 9px 0 9px 15px;
+		overflow: hidden;
+		border-bottom-width: 2px;
+		border-bottom: 2px groove lighten($color-shadow-light, 95%);
+		-webkit-border-image: url(../images/textures/bg_fieldset_elements_border.png) 2 stretch stretch;
+		border-image: url(../images/textures/bg_fieldset_elements_border.png) 2 stretch stretch;
+				
 		&:hover, &.selected {
-			background-color: lighten($color-highlight, 10%);
+			background-color: $color-highlight-opacity;
 		}
 		
 		input, label, .icon, .title {
 			float: left;
+			line-height: 1.3em;
 		}
 		
 		.icon {
 			width: 20px;
+			display: block;
+			width:  16px;
+			height:  16px;
+			margin: 0 4px;
+			background-color: transparent;
+			background-image: url(../images/sitetree_ss_pageclass_icons_default.png);
+			background-repeat: no-repeat;
+		}
+			
+		.class-HomePage {
+			background-position: 0 -48px;
 		}
 		
+		.class-RedirectorPage {
+			background-position: 0 -16px;
+		}
+		
+		.class-VirtualPage {
+			background-position: 0 -32px;
+		}
+		
+		.class-ErrorPage {
+			background-position: 0 -112px;
+		}
+			
 		.title {
-			width: 100px;
+			width: 120px;
 			font-weight: bold;
+			padding-right: 10px;
 		}
 		
 		.description {
 			font-style: italic;
 		}
+		
 	}
 }
 
@@ -807,4 +836,33 @@ form.member-profile-form {
 	a {
 		padding-right: 1em;
 	}
-}
\ No newline at end of file
+}
+
+/** -------------------------------------------------------
+ * Modal - JQuery UI Dialog
+ * -------------------------------------------------------- */
+ .cms .ui-widget-overlay {
+ 	background-color: #000;
+ 	background-image: none;
+ }
+ 
+ .cms .ui-dialog {
+ 	background: #fafafa url(../images/textures/bg_cms_main_content.png) repeat top left;
+ 	padding:  0;
+ 	border:  3px solid #000;
+ 	overflow: visible;
+ 	
+ 	& .ui-dialog-content {
+ 		padding: 0.5em 0;
+ 	}
+ 	
+ 	.Actions {
+ 		float:  right;
+ 		padding: 15px;	
+ 	}
+ 	
+ 	.field {
+ 		border-bottom: none;
+ 		border-image: none;
+ 	}
+ }
diff --git a/admin/scss/_tree.scss b/admin/scss/_tree.scss
index a600b3960..0973ce85f 100644
--- a/admin/scss/_tree.scss
+++ b/admin/scss/_tree.scss
@@ -521,18 +521,18 @@ a .jstree-pageicon {
 	background-repeat: no-repeat;
 }
 
-li.class-HomePage a .jstree-pageicon {
+li.class-HomePage > a .jstree-pageicon {
 	background-position: 0 -48px;
 }
 
-li.class-RedirectorPage a .jstree-pageicon {
+li.class-RedirectorPage > a .jstree-pageicon {
 	background-position: 0 -16px;
 }
 
-li.class-VirtualPage a .jstree-pageicon {
+li.class-VirtualPage > a .jstree-pageicon {
 	background-position: 0 -32px;
 }
 
-li.class-ErrorPage a .jstree-pageicon {
+li.class-ErrorPage > a .jstree-pageicon {
 	background-position: 0 -112px;
 }
\ No newline at end of file
diff --git a/admin/scss/_uitheme.scss b/admin/scss/_uitheme.scss
index 39e5ccfea..3187e79db 100644
--- a/admin/scss/_uitheme.scss
+++ b/admin/scss/_uitheme.scss
@@ -50,11 +50,49 @@
 		font-family: $font-family;
 		border: 0;
 	}
-	
-	.ui-widget-header {
-		background: $color-widget-bg;
-		border: 0;
-		padding: 0;
+
+	.ui-widget-header {			
+		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%)
+		));
+		border-bottom: 3px solid darken($color-widget-bg, 50%);
+		padding: 8px;	
+		@include border-radius(0);
+			
+		& .ui-dialog-title {
+			padding: 6px 0;
+			text-shadow: lighten($color-base, 10%) 1px 1px 0;
+		}
+		
+		
+		
+		& a.ui-dialog-titlebar-close {
+			position:  absolute;
+			top: -8px;
+			right: -15px;
+			width: 30px;
+			height:  30px;
+		}
+		
+		& a.ui-state-hover {
+			border-color: transparent;
+			background: transparent;
+			
+			& .ui-icon-closethick {
+				background-position: 0 -30px;
+			}
+		}
+		
+		& .ui-icon-closethick {
+			background-image: url(../images/dialog_close.png);
+			background-position: 0 0;
+			width: 30px;
+			height:  30px;
+		}
 	}
 
 	.ui-state-hover {
diff --git a/admin/scss/themes/_default.scss b/admin/scss/themes/_default.scss
index 1cb123891..b9bd7ba0e 100644
--- a/admin/scss/themes/_default.scss
+++ b/admin/scss/themes/_default.scss
@@ -21,6 +21,7 @@ $color-shadow-light: rgba(201, 205, 206, 0.8);
 $color-shadow-dark: rgba(107, 120, 123, 0.5);
 
 $color-highlight: #FFFF66;
+$color-highlight-opacity: rgba(255, 255, 102, 0.3);
 
 $color-menu-button: #338DC1;
 $color-menu-background: #c6d7df;
@@ -78,4 +79,4 @@ $grid-horizontal: 8px;
 /** -----------------------------------------------
  * Application Logo (CMS Logo) Must be 24px x 24px
  * ------------------------------------------------ */
-$application-logo-small: image-url("logo_small.png");
\ No newline at end of file
+$application-logo-small: image-url("logo_small.png");