dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 9067
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-11-15 18:28:14 +0100
message:
  Dashboard css fix
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/document.vm
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/map_view.vm
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/report.vm
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/report_table.vm
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css


--
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	2012-11-06 07:01:56 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/resources/org/hisp/dhis/dashboard/i18n_module.properties	2012-11-15 17:28:14 +0000
@@ -9,8 +9,10 @@
 report_table=Report tables
 map_view=Maps
 map=Maps
-this_is_a_link_area=This is a link area, click 'insert' and select links
-this_is_a_chart_area=This is a chart area, click 'insert' and select a chart
+this_is_a_link_area=This is a link area
+click_insert_and_select_link=Click insert and select links
+this_is_a_chart_area=This is a chart area
+click_insert_and_select_chart=Click Insert and select a chart
 insert_links_by_going_to=Insert links by going to
 messages=Messages
 sender=Sender

=== 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	2012-06-05 21:31:46 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/dashboard.vm	2012-11-15 17:28:14 +0000
@@ -31,7 +31,10 @@
     #if ( $page )
         #parse( "/dhis-web-dashboard-integration/${page}.vm" )
     #else
-        <div class="labelText">$i18n.getString( 'this_is_a_link_area' )</div>
+        <div class="labelText">
+        	$i18n.getString( 'this_is_a_link_area' )<br><br>
+            $i18n.getString( 'click_insert_and_select_link' )
+        </div>
     #end
 </div>
 #end
@@ -48,7 +51,10 @@
     #if ( $chart )
         <img style="cursor:pointer" src="../api/charts/${chart.uid}/data?width=310&height=310" onclick="viewChart( '../api/charts/${chart.uid}/data', '${encoder.htmlEncode( $chart.name )}' )">
     #else
-        <div class="labelText">$i18n.getString( 'this_is_a_chart_area' )</div>
+        <div class="labelText">
+        	$i18n.getString( 'this_is_a_chart_area' )<br><br>
+            $i18n.getString( 'click_insert_and_select_chart' )
+        </div>
     #end
 </div>
 #end

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/document.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/document.vm	2012-06-07 14:16:27 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/document.vm	2012-11-15 17:28:14 +0000
@@ -22,6 +22,6 @@
 </table>
 
 #if( $documents.size() == 0 )
-<div class="labelText">$i18n.getString( "insert_links_by_going_to" ) 
+<div class="labelText">$i18n.getString( "insert_links_by_going_to" )<br>
 <a href="../dhis-web-reporting/displayViewDocumentForm.action">$i18n.getString( "document" )</a></div>
 #end
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/map_view.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/map_view.vm	2012-11-08 14:13:17 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/map_view.vm	2012-11-15 17:28:14 +0000
@@ -17,6 +17,6 @@
 </table>
 
 #if( $maps.size() == 0 )
-<div class="labelText">$i18n.getString( "insert_links_by_going_to" ) 
+<div class="labelText">$i18n.getString( "insert_links_by_going_to" )<br>
 <a href="../dhis-web-mapping/app/index.html">$i18n.getString( "gis" )</a></div>
 #end
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/report.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/report.vm	2012-06-07 14:16:27 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/report.vm	2012-11-15 17:28:14 +0000
@@ -17,6 +17,6 @@
 </table>
 
 #if( $reports.size() == 0 )
-<div class="labelText">$i18n.getString( "insert_links_by_going_to" ) 
+<div class="labelText">$i18n.getString( "insert_links_by_going_to" )<br>
 <a href="../dhis-web-reporting/displayViewReportForm.action">$i18n.getString( "report" )</a></div>
 #end
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/report_table.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/report_table.vm	2012-06-07 14:16:27 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/report_table.vm	2012-11-15 17:28:14 +0000
@@ -17,6 +17,6 @@
 </table>
 
 #if( $reportTables.size() == 0 )
-<div class="labelText">$i18n.getString( "insert_links_by_going_to" ) 
+<div class="labelText">$i18n.getString( "insert_links_by_going_to" )<br>
 <a href="../dhis-web-reporting/displayManageTableForm.action">$i18n.getString( "report_table" )</a></div>
 #end
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2012-11-15 13:31:04 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2012-11-15 17:28:14 +0000
@@ -63,8 +63,11 @@
 
 .labelText
 {
-  color: #888;
-  padding: 3px;
+  position: relative;
+  color: #999;
+  font-size: 16px;
+  padding: 40px 0 0 30px;
+  width: 230px;
 }
 
 #dashboardMenu