dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11284
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2013-06-29 15:33:55 +0200
message:
  Redesigned module intro pages. MOved inline css to stylesheet.
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/modules.vm
  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-commons-resources/src/main/webapp/macros.vm
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties


--
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/about/modules.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/modules.vm	2013-04-17 13:38:45 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/modules.vm	2013-06-29 13:33:55 +0000
@@ -3,7 +3,7 @@
 
 #if( $maintenanceModules && $maintenanceModules.size() > 0 )
 <td valign="top">
-<ul class="introList" style="width:335px; margin-top:0px; margin-right:15px;">
+<ul class="introList" style="width:340px; margin-top:0px; margin-right:15px;">
 #foreach( $module in $maintenanceModules )
 	#introListImgItem( "${module.defaultAction}" "${module.name}" "${module.name}" )
 #end
@@ -13,7 +13,7 @@
 
 #if( $serviceModules && $serviceModules.size() > 0 )
 <td valign="top">
-<ul class="introList" style="width:335px; margin-top:0px;">
+<ul class="introList" style="width:340px; margin-top:0px;">
 #foreach( $module in $serviceModules )
 	#introListImgItem( "${module.defaultAction}" "${module.name}" "${module.name}" )
 #end

=== 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-06-29 13:03:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css	2013-06-29 13:33:55 +0000
@@ -396,27 +396,31 @@
 {
   display: none;
   list-style-type:none;
-  width: 450px;
-  background-color: #d3e5d3;
-  border: 1px solid #a4d2a3;
+  width: 465px;
   padding-top: 15px;
   padding-bottom: 20px;
   padding-left: 5px;
   padding-right: 5px;
-  border-radius: 5px;
+  color: #444;
+}
+
+.introIcon
+{
+  float: left; 
+  margin-right: 25px;
 }
 
 .introItem
 {
-  padding: 12px;
+  padding: 18px;
   cursor: pointer;
   min-height: 44px;
-  border-radius: 3px;
+  border-bottom: 1px solid #e0e0e0;
 }
 
 .introItem:hover
 {
-  background-color: #9dc69c;
+  background-color: #f6f6f6;
 }
 
 .introItemHeader

=== 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-06-29 13:03:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css	2013-06-29 13:33:55 +0000
@@ -403,7 +403,13 @@
   padding-right: 5px;
   border-radius: 5px;
 }
-	
+
+.introIcon
+{
+  float: left; 
+  margin-right: 25px;
+}
+
 .introItem
 {
   padding: 12px;

=== 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-06-29 13:03:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2013-06-29 13:33:55 +0000
@@ -391,27 +391,31 @@
 {
   display: none;
   list-style-type:none;
-  width: 450px;
-  background-color: #d5efd5;
-  border: 1px solid #a4d2a3;
+  width: 465px;
   padding-top: 15px;
   padding-bottom: 20px;
   padding-left: 5px;
   padding-right: 5px;
-  border-radius: 5px;
+  color: #444;
+}
+
+.introIcon
+{
+  float: left; 
+  margin-right: 25px;
 }
 
 .introItem
 {
-  padding: 12px;
+  padding: 18px;
   cursor: pointer;
   min-height: 44px;
-  border-radius: 3px;
+  border-bottom: 1px solid #e0e0e0;
 }
 
 .introItem:hover
 {
-  background-color: #a4d2a3;
+  background-color: #f6f6f6;
 }
 
 .introItemHeader

=== 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-06-29 13:03:14 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css	2013-06-29 13:33:55 +0000
@@ -401,6 +401,12 @@
   border-radius: 5px;
 }
 
+.introIcon
+{
+  float: left; 
+  margin-right: 25px;
+}
+
 .introItem
 {
   padding: 12px;

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm	2013-06-25 09:01:34 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm	2013-06-29 13:33:55 +0000
@@ -81,7 +81,7 @@
 
 #macro( introListImgItem $action $objectKey $image )
 <li class="introItem" onclick="window.location.href='${action}'">
-  <span class="introItemHeader"><img src="../icons/${image}.png" style="float:left; margin-right:15px">$i18n.getString( "${objectKey}" )</span><br>$i18n.getString( "intro_${objectKey}" )
+  <span class="introItemHeader"><img src="../icons/${image}.png" class="introIcon">$i18n.getString( "${objectKey}" )</span><br>$i18n.getString( "intro_${objectKey}" )
 </li>
 #end
 

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2013-06-22 18:22:32 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2013-06-29 13:33:55 +0000
@@ -84,11 +84,11 @@
 intro_dhis-web-validationrule=Validate and assess data quality using validation rules or statistical methods.
 intro_dhis-web-mapping=Visualize data on maps using polygons, points, symbols with customizable legends.
 intro_dhis-web-reporting=Analyse data using predefined and dynamic report tools and view reporting rates.
-intro_dhis-web-light=Access a mobile device optimized version of data entry, settings, messages and analysis.
+intro_dhis-web-light=Access a mobile device optimized version of data entry, messages and analysis.
 intro_dhis-web-mobile=Access a smartphone optimized version of data entry, settings, messages.
 intro_dhis-web-dashboard-integration=Get an overview of favorite charts, reports and maps and view or write messages.
 intro_dhis-web-visualizer=Create dynamic data visualizations for data elements and indicators.
-intro_dhis-web-pivot=Generate flexible pivot tables with data arranged and aggregated in all dimensions. 
+intro_dhis-web-pivot=Generate flexible pivot tables with data aggregated in all dimensions. 
 intro_dhis-web-sms=Send reminders and notifications as SMS to phones, manually or as scheduled tasks.
 intro_dhis-web-spreadsheet-reporting=Generate and import data from reports based on predefined Excel templates.
 intro_dhis-web-appmanager=Access and upload apps, which are extensions to the standard user interface.