ソースを参照

Make sure that the images are reloaded when the application is upgraded.

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@3788 a333f486-631f-4898-b8df-5754b55c2be0
dflaven 9 年 前
コミット
65e0dc71e0
3 ファイル変更58 行追加56 行削除
  1. 3 1
      css/css-variables.scss
  2. 27 27
      css/light-grey.css
  3. 28 28
      css/light-grey.scss

+ 3 - 1
css/css-variables.scss

@@ -3,4 +3,6 @@ $grey-color: #555555;
 $complement-color: #1c94c4;
 $complement-light: #d6e8ef;
 $frame-background-color: #F1F1F1;
-$text-color: #000;
+$text-color: #000;
+// Beware the version number MUST beging with a letter otherwise it may be truncated...
+$version: v2.2.0;

+ 27 - 27
css/light-grey.css

@@ -308,7 +308,7 @@ td a.mailto, td a.mailto:visited {
   text-decoration: none;
   color: black;
   padding-left: 20px;
-  background: url(../images/mail.png) no-repeat left;
+  background: url(../images/mail.png?v=v2.2.0) no-repeat left;
 }
 
 
@@ -316,7 +316,7 @@ td a.mailto:hover {
   text-decoration: underline;
   color: #e87c1e;
   padding-left: 20px;
-  background: url(../images/mail.png) no-repeat left;
+  background: url(../images/mail.png?v=v2.2.0) no-repeat left;
 }
 
 
@@ -340,12 +340,12 @@ a.small_action {
   padding-left: 5px;
   padding-top: 2px;
   padding-bottom: 2px;
-  background: #e87c1e url(../images/actions_left.png) no-repeat left;
+  background: #e87c1e url(../images/actions_left.png?v=v2.2.0) no-repeat left;
 }
 
 
 .actions_details span {
-  background: url(../images/actions_right.png) no-repeat right;
+  background: url(../images/actions_right.png?v=v2.2.0) no-repeat right;
   color: white;
   font-weight: bold;
   padding-top: 2px;
@@ -593,7 +593,7 @@ div.actions_menu > ul {
  */
 
   padding-left: 5px;
-  background: #e87c1e url(../images/actions_left.png) no-repeat top left;
+  background: #e87c1e url(../images/actions_left.png?v=v2.2.0) no-repeat top left;
   cursor: pointer;
   margin: 0;
 }
@@ -607,7 +607,7 @@ div.actions_menu > ul > li {
   height: 17px;
   padding-right: 16px;
   padding-left: 4px;
-  background: url(../images/actions_right.png) no-repeat top right transparent;
+  background: url(../images/actions_right.png?v=v2.2.0) no-repeat top right transparent;
   font-weight: bold;
   color: white;
   vertical-align: middle;
@@ -805,7 +805,7 @@ a.dp-choose-date, a.dp-choose-date:hover, a.dp-choose-date:visited, td a.dp-choo
   display: block;
   text-indent: -2000px;
   overflow: hidden;
-  background: url(../images/calendar.png) no-repeat;
+  background: url(../images/calendar.png?v=v2.2.0) no-repeat;
 }
 
 
@@ -932,7 +932,7 @@ div.HRDrawer {
  * Beware: IE6 does not support multiple selector with multiple classes, only the last class is used
  */
 .wizContainer table.listResults tr td.truncated, .wizContainer table.listResults tr.odd td.truncated, table.listResults tr td.truncated, table.listResults tr.odd td.truncated {
-  background: url(../images/truncated.png) bottom repeat-x;
+  background: url(../images/truncated.png?v=v2.2.0) bottom repeat-x;
 }
 
 
@@ -940,7 +940,7 @@ div.HRDrawer {
  * Beware: IE6 does not support multiple selector with multiple classes, only the last class is used
  */
 .wizContainer table.listResults  tr.even td.truncated, table.listResults tr.even td.truncated {
-  background: #f9f9f1 url(../images/truncated.png) bottom repeat-x;
+  background: #f9f9f1 url(../images/truncated.png?v=v2.2.0) bottom repeat-x;
 }
 
 
@@ -948,7 +948,7 @@ div.HRDrawer {
  * Beware: IE6 does not support multiple selector with multiple classes, only the last class is used
  */
 , .wizContainer table.listResults  tr.even td.hover.truncated, table.listResults tr.even td.hover.truncated {
-  background: #fdf5d0 url(../images/truncated.png) bottom repeat-x;
+  background: #fdf5d0 url(../images/truncated.png?v=v2.2.0) bottom repeat-x;
 }
 
 
@@ -956,7 +956,7 @@ div.HRDrawer {
  * Beware: IE6 does not support multiple selector with multiple classes, only the last class is used
  */
 .wizContainer table.listResults  tr td.hover.truncated, .wizContainer table.listResults  tr.odd td.hover.truncated, table.listResults tr td.hover.truncated, table.listResults tr.odd td.hover.truncated {
-  background: #fdf5d0 url(../images/truncated.png) bottom repeat-x;
+  background: #fdf5d0 url(../images/truncated.png?v=v2.2.0) bottom repeat-x;
 }
 
 
@@ -1119,7 +1119,7 @@ div#logo {
 div#logo div {
   height: 88px;
   width: 244px;
-  background: url(../images/itop-logo-2.png) left no-repeat;
+  background: url(../images/itop-logo-2.png?v=v2.2.0) left no-repeat;
 }
 
 
@@ -1185,7 +1185,7 @@ div#logo div {
 
 #global-search-image {
   vertical-align: middle;
-  background: url(../images/search.png) center center no-repeat;
+  background: url(../images/search.png?v=v2.2.0) center center no-repeat;
   display: inline-block;
   width: 28px;
   height: 30px;
@@ -1224,7 +1224,7 @@ span.ui-icon {
 
 
 .ui-layout-button-pin-down {
-  background: url(../images/splitter-bkg.png) transparent;
+  background: url(../images/splitter-bkg.png?v=v2.2.0) transparent;
   width: 16px;
   background-position: -144px -144px;
 }
@@ -1507,7 +1507,7 @@ img.first, img.last, img.next, img.prev {
 
 div.actions_button {
   float: right;
-  background: #e87c1e url("../images/actions_left.png") no-repeat scroll left top;
+  background: #e87c1e url("../images/actions_left.png?v=v2.2.0") no-repeat scroll left top;
   padding-left: 5px;
   margin-top: 0;
   margin-right: 10px;
@@ -1517,7 +1517,7 @@ div.actions_button {
 
 
 .actions_button a:hover, .actions_button a:visited, div.actions_button a {
-  background: #e87c1e url(../images/actions_bkg.png) no-repeat scroll right top;
+  background: #e87c1e url(../images/actions_bkg.png?v=v2.2.0) no-repeat scroll right top;
   color: white;
   padding-right: 8px;
   cursor: pointer;
@@ -1551,12 +1551,12 @@ select#org_id {
 
 
 .dragHover {
-  background: url(./ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png);
+  background: url(./ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png?v=v2.2.0);
 }
 
 
 .edit_mode .dashlet {
-  background: url(./ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png);
+  background: url(./ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png?v=v2.2.0);
   padding: 5px;
   position: relative;
 }
@@ -1598,7 +1598,7 @@ table.prop_table {
   top: 0;
   right: 0;
   z-index: 10;
-  background: transparent url(../images/delete.png) no-repeat center;
+  background: transparent url(../images/delete.png?v=v2.2.0) no-repeat center;
 }
 
 
@@ -1872,21 +1872,21 @@ a.summary, a.summary:hover {
 
 .message_info {
   border: 1px solid #999933;
-  background: url(../images/info-mini.png) 1em 1em no-repeat #ffffcc;
+  background: url(../images/info-mini.png?v=v2.2.0) 1em 1em no-repeat #ffffcc;
   padding-left: 3em;
 }
 
 
 .message_ok {
   border: 1px solid #339933;
-  background: url(../images/ok.png) 1em 1em no-repeat #ccffcc;
+  background: url(../images/ok.png?v=v2.2.0) 1em 1em no-repeat #ccffcc;
   padding-left: 3em;
 }
 
 
 .message_error {
   border: 1px solid #993333;
-  background: url(../images/error.png) 1em 1em no-repeat #ffcccc;
+  background: url(../images/error.png?v=v2.2.0) 1em 1em no-repeat #ffcccc;
   padding-left: 3em;
 }
 
@@ -2051,24 +2051,24 @@ div.explain-printable {
 
 #hiddeable_chapters .ui-tabs .ui-tabs-nav li.hideable-chapter span {
   padding-left: 20px;
-  background: url(../images/eye-open-555.png) 2px center no-repeat;
+  background: url(../images/eye-open-555.png?v=v2.2.0) 2px center no-repeat;
 }
 
 
 #hiddeable_chapters .ui-tabs .ui-tabs-nav li.hideable-chapter.strikethrough span {
   text-decoration: line-through;
-  background: url(../images/eye-closed-555.png) 2px center no-repeat;
+  background: url(../images/eye-closed-555.png?v=v2.2.0) 2px center no-repeat;
 }
 
 
 .printable-version legend {
   padding-left: 26px;
-  background: #1c94c4 url(../images/eye-open-fff.png) 8px center no-repeat;
+  background: #1c94c4 url(../images/eye-open-fff.png?v=v2.2.0) 8px center no-repeat;
 }
 
 
 .printable-version .strikethrough legend {
-  background: #1c94c4 url(../images/eye-closed-fff.png) 8px center no-repeat;
+  background: #1c94c4 url(../images/eye-closed-fff.png?v=v2.2.0) 8px center no-repeat;
 }
 
 
@@ -2097,7 +2097,7 @@ span.refresh-button {
   width: 21px;
   height: 18px;
   cursor: pointer;
-  background: transparent url(../images/refresh-fff.png) left center no-repeat;
+  background: transparent url(../images/refresh-fff.png?v=v2.2.0) left center no-repeat;
 }
 
 

+ 28 - 28
css/light-grey.scss

@@ -247,13 +247,13 @@ td a.mailto, td a.mailto:visited {
 	text-decoration:none;
 	color:#000000;
 	padding-left:20px;
-	background: url(../images/mail.png) no-repeat left;
+	background: url(../images/mail.png?v=#{$version}) no-repeat left;
 }
 td a.mailto:hover {
 	text-decoration:underline;
 	color:$highlight-color;
 	padding-left:20px;
-	background: url(../images/mail.png) no-repeat left;
+	background: url(../images/mail.png?v=#{$version}) no-repeat left;
 }
 
 a.small_action {
@@ -272,10 +272,10 @@ a.small_action {
 	padding-left: 5px;
 	padding-top: 2px;
 	padding-bottom: 2px;
-	background: $highlight-color url(../images/actions_left.png) no-repeat left;
+	background: $highlight-color url(../images/actions_left.png?v=#{$version}) no-repeat left;
 }
 .actions_details span{
-	background: url(../images/actions_right.png) no-repeat right;
+	background: url(../images/actions_right.png?v=#{$version}) no-repeat right;
 	color: #fff;
 	font-weight: bold;
 	padding-top: 2px;
@@ -449,7 +449,7 @@ div.actions_menu > ul {
 	display:block;
 	nowidth:70px; /* Nasty work-around for IE... en attendant mieux */
 	padding-left: 5px;
-	background: $highlight-color url(../images/actions_left.png) no-repeat top left;
+	background: $highlight-color url(../images/actions_left.png?v=#{$version}) no-repeat top left;
 	cursor: pointer;
 	margin: 0;
 }
@@ -462,7 +462,7 @@ div.actions_menu > ul > li {
 	height: 17px;
 	padding-right: 16px;
 	padding-left: 4px;
-	background: url(../images/actions_right.png) no-repeat top right transparent;
+	background: url(../images/actions_right.png?v=#{$version}) no-repeat top right transparent;
 	font-weight: bold;
 	color: $popup-menu-text-higlight-color;
 	vertical-align: middle;
@@ -623,7 +623,7 @@ td a.dp-choose-date, a.dp-choose-date, td a.dp-choose-date:hover, a.dp-choose-da
 	display: block;
 	text-indent: -2000px;
 	overflow: hidden;
-	background: url(../images/calendar.png) no-repeat; 
+	background: url(../images/calendar.png?v=#{$version}) no-repeat; 
 }
 td a.dp-choose-date.dp-disabled, a.dp-choose-date.dp-disabled {
 	background-position: 0 -20px;
@@ -639,7 +639,7 @@ input.dp-applied {
 
 /* For search forms */
 .SearchDrawer {
-	//background: $complement-color url(../images/search-top-left-corner.png) top left no-repeat;
+	//background: $complement-color url(../images/search-top-left-corner.png?v=#{$version}) top left no-repeat;
 	border-top: 5px solid $complement-color;
 	border-left: 5px solid $complement-color;
 	border-right: 5px solid $complement-color;
@@ -718,22 +718,22 @@ div.HRDrawer {
 
 /* Beware: IE6 does not support multiple selector with multiple classes, only the last class is used */
 table.listResults tr.odd td.truncated, table.listResults tr td.truncated, .wizContainer table.listResults tr.odd td.truncated, .wizContainer table.listResults tr td.truncated {
-	background: url(../images/truncated.png) bottom  repeat-x;
+	background: url(../images/truncated.png?v=#{$version}) bottom  repeat-x;
 }
 
 /* Beware: IE6 does not support multiple selector with multiple classes, only the last class is used */
 table.listResults tr.even td.truncated, .wizContainer table.listResults  tr.even td.truncated {
-	background: #f9f9f1 url(../images/truncated.png) bottom  repeat-x;
+	background: #f9f9f1 url(../images/truncated.png?v=#{$version}) bottom  repeat-x;
 }
 
 /* Beware: IE6 does not support multiple selector with multiple classes, only the last class is used */
 table.listResults tr.even td.hover.truncated, , .wizContainer table.listResults  tr.even td.hover.truncated {
-	background: #fdf5d0 url(../images/truncated.png) bottom  repeat-x;
+	background: #fdf5d0 url(../images/truncated.png?v=#{$version}) bottom  repeat-x;
 }
 
 /* Beware: IE6 does not support multiple selector with multiple classes, only the last class is used */
 table.listResults tr.odd td.hover.truncated,  table.listResults tr td.hover.truncated, .wizContainer table.listResults  tr.odd td.hover.truncated, .wizContainer table.listResults  tr td.hover.truncated {
-	background: #fdf5d0 url(../images/truncated.png) bottom  repeat-x;
+	background: #fdf5d0 url(../images/truncated.png?v=#{$version}) bottom  repeat-x;
 }
 
 table.listResults.truncated {
@@ -848,7 +848,7 @@ div#logo {
 div#logo div {
 	height: 88px;
 	width: 244px;
-	background: url(../images/itop-logo-2.png) left no-repeat;
+	background: url(../images/itop-logo-2.png?v=#{$version}) left no-repeat;
 }
 #left-pane .ui-layout-north {
 	overflow: hidden;
@@ -898,7 +898,7 @@ div#logo div {
 }
 #global-search-image {
 	vertical-align: middle;
-	background: url(../images/search.png) center center no-repeat;
+	background: url(../images/search.png?v=#{$version}) center center no-repeat;
 	display:inline-block;
 	width: 28px;
 	height: 30px;
@@ -927,7 +927,7 @@ span.ui-icon {
 	margin:0 2px;
 }
 .ui-layout-button-pin-down {
-	background: url(../images/splitter-bkg.png) transparent;
+	background: url(../images/splitter-bkg.png?v=#{$version}) transparent;
 	width: 16px;
 	background-position: -144px -144px;
 }
@@ -1123,7 +1123,7 @@ img.prev, img.first, img.next, img.last {
 }
 div.actions_button {
 	float:right;
-	background: $highlight-color url("../images/actions_left.png") no-repeat scroll left top;
+	background: $highlight-color url("../images/actions_left.png?v=#{$version}") no-repeat scroll left top;
 	padding-left: 5px;
 	margin-top: 0;
 	margin-right: 10px;
@@ -1132,7 +1132,7 @@ div.actions_button {
 }
 
 div.actions_button a, .actions_button a:hover, .actions_button a:visited {
-	background: $highlight-color  url(../images/actions_bkg.png) no-repeat scroll right top;
+	background: $highlight-color  url(../images/actions_bkg.png?v=#{$version}) no-repeat scroll right top;
 	color:#fff;
 	padding-right: 8px;
 	cursor:pointer;
@@ -1156,10 +1156,10 @@ select#org_id {
 	cursor: unquote("not-allowed");
 }
 .dragHover {
-	background: url(./ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png);
+	background: url(./ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png?v=#{$version});
 }
 .edit_mode .dashlet {
-	background: url(./ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png);
+	background: url(./ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png?v=#{$version});
 	padding: 5px;
 	margin:0;
 	position:relative;
@@ -1190,7 +1190,7 @@ table.prop_table {
 	top: 0;
 	right: 0;
 	z-index: 10;
-	background: transparent url(../images/delete.png) no-repeat center;
+	background: transparent url(../images/delete.png?v=#{$version}) no-repeat center;
 }
 td.prop_value {
 	text-align: left;
@@ -1390,17 +1390,17 @@ a.summary,  a.summary:hover {
 }
 .message_info {
 	border: 1px solid #993;
-	background: url(../images/info-mini.png) 1em 1em no-repeat #ffc;
+	background: url(../images/info-mini.png?v=#{$version}) 1em 1em no-repeat #ffc;
 	padding-left: 3em;
 }
 .message_ok {
 	border: 1px solid #393;
-	background: url(../images/ok.png) 1em 1em no-repeat #cfc;
+	background: url(../images/ok.png?v=#{$version}) 1em 1em no-repeat #cfc;
 	padding-left: 3em;
 }
 .message_error {
 	border: 1px solid #933;
-	background: url(../images/error.png) 1em 1em no-repeat #fcc;
+	background: url(../images/error.png?v=#{$version}) 1em 1em no-repeat #fcc;
 	padding-left: 3em;
 }
 .fg-menu a img {
@@ -1517,19 +1517,19 @@ div.explain-printable {
 }
 #hiddeable_chapters .ui-tabs .ui-tabs-nav li.hideable-chapter span {
 	padding-left: 20px;
-	background: url(../images/eye-open-555.png) 2px center no-repeat;
+	background: url(../images/eye-open-555.png?v=#{$version}) 2px center no-repeat;
 }
 
 #hiddeable_chapters .ui-tabs .ui-tabs-nav li.hideable-chapter.strikethrough span {
 	text-decoration: line-through;
-	background: url(../images/eye-closed-555.png) 2px center no-repeat;
+	background: url(../images/eye-closed-555.png?v=#{$version}) 2px center no-repeat;
 }
 .printable-version legend {
 	padding-left: 26px;
-	background: $complement-color url(../images/eye-open-fff.png) 8px center no-repeat;
+	background: $complement-color url(../images/eye-open-fff.png?v=#{$version}) 8px center no-repeat;
 }
 .printable-version .strikethrough legend {
-	background: $complement-color url(../images/eye-closed-fff.png) 8px center no-repeat;
+	background: $complement-color url(../images/eye-closed-fff.png?v=#{$version}) 8px center no-repeat;
 }
 .printable-version fieldset.strikethrough span {
 	display: none;
@@ -1548,7 +1548,7 @@ span.refresh-button {
 	width: 21px;
 	height: 18px;
 	cursor: pointer;
-	background: transparent url(../images/refresh-fff.png) left center no-repeat;
+	background: transparent url(../images/refresh-fff.png?v=#{$version}) left center no-repeat;
 }
 .case-log-history-entry {
 	display: block;