Merge pull request #1097 from geoadmin/gal_rename_services

CSS: Use attribute filter css instead of class name for import WMS and K...
geoadmin · Feb 13, 2014 · 0435c4e · 0435c4e
2 parents de00176 + 3fcf08a
commit 0435c4e
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 32 deletions.
diff --git a/src/components/importkml/style/importkml.less b/src/components/importkml/style/importkml.less
@@ -1,5 +1,5 @@
 /* General */
-.import-kml {
+[ga-import-kml] {
   width: 420px;
   padding: 10px;
   position: relative;
@@ -91,7 +91,7 @@ form {
 }
 
 /* OVERRIDE BOOTSTRAP CSS */
-.import-kml {
+[ga-import-kml] {
 
   .nav > li > a {
     padding: 0px 10px;

diff --git a/src/components/importwms/style/importwms.less b/src/components/importwms/style/importwms.less
@@ -1,4 +1,4 @@
-.import-wms {
+[ga-import-wms] {
 
   position: relative;
   background-color: white;

diff --git a/src/components/timeselector/TimeSelectorDirective.js b/src/components/timeselector/TimeSelectorDirective.js
@@ -175,6 +175,9 @@
       restrict: 'A',
       template: '<a href="#" ng-click="toggle($event)" ng-class="stateClass">' +
           '</a>',
+      scope: {
+        isActive: '=gaTimeSelectorBtActive'
+      },
       link: function(scope, elt, attrs) {
 
         // Enable the button if it is disable
@@ -246,7 +249,8 @@
         },
         scope: {
           map: '=gaTimeSelectorMap',
-          options: '=gaTimeSelectorOptions'
+          options: '=gaTimeSelectorOptions',
+          isActive: '=gaTimeSelectorActive'
         },
         controller: 'GaTimeSelectorDirectiveController',
         link: function(scope, elt, attrs, controller) {
@@ -284,8 +288,11 @@
           // Watchers
           scope.$watch('isActive', function(active) {
             if (angular.isDefined(active)) {
+              elt.toggle(active);
               scope.stateClass = (active) ? 'active' : '';
               applyNewYear((active ? scope.currentYear : undefined));
+            } else {
+              elt.hide();
             }
           });
 

diff --git a/src/index.mako.html b/src/index.mako.html
@@ -125,8 +125,14 @@
         </div>
         <div ga-attribution ga-attribution-map="map"></div>
       </div>
-      <!-- <div ga-time-selector-bt id="time-selector-bt"></div> -->
-      <div ga-swipe ga-swipe-map="map" ga-swipe-active="isSwipeActive"></div>
+      <!--div ga-time-selector-bt 
+           ga-time-selector-bt-active="isTimeSelectorActive"-->
+      </div> 
+      <div ga-swipe 
+           ga-swipe-map="map" 
+           ga-swipe-active="isSwipeActive" 
+           style="display:none;">
+      </div>
     </div> <!-- #map -->
 
 
@@ -163,7 +169,11 @@
     </div>
 
     <div ng-controller="GaTimeSelectorController">
-      <div ga-time-selector ga-time-selector-map="map" ga-time-selector-options="options" ng-show="isActive" id="time-selector" class="ng-hide"></div>
+      <div ga-time-selector ga-time-selector-map="map"
+           ga-time-selector-options="options"
+           ga-time-selector-active="isTimeSelectorActive" 
+           style="display:none;">
+      </div>
     </div>
 
     <div id="pulldown" class="{{(globals.catalogShown && globals.selectionShown) ? 'selection-and-catalog-shown' : ''}}">
@@ -229,12 +239,12 @@
                 </li>
                 <li><!-- Measure -->
                   <a href=""  ng-click="isMeasureActive = !isMeasureActive">
-                    <span  ng-class="{'selected': isMeasureActive}" translate="{{'measure'}}"></span>
+                    <span  ng-class="{'selected': isMeasureActive}" translate>measure</span>
                   </a>
                 </li>
                 <li><!-- Feature Tree -->
                   <a href=""  ng-click="globals.isFeatureTreeActive = !globals.isFeatureTreeActive">
-                    <span  ng-class="{'selected': globals.isFeatureTreeActive}" translate="{{(globals.isFeatureTreeActive) ? 'object_information' : 'object_information'}}"></span>
+                    <span  ng-class="{'selected': globals.isFeatureTreeActive}" translate>object_information</span>
                   </a>
                 </li>
               </ul>
@@ -394,51 +404,53 @@ <h4 class="modal-title" translate>error</h4>
 
     <!-- Popup: Import WMS -->
     <div ga-popup="importWmsPopupShown"
-      ga-popup-options="{title:'import_wms'}"
-      ga-draggable=".ga-popup-title"
-      id="import-wms-popup" >
+         ga-popup-options="{title:'import_wms'}"
+         ga-draggable=".ga-popup-title"
+         id="import-wms-popup" >
       <div ng-controller="GaImportWmsController">
         <div ga-import-wms
-          ga-import-wms-map="map"
-          ga-import-wms-options="options"
-          id="import-wms"
-          class="import-wms">
+             ga-import-wms-map="map"
+             ga-import-wms-options="options">
         </div>
       </div>
     </div> <!-- end Import WMS -->
 
     <!-- Popup: Import KML -->
     <div ga-popup="importKmlPopupShown"
-      ga-popup-options="{title:'import_kml'}"
-      ga-draggable=".ga-popup-title"
-      id="import-kml-popup" >
+         ga-popup-options="{title:'import_kml'}"
+         ga-draggable=".ga-popup-title"
+         id="import-kml-popup" >
       <div ng-controller="GaImportKmlController">
         <div ga-import-kml
-          ga-import-kml-map="map"
-          ga-import-kml-options="options"
-          id="import-kml"
-          class="import-kml">
+             ga-import-kml-map="map"
+             ga-import-kml-options="options">
         </div>
       </div>
     </div><!-- end Import KML -->
 
     <!-- Popup: Measure -->
     <div ga-popup="isMeasureActive"
-      ga-popup-options="{title:'measure',showPrint:true}"
-      ga-draggable=".ga-popup-title"
-      id="measure-popup" >
+         ga-popup-options="{title:'measure',showPrint:true}"
+         ga-draggable=".ga-popup-title"
+         id="measure-popup" >
       <div ng-controller="GaMeasureController">
-        <div ga-measure ga-measure-map="map" ga-measure-options="options" ga-measure-active="isMeasureActive"></div>
+        <div ga-measure 
+             ga-measure-map="map" 
+             ga-measure-options="options" 
+             ga-measure-active="isMeasureActive"></div>
       </div>
     </div><!-- end Measure -->
 
     <!-- Popup: Feature Tree -->
     <div ga-popup="globals.isFeatureTreeActive"
-      ga-popup-options="{title: 'object_information'}"
-      ga-draggable=".ga-popup-title"
-      id="featuretree-popup">
-      <div id="featuretree" ng-controller="GaFeaturetreeController">
-        <div ga-featuretree ga-featuretree-options="options" ga-featuretree-map="map"></div>
+         ga-popup-options="{title: 'object_information'}"
+         ga-draggable=".ga-popup-title"
+         id="featuretree-popup">
+      <div ng-controller="GaFeaturetreeController" 
+           id="featuretree"> 
+        <div ga-featuretree 
+             ga-featuretree-options="options" 
+             ga-featuretree-map="map"></div>
       </div>
     </div>