dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4932
committer: Jo Størset <storset@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-10-13 16:29:49 +0200
message:
  Split up the mobile browser dashboard and rebranded as reports..
removed:
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard.vm
added:
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard_charts.vm
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard_documents.vm
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard_reports.vm
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/reports.vm
modified:
  dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties
  dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_fr_FR.properties
  dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard_page.vm
  dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/menu.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-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties	2011-10-12 21:08:12 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties	2011-10-13 14:29:49 +0000
@@ -1,7 +1,14 @@
+DHIS_2 = DHIS 2
 menu = Menu
 home = Home
 navigate_to = Navigate to
-dashboard = Dashboard
+reports = Reports
+charts = Charts
+documents = Documents
+dashboard = Dashboard (beta)
+dashboard_reports = Dashboard reports
+dashboard_charts = Dashboard charts
+dashboard_documents = Dashboard documents
 data_entry = Data Entry
 logout = Logout
 desktop_version = Desktop version

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_fr_FR.properties'
--- dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_fr_FR.properties	2011-10-13 13:06:30 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module_fr_FR.properties	2011-10-13 14:29:49 +0000
@@ -1,7 +1,7 @@
 menu = Menu
 home = Accueil
 navigate_to to =Acc\u00e9dez \u00e0 navigation
-dashboard = Tableau de bord =
+dashboard = Tableau de bord
 data_entry = Entr\u00e9e de donn\u00e9es
 logout = D\u00e9connexion
 desktop_version = Version bureau

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml	2011-10-12 13:13:14 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml	2011-10-13 14:29:49 +0000
@@ -41,11 +41,26 @@
       <param name="requiredAuthorities">F_DATAVALUE_ADD,F_DATAVALUE_UPDATE,F_DATAVALUE_DELETE</param>
     </action>
 
-    <!-- dashboard -->
-
-    <action name="dashboard" class="org.hisp.dhis.light.dashboard.action.ProvideContentAction">
-      <result name="success" type="velocity">/dhis-web-light/dashboard_page.vm</result>
-      <param name="page">/dhis-web-light/dashboard.vm</param>
+    <!-- Reports -->
+    
+    <action name="reports" class="org.hisp.dhis.light.dashboard.action.ProvideContentAction">
+      <result name="success" type="velocity">/dhis-web-light/main.vm</result>
+      <param name="page">/dhis-web-light/reports.vm</param>
+    </action>
+
+    <action name="dashboard-charts" class="org.hisp.dhis.light.dashboard.action.ProvideContentAction">
+      <result name="success" type="velocity">/dhis-web-light/dashboard_page.vm</result>
+      <param name="page">/dhis-web-light/dashboard_charts.vm</param>
+    </action>
+
+    <action name="dashboard-reports" class="org.hisp.dhis.light.dashboard.action.ProvideContentAction">
+      <result name="success" type="velocity">/dhis-web-light/dashboard_page.vm</result>
+      <param name="page">/dhis-web-light/dashboard_reports.vm</param>
+    </action>
+
+    <action name="dashboard-documents" class="org.hisp.dhis.light.dashboard.action.ProvideContentAction">
+      <result name="success" type="velocity">/dhis-web-light/dashboard_page.vm</result>
+      <param name="page">/dhis-web-light/dashboard_documents.vm</param>
     </action>
 
     <action name="getReport" class="org.hisp.dhis.light.dashboard.action.GetReportAction">

=== removed file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard.vm	2011-09-22 10:22:37 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard.vm	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-<!-- Charts -->
-
-<div class="contentDiv">
-#foreach( $id in $charts )
-<div class="contentChartDiv"><img src="getChart.action?id=${id}" style="width:100%"></div>
-#end
-</div>
-
-<!-- Report tables -->
-
-<div class="headerDiv"><span class="header">Report tables</span></div>
-
-<div class="contentDiv">
-#foreach( $table in $reportTables )
-<div class="contentItemDiv" id="reportTable${table.id}" onclick="getReportParams( '${table.id}' )">$encoder.htmlEncode( $table.name )</div>
-#end
-</div>
-
-<!-- Documents -->
-
-<div class="headerDiv"><span class="header">Documents</span></div>
-
-<div class="contentDiv">
-#foreach( $doc in $documents )
-#if( $doc.external )
-#set( $link = $doc.url )
-#else
-#set( $link = "../dhis-web-commons-stream/loadDocument.action?id=${doc.id}" )
-#end
-
-<div class="contentItemDiv" onclick="javascript:window.location.href='${link}'">$encoder.htmlEncode( $doc.name )</div>
-#end
-</div>

=== added file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard_charts.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard_charts.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard_charts.vm	2011-10-13 14:29:49 +0000
@@ -0,0 +1,7 @@
+<div class="headerDiv"><span class="header">$i18n.getString("dashboard_charts")</span></div>
+
+<div class="contentDiv">
+#foreach( $id in $charts )
+<div class="contentChartDiv"><img src="getChart.action?id=${id}" style="width:100%"></div>
+#end
+</div>

=== added file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard_documents.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard_documents.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard_documents.vm	2011-10-13 14:29:49 +0000
@@ -0,0 +1,13 @@
+<div class="headerDiv"><span class="header">$i18n.getString("dashboard_documents")</span></div>
+
+<div class="contentDiv">
+#foreach( $doc in $documents )
+#if( $doc.external )
+#set( $link = $doc.url )
+#else
+#set( $link = "../dhis-web-commons-stream/loadDocument.action?id=${doc.id}" )
+#end
+
+<div class="contentItemDiv" onclick="javascript:window.location.href='${link}'">$encoder.htmlEncode( $doc.name )</div>
+#end
+</div>

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard_page.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard_page.vm	2011-10-12 21:21:30 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard_page.vm	2011-10-13 14:29:49 +0000
@@ -16,8 +16,6 @@
 <head>
 <body>
 
-<div class="headerDiv"><span class="header">DHIS 2</span></div>
-
 #parse( $page )
 
 </body>

=== added file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard_reports.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard_reports.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/dashboard_reports.vm	2011-10-13 14:29:49 +0000
@@ -0,0 +1,7 @@
+<div class="headerDiv"><span class="header">$i18n.getString("dashboard_reports")</span></div>
+
+<div class="contentDiv">
+#foreach( $table in $reportTables )
+<div class="contentItemDiv" id="reportTable${table.id}" onclick="getReportParams( '${table.id}' )">$encoder.htmlEncode( $table.name )</div>
+#end
+</div>

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/menu.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/menu.vm	2011-10-12 21:13:24 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/menu.vm	2011-10-13 14:29:49 +0000
@@ -1,10 +1,9 @@
-
 <h2>$i18n.getString( "menu" )</h2>
 
 <p>
 <ul>
     <li><a href="selectOrganisationUnit.action">$i18n.getString( "data_entry" )</a></li>
-    <li><a href="dashboard.action">$i18n.getString( "dashboard" )</a></li>
+    <li><a href="reports.action">$i18n.getString( "reports" )</a></li>
 </ul>
 </p>
 

=== added file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/reports.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/reports.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/reports.vm	2011-10-13 14:29:49 +0000
@@ -0,0 +1,14 @@
+<h2>$i18n.getString( "dashboard" )</h2>
+
+<ul>
+    <li><a href="dashboard-charts.action">$i18n.getString( "charts" )</a></li>
+    <li><a href="dashboard-reports.action">$i18n.getString( "reports" )</a></li>
+    <li><a href="dashboard-documents.action">$i18n.getString( "documents" )</a></li>
+</ul>
+
+<div id="footer">
+<h2>$i18n.getString( "navigate_to" )</h2>
+<ul>
+	<li><a href="index.action">$i18n.getString("home")</a></li>
+</ul>
+</div>