dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 19724
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-08-05 18:24:50 +0200
message:
  Dashboard, labels, i18n
modified:
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/dashboard.vm
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.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-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties	2015-05-05 04:23:07 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties	2015-08-05 16:24:50 +0000
@@ -122,6 +122,8 @@
 could_not_delete_interpretation=Could not delete interpretation, please try again later
 could_not_delete_interpretation_comment=Could not delete interpretation comment, please try again later
 could_not_save_interpretation=Could not save interpretation, please try again later
+applies_to_favorites_with_user_org_units_only=Applies to favorites with "user org units" only
+user_org_unit_filter=User organisation unit filter
 download=Download
 api_link=API link
 get_as_image=Get as image
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/dashboard.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/dashboard.vm	2015-08-03 19:32:48 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/dashboard.vm	2015-08-05 16:24:50 +0000
@@ -30,6 +30,8 @@
 var i18n_add = '$encoder.jsEscape( $i18n.getString( "add" ), "'")';
 var i18n_click_and_drag_to_new_position = '$encoder.jsEscape( $i18n.getString( "click_and_drag_to_new_position" ), "'")';
 var i18n_get_as_image = '$encoder.jsEscape( $i18n.getString( "get_as_image" ), "'")';
+var i18n_user_org_unit_filter = '$encoder.jsEscape( $i18n.getString( "user_org_unit_filter" ), "'")';
+var i18n_applies_to_favorites_with_user_org_units_only = '$encoder.jsEscape( $i18n.getString( "applies_to_favorites_with_user_org_units_only" ), "'")';
 
 jQuery( document ).ready( function() {
   dhis2.leftBar.resetPosition();
@@ -107,7 +109,7 @@
 
 <div id="addDashboardForm">
     <label style="margin-right: 10px">$i18n.getString( "name" )</label><input type="text" id="dashboardName" style="width: 240px; padding: 5px; margin-right: 10px;">
-    <a class="greyButtonLink" href="javascript:dhis2.db.addDashboard()" style="margin-top: 1px">$i18n.getString( 'create' )</a>
+    <a class="greyButtonLink" href="javascript:dhis2.db.addDashboard()" style="margin-top: 1px">$i18n.getString( "create" )</a>
 </div>
 
 <div id="manageDashboardForm" class="page">
@@ -121,7 +123,8 @@
 </div>
 
 <div id="orgUnitSelectorForm" class="page">
-	<div id="selectionTree" style="width:340px; height:400px"></div>
+	<div class="tipText" style="padding: 2px 0 4px 0">$i18n.getString( "applies_to_favorites_with_user_org_units_only" )</div>
+	<div id="selectionTree" style="width:339px; height:376px"></div>
 	<div style="padding-top:15px; float:right;">
 		<a class="greyButtonLink" href="javascript:dhis2.db.clearSelectedOrgUnits()">$i18n.getString( "clear" )</a>
 		<a class="greyButtonLink" href="javascript:dhis2.db.updateSelectedOrgUnits()">$i18n.getString( "update" )</a>

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js	2015-08-03 22:22:21 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js	2015-08-05 16:24:50 +0000
@@ -1237,7 +1237,7 @@
 		width: 370,
 		height: 500,
 		resizable: false,
-		title: "Select user organisation unit"
+		title: i18n_user_org_unit_filter
 	} );
 }