c80_news_tz 0.1.1.25 → 0.1.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdfca018b811d2190fc6420436a90d426d882cd5
-  data.tar.gz: 5a2b40535b355d269a916a3eda96804bd81bb770
+  metadata.gz: 8835fd86c88a3f31564212488091f03bbef544e1
+  data.tar.gz: 70c441547614fa96359bcc346b41b9e340ac2dda
 SHA512:
-  metadata.gz: 47bbaf4ff2f8189eed4ac55ed419a5caaadcfbe32f58ef6c5d40e045d31ed9dec7fbb195afb31a0fa87d33cc0c328a592df0bd7a44b12a55652c0a002cc6aeba
-  data.tar.gz: afe2294ccbc9e0312f4e56d5404994fa26247ea518fd9370df5d1e33faa8d74cda3bba0c9c64afdd0650358674e0ff7957ec55ed7cb039b5e4fcc73e36ec0a7f
+  metadata.gz: 1e738d5069822a972839b35d17d62aaa1502c73ced2413ad8e19ccf37e1daf0f5dbc35bbc3df390b54219c921fbef51a44df85625c2342023ec5f581bc22cc0c
+  data.tar.gz: 5a578aa2f65851b46ba5aca710f7a10c6a8df42f572054900ca807cf9839e16ae96d8d2735c1e93053156288c016e70eb5b5a08834ae180397cd0762fd77c174

data/app/assets/stylesheets/c80_news_tz/frontend/pubs_medium.scss

@@ -11,6 +11,26 @@ div.pub_medium {
     margin: 0 71px;
   }
 
+  a.preview_image {
+    width: 223px;
+    height: 149px;
+    background-image: none !important;
+    display: block;
+    text-align: center;
+    white-space: nowrap;
+
+    span.helper {
+      display: inline-block;
+      vertical-align: middle;
+      height: 100%;
+    }
+
+    img {
+      vertical-align: middle;
+    }
+
+  }
+
   div.time {
     height: 24px;
     line-height: 24px;
@@ -64,4 +84,8 @@ div.pub_medium {
     right:0;
   }
 
+  div.desc_short {
+
+  }
+
 }

data/app/helpers/c80_news_tz/companies_helper.rb

@@ -0,0 +1,49 @@
+module C80NewsTz
+  module CompaniesHelper
+
+    # рендер списка компаний
+    def render_companies_list(page = 1, per_page = 8)
+
+      # NB:: передаём в партиал два списка:
+      # NB::  - один: непосредственно для ренедра
+      # NB::  - другой: вспомогательный, для передачи в виде аргумента в will_paginate
+
+      companies = Company.paginate(page: page, per_page: per_page)
+      companies_list = arrange_companies_list(companies)
+
+      render :partial => 'c80_news_tz/companies/shared/companies_list',
+             :locals => {
+                 companies_for_render: companies_list,
+                 companies: companies
+             }
+    end
+
+    private
+
+    # подготовить данные для рендера списка компаний во view
+    def arrange_companies_list(companies)
+      result = []
+      companies.each do |company|
+        wh = company.logo.thumb_preview_list_wh
+        result << {
+            title: company.title,
+            activity_type: company.activity_type,
+            href: apph_url_for_company(company.slug),
+            pubs_count: company.facts.count,
+            desc_short: company.desc_short,
+            logo: {
+                :alt_image => company.title,
+                :image => company.logo.thumb_preview_list,
+                :ww => wh[0],
+                :hh => wh[1],
+                :a_href => apph_url_for_company(company.slug),
+                :a_class => 'preview_image'
+            }
+        }
+
+      end
+      result
+    end
+
+  end
+end

data/app/helpers/c80_news_tz/publications_helper.rb

@@ -30,7 +30,8 @@ module C80NewsTz
           :image => photo_preview,
           :ww => ww,
           :hh => hh,
-          :a_href => url_for_fact(pub)
+          :a_href => url_for_fact(pub),
+          :a_class => 'preview_image'
       }
 
       # соберём характеристики компании главной публикации

data/app/uploaders/c80_news_tz/clogo_uploader.rb

@@ -8,7 +8,7 @@ module C80NewsTz
 
     process :resize_to_limit => [500,500]
 
-    version :thumb_fit do
+      version :thumb_fit do
       process :resize_to_fit => [124,124]
     end
 
@@ -29,6 +29,18 @@ module C80NewsTz
       process :resize_to_fit => [124, 124]
     end
 
+    # идёт в блок в списке партнёров на странице "партнёры"
+    version :thumb_preview_list do
+      process :resize_to_w223
+      #process :resize_to_fit => [223, 310]
+    end
+
+    # выдать актуальную ширину\высоту thumb_preview_list
+    def thumb_preview_list_wh
+      image = ::MiniMagick::Image.open(model.logo.thumb_preview_list.current_path)
+      [image["width"], image["height"]]
+    end
+
     def store_dir
       "uploads/companies/_logos/#{format("%02d", model.id)}"
     end
@@ -49,6 +61,29 @@ module C80NewsTz
       model.instance_variable_get(var) or model.instance_variable_set(var, SecureRandom.hex(length/2))
     end
 
+    private
+
+    # NB:: подгон под ширину preview image в pub_medium
+    def resize_to_w223
+      manipulate! do |img|
+        w = 223
+        h = calc_height_of_image(w)
+        img.resize "#{w}x#{h}>"
+        img = yield(img) if block_given?
+        img
+      end
+    end
+
+    def calc_height_of_image(w)
+      model_image = ::MiniMagick::Image.open(model.logo.current_path)
+      calc_height(w, model_image["width"], model_image["height"])
+    end
+
+    # подгоняем по ширине, рассчитываем высоту
+    def calc_height(width, original_w, original_h)
+      k = width.to_f/original_w
+      original_h * k
+    end
 
   end
 

data/app/views/c80_news_tz/companies/shared/_companies_list.html.erb

@@ -0,0 +1,37 @@
+<div class="div_pubs clearfix">
+  <% companies_for_render.each_with_index do |c,index| %>
+      <% k = index%3 %>
+      <div class="pub_medium pub_medium_<%= k %>">
+
+        <!--<div class="time"><%# что бы тут вывести? %></div>-->
+
+        <%# лого компании %>
+        <%= render_image_link_lazy_holder(c[:logo]) %>
+
+        <%# тип деятельности %>
+        <div class="rubric_title"><%= c[:activity_type] %></div>
+
+        <%# название компании %>
+        <div class="title"><%= link_to c[:title], c[:href], title:c[:title] %></div>
+
+        <%= link_to("#{c[:href]}",
+                    title: "Публикаций: #{c[:pubs_count]}",
+                    class: 'comments') do %>
+            <i class="fa fa-file-text"></i>
+            <%= c[:pubs_count] %>
+        <% end %>
+
+        <div class="desc_short">
+          <%= c[:desc_short] %>
+        </div>
+
+      </div>
+
+      <% if k == 2 && index != companies_for_render.count-1 %>
+          <div class="hr"></div>
+      <% end %>
+  <% end %>
+</div>
+<div class="div_will_paginate">
+  <%= will_paginate companies %>
+</div>

data/lib/c80_news_tz/version.rb

@@ -1,3 +1,3 @@
 module C80NewsTz
-  VERSION = "0.1.1.25"
+  VERSION = "0.1.1.26"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_news_tz
 version: !ruby/object:Gem::Version
-  version: 0.1.1.25
+  version: 0.1.1.26
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,6 +143,7 @@ files:
 - app/helpers/c80_news_tz/banners_helper.rb
 - app/helpers/c80_news_tz/blurbs_helper.rb
 - app/helpers/c80_news_tz/comments_helper.rb
+- app/helpers/c80_news_tz/companies_helper.rb
 - app/helpers/c80_news_tz/publications_helper.rb
 - app/helpers/c80_news_tz/subj_helper.rb
 - app/models/c80_news_tz/adress.rb
@@ -194,6 +195,7 @@ files:
 - app/views/c80_news_tz/comments/shared/_comments_block.html.erb
 - app/views/c80_news_tz/comments/shared/_comments_list.html.erb
 - app/views/c80_news_tz/comments/shared/_reply_comment_form.html.erb
+- app/views/c80_news_tz/companies/shared/_companies_list.html.erb
 - app/views/layouts/c80_news_tz/application.html.erb
 - app/views/shared/_banner_01.html.erb
 - app/views/shared/_banner_02.html.erb