From 04eff47988665540d0e9e5aa134f23562358c801 Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Tue, 24 Jul 2018 08:54:47 +0200
Subject: [PATCH 1/2] Remove unneeded 'for' attributes on span

---
 contribs/gmf/src/layertree/component.html | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/contribs/gmf/src/layertree/component.html b/contribs/gmf/src/layertree/component.html
index 0db3412a7705..814bb4278954 100644
--- a/contribs/gmf/src/layertree/component.html
+++ b/contribs/gmf/src/layertree/component.html
@@ -129,10 +129,9 @@
         <ul>
           <li ng-if="::(layertreeCtrl.depth === 1 && !layertreeCtrl.node.mixed) || (layertreeCtrl.depth > 1 && layertreeCtrl.parent.node.mixed)">
             <i class="fa fa-tint fa-fw"></i>
-            <span for="layer-opactity">{{'Opacity'|translate}}</span>
+            <span>{{'Opacity'|translate}}</span>
             <input
               class="input-action"
-              name="layer-opactity"
               type="range"
               min="0"
               max="1"
@@ -190,10 +189,9 @@
 
   <div ng-if="::gmfLayertreeCtrl.supportsOpacityChange(layertreeCtrl)">
     <i class="fa fa-tint fa-fw"></i>
-    <span for="layer-opactity">{{'Opacity'|translate}}</span>
+    <span>{{'Opacity'|translate}}</span>
     <input
         class="input-action"
-        name="layer-opactity"
         type="range"
         min="0"
         max="1"

From 95ba2a8bcf25e7dbdb3cac648a2702d4c9b8fb75 Mon Sep 17 00:00:00 2001
From: Frederic Junod <frederic.junod@camptocamp.com>
Date: Tue, 24 Jul 2018 09:08:35 +0200
Subject: [PATCH 2/2] Use unique identifiers in share and featureStyle
 components

---
 contribs/gmf/src/drawing/featureStyleComponent.html | 8 ++++----
 contribs/gmf/src/drawing/featureStyleComponent.js   | 7 +++++++
 contribs/gmf/src/permalink/shareComponent.html      | 8 ++++----
 contribs/gmf/src/permalink/shareComponent.js        | 8 ++++++++
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/contribs/gmf/src/drawing/featureStyleComponent.html b/contribs/gmf/src/drawing/featureStyleComponent.html
index 0353e4f4da6b..40d7f29531b2 100644
--- a/contribs/gmf/src/drawing/featureStyleComponent.html
+++ b/contribs/gmf/src/drawing/featureStyleComponent.html
@@ -10,13 +10,13 @@
       ng-if="fsCtrl.type !== 'Text'"
       class="form-group">
         <input
-          id="gmf-featurestyle-showlabel"
+          id="gmf-featurestyle-showlabel-{{::fsCtrl.uid}}"
           type="checkbox"
           ng-model="fsCtrl.getSetShowLabel"
           ng-model-options="{getterSetter: true}"/>
         <label
           ng-switch="fsCtrl.type"
-          for="gmf-featurestyle-showlabel"
+          for="gmf-featurestyle-showlabel-{{::fsCtrl.uid}}"
           class="control-label">
           {{'Display label' | translate}}
         </label>
@@ -25,13 +25,13 @@
       ng-if="fsCtrl.type !== 'Text'"
       class="form-group">
       <input
-          id="gmf-featurestyle-showmeasure"
+          id="gmf-featurestyle-showmeasure-{{::fsCtrl.uid}}"
           type="checkbox"
           ng-model="fsCtrl.getSetShowMeasure"
           ng-model-options="{getterSetter: true}"/>
       <label
           ng-switch="fsCtrl.type"
-          for="gmf-featurestyle-showmeasure"
+          for="gmf-featurestyle-showmeasure-{{::fsCtrl.uid}}"
           class="control-label">
         <span ng-switch-when="Circle">
           {{'Display azimuth and radius' | translate}}
diff --git a/contribs/gmf/src/drawing/featureStyleComponent.js b/contribs/gmf/src/drawing/featureStyleComponent.js
index 9d83a1bc9c5b..5b7b8ecd2962 100644
--- a/contribs/gmf/src/drawing/featureStyleComponent.js
+++ b/contribs/gmf/src/drawing/featureStyleComponent.js
@@ -2,6 +2,7 @@
  * @module gmf.drawing.featureStyleComponent
  */
 import googAsserts from 'goog/asserts.js';
+import * as olBase from 'ol/index.js';
 import * as olEvents from 'ol/events.js';
 import ngeoFormatFeatureProperties from 'ngeo/format/FeatureProperties.js';
 
@@ -66,6 +67,12 @@ exports.directive('gmfFeaturestyle',
  */
 exports.Controller_ = function($scope, ngeoFeatureHelper) {
 
+  /**
+   * @type {number}
+   * @export
+   */
+  this.uid = olBase.getUid(this);
+
   /**
    * @type {?ol.Feature}
    * @export
diff --git a/contribs/gmf/src/permalink/shareComponent.html b/contribs/gmf/src/permalink/shareComponent.html
index 0097c8f952f8..4da00b0151d3 100644
--- a/contribs/gmf/src/permalink/shareComponent.html
+++ b/contribs/gmf/src/permalink/shareComponent.html
@@ -5,8 +5,8 @@ <h4 class="modal-title" translate>Share this map</h4>
 <div class="modal-body">
   <form role="form" name="gmfShareForm" novalidate>
     <div class="form-group">
-      <label for="gmfShareInputShortLink" translate>Permalink</label>
-      <input type="text" class="form-control" id="gmfShareInputShortLink" onclick="this.select()" ng-model="$ctrl.shortLink" readonly="True">
+      <label for="gmfShareInputShortLink-{{::$ctrl.uid}}" translate>Permalink</label>
+      <input type="text" class="form-control" id="gmfShareInputShortLink-{{::$ctrl.uid}}" onclick="this.select()" ng-model="$ctrl.shortLink" readonly="True">
       <p class="help-block" translate>Copy this link to share it.</p>
       <p class="text-danger" ng-if="$ctrl.showLengthWarning">
         <span class="fa fa-exclamation-triangle"></span>
@@ -20,8 +20,8 @@ <h4 class="modal-title" translate>Share this map</h4>
     <hr>
     <div class="gmf-share-email" ng-if="::$ctrl.enableEmail">
       <div class="form-group">
-        <label for="gmfShareInputEmail" translate>Send this link to</label>
-        <input type="email" class="form-control"  name="inputEmail" id="gmfShareInputEmail" placeholder="E-mail" ng-model="$ctrl.email" required>
+        <label for="gmfShareInputEmail-{{::$ctrl.uid}}" translate>Send this link to</label>
+        <input type="email" class="form-control"  name="inputEmail" id="gmfShareInputEmail-{{::$ctrl.uid}}" placeholder="E-mail" ng-model="$ctrl.email" required>
         <span ng-show="gmfShareForm.$submitted || gmfShareForm.inputEmail.$touched">
           <span class="text-danger" ng-show="gmfShareForm.inputEmail.$error.email || gmfShareForm.inputEmail.$error.required">
             <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
diff --git a/contribs/gmf/src/permalink/shareComponent.js b/contribs/gmf/src/permalink/shareComponent.js
index 32ac75703eee..bc4ceb6e418a 100644
--- a/contribs/gmf/src/permalink/shareComponent.js
+++ b/contribs/gmf/src/permalink/shareComponent.js
@@ -3,6 +3,7 @@
  */
 import gmfPermalinkShareService from 'gmf/permalink/ShareService.js';
 import ngeoStatemanagerLocation from 'ngeo/statemanager/Location.js';
+import * as olBase from 'ol/index.js';
 
 const exports = angular.module('gmfPermalinkShareComponent', [
   gmfPermalinkShareService.module.name,
@@ -73,6 +74,13 @@ class ShareComponentController {
    * @ngname GmfShareController
    */
   constructor($scope, ngeoLocation, gmfShareService, $q, $attrs) {
+
+    /**
+     * @type {number}
+     * @export
+     */
+    this.uid = olBase.getUid(this);
+
     /**
      * @type {angular.Scope}
      * @private