dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3095
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2011-03-20 13:12:22 +0100
message:
  Made the top menu slightly smaller to accommodate smaller screens
modified:
  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/logo_background.png
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_separator.png
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/inputReportParamsForm.vm
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewPivotTableForm.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/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	2011-01-17 11:14:18 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css	2011-03-20 12:12:22 +0000
@@ -34,7 +34,7 @@
 {
   background-image: url('logo_background.png');
   background-repeat: repeat-x;
-  height: 71px;
+  height: 59px;
   position: absolute;
   top: 0px;
   left: 0px;
@@ -49,7 +49,7 @@
 img#header2
 {
   position: absolute;
-  top: 7px;
+  top: 1px;
   left: 35px;
 }
 
@@ -101,7 +101,7 @@
   color: #ffffff;
   font-weight: bold;
   text-align: center;
-  line-height: 53px;
+  line-height: 44px;
   cursor: pointer;
 }
 
@@ -136,7 +136,7 @@
 span#headerText
 {
   position: absolute;
-  top: 23px;
+  top: 19px;
   left: 228px;
   font-weight: lighter;
   color: white;
@@ -167,21 +167,21 @@
 div#menuDropDown1
 {
   position: absolute;
-  top: 71px;
+  top: 59px;
   left: 580px;
 }
 
 div#menuDropDown2
 {
   position: absolute;
-  top: 71px;
+  top: 59px;
   left: 680px;
 }
 
 div#menuDropDown3
 {
   position: absolute;
-  top: 71px;
+  top: 59px;
   left: 780px;
 }
 
@@ -235,7 +235,7 @@
   width: 235px;
   float: left;
   position: absolute;
-  top: 71px;
+  top: 59px;
   left: 0px;
   padding-top: 6px;
   border-right: 1px solid #10375f;
@@ -365,7 +365,7 @@
 
 #mainPage 
 {
-  margin: 96px 10px 10px 270px;
+  margin: 84px 10px 10px 270px;
 }
 
 #popupPage 
@@ -439,4 +439,3 @@
   color: #3c533c;
   font-weight: bold;
 }
-

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_background.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_background.png	2010-06-30 18:44:56 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_background.png	2011-03-20 12:12:22 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_separator.png'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_separator.png	2010-06-30 18:44:56 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/logo_separator.png	2011-03-20 12:12:22 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css	2011-01-31 09:06:13 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/style/dhis-web-dataentry.css	2011-03-20 12:12:22 +0000
@@ -8,7 +8,7 @@
   font-size: 14px;
   text-align: right;
   position: fixed;
-  top: 80px;
+  top: 71px;
   right: 10px;
   filter: alpha(opacity=85);
   opacity: 0.85;

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/inputReportParamsForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/inputReportParamsForm.vm	2011-03-18 14:45:12 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/inputReportParamsForm.vm	2011-03-20 12:12:22 +0000
@@ -92,7 +92,7 @@
             <input type="button" value="$i18n.getString( 'get_report' )" onclick="generateReport( '' )" style="width:140px">        	
             <input type="button" value="$i18n.getString( 'back' )" onclick="javascript:window.location.href='displayManageTableForm.action'" style="width:140px">
         	#elseif ( $mode == "report" )
-            <input type="button" value="$i18n.getString( 'get_report_as_pdf' )" onclick="generateReport( 'pdf' )" style="width:140px">
+            <input type="button" value="$i18n.getString( 'get_report' )" onclick="generateReport( 'pdf' )" style="width:140px">
             <input type="button" value="$i18n.getString( 'back' )" onclick="javascript:window.location.href='displayViewReportForm.action'" style="width:140px"><br>
             <input type="button" value="$i18n.getString( 'get_report_as_xls' )" onclick="generateReport( 'xls' )" style="width:140px">
         	#end

=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewPivotTableForm.vm'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewPivotTableForm.vm	2011-03-18 14:45:12 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/viewPivotTableForm.vm	2011-03-20 12:12:22 +0000
@@ -1,6 +1,6 @@
 <script type="text/javascript">
    jQuery(document).ready(function(){
-		<!-- Init page -->
+		
 		loadListeners();
 
 		selectionTreeSelection.setMultipleSelectionAllowed( false );
@@ -8,16 +8,14 @@
 		selectionTree.clearSelectedOrganisationUnits();
 		selectionTree.buildSelectionTree();
 
-		<!-- Calendar setup -->
 		datePickerInRange( 'startDate' , 'endDate' );	
-		
-		<!-- I18n variables -->
-		var i18n_indicator_group = '$encoder.jsEscape( $i18n.getString( "indicator_group" ) , "'")';
-		var i18n_start_date = '$encoder.jsEscape( $i18n.getString( "start_date" ) , "'")';
-		var i18n_end_date = '$encoder.jsEscape( $i18n.getString( "end_date" ) , "'")';
-		var i18n_period_type = '$encoder.jsEscape( $i18n.getString( "period_type" ) , "'")';
-		var i18n_organisation_unit_level = '$encoder.jsEscape( $i18n.getString( "organisation_unit_level" ) , "'")';
 	});
+	
+	var i18n_indicator_group = '$encoder.jsEscape( $i18n.getString( "indicator_group" ) , "'")';
+	var i18n_start_date = '$encoder.jsEscape( $i18n.getString( "start_date" ) , "'")';
+	var i18n_end_date = '$encoder.jsEscape( $i18n.getString( "end_date" ) , "'")';
+	var i18n_period_type = '$encoder.jsEscape( $i18n.getString( "period_type" ) , "'")';
+	var i18n_organisation_unit_level = '$encoder.jsEscape( $i18n.getString( "organisation_unit_level" ) , "'")';
 </script>
 
 <style type="text/css">