=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm 2013-09-01 21:38:52 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm 2013-10-22 18:10:32 +0000 @@ -1,6 +1,7 @@

$i18n.getString( "about_dhis2" )

+
$i18n.getString( "web_api" ):
$i18n.getString( "browse_it_here" )
$i18n.getString( "current_user" ):
$!currentUsername
$i18n.getString( "version" ):
$!info.version
$i18n.getString( "build_revision" ):
$!info.revision
=== 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-10-15 14:00:22 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/green/green.css 2013-10-22 18:10:32 +0000 @@ -107,24 +107,18 @@ #menuLink1 { position: absolute; - left: 595px; + left: 695px; } #menuLink2 { position: absolute; - left: 695px; + left: 795px; } #menuLink3 { position: absolute; - left: 795px; -} - -#menuLink4 -{ - position: absolute; left: 895px; } @@ -132,14 +126,14 @@ { position: absolute; top: 44px; - left: 595px; + left: 695px; } #menuDropDown2 { position: absolute; top: 44px; - left: 695px; + left: 795px; } #menuDropDown3 @@ -149,13 +143,6 @@ left: 795px; } -#menuDropDown4 -{ - position: absolute; - top: 44px; - left: 795px; -} - .menuDropDownArea { font-size: 9pt; === 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-10-09 17:31:36 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/india/india.css 2013-10-22 18:10:32 +0000 @@ -107,24 +107,18 @@ #menuLink1 { position: absolute; - left: 595px; + left: 695px; } #menuLink2 { position: absolute; - left: 695px; + left: 795px; } #menuLink3 { position: absolute; - left: 795px; -} - -#menuLink4 -{ - position: absolute; left: 895px; } @@ -132,14 +126,14 @@ { position: absolute; top: 44px; - left: 595px; + left: 695px; } #menuDropDown2 { position: absolute; top: 44px; - left: 695px; + left: 795px; } #menuDropDown3 @@ -149,13 +143,6 @@ left: 795px; } -#menuDropDown4 -{ - position: absolute; - top: 44px; - left: 795px; -} - .menuDropDownArea { font-size: 9pt; === 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-10-15 14:00:22 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/light_blue/light_blue.css 2013-10-22 18:10:32 +0000 @@ -107,24 +107,18 @@ #menuLink1 { position: absolute; - left: 595px; + left: 695px; } #menuLink2 { position: absolute; - left: 695px; + left: 795px; } #menuLink3 { position: absolute; - left: 795px; -} - -#menuLink4 -{ - position: absolute; left: 895px; } @@ -132,14 +126,14 @@ { position: absolute; top: 44px; - left: 595px; + left: 695px; } #menuDropDown2 { position: absolute; top: 44px; - left: 695px; + left: 795px; } #menuDropDown3 @@ -149,13 +143,6 @@ left: 795px; } -#menuDropDown4 -{ - position: absolute; - top: 44px; - left: 795px; -} - .menuDropDownArea { font-size: 9pt; === 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-10-09 17:31:36 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/vietnam/vietnam.css 2013-10-22 18:10:32 +0000 @@ -107,24 +107,18 @@ #menuLink1 { position: absolute; - left: 595px; + left: 695px; } #menuLink2 { position: absolute; - left: 695px; + left: 795px; } #menuLink3 { position: absolute; - left: 795px; -} - -#menuLink4 -{ - position: absolute; left: 895px; } @@ -132,14 +126,14 @@ { position: absolute; top: 44px; - left: 595px; + left: 695px; } #menuDropDown2 { position: absolute; top: 44px; - left: 695px; + left: 795px; } #menuDropDown3 @@ -149,13 +143,6 @@ left: 795px; } -#menuDropDown4 -{ - position: absolute; - top: 44px; - left: 795px; -} - .menuDropDownArea { font-size: 9pt; === 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 2013-08-16 12:29:21 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.js 2013-10-22 18:10:32 +0000 @@ -49,16 +49,7 @@ hideDropDownTimeout(); } ); - $( "#menuLink4" ).hover( function() - { - showDropDown( "menuDropDown4" ); - }, - function() - { - hideDropDownTimeout(); - } ); - - $( "#menuDropDown1, #menuDropDown2, #menuDropDown3, #menuDropDown4" ).hover( function() + $( "#menuDropDown1, #menuDropDown2, #menuDropDown3" ).hover( function() { cancelHideDropDownTimeout(); }, === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm 2013-10-22 17:26:04 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm 2013-10-22 18:10:32 +0000 @@ -68,6 +68,10 @@ + + $encoder.htmlEncode( $applicationTitle ) + + #if( $maintenanceModules.size() > 0 ) @@ -99,27 +102,17 @@ #end - - -