dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11325
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-07-03 19:47:01 +0200
message:
  Dashboard, updated sharing help
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css
  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/mainForm.vm


--
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/dhis-web-commons/css/green/green.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css	2013-07-03 11:42:31 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css	2013-07-03 17:47:01 +0000
@@ -173,6 +173,7 @@
   opacity: 0.94;
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
+  box-shadow: #ccc 0px 1px 1px 0px;
 }
 
 .menuDropDownBox

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css	2013-07-03 11:42:31 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css	2013-07-03 17:47:01 +0000
@@ -173,6 +173,7 @@
   opacity: 0.94;
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
+  box-shadow: #ccc 0px 1px 1px 0px;
 }
 
 .menuDropDownBox

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2013-07-03 11:42:31 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2013-07-03 17:47:01 +0000
@@ -173,6 +173,7 @@
   opacity: 0.94;
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
+  box-shadow: #ccc 0px 1px 1px 0px;
 }
 
 .menuDropDownBox

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css	2013-07-03 11:42:31 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css	2013-07-03 17:47:01 +0000
@@ -173,6 +173,7 @@
   opacity: 0.94;
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
+  box-shadow: #ccc 0px 1px 1px 0px;
 }
 
 .menuDropDownBox

=== 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	2013-07-03 12:43:28 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties	2013-07-03 17:47:01 +0000
@@ -45,6 +45,7 @@
 data_visualizer=Data visualizer
 gis=GIS
 report_table=Report table
+pivot_table=Pivot table
 add_a_comment=Add a comment
 new_interpretations=new interpretations
 new_interpretation=new interpretation
@@ -59,7 +60,7 @@
 viewing=Viewing
 from=From
 load_favorite_click_share=load a favorite and click 'Share' on the top menu
-generate_report_table_click_share=generate a report table and click 'Share' on the top menu
+generate_pivot_table_click_share=generate a pivot table and click 'Share' on the top menu
 share_interpretation=Share interpretation
 select_users_and_user_groups=Select users and user groups
 generate_data_set_report_click_share=generate a data set report and click 'Share' on the top menu

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm	2013-07-03 12:43:28 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/mainForm.vm	2013-07-03 17:47:01 +0000
@@ -41,9 +41,9 @@
 
 <div id="shareHelpForm">
 	<ul>
-		<li>$i18n.getString( "from" ) <a href="../dhis-web-visualizer/app/">$i18n.getString( "data_visualizer" )</a>, $i18n.getString( "load_favorite_click_share" )</li>
+		<li>$i18n.getString( "from" ) <a href="../dhis-web-pivot/app/index.html">$i18n.getString( "pivot_table" )</a>, $i18n.getString( "generate_pivot_table_click_share" )</li>
+        <li>$i18n.getString( "from" ) <a href="../dhis-web-visualizer/app/">$i18n.getString( "data_visualizer" )</a>, $i18n.getString( "load_favorite_click_share" )</li>
 		<li>$i18n.getString( "from" ) <a href="../dhis-web-mapping/app/">$i18n.getString( "gis" )</a>, $i18n.getString( "load_favorite_click_share" )</li>
-		<li>$i18n.getString( "from" ) <a href="../dhis-web-reporting/displayManageTableForm.action">$i18n.getString( "report_table" )</a>, $i18n.getString( "generate_report_table_click_share" )</li>
 		<li>$i18n.getString( "from" ) <a href="../dhis-web-reporting/showDataSetReportForm.action">$i18n.getString( "data_set_report" )</a>, $i18n.getString( "generate_data_set_report_click_share" )</li>
 	</ul>
 </div>
\ No newline at end of file