dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 16976
committer: Mark Polak <markpo@xxxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-10-07 11:15:58 +0200
message:
  Attempt to hide menu search box on and hide header text on screens with a width below 700px
modified:
  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/javascripts/dhis2/dhis2.menu.ui.js


--
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/menu.css'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/menu.css	2014-06-22 13:56:22 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/css/menu.css	2014-10-07 09:15:58 +0000
@@ -532,7 +532,7 @@
 /*
  * Media queries for the menu
  */
-@media only screen and (max-width: 580px)
+@media (max-width: 700px), (max-device-width: 700px)
 {
     #headerText
     {

=== 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-30 09:50:16 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.menu.ui.js	2014-10-07 09:15:58 +0000
@@ -946,17 +946,19 @@
  */
 (function () {
     dhis2.menu.ui.initMenu = function () {
+        var helpPageLink = "";
+        var isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
+
         try {
-		var helpPageLink = "";
-		$.ajax({
-			type : "GET",
-			url : "../dhis-web-commons/menu/getHelpPageLinkModule.action",
-			dataType : "json",
-			async : false,
-			success : function(json) {
-				helpPageLink = json;
-			}
-		});
+            $.ajax({
+                type : "GET",
+                url : "../dhis-web-commons/menu/getHelpPageLinkModule.action",
+                dataType : "json",
+                async : false,
+                success : function(json) {
+                    helpPageLink = json;
+                }
+            });
             dhis2.menu.ui.createMenu("profile", [
                 {
                     name: "settings",
@@ -1010,7 +1012,7 @@
             dhis2.menu.mainAppMenu = dhis2.menu.ui.createMenu("applications",
                 "/dhis-web-commons/menu/getModules.action",
                 {
-                    searchable: true,
+                    searchable: !isMobile,
                     scrollable: true,
                     extraLink: {
                         text: 'more_applications',