Fix sidebar toggle logic, legends styles, and map form locales

Flexberry · Sep 22, 2017 · 88b3cf4 · 88b3cf4
1 parent 8b2b389
commit 88b3cf4
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 28 deletions.
diff --git a/addon/styles/themes/default/modules/sidebar.overrides b/addon/styles/themes/default/modules/sidebar.overrides
@@ -348,7 +348,6 @@
                     }
                 }
                 .layer-legend-image-wrapper {
-                    min-height: @layerLegendImageWrapperMinHeight;
                     font-size: @layerLegendImageWrapperFontSize;
                     vertical-align: middle;
                     width: 100%;
@@ -359,8 +358,6 @@
                         float: left;
                     }
                     .layer-legend-image {
-                        max-height: @layerLegendImageMaxHeight;
-                        min-width: @layerLegendImageMinWidth;
                     }
                     .layer-legend-caption {
                         color: @layerLegendCaptionColor;

diff --git a/addon/styles/themes/default/modules/sidebar.variables b/addon/styles/themes/default/modules/sidebar.variables
@@ -83,12 +83,8 @@
 @layerLegendProgressbarBackground: @bluecolor;
 @layerLegendProgressbarPseudoBackground: @lightbluecolor;
 
-@layerLegendImageWrapperMinHeight: 27px;
 @layerLegendImageWrapperFontSize: 12px;
 
-@layerLegendImageMaxHeight: 27px;
-@layerLegendImageMinWidth: 34px;
-
 @layerLegendCaptionColor: @bluecolor;
 @layerLegendCaptionMargin: 5px 0px 0px 5px;
 @layerLegendCaptionMaxWidth: 80%;

diff --git a/tests/dummy/app/controllers/map.js b/tests/dummy/app/controllers/map.js
@@ -216,9 +216,10 @@ export default EditMapController.extend(
           this.set('sidebar.2.active', true);
         }
 
-        if (!Ember.$('.right.sidebar').hasClass('visible')) {
-          this.send('toggleSidebar', '.right.sidebar', '.mappanel', {
-            changed: false
+        if (!this.get('sidebarOpened')) {
+          this.send('toggleSidebar', {
+            changed: false,
+            tabName: 'identify'
           });
         }
       }

diff --git a/tests/dummy/app/locales/en/forms/map.js b/tests/dummy/app/locales/en/forms/map.js
@@ -0,0 +1,22 @@
+export default {
+  'caption': 'Map',
+  'treeviewbuttontooltip': 'Show tree view',
+  'searchbuttontooltip': 'Show search',
+  'bookmarksbuttontooltip': 'Spatial bookmarks',
+  'identifybuttontooltip': 'Show identification',
+
+  'tabbar': {
+    'treeview': {
+      'caption': 'Layers list'
+    },
+    'search': {
+      'caption': 'Search'
+    },
+    'identify': {
+      'caption': 'Identify'
+    },
+    'bookmarks': {
+      'caption': 'Spatial bookmarks'
+    }
+  }
+};
diff --git a/tests/dummy/app/locales/en/translations.js b/tests/dummy/app/locales/en/translations.js
@@ -2,6 +2,8 @@ import Ember from 'ember';
 import EmberFlexberryTranslations from 'ember-flexberry/locales/en/translations';
 import EmberFlexberryGisTranslations from 'ember-flexberry-gis/locales/en/translations';
 
+import MapFormTranslations from './forms/map';
+
 const translations = {};
 Ember.$.extend(true, translations, EmberFlexberryTranslations, EmberFlexberryGisTranslations);
 
@@ -150,13 +152,9 @@ Ember.$.extend(true, translations, {
     'maps': {
       'caption': 'Maps'
     },
-    'map': {
-      'caption': 'Map',
-      'treeviewbuttontooltip': 'Show tree view',
-      'searchbuttontooltip': 'Show search',
-      'bookmarksbuttontooltip': 'Spatial bookmarks',
-      'identifybuttontooltip': 'Show identification'
-    },
+
+    'map': MapFormTranslations,
+
     'crs': {
       'current': {
         'name': 'In map\'s coordinate system',

diff --git a/tests/dummy/app/locales/ru/forms/map.js b/tests/dummy/app/locales/ru/forms/map.js
@@ -0,0 +1,22 @@
+export default {
+  'caption': 'Карта',
+  'treeviewbuttontooltip': 'Показать дерево слоёв',
+  'searchbuttontooltip': 'Показать поиск',
+  'bookmarksbuttontooltip': 'Пространственные закладки',
+  'identifybuttontooltip': 'Показать идентификацию',
+
+  'tabbar': {
+    'treeview': {
+      'caption': 'Список слоев'
+    },
+    'search': {
+      'caption': 'Поиск'
+    },
+    'identify': {
+      'caption': 'Идентификация'
+    },
+    'bookmarks': {
+      'caption': 'Пространственные закладки'
+    }
+  }
+};
diff --git a/tests/dummy/app/locales/ru/translations.js b/tests/dummy/app/locales/ru/translations.js
@@ -2,6 +2,8 @@ import Ember from 'ember';
 import EmberFlexberryTranslations from 'ember-flexberry/locales/ru/translations';
 import EmberFlexberryGisTranslations from 'ember-flexberry-gis/locales/ru/translations';
 
+import MapFormTranslations from './forms/map';
+
 const translations = {};
 Ember.$.extend(true, translations, EmberFlexberryTranslations, EmberFlexberryGisTranslations);
 
@@ -150,16 +152,13 @@ Ember.$.extend(true, translations, {
     'maps': {
       'caption': 'Карты'
     },
-    'map': {
-      'caption': 'Карта',
-      'treeviewbuttontooltip': 'Показать дерево слоёв',
-      'searchbuttontooltip': 'Показать поиск',
-      'bookmarksbuttontooltip': 'Пространственные закладки',
-      'identifybuttontooltip': 'Показать идентификацию'
-    },
+
+    'map': MapFormTranslations,
+
     'csw': {
       'caption': 'CSW соединения'
     },
+
     'crs': {
       'current': {
         'name': 'В системе коодинат карты',

diff --git a/tests/dummy/app/templates/map.hbs b/tests/dummy/app/templates/map.hbs
@@ -41,7 +41,7 @@
     }}
     <div class="ui very wide right sidebar pushable tabbar">
       <div data-tab="treeview" class="ui tab treeview">
-        <h3>Список слоев</h3>
+        <h3>{{t "forms.map.tabbar.treeview.caption"}}</h3>
         {{#if _showTree}}
           {{flexberry-maplayers
             class="styled"
@@ -91,7 +91,7 @@
         {{/if}}
       </div>
       <div data-tab="search" class="ui tab search">
-        <h3>Поиск</h3>
+        <h3>{{t "forms.map.tabbar.search.caption"}}</h3>
         {{flexberry-search-panel
           querySearch=(action "querySearch")
           clearSearch=(action "clearSearch")
@@ -106,7 +106,7 @@
         }}
       </div>
       <div data-tab="identify" class="ui tab identify">
-        <h3>Идентификация</h3>
+        <h3>{{t "forms.map.tabbar.identify.caption"}}</h3>
         {{flexberry-identify-panel
           leafletMap=leafletMap
           layerMode=identifyLayersOption
@@ -122,7 +122,7 @@
         }}
       </div>
       <div data-tab="bookmarks" class="ui tab bookmarks">
-        <h3>Пространственные закладки</h3>
+        <h3>{{t "forms.map.tabbar.bookmarks.caption"}}</h3>
         {{spatial-bookmark
           leafletMap=leafletMap
           storageKey=model.id