dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 2122 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: trunk
timestamp: Wed 2010-09-15 19:00:47 +0200
message:
  (GIS) Icons and CSS fixes.
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/favorite_star2.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/help.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/map.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_in.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_out.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_world.png
  dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm
  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/grid-split.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-commons-resources/src/main/webapp/images/favorite_star2.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/favorite_star2.png	2009-09-22 19:54:18 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/favorite_star2.png	2010-09-15 16:17:48 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/help.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/help.png	2010-02-24 11:14:58 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/help.png	2010-09-15 16:17:48 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/map.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/map.png	2009-09-22 19:54:18 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/map.png	2010-09-15 16:44:31 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_in.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_in.png	2009-09-21 17:41:44 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_in.png	2010-09-15 16:17:48 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_out.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_out.png	2009-09-21 17:41:44 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_out.png	2010-09-15 16:17:48 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_world.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_world.png	2009-09-21 17:41:44 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/zoom_world.png	2010-09-15 16:17:48 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm'
--- dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm	2010-09-13 14:13:44 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/i18n.vm	2010-09-15 16:17:48 +0000
@@ -34,7 +34,7 @@
 var i18n_legend_set = '$encoder.jsEscape($i18n.getString( 'legend_set' ) , "'")';
 var i18n_bounds = '$encoder.jsEscape($i18n.getString( 'bounds' ) , "'")';
 var i18n_comma_separated_values = '$encoder.jsEscape($i18n.getString( 'comma_separated_values' ) , "'")';
-var i18n_ajax_request_failed = '$encoder.jsEscape($i18n.getString( 'i18n_ajax_request_failed' ) , "'")';
+var i18n_ajax_request_failed = '$encoder.jsEscape($i18n.getString( 'ajax_request_failed' ) , "'")';
 var i18n_component_init_not_complete = '$encoder.jsEscape($i18n.getString( 'component_init_not_complete' ) , "'")';
 var i18n_error = '$encoder.jsEscape($i18n.getString( 'error' ) , "'")';
 var i18n_form_is_not_complete = '$encoder.jsEscape($i18n.getString( 'form_is_not_complete' ) , "'")';
@@ -76,7 +76,7 @@
 var i18n_return_to_DHIS_2_dashboard = '$encoder.jsEscape($i18n.getString( 'return_to_DHIS_2_dashboard' ) , "'")';
 var i18n_exit_gis = '$encoder.jsEscape($i18n.getString( 'exit_gis' ) , "'")';
 var i18n_help = '$encoder.jsEscape($i18n.getString( 'help' ) , "'")';
-var i18n_create_predefined_legend_sets = '$encoder.jsEscape($i18n.getString( 'i18n_create_predefined_legend_sets' ) , "'")';
+var i18n_create_predefined_legend_sets = '$encoder.jsEscape($i18n.getString( 'create_predefined_legend_sets' ) , "'")';
 var i18n_export_map_as_excel = '$encoder.jsEscape($i18n.getString( 'export_map_as_excel' ) , "'")';
 var i18n_favorite_map_views = '$encoder.jsEscape($i18n.getString( 'favorite_map_views' ) , "'")';	
 var i18n_show_hide_labels = '$encoder.jsEscape($i18n.getString( 'show_hide_labels' ) , "'")';	

=== 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-09-15 11:29:43 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/css/style.css	2010-09-15 16:58:24 +0000
@@ -32,16 +32,15 @@
 .x-tree .x-panel-body {
 	background-color:#F8F8F8;
 }
+.x-tree-node-leaf .x-tree-node-icon {
+    background-image:url("../../../images/map.png");
+}
 .x-btn-tl, .x-btn-tr, .x-btn-tc, .x-btn-ml, .x-btn-mr, .x-btn-mc, .x-btn-bl, .x-btn-br, .x-btn-bc {
 	background-image:url(../../resources/ext-ux/theme/gray-extend-ux/btn.gif);
 }
-.ext-gecko .x-btn button, .ext-webkit .x-btn button {
-	padding-left:7px;
-	padding-right:7px;
-}
 .x-toolbar .xtb-sep {
     background-image:url(../../resources/ext-ux/theme/gray-extend-ux/grid-split.png);
-    height:27px;
+    height:25px;
 }
 #map_tb .x-panel-bbar .x-toolbar, .x-panel-tbar .x-toolbar {
     border:1px solid #bbbbbb;
@@ -226,6 +225,21 @@
 	color:#333;
     padding-bottom:2px;
 }
+.x-btn-text-icon .x-btn-icon-small-left .x-btn-text {
+    padding-bottom:2px;
+    padding-left:20px;
+}
+.ext-gecko .x-btn button, .ext-webkit .x-btn button {
+    padding-left:7px;
+    padding-right:7px;
+}
+#ext-gen105 {
+    background-position:0 center;
+    background-repeat:no-repeat;
+    height:16px;
+	padding-left:21px;
+    padding-right:4px;
+}
 
 /* Ext Loading Mask */
 .x-mask-loading2 div  {
@@ -323,9 +337,6 @@
 	font:normal 11px lucida sans unicode,arial;
 	color:#333;
 }
-.x-btn-text-icon .x-btn-icon-small-left .x-btn-text {
-	padding-left:20px;
-}
 
 /* Msg */
 .x-msg-hl {

=== 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-09-15 15:58:06 +0000
+++ dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/mapping/script/index.js	2010-09-15 16:20:12 +0000
@@ -3624,7 +3624,8 @@
 			'-',
 			helpButton,
 			'->',
-			exitButton
+			exitButton,
+            ' '
 		]
 	});
     

=== modified file 'dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/theme/gray-extend-ux/grid-split.png'
Binary files dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/theme/gray-extend-ux/grid-split.png	2010-08-18 09:45:34 +0000 and dhis-2/dhis-web/dhis-web-mapping/src/main/webapp/dhis-web-mapping/resources/ext-ux/theme/gray-extend-ux/grid-split.png	2010-09-15 16:17:48 +0000 differ