dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1532
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: trunk
timestamp: Tue 2010-03-02 14:57:10 +0100
message:
  (GIS) Window title icons added.
modified:
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/config.js
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription.

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css	2010-03-02 12:01:42 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css	2010-03-02 13:57:10 +0000
@@ -14,6 +14,10 @@
 	background-color:#FFFFFF;
 }
 
+#grid_gp .x-grid3-cell-inner {
+	color:#333;
+}
+
 .x-grid3-cell-inner, .x-grid3-hd-inner  {
 	font-family:lucida sans unicode, arial;
 	font-weight:normal;
@@ -81,12 +85,6 @@
 	color:#888;
 }
 
-/* GRID */
-
-#grid_gp .x-grid3-cell-inner {
-	color:#333;
-}
-
 /* LOADING MASK */
 
 .x-mask-loading2 div  {
@@ -120,6 +118,27 @@
 	padding:8px 0 0 0;
 }
 
+#window-favorites-title {
+	padding:0 0 3px 20px;
+	background:url('../../../images/favorite_star2.png') no-repeat 0 0 transparent;
+	font:bold 11px arial;
+	color:#111;
+}
+
+#window-legendset-title {
+	padding:0 0 3px 20px;
+	background:url('../../../images/color_swatch.png') no-repeat 0 0 transparent;
+	font:bold 11px arial;
+	color:#111;
+}
+
+#window-help-title {
+	padding:0 0 3px 20px;
+	background:url('../../../images/help.png') no-repeat 0 0 transparent;
+	font:bold 11px arial;
+	color:#111;
+}
+
 /* HELP */
 
 #help {

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/config.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/config.js	2010-03-02 11:58:13 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/config.js	2010-03-02 13:57:10 +0000
@@ -39,7 +39,7 @@
 
     gridpanel_width = west_width - 15;
     
-    multiselect_width = 230;
+    multiselect_width = 210;
 	
     combo_width = 150;
 	combo_list_width = combo_width + 17;

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2010-03-02 13:11:46 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2010-03-02 13:57:10 +0000
@@ -530,10 +530,10 @@
     
 	var viewWindow = new Ext.Window({
         id: 'view_w',
-        title: '<span style="' + AA_DARK + '">Favorites</span>',
+        title: '<span id="window-favorites-title">Favorites</span>',
 		layout: 'fit',
         closeAction: 'hide',
-		width: 260,
+		width: 234,
         items:
         [
             {
@@ -547,7 +547,7 @@
                     tabchange: function(panel, tab)
                     {
                         if (tab.id == 'view0') { 
-                            viewWindow.setHeight(173);
+                            viewWindow.setHeight(188);
                         }
                         else if (tab.id == 'view1') {
                             viewWindow.setHeight(150);
@@ -939,10 +939,10 @@
     
     var legendSetWindow = new Ext.Window({
         id: 'legendset_w',
-        title: '<span style="' + AA_DARK + '">Legend sets</span>',
+        title: '<span id="window-legendset-title">Legend sets</span>',
 		layout: 'fit',
         closeAction: 'hide',
-		width: multiselect_width + 37,
+		width: 245,
         items:
         [
             {
@@ -2809,7 +2809,7 @@
 				params: { id: ACTIVEPANEL },
 				success: function(r) {
 					var h = new Ext.Window({
-						title: '<span style="' + AA_DARK + '">Help</span>',
+						title: '<span id="window-help-title">Help</span>',
 						html: '<div id="help">' + r.responseText + '</div>',
 						width: 300,
 						height: 400,