Merge pull request #4697 from camptocamp/mobile-measure-area

Move the mobile measure area from mobile_alt to mobile.
camptocamp · Feb 27, 2019 · 0e370c5 · 0e370c5
2 parents fb97a32 + 0cbd52f
commit 0e370c5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/contribs/gmf/apps/mobile/index.html.ejs b/contribs/gmf/apps/mobile/index.html.ejs
@@ -35,6 +35,14 @@
         gmf-displayquerywindow-featuresstyle="::mainCtrl.queryFeatureStyle"
         gmf-displayquerywindow-defaultcollapsed="false">
       </gmf-displayquerywindow>
+      <div
+        class="gmf-mobile-measure"
+        gmf-mobile-measurearea
+        gmf-mobile-measurearea-active="mainCtrl.measureAreaActive"
+        gmf-mobile-measurearea-precision="2"
+        gmf-mobile-measurearea-sketchstyle="::mainCtrl.customMeasureStyle"
+        gmf-mobile-measurearea-map="::mainCtrl.map">
+      </div>
       <div
         class="gmf-mobile-measure"
         gmf-mobile-measurelength
@@ -160,6 +168,15 @@
               {{'Length' | translate}}
             </a>
           </li>
+          <li>
+            <a ngeo-btn
+              ng-click="mainCtrl.hideNav()"
+              class="gmf-mobile-nav-button"
+              ng-model="mainCtrl.measureAreaActive">
+              <span class="fa fa-fw" ng-class="{'fa-check': mainCtrl.measureAreaActive}"></span>
+              {{'Area' | translate}}
+            </a>
+          </li>
         </ul>
       </div>
       <gmf-authentication id="login" class="gmf-mobile-nav-slide" data-header-title="{{'Login' | translate}}"

diff --git a/contribs/gmf/apps/mobile_alt/index.html.ejs b/contribs/gmf/apps/mobile_alt/index.html.ejs
@@ -33,14 +33,6 @@
         gmf-displayquerywindow-featuresstyle="::mainCtrl.queryFeatureStyle"
         gmf-displayquerywindow-defaultcollapsed="false">
       </gmf-displayquerywindow>
-      <div
-        class="gmf-mobile-measure"
-        gmf-mobile-measurearea
-        gmf-mobile-measurearea-active="mainCtrl.measureAreaActive"
-        gmf-mobile-measurearea-precision="2"
-        gmf-mobile-measurearea-sketchstyle="::mainCtrl.customMeasureStyle"
-        gmf-mobile-measurearea-map="::mainCtrl.map">
-      </div>
       <div
         class="gmf-mobile-measure"
         gmf-mobile-measurelength
@@ -174,15 +166,6 @@
               {{'Length' | translate}}
             </a>
           </li>
-          <li>
-            <a ngeo-btn
-              ng-click="mainCtrl.hideNav()"
-              class="gmf-mobile-nav-button"
-              ng-model="mainCtrl.measureAreaActive">
-              <span class="fa fa-fw" ng-class="{'fa-check': mainCtrl.measureAreaActive}"></span>
-              {{'Area' | translate}}
-            </a>
-          </li>
         </ul>
       </div>
       <gmf-authentication id="login" class="gmf-mobile-nav-slide" data-header-title="{{'Login' | translate}}"