c80_map 0.1.0.15 → 0.1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c21b38d6f69779edb81051a4470de447878450f
-  data.tar.gz: 20ba2d4f2ad1c69afa5fe771bab2813c1442ac08
+  metadata.gz: d22299dc8d3a58ca88d2affdcdb4ae197c0423f5
+  data.tar.gz: 065d046f0e9b487d05d0d4f121fc4287189b4f6a
 SHA512:
-  metadata.gz: d13d44acbc3d2f0c5803d1840872768ea45cb49b4fc86badf64e89e731203f3ba26d14d7b1c6d30a7ab3061427db72cf593cab0a374f64628501d5f4a31cc494
-  data.tar.gz: 00dec2fb04b6cb7abbbb8221571f7224a360b39851badc59151b177cc43ee05f696d44846cbc32ec193a7a1717a395c7afcdbaaf58012d34d142c8dc2b046da5
+  metadata.gz: 940fe038d0f4f86baf1cdb58846ac55d8fdc24e9212ed72b82f49ae6f086af10aa35698e07311f219fe09d9c4afa4635efdc565001c600796aaf9ada077e3539
+  data.tar.gz: f3c55276a80e32c7463053dba2edcba99f3e3b2856862e7cfd629651c094b2aa1468263941acac1d49fb03391609a8e4fedbea682872d45e706a69e3ed46972b

data/app/assets/javascripts/buttons/button_back_to_map.js

@@ -8,6 +8,8 @@ function BackToMapButton() {
     var _cnt = null;
     var _btn = null;
 
+    var _$building_info = null;
+
     var _onClick = function () {
         _map.setMode('viewing');
 
@@ -43,14 +45,39 @@ function BackToMapButton() {
         _btn = $('<a href="#" id="BackToMapButton">Обратно на карту</a>');
         _btn.on('click', _onClick);
         _cnt.append(_btn);
+
+        _$building_info = $('.building_info');
+
     };
 
     _this.show = function () {
+
+        // хардкод - подгоняем под длину анимации, прописанной в css
+        setTimeout(__show, 800);
+
+
+    };
+    var __show = function () {
+        // фиксируем
+        var building_info_top = _$building_info.offset().top;
+        var building_info_height = _$building_info.height();
+
+        // считаем
+        var btn_top = building_info_top + building_info_height;
+        var btn_left = _$building_info.offset().left;
+
+        // позиционируем
+        _btn.css('top', btn_top + 'px');
+        _btn.css('left', btn_left + 'px');
+
+        // показываем
+        _btn.css('opacity','1');
         _cnt.css('display', 'block');
     };
 
     _this.hide = function () {
         _cnt.css('display', 'none');
+        _btn.css('opacity', '0');
     }
 
 }

data/app/assets/javascripts/src/main.js

@@ -570,7 +570,7 @@ var clog = function () {
             }, false);
 
             self.back_to_map_button_klass = new BackToMapButton();
-            self.back_to_map_button_klass.init("#container_buttons", self);
+            self.back_to_map_button_klass.init("#ui", self);
 
             self.save_preloader_klass = new SavePreloader();
             self.save_preloader_klass.init();

data/app/assets/stylesheets/view/buttons/area_order_button.scss

@@ -0,0 +1,16 @@
+#area_order_button {
+  width: auto;
+  padding: 0 15px;
+  position: absolute;
+  bottom: 15px;
+  right: 15px;
+  font-weight: normal;
+  border-radius: 2px;
+}
+
+// когда входим в здание - кнопка не видна
+div.view_building {
+  #area_order_button {
+    display: none;
+  }
+}

data/app/assets/stylesheets/view/buttons/button_back_to_map.scss

@@ -0,0 +1,28 @@
+#BackToMapButton {
+  background-color: #3377A8;
+  color: #fff !important;
+  display: block;
+  font-size: 17px;
+  cursor: pointer;
+  text-align: center;
+  line-height: 50px;
+  width: 417px;
+  height: 50px;
+  z-index: 99999;
+  transition: opacity 0.6s ease-out;
+  -webkit-transition: all 0.6s ease-out;
+  -moz-transition: all 0.6s ease-out;
+  -ms-transition: all 0.6s ease-out;
+  -o-transition: all 0.6s ease-out;
+  position: absolute;
+  padding: 0 15px;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
+  text-transform: uppercase;
+  font-family: FrankRegular, sans-serif;
+  font-weight: normal;
+
+  &:hover {
+    background-color: #5FCE4B;
+  }
+
+}

data/app/models/c80_map/map_json.rb

@@ -58,10 +58,17 @@ module C80Map
           # har["is_free"] = area.area_representator.is_free?
         end
 
+        cc = nil
+        if b.coords.present?
+          cc = b.coords.split(",")
+        else
+          Rails.logger.debug "[TRACE] <Map_json.update_json> nil! #{b.id}"
+        end
+
         ob = {
             id: b.id,
             object_type: 'building',
-            coords: b.coords.split(","),
+            coords: cc,
             building_hash: hbu,
             # building_hash: {
             #     id: 2,

data/app/views/c80_map/_map_row_index.html.erb

@@ -30,7 +30,7 @@
     </div>
     <div class="container" id="ui">
       <%= render "layouts/shared/map_row/building_info" %>
-      <%= render "layouts/shared/map_row/area_order_button" %>
+      <%# render "layouts/shared/map_row/area_order_button" %>
     </div>
     <div class="container" id="container_buttons">
       <div class="mzoom_buttons"></div>

data/lib/c80_map/version.rb

@@ -1,3 +1,3 @@
 module C80Map
-  VERSION = "0.1.0.15"
+  VERSION = "0.1.0.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_map
 version: !ruby/object:Gem::Version
-  version: 0.1.0.15
+  version: 0.1.0.16
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,6 +95,8 @@ files:
 - app/assets/javascripts/view/save_preloader.js
 - app/assets/stylesheets/c80_map.scss
 - app/assets/stylesheets/map.scss
+- app/assets/stylesheets/view/buttons/area_order_button.scss
+- app/assets/stylesheets/view/buttons/button_back_to_map.scss
 - app/assets/stylesheets/view/modal_window.scss
 - app/assets/stylesheets/view/save_preloader.scss
 - app/controllers/c80_map/application_controller.rb