dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #25743
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12801: Merged the Help top menu into Profile
------------------------------------------------------------
revno: 12801
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-10-22 20:10:32 +0200
message:
Merged the Help top menu into Profile
modified:
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/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/main.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.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/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 @@
<h3>$i18n.getString( "about_dhis2" )</h3>
<dl>
+ <dt>$i18n.getString( "web_api" ):</dt><dd><a href="../api">$i18n.getString( "browse_it_here" )</a></dd>
<dt>$i18n.getString( "current_user" ):</dt><dd>$!currentUsername</dd>
<dt>$i18n.getString( "version" ):</dt><dd>$!info.version</dd>
<dt>$i18n.getString( "build_revision" ):</dt><dd>$!info.revision</dd>
=== 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 @@
<img id="headerBanner" src="../dhis-web-commons/css/${stylesheetDirectory}/logo_banner.png"
onclick="window.location.href='../${startModule}/index.action'" style="cursor:pointer" title="$i18n.getString( 'view_intepretations' )">
+ <span id="headerText" onclick="window.location.href='../${startModule}/index.action'" style="cursor:pointer" title="$i18n.getString( 'view_home_page' )">
+ $encoder.htmlEncode( $applicationTitle )
+ </span>
+
<ul id="menuLinkArea">
#if( $maintenanceModules.size() > 0 )
<li><a id="menuLink1" href="../dhis-web-commons-about/modules.action" class="menuLink">$i18n.getString( "maintenance" )</a></li>
@@ -75,8 +79,7 @@
#if( $serviceModules.size() > 0 )
<li><a id="menuLink2" href="../dhis-web-commons-about/modules.action" class="menuLink">$i18n.getString( "services" )</a></li>
#end
- <li><a id="menuLink3" href="../dhis-web-commons-about/functions.action" class="menuLink">$i18n.getString( "help" )</a></li>
- <li><a id="menuLink4" href="../dhis-web-commons-about/functions.action" class="menuLink">$i18n.getString( "profile" )</a></li>
+ <li><a id="menuLink3" href="../dhis-web-commons-about/functions.action" class="menuLink">$i18n.getString( "profile" )</a></li>
</ul>
#if( $maintenanceModules.size() > 0 )
@@ -99,27 +102,17 @@
</div>
#end
- <div id="menuDropDown3" class="menuDropDownArea">
- <ul class="menuDropDownBox">
- <li><a href="../dhis-web-commons-about/help.action">$i18n.getString( "help_center" ) </a></li>
- <li><a href="../api">$i18n.getString( "web_api" ) </a></li>
- <li><a href="../dhis-web-commons-about/about.action">$i18n.getString( "about_dhis2" ) </a></li>
- </ul>
- </div>
-
- <div id="menuDropDown4" class="menuDropDownArea">
+ <div id="menuDropDown3" class="menuDropDownArea">
<ul class="menuDropDownBox">
<li><a href="../dhis-web-commons-about/userSettings.action">$i18n.getString( "settings" ) </a></li>
<li><a href="../dhis-web-commons-about/showUpdateUserProfileForm.action">$i18n.getString( "profile" ) </a></li>
<li><a href="../dhis-web-commons-about/showUpdateUserAccountForm.action">$i18n.getString( "account" ) </a></li>
+ <li><a href="../dhis-web-commons-about/help.action">$i18n.getString( "help" ) </a></li>
<li><a href="../dhis-web-commons-security/logout.action">$i18n.getString( "log_out" ) </a></li>
+ <li><a href="../dhis-web-commons-about/about.action">$i18n.getString( "about_dhis2" ) </a></li>
</ul>
</div>
- <span id="headerText" onclick="window.location.href='../${startModule}/index.action'" style="cursor:pointer" title="$i18n.getString( 'view_home_page' )">
- $encoder.htmlEncode( $applicationTitle )
- </span>
-
<span id="showLeftBar">
<a href="javascript:dhis2.leftBar.showAnimated()" title="$i18n.getString( 'show_menu' )">
<img src="../images/show_menu.png" width="16" height="16" alt="$i18n.getString( 'show_menu' )"/></a>
=== 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-10-15 17:46:57 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2013-10-22 18:10:32 +0000
@@ -403,6 +403,7 @@
cpu_cores=CPU cores
user_groups=User groups
please_select=Please select
+browse_it_here=Browse it here
#-- Change Log------------------------------------------------------------------#
