Merge pull request #2428 from camptocamp/tablet-redirect

Add a tablet redirect
camptocamp · Mar 10, 2017 · 069100e · 069100e
2 parents 7c644b4 + 7e24822
commit 069100e
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 25 deletions.
diff --git a/contribs/gmf/apps/desktop/index.html b/contribs/gmf/apps/desktop/index.html
@@ -176,9 +176,11 @@
               class="dropdown-menu">
             </gmf-backgroundlayerselector>
           </div>
-          <gmf-disclaimer
-            gmf-disclaimer-map="::mainCtrl.map">
-          </gmf-disclaimer>
+          <div class="gmf-app-map-messages">
+            <gmf-disclaimer
+              gmf-disclaimer-map="::mainCtrl.map">
+            </gmf-disclaimer>
+          </div>
           <gmf-displayquerywindow
             gmf-displayquerywindow-featuresstyle="::mainCtrl.queryFeatureStyle"
             gmf-displayquerywindow-desktop="true">

diff --git a/contribs/gmf/apps/desktop_alt/index.html b/contribs/gmf/apps/desktop_alt/index.html
@@ -176,13 +176,14 @@
               class="dropdown-menu">
             </gmf-backgroundlayerselector>
           </div>
-          <gmf-disclaimer
-            gmf-disclaimer-map="::mainCtrl.map"
-            gmf-disclaimer-external="::true"
-            gmf-disclaimer-external-msg="disclaimerMsg"
-            gmf-disclaimer-external-visibility="disclaimerVisibility"
-            >
-          </gmf-disclaimer>
+          <div class="gmf-app-map-messages">
+            <gmf-disclaimer
+              gmf-disclaimer-map="::mainCtrl.map"
+              gmf-disclaimer-external="::true"
+              gmf-disclaimer-external-msg="disclaimerMsg"
+              gmf-disclaimer-external-visibility="disclaimerVisibility">
+            </gmf-disclaimer>
+          </div>
         </div>
         <gmf-map class="gmf-map" gmf-map-map="mainCtrl.map"
           ngeo-map-query=""

diff --git a/contribs/gmf/apps/mobile/index.html b/contribs/gmf/apps/mobile/index.html
@@ -59,9 +59,13 @@
         ngeo-mobile-geolocation-options="::mainCtrl.mobileGeolocationOptions">
         <span class="fa fa-location-arrow"></span>
       </button>
-      <gmf-disclaimer
-        gmf-disclaimer-map="::mainCtrl.map">
-      </gmf-disclaimer>
+      <div class="gmf-app-map-messages">
+        <gmf-disclaimer gmf-disclaimer-map="::mainCtrl.map"></gmf-disclaimer>
+        <div class="alert alert-info alert-dismissible fade in visible-sm" role="alert">
+          <button type="button" class="close" data-dismiss="alert" aria-label="{{'Close' | translate }}"><span aria-hidden="true" class="fa fa-times"></span></button>
+          <span>{{"You're using the mobile version. Check out the" | translate }} <a href="http://camptocamp.github.io/ngeo/master/examples/contribs/gmf/apps/desktop/">{{'standard version' | translate}}</a>.</span>
+        </div>
+      </div>
     </main>
     <nav class="gmf-mobile-nav-left" gmf-mobile-nav>
       <header>

diff --git a/contribs/gmf/apps/oeedit/index.html b/contribs/gmf/apps/oeedit/index.html
@@ -103,9 +103,11 @@
               class="dropdown-menu">
             </gmf-backgroundlayerselector>
           </div>
-          <gmf-disclaimer
-            gmf-disclaimer-map="::mainCtrl.map">
-          </gmf-disclaimer>
+          <div class="gmf-app-map-messages">
+            <gmf-disclaimer
+              gmf-disclaimer-map="::mainCtrl.map">
+            </gmf-disclaimer>
+          </div>
           <gmf-displayquerywindow
             gmf-displayquerywindow-featuresstyle="::mainCtrl.queryFeatureStyle"
             gmf-displayquerywindow-desktop="true">

diff --git a/contribs/gmf/apps/oeview/index.html b/contribs/gmf/apps/oeview/index.html
@@ -60,9 +60,11 @@
               class="dropdown-menu">
             </gmf-backgroundlayerselector>
           </div>
-          <gmf-disclaimer
-            gmf-disclaimer-map="::mainCtrl.map">
-          </gmf-disclaimer>
+          <div class="gmf-app-map-messages">
+            <gmf-disclaimer
+              gmf-disclaimer-map="::mainCtrl.map">
+            </gmf-disclaimer>
+          </div>
           <gmf-displayquerywindow
             gmf-displayquerywindow-featuresstyle="::mainCtrl.queryFeatureStyle"
             gmf-displayquerywindow-desktop="true">

diff --git a/contribs/gmf/less/desktop.less b/contribs/gmf/less/desktop.less
@@ -340,7 +340,7 @@ gmf-backgroundlayerselector {
 /**
  * GMF DrawFeature directive
  */
-gmf-drawfeature h2 {
+.gmf-app-map-messages h2 {
   display: none;
 }
 
@@ -479,6 +479,7 @@ gmf-featurestyle {
   position: absolute;
   top: 0;
   width: 20rem;
+  z-index: 999;
 }
 
 
@@ -521,7 +522,7 @@ gmf-featurestyle {
 
 /** Disclaimer */
 @bgselector-image-size: 48px;
-gmf-disclaimer {
+.gmf-app-map-messages {
   position: absolute;
   vertical-align: bottom;
   left: ~"calc(2 * @{app-margin} + @{bgselector-image-size} + 2 * @{padding-small-vertical})";

diff --git a/contribs/gmf/less/map.less b/contribs/gmf/less/map.less
@@ -108,8 +108,8 @@ button[ngeo-mobile-geolocation] {
   }
 }
 
-/** Disclaimer */
-gmf-disclaimer {
+/** Disclaimer and tablet redirect */
+.gmf-app-map-messages {
   position: absolute;
   bottom: @app-margin;
   left: @app-margin;

diff --git a/contribs/gmf/less/mobile.less b/contribs/gmf/less/mobile.less
@@ -127,8 +127,8 @@ button[ngeo-mobile-geolocation] {
   }
 }
 
-/** Disclaimer */
-main gmf-disclaimer {
+/** Disclaimer, and tablet redirect */
+main .gmf-app-map-messages {
   text-align: left;
 
   button {