From 292bd79b82b81d25b148849fcfca3df75d0a65f6 Mon Sep 17 00:00:00 2001
From: jbridson <jeremy@silverstripe.com>
Date: Thu, 8 Mar 2012 16:27:24 +1300
Subject: [PATCH] BUGFIX:SSF-53 - fixed filter and reset buttons in ie7 and ie8
 plus fixed an array of other ie7/8 styling bugs

---
 admin/css/ie7.css             |  31 ++++++++-
 admin/css/ie8.css             |  16 +++++
 admin/images/filter-icons.png | Bin 0 -> 2097 bytes
 admin/scss/ie7.scss           | 118 +++++++++++++++++++++++++++++++---
 admin/scss/ie8.scss           |  52 ++++++++++++++-
 5 files changed, 205 insertions(+), 12 deletions(-)
 create mode 100644 admin/images/filter-icons.png

diff --git a/admin/css/ie7.css b/admin/css/ie7.css
index 7d185239c..35d53db43 100644
--- a/admin/css/ie7.css
+++ b/admin/css/ie7.css
@@ -15,4 +15,33 @@ html { overflow: hidden; }
 
 .jstree li a .ui-icon { text-indent: 0px !important; }
 
-.cms table.ss-gridfield-table tbody td button span.ui-button-text { zoom: 1; }
+.cms table.ss-gridfield-table tr th.extra span input { height: 23px; }
+
+.ss-gridfield-button-filter.ss-ui-button { margin: -1px -5px; background: #e6e6e6 url(../images/filter-icons.png) no-repeat -40px 6px; filter: none; }
+.ss-gridfield-button-filter.ss-ui-button.hover-alike:active { background: #2e7ead url(../images/filter-icons.png) no-repeat -15px 7px; filter: none; }
+.ss-gridfield-button-filter.ss-ui-button.hover-alike { background: #338dc1 url(../images/filter-icons.png) no-repeat -16px 6px; filter: none; }
+
+.ss-gridfield-button-reset.ss-ui-button { margin: -1px -5px; background: #e6e6e6 url(../images/filter-icons.png) no-repeat 8px 5px; filter: none; }
+.ss-gridfield-button-reset.ss-ui-button.filtered:hover { background: red url(../images/filter-icons.png) no-repeat 8px -17px; filter: none; }
+.ss-gridfield-button-reset.ss-ui-button.filtered:active { background: #e60000 url(../images/filter-icons.png) no-repeat 9px -16px; filter: none; }
+
+.cms table.ss-gridfield-table tr td { border-right: 1px solid #9a9a9a; }
+.cms table.ss-gridfield-table tr th { border-right: 1px solid #9a9a9a; }
+.cms table.ss-gridfield-table tr th.main { border-top: 1px solid #9a9a9a; border-bottom: none; }
+.cms table.ss-gridfield-table tr th.extra { border-top: 1px solid #9a9a9a; padding-right: 12px; }
+.cms table.ss-gridfield-table td:first-child, .cms table.ss-gridfield-table th:first-child { border-left: 1px solid #9a9a9a; }
+
+.cms .ss-gridfield table.ss-gridfield-table tbody td button.gridfield-button-delete { display: block; float: left; }
+.cms .ss-gridfield table.ss-gridfield-table tbody td button.gridfield-button-unlink.ui-state-hover { display: block; float: left; }
+.cms .ss-gridfield table.ss-gridfield-table tbody td a.edit-link { display: block; float: left; }
+
+.cms .cms-content .cms-content-fields .aligned_right_label { margin-left: 0; }
+.cms .cms-content .cms-content-fields .field.dropdown .middleColumn { max-width: 512px; }
+
+.pagination-page-number { position: relative; bottom: 10px; right: 10px; }
+.pagination-page-number input { width: 45px; padding: 0px; }
+
+table.ss-gridfield-table tr.title th h2 { float: left; }
+
+table.ss-gridfield-table tr.ss-gridfield-item.odd { background: white; }
+table.ss-gridfield-table tr.ss-gridfield-item.even { background: #F0F4F7; }
diff --git a/admin/css/ie8.css b/admin/css/ie8.css
index d1eab2242..84b24fd41 100644
--- a/admin/css/ie8.css
+++ b/admin/css/ie8.css
@@ -8,3 +8,19 @@
 .ss-ui-button.cms-page-add-button.ui-state-hover, .cms .ss-ui-button.cms-page-add-button:hover { background: #80bf40 url("../images/btn-icon-saaa1989272.png") 5px -49px no-repeat; }
 
 .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { background-image: none; }
+
+.ss-gridfield-button-filter.ss-ui-button { background: #e6e6e6 url(../images/filter-icons.png) no-repeat -40px 6px; filter: none; }
+.ss-gridfield-button-filter.ss-ui-button.hover-alike:active { background: #2e7ead url(../images/filter-icons.png) no-repeat -15px 7px; filter: none; }
+.ss-gridfield-button-filter.ss-ui-button.hover-alike { background: #338dc1 url(../images/filter-icons.png) no-repeat -16px 6px; filter: none; }
+
+.ss-gridfield-button-reset.ss-ui-button { background: #e6e6e6 url(../images/filter-icons.png) no-repeat 8px 5px; filter: none; }
+.ss-gridfield-button-reset.ss-ui-button.filtered:hover { background: red url(../images/filter-icons.png) no-repeat 8px -17px; filter: none; }
+.ss-gridfield-button-reset.ss-ui-button.filtered:active { background: #e60000 url(../images/filter-icons.png) no-repeat 9px -16px; filter: none; }
+
+.cms table.ss-gridfield-table tr td { border-right: 1px solid #9a9a9a; }
+.cms table.ss-gridfield-table tr th { border-right: 1px solid #9a9a9a; }
+.cms table.ss-gridfield-table tr th.main { border-top: 1px solid #9a9a9a; border-bottom: none; }
+.cms table.ss-gridfield-table tr th.extra { border-top: 1px solid #9a9a9a; }
+.cms table.ss-gridfield-table td:first-child, .cms table.ss-gridfield-table th:first-child { border-left: 1px solid #9a9a9a; }
+
+.cms .cms-content .cms-content-fields .aligned_right_label { margin-left: 0; }
diff --git a/admin/images/filter-icons.png b/admin/images/filter-icons.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5802cc398d5edc71f7e9d4bbcefffcc0cc031d7
GIT binary patch
literal 2097
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
b{|GPu(8$g-Yq;b?00000NkvXXu0mjfgCPPr

literal 0
HcmV?d00001

diff --git a/admin/scss/ie7.scss b/admin/scss/ie7.scss
index 00788b594..af47dfde1 100644
--- a/admin/scss/ie7.scss
+++ b/admin/scss/ie7.scss
@@ -53,16 +53,114 @@ html {
 	text-indent: 0px !important;
 }
 
-.cms {
-	table.ss-gridfield-table {
-		tbody {
-			td {
-				button {
-					span.ui-button-text {
-						zoom:1;
-					}
-				}
+//fix for filter and reset icons on datagrid 
+
+.cms table.ss-gridfield-table tr th.extra span input {
+	height:23px;
+}
+
+.ss-gridfield-button-filter.ss-ui-button {
+	margin: -1px -5px;
+	background: #e6e6e6 url(../images/filter-icons.png) no-repeat -40px 6px; filter:none;
+	&.hover-alike:active {
+		background: darken(#338DC1, 5%) url(../images/filter-icons.png) no-repeat -15px 7px; filter:none;
+	}
+	&.hover-alike {
+		background: #338DC1 url(../images/filter-icons.png) no-repeat -16px 6px; filter:none;
+	}
+}
+.ss-gridfield-button-reset.ss-ui-button {
+	margin: -1px -5px;
+	background: #e6e6e6 url(../images/filter-icons.png) no-repeat 8px 5px; filter:none;
+	&.filtered:hover {
+		background: #FF0000 url(../images/filter-icons.png) no-repeat 8px -17px; filter:none;
+	}
+	&.filtered:active {
+		background: darken(#FF0000, 5%) url(../images/filter-icons.png) no-repeat 9px -16px; filter:none;
+	}
+}
+
+//fix for borders on gridfield table
+
+.cms table.ss-gridfield-table {
+	tr {
+		td {
+			border-right: 1px solid lighten(#808080, 10%);
+		}
+		th {
+			border-right: 1px solid lighten(#808080, 10%);
+			&.main {
+				border-top: 1px solid lighten(#808080, 10%);
+				border-bottom: none;
+			}
+			&.extra {
+				border-top: 1px solid lighten(#808080, 10%);
+				padding-right:12px;
 			}
 		}
 	}
-}
\ No newline at end of file
+	td:first-child, th:first-child {
+		border-left: 1px solid lighten(#808080, 10%);
+	}
+}
+
+//fix for edit and delete icons in IE7
+
+.cms .ss-gridfield table.ss-gridfield-table tbody {
+	td {
+		button {
+			&.gridfield-button-delete {
+				display:block;
+				float:left;
+			}
+			&.gridfield-button-unlink.ui-state-hover {
+				display:block;
+				float:left;
+			}
+		}
+		a.edit-link {
+			display:block;
+			float:left;
+		}
+	}
+}
+
+//fix for wrong alignment of label on parent groups field in users groups and fix for width of parent group dropdown field
+
+.cms .cms-content .cms-content-fields {
+	.aligned_right_label {
+		margin-left:0;
+	}
+	.field.dropdown .middleColumn {
+		max-width:512px;
+	}	
+}
+
+//fix for input on datagrid pagination
+
+.pagination-page-number {
+	position:relative;
+	bottom:10px;
+	right:10px;
+	input {
+		width:45px;
+		padding:0px;
+	}
+}
+
+//fix for wrong height on users groups gridfield table header
+
+table.ss-gridfield-table tr.title th h2 {
+	float:left;
+}
+
+//fix for alternate colors on rows in datagrid
+
+table.ss-gridfield-table tr {	
+	&.ss-gridfield-item.odd {
+		background: white;
+	}
+	&.ss-gridfield-item.even {
+		background: #F0F4F7;
+	}
+}	
\ No newline at end of file
diff --git a/admin/scss/ie8.scss b/admin/scss/ie8.scss
index 33f6ee02c..62bfe3fc4 100644
--- a/admin/scss/ie8.scss
+++ b/admin/scss/ie8.scss
@@ -27,4 +27,54 @@
 .ui-widget-content .ui-state-default, 
 .ui-widget-header .ui-state-default {
 	background-image:none;
-}
\ No newline at end of file
+}
+
+//fix for filter and reset icons on datagrid
+
+.ss-gridfield-button-filter.ss-ui-button{
+	background: #e6e6e6 url(../images/filter-icons.png) no-repeat -40px 6px; filter:none;
+	&.hover-alike:active {
+		background: darken(#338DC1, 5%) url(../images/filter-icons.png) no-repeat -15px 7px; filter:none;
+	}
+	&.hover-alike {
+		background: #338DC1 url(../images/filter-icons.png) no-repeat -16px 6px; filter:none;
+	}
+}
+.ss-gridfield-button-reset.ss-ui-button{
+	background: #e6e6e6 url(../images/filter-icons.png) no-repeat 8px 5px; filter:none;
+	&.filtered:hover {
+		background: #FF0000 url(../images/filter-icons.png) no-repeat 8px -17px; filter:none;
+	}
+	&.filtered:active {
+		background: darken(#FF0000, 5%) url(../images/filter-icons.png) no-repeat 9px -16px; filter:none;
+	}
+}
+
+//fix for borders on gridfield table
+
+.cms table.ss-gridfield-table {
+	tr {
+		td {
+			border-right: 1px solid lighten(#808080, 10%);
+		}
+		th {
+			border-right: 1px solid lighten(#808080, 10%);
+			&.main {
+				border-top: 1px solid lighten(#808080, 10%);
+				border-bottom: none;
+			}
+			&.extra {
+				border-top: 1px solid lighten(#808080, 10%);
+			}
+		}
+	}
+	td:first-child, th:first-child {
+		border-left: 1px solid lighten(#808080, 10%);
+	}
+}
+
+//fix for wrong alignment of label on parent groups field in users groups
+
+.cms .cms-content .cms-content-fields .aligned_right_label {
+			margin-left:0;
+}