dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2062
committer: Lars <larshelg@larshelg-laptop>
branch nick: trunk
timestamp: Thu 2010-07-01 05:25:19 +0200
message:
  Minor fix
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/blue/dom.js
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/dom.js
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/dom.js
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/dom.js
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/dom.js
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/south_africa/dom.js
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/dom.js
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/dom.js
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.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/css/blue/dom.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/blue/dom.js	2009-11-02 18:13:58 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/blue/dom.js	2010-07-01 03:25:19 +0000
@@ -25,3 +25,9 @@
     $( this ).css( "border", "1px solid #d5efd5" );
   });
 });
+
+// Called from main/Leftbar
+function setMainPageNormal()
+{
+	document.getElementById( 'mainPage' ).style.marginLeft = '300px';
+}

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/dom.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/dom.js	2009-11-02 18:13:58 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/dom.js	2010-07-01 03:25:19 +0000
@@ -25,3 +25,9 @@
     $( this ).css( "border", "1px solid #d5efd5" );
   });
 });
+
+// Called from main/Leftbar
+function setMainPageNormal()
+{
+	document.getElementById( 'mainPage' ).style.marginLeft = '300px';
+}

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/dom.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/dom.js	2009-11-02 18:13:58 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/dom.js	2010-07-01 03:25:19 +0000
@@ -25,3 +25,9 @@
     $( this ).css( "border", "1px solid #d5efd5" );
   });
 });
+
+// Called from main/Leftbar
+function setMainPageNormal()
+{
+	document.getElementById( 'mainPage' ).style.marginLeft = '300px';
+}

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/dom.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/dom.js	2009-11-02 18:13:58 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/dom.js	2010-07-01 03:25:19 +0000
@@ -25,3 +25,9 @@
     $( this ).css( "border", "1px solid #d5efd5" );
   });
 });
+
+// Called from main/Leftbar
+function setMainPageNormal()
+{
+	document.getElementById( 'mainPage' ).style.marginLeft = '270px';
+}

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/dom.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/dom.js	2009-11-02 18:13:58 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/openhealth/dom.js	2010-07-01 03:25:19 +0000
@@ -27,3 +27,9 @@
     $( this ).css( "border", "1px solid #d5efd5" );
   });
 });
+
+// Called from main/Leftbar
+function setMainPageNormal()
+{
+	document.getElementById( 'mainPage' ).style.marginLeft = '300px';
+}

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/south_africa/dom.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/south_africa/dom.js	2009-11-02 18:13:58 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/south_africa/dom.js	2010-07-01 03:25:19 +0000
@@ -25,3 +25,9 @@
     $( this ).css( "border", "1px solid #d5efd5" );
   });
 });
+
+// Called from main/Leftbar
+function setMainPageNormal()
+{
+	document.getElementById( 'mainPage' ).style.marginLeft = '300px';
+}

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/dom.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/dom.js	2009-11-02 18:13:58 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/dom.js	2010-07-01 03:25:19 +0000
@@ -25,3 +25,9 @@
     $( this ).css( "border", "1px solid #d5efd5" );
   });
 });
+
+// Called from main/Leftbar
+function setMainPageNormal()
+{
+	document.getElementById( 'mainPage' ).style.marginLeft = '300px';
+}

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/dom.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/dom.js	2009-11-02 18:13:58 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vista/dom.js	2010-07-01 03:25:19 +0000
@@ -25,3 +25,9 @@
     $( this ).css( "border", "1px solid #d5efd5" );
   });
 });
+
+// Called from main/Leftbar
+function setMainPageNormal()
+{
+	document.getElementById( 'mainPage' ).style.marginLeft = '300px';
+}

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js	2010-06-30 18:44:56 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js	2010-07-01 03:25:19 +0000
@@ -159,7 +159,7 @@
     this.showAnimated = function()
     {
         setMenuVisible();        
-        setMainPageLeftMargin( '270px' );
+        setMainPageNormal( '270px' ); // Delegated to dom.js for each style
         $( 'div#leftBar' ).show( 'fast' );
         $( 'span#showLeftBar' ).hide( 'fast' );
     };
@@ -167,7 +167,7 @@
     this.hideAnimated = function()
     {
         setMenuHidden();
-        setMainPageLeftMargin( '20px' );
+        setMainPageFullscreen( '20px' );
         $( 'div#leftBar' ).hide( 'fast' );
         $( 'span#showLeftBar' ).show( 'fast' );
     };
@@ -175,16 +175,16 @@
     this.hide = function()
     {
         setMenuHidden();
-        setMainPageLeftMargin( '20px' );
+        setMainPageFullscreen( '20px' );
         document.getElementById( 'leftBar' ).style.display = 'none';
         document.getElementById( 'showLeftBar' ).style.display = 'block';
     } 
 
-    function setMainPageLeftMargin( width )
-    {
-        document.getElementById( 'mainPage' ).style.marginLeft = width;
-    }
-        
+	function setMainPageFullscreen()
+	{
+		document.getElementById( 'mainPage' ).style.marginLeft = '20px';
+	}
+
     function setMenuVisible()
     {
         var request = new Request();

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties	2010-06-19 18:48:05 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties	2010-07-01 03:25:19 +0000
@@ -91,4 +91,5 @@
 intro_system_settings = Customize the system behavior with regard to reporting framework, start page, title, flag and more.
 disable_dataentry_when_dataset_completed = Disable data entry when data set completed.
 max_attempts = Max number of login attempts
-lockout_timeframe = Lockout minutes after max number of login attempts
\ No newline at end of file
+lockout_timeframe = Lockout minutes after max number of login attempts
+data_analysis_factor = Data analysis std dev factor
\ No newline at end of file