dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11289
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2013-06-30 13:36:20 +0200
message:
  Moved css from template to stylesheets
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/functions.vm
  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/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/functions.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/functions.vm	2013-06-29 15:17:25 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/functions.vm	2013-06-30 11:36:20 +0000
@@ -2,7 +2,7 @@
 <tr>
 	
 <td valign="top">
-<ul class="introList" style="width:350px; margin-top:0px; margin-right:15px;">
+<ul class="introList introTwoColList" style="margin-right:15px;">
 	#introListImgItem( "../dhis-web-commons-about/help.action", "help_center", "function-help-center" )
     #introListImgItem( "../dhis-web-commons-about/software.action", "supportive_software", "function-supportive-software" )
     #introListImgItem( "../dhis-web-commons-about/modules.action", "system_overview", "function-system-overview" )
@@ -12,7 +12,7 @@
 </td>
 
 <td valign="top">
-<ul class="introList" style="width:350px; margin-top:0px;">
+<ul class="introList introTwoColList">
     #introListImgItem( "../dhis-web-commons-about/userSettings.action", "settings", "function-settings" )
     #introListImgItem( "../dhis-web-commons-about/showUpdateUserProfileForm.action", "profile", "function-profile" )
     #introListImgItem( "../dhis-web-commons-about/showUpdateUserAccountForm.action", "account", "function-account" )

=== 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-06-29 15:15:54 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/modules.vm	2013-06-30 11:36:20 +0000
@@ -3,7 +3,7 @@
 
 #if( $maintenanceModules && $maintenanceModules.size() > 0 )
 <td valign="top">
-<ul class="introList" style="width:350px; margin-top:0px; margin-right:15px;">
+<ul class="introList introTwoColList" style="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:350px; margin-top:0px;">
+<ul class="introList introTwoColList">
 #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:33:55 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css	2013-06-30 11:36:20 +0000
@@ -404,6 +404,13 @@
   color: #444;
 }
 
+.introTwoColList
+{
+  padding-left: 0;
+  padding-right: 0;
+  width: 347px;
+}
+
 .introIcon
 {
   float: left; 

=== 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:33:55 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css	2013-06-30 11:36:20 +0000
@@ -404,6 +404,13 @@
   border-radius: 5px;
 }
 
+.introTwoColList
+{
+  padding-left: 0;
+  padding-right: 0;
+  width: 347px;
+}
+
 .introIcon
 {
   float: left; 

=== 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:33:55 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2013-06-30 11:36:20 +0000
@@ -399,6 +399,13 @@
   color: #444;
 }
 
+.introTwoColList
+{
+  padding-left: 0;
+  padding-right: 0;
+  width: 347px;
+}
+
 .introIcon
 {
   float: left; 

=== 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:33:55 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css	2013-06-30 11:36:20 +0000
@@ -401,6 +401,13 @@
   border-radius: 5px;
 }
 
+.introTwoColList
+{
+  padding-left: 0;
+  padding-right: 0;
+  width: 347px;
+}
+
 .introIcon
 {
   float: left; 

=== 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-29 13:33:55 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2013-06-30 11:36:20 +0000
@@ -83,7 +83,7 @@
 intro_dhis-web-importexport=Import and export data from DHIS or third-party systems on various formats.
 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-reporting=Analyse data and reporting rates using predefined and dynamic report tools.
 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.
@@ -96,13 +96,13 @@
 #-- Intro functions -------------------------------------------------------------#
 
 intro_help_center=Get help on a various of topics related to setting up and using the DHIS 2.
-intro_supportive_software=Get an overview of useful software like report designers, myDatamart and mobile clients.
+intro_supportive_software=Get an overview of useful software like report designers mobile clients.
 intro_system_overview=Visit the system overview page to get a complete list of modules and their purpose.
 intro_web_api=Go to the Web API entry point, which is an interface for other computer systems.
-intro_about_dhis2=Visit the about page to get information about the system version and runtime environment.
+intro_about_dhis2=Get information about the system version and runtime environment.
 intro_settings=Set your personal preferences for interface language, style and email settings.
-intro_profile=Set up your personal profile with information about yourself like job title and interests.
-intro_account=Manage your user account including name, password, email and mobile phone number.
+intro_profile=Set up your personal profile with information your like job title and interests.
+intro_account=Manage your user account including name, password, email and mobile number.
 intro_log_out=Go here to log out of the system and deny others to access your user account.
 
 #-- Common ---------------------------------------------------------------------#