move the measurement checkbox next to the label

camptocamp · Dec 19, 2017 · f5c4925 · f5c4925
1 parent 8323c7a
commit f5c4925
Showing 1 changed file with 33 additions and 37 deletions.
diff --git a/contribs/gmf/src/directives/partials/featurestyle.html b/contribs/gmf/src/directives/partials/featurestyle.html
@@ -20,7 +20,39 @@
           class="control-label">
           {{'Display label' | translate}}
         </label>
-     </div>
+  </div>
+  <div
+      ng-if="fsCtrl.type !== 'Text'"
+      class="form-group">
+      <input
+          id="gmf-featurestyle-showmeasure"
+          type="checkbox"
+          ng-model="fsCtrl.getSetShowMeasure"
+          ng-model-options="{getterSetter: true}"/>
+      <label
+          ng-switch="fsCtrl.type"
+          for="gmf-featurestyle-showmeasure"
+          class="control-label">
+        <span ng-switch-when="Circle">
+          {{'Display azimuth and radius' | translate}}
+        </span>
+        <span ng-switch-when="Polygon">
+          {{'Display surface' | translate}}
+        </span>
+        <span ng-switch-when="Rectangle">
+          {{'Display surface' | translate}}
+        </span>
+        <span ng-switch-when="LineString">
+          {{'Display length' | translate}}
+        </span>
+        <span ng-switch-when="Point">
+          {{'Display coordinates' | translate}}
+        </span>
+      </label>
+      <em class="text-muted">
+        ({{ fsCtrl.measure }})
+      </em>
+  </div>
 </div>
 <div
     ng-if="fsCtrl.feature && fsCtrl.type"
@@ -119,40 +151,4 @@
     </div>
   </div>
 
-  <div
-      ng-if="fsCtrl.type !== 'Text'"
-      class="form-group">
-    <div class="col-md-12">
-      <input
-          id="gmf-featurestyle-showmeasure"
-          type="checkbox"
-          ng-model="fsCtrl.getSetShowMeasure"
-          ng-model-options="{getterSetter: true}"/>
-      <label
-          ng-switch="fsCtrl.type"
-          for="gmf-featurestyle-showmeasure"
-          class="control-label">
-        <span ng-switch-when="Circle">
-          {{'Display azimuth and radius' | translate}}
-        </span>
-        <span ng-switch-when="Polygon">
-          {{'Display surface' | translate}}
-        </span>
-        <span ng-switch-when="Rectangle">
-          {{'Display surface' | translate}}
-        </span>
-        <span ng-switch-when="LineString">
-          {{'Display length' | translate}}
-        </span>
-        <span ng-switch-when="Point">
-          {{'Display coordinates' | translate}}
-        </span>
-      </label>
-      <em class="text-muted">
-        ({{ fsCtrl.measure }})
-      </em>
-    </div>
-
-  </div>
-
 </div>