=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/menu.css' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/menu.css 2014-04-02 12:45:15 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/menu.css 2014-04-02 13:48:42 +0000 @@ -395,6 +395,37 @@ padding-right: 4px; } +.app-menu-error +{ + background: darkred; + background: rgba(160, 0, 0, .70); + border: 1px solid darkred; + border-radius: 5px; + display: block; + padding: .5em 0; + text-align: center; + width: 100%; +} + +.app-menu-error:hover +{ + background: rgba(160, 0, 0, .80); + cursor: pointer; +} + +.app-menu-error a +{ + background-color: transparent; + color: white; +} + +.app-menu-error a:hover +{ + background-color: transparent; + color: white; + text-decoration: none; +} + /* * Media queries for the menu */ === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.js' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.js 2014-04-01 12:46:32 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.js 2014-04-02 13:48:42 +0000 @@ -404,8 +404,6 @@ //TODO: Give user feedback for successful save }).error(function () { //TODO: Give user feedback for failure to save - //TODO: Translate this error message - alert('Unable to save your app order to the server.'); }); } } @@ -475,8 +473,11 @@ menu.addMenuItems(data.modules); } }).error(function () { + //TODO: Give user feedback for failure to load items //TODO: Translate this error message - alert('Can not load apps from server.'); + var error_template = '
  • Unable to load your apps, click to refresh
  • '; + $('#' + selector).addClass('app-menu').html(''); + $('#menuDropDown1 .menuDropDownBox').html(error_template); }); /**