dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 3152 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-03-24 13:35:20 +0100
message:
  (GIS) Minor layout fixes.
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/index.js
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/theme/gray-extend-ux/bg2.png


--
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	2011-03-23 16:19:24 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css	2011-03-24 12:03:18 +0000
@@ -44,12 +44,6 @@
     background-image:url(../../resources/ext-ux/theme/gray-extend-ux/grid-split.png);
     height:23px;
 }
-
-#map_tb .x-panel-bbar .x-toolbar, .x-panel-tbar .x-toolbar {
-    border:1px solid #bbbbbb;
-    border-bottom:1px solid #cccccc;
-    background-image:url(../../resources/ext-ux/theme/gray-extend-ux/bg2.png);;
-}
 .x-panel-tbar .x-toolbar {
     padding:0;
 }
@@ -445,3 +439,12 @@
 #pointlegend {
     padding-left:4px;
 }
+#map_tb .x-panel-bbar .x-toolbar, .x-panel-tbar .x-toolbar {
+    border:1px solid #bbbbbb;
+    border-bottom:1px solid #cccccc;
+    background-image:url(../../resources/ext-ux/theme/gray-extend-ux/bg2.png);
+    -moz-border-radius-topleft: 2px;
+    -webkit-border-top-left-radius: 2px;
+    -moz-border-radius-topright: 2px;
+    -webkit-border-top-right-radius: 2px;
+}

=== 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	2011-03-23 16:19:24 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2011-03-24 12:03:18 +0000
@@ -2473,7 +2473,7 @@
 	
 	var predefinedMapLegendSetButton = new Ext.Button({
 		iconCls: 'icon-predefinedlegendset',
-		tooltip: G.i18n.create_predefined_legend_sets,
+		tooltip: G.i18n.predefined_legend_sets,
 		disabled: !G.user.isAdmin,
         style: 'margin-top:1px',
 		handler: function() {

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/theme/gray-extend-ux/bg2.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/theme/gray-extend-ux/bg2.png	2011-03-23 16:19:24 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/theme/gray-extend-ux/bg2.png	2011-03-24 11:07:06 +0000 differ