=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.ui.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.ui.js 2014-08-26 07:05:04 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.ui.js 2014-08-30 09:50:16 +0000
@@ -115,7 +115,7 @@
templates.search = '
' +
'' +
- '' +
+ '' +
'
';
templates.extraLink = '';
@@ -537,7 +537,12 @@
}
//Add the linkItem to the menu
- jqLite(document.querySelector('#' + defaultMenu.container + ' ul')).append(linkItem);
+ //Make sure that the application button element is always positioned after the profile
+ if (document.querySelector('#applicationsButton') !== null) {
+ jqLite(document.querySelector('#applicationsButton')).before(linkItem);
+ } else {
+ jqLite(document.querySelector('#' + defaultMenu.container + ' ul')).append(linkItem);
+ }
});
defaultMenu.eventsHandlers.push(function (menuElement) {
@@ -952,7 +957,6 @@
helpPageLink = json;
}
});
-
dhis2.menu.ui.createMenu("profile", [
{
name: "settings",
@@ -978,7 +982,7 @@
{
name: "help",
namespace: "/dhis-web-commons-about",
- defaultAction: helpPageLink.defaultAction,
+ defaultAction: helpPageLink.defaultAction || "", //FIXME: This sets the help url to an empty string when the ajax call failed. We should find an alternative.
icon: "../icons/function-account.png",
description: ""
},