c80_news 0.1.0.11 → 0.1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de13e0bc3a1f20519899b157fbabbf2cc56948e7
-  data.tar.gz: 0d52a37680d717feabe4c67711485f6b94127e41
+  metadata.gz: 100cce9ae05213c510c94a3f627953df8d16a2d1
+  data.tar.gz: e3bd28704e957118f4ceb2d3a2fdcd93a9fb7a8b
 SHA512:
-  metadata.gz: 0a630380ce62add26ee78c830d974beb6b4554d81af7525e2439d4db06f64a30a8bea1a6ef0a465a81edbd35e96c70c46d27ad741db47e368d91760e0776d508
-  data.tar.gz: 0896990aa87c254d4008a4112dce5e0427b20c7cbdd6243184fedd9cee22a300f1343eb763433bdad247d75d5dae0394052eded6ae732038e7989d3cc29950fd
+  metadata.gz: c231c4ad019c4864344f561a590dfc8fea823ec2440415933fecfbf1c1a5d3037b9659563ec14681756be77e156de9e7833200a0b02dc548039d85f7f112349e
+  data.tar.gz: 3096a130e04c191c5338d617739067619f223440a588e38155e804567062aa66d363ce7b0ab4c2048688501249d880c867c738f772dd831f770e75f422d5532b

data/README.md

@@ -65,6 +65,9 @@ $ grep c80_news . -r --include=Gemfile
 ```
 render_news_block
 render_one_fact
+
+render_news_block(false, params[:page], {:partial_name => 'fact_inverted', :thumb_size => 'thumb_preview', :css_class_news_block => 'style_photostudio'})
+render_news_block(true, params[:page], {:partial_name => 'fact_inverted', :thumb_size => 'thumb_md', :css_class_news_block => 'style_photostudio'})
 ```
 
 ## Development

data/app/assets/javascripts/c80_news/facts_ajax.js

@@ -9,7 +9,7 @@ var fNewsStartWillPaginateAjax;
 var fNewsProcessBlocks; // при клике по preview-картинке новости будет происходить переход на просмотр новости
 
 $(function () {
-   if ($(".news_block").length) {
+   if ($('.news_block[data-is_render_paginator="true"]').length) {
 
        fNewsBindHistoryAdapter = function () {
            History.Adapter.bind(window,'statechange',function(){ // Note: We are using statechange instead of popstate
@@ -48,7 +48,7 @@ $(function () {
 
        fNewsProccessPaginateLinks = function () {
            //console.log("fNewsProccessPaginateLinks");
-           $(".div_will_paginate a").click(function (e) {
+           $(".news_block .div_will_paginate a").click(function (e) {
                e.preventDefault();
                var page = $(this).attr('href').split("?page=")[1];
                History.pushState({page:page},window.document.title,"?page="+page);
@@ -56,7 +56,7 @@ $(function () {
        };
 
        fNewsStartWillPaginateAjax = function () {
-           if ($(".div_will_paginate a").length > 0) {
+           if ($(".news_block .div_will_paginate a").length > 0) {
                fNewsProccessPaginateLinks();
                fNewsBindHistoryAdapter();
            }

data/app/assets/stylesheets/c80_news/news_block.scss

@@ -18,6 +18,10 @@ div.news_block {
         max-width: 100%;
       }
 
+      &.clear_left {
+        clear: left;
+      }
+
     }
 
     &.per_row_3 {

data/app/assets/stylesheets/c80_news/will_paginate.scss

@@ -0,0 +1,65 @@
+div.ajax_div {
+
+  div.div_will_paginate {
+    width: 100%;
+    clear: both;
+    float: left;
+    padding: 0 46px;
+
+    .pagination {
+      margin: 0;
+
+      span {
+        &.previous_page {
+          display: none;
+        }
+        &.next_page {
+          display: none;
+        }
+      }
+
+      em {
+
+        display: inline-block;
+        line-height: 29px;
+        width: 30px;
+        height: 30px;
+
+        text-align: center;
+        font-weight: bold !important;
+        font-style: normal !important;
+
+        border: 1px solid #B6B6B6;
+        background-color: #E9353B;
+        color:#ffffff;
+
+      }
+
+      a {
+        display: inline-block;
+        line-height: 29px;
+        width: 30px;
+        height: 30px;
+
+        border: 1px solid #B6B6B6;
+        background-color: #ffffff;
+        color:#777777;
+        text-align: center;
+        font-weight: bold !important;
+
+        text-decoration: none;
+        &:hover, &:active, &:focus { text-decoration: none !important; color: black; }
+
+        &.previous_page {
+          display: none;
+        }
+        &.next_page {
+          display: none;
+        }
+
+      }
+    }
+
+  }
+
+}

data/app/helpers/c80_news/application_helper.rb

@@ -25,26 +25,31 @@ module C80News
 
       news = Fact.paginate(:page => page, :per_page => per_page)
 
+      is_render_paginator = options[:is_render_paginator].present? \
+                            ? options[:is_render_paginator] \
+                            : is_news_page
+
       render :partial => "shared/news_block",
              :locals => {
                  :news_list => news,
                  :is_news_page => is_news_page,
                  :per_block_row => per_block_row,
                  :partial_name => options[:partial_name],
-                 :is_render_paginator => options[:is_render_paginator],
+                 :is_render_paginator => is_render_paginator,
                  :thumb_size => options[:thumb_size],
-                 :css_class_news_block => css_class_news_block
+                 :css_class_news_block => css_class_news_block,
+                 :h3_title => options[:h3_title]
              }
     end
 
-    def render_one_fact(fact, partial_name='fact',thumb_size='thumb_md')
+    def render_one_fact(fact, partial_name='fact', thumb_size='thumb_md', additional_css_class=nil)
 
 
       unless thumb_size.present?
         thumb_size = 'thumb_md'
       end
 
-      Rails.logger.debug "[TRACE] <render_one_fact> thumb_size: #{thumb_size}"
+      # Rails.logger.debug "[TRACE] <render_one_fact> thumb_size: #{thumb_size}"
 
       # свойства модуля
       p = Prop.first
@@ -58,7 +63,8 @@ module C80News
                  fact: fact,
                  css_common_width_height: "width:#{w}px;height:#{h}px",
                  css_common_width: "width:#{w}px;",
-                 thumb_size:thumb_size
+                 thumb_size:thumb_size,
+                 additional_css_class:additional_css_class
              }
     end
 
@@ -66,5 +72,26 @@ module C80News
       "/news/#{fact.slug}"
     end
 
+    # метод добавлен, чтобы сократить количество символов в строке, которую надо вставить в
+    # 256-символьное структурное поле Страницы (Page) типа after_main (в админке), чтобы отрендерить новостной виджет
+    def render_news_widget(css_class_news_block='style_default',
+                           partial_name='fact_inverted',
+                           thumb_size='thumb_preview',
+                           h3_title=' '
+    )
+
+      if h3_title == ' '
+        h3_title = I18n.t('c80_news.news_widget.h3_title')
+      end
+
+      render_news_block(false, params[:page], {
+                                 :partial_name => partial_name,
+                                 :thumb_size => thumb_size,
+                                 :css_class_news_block => css_class_news_block,
+                                 :h3_title => h3_title
+                             }
+      )
+    end
+
   end
 end

data/app/views/c80_news/application/guru.js.erb

@@ -1,4 +1,4 @@
-var $cc = $(".ajax_div").parent();
+
 var html_str = "<%= j render_news_block(true,params[:page], {
                                                                 :partial_name => params[:partial_name],
                                                                 :is_render_paginator => params[:is_render_paginator],
@@ -6,10 +6,10 @@ var html_str = "<%= j render_news_block(true,params[:page], {
                                                             })
 %>";
 
-$('.ajax_div').remove();
-$cc.prepend(html_str); <%# TODO_MY:: параметризировать: либо apprend, либо prepend %>
+var $aa = $('.news_block[data-is_render_paginator="true"]');
+$aa.replaceWith(html_str);
 
-Holder.run(".ajax_div img");
+Holder.run($aa.find("img"));
 fLazyStart();
 
 fNewsProccessPaginateLinks();

data/app/views/shared/_fact_inverted.html.erb

@@ -1,4 +1,4 @@
-<div class="fact">
+<div class="fact <%=additional_css_class%>">
   <%= render_image_link_lazy({
                                      :alt_image => fact.title,
                                      :image => fact.send(thumb_size),

data/app/views/shared/_news_block.html.erb

@@ -1,3 +1,6 @@
+<% if h3_title.present? %>
+    <h3 class="section_title h3_for_news_block"><%= h3_title %></h3>
+<% end %>
 <div class="ajax_div news_block <%= css_class_news_block %>"
      data-partial_name="<%= partial_name %>"
      data-css_class_news_block="<%= css_class_news_block %>"

data/app/views/shared/_news_list.html.erb

@@ -1,7 +1,11 @@
 <div class="news_list clearfix per_row_<%=per_row%>">
-  <% news_list.each do |fact| %>
+  <% news_list.each_with_index do |fact, index| %>
 
-      <%= render_one_fact(fact, partial_name, thumb_size).to_s %>
+      <%# чтобы не было такого https://dl.dropboxusercontent.com/u/1365807/work/sokol/tx/2016-11-05_165449_news_clear.jpg %>
+      <% clear_left_css_class = index % per_row == 0 ? 'clear_left':'' %>
+      <% clear_left_css_class += " index_#{index}" %>
+
+      <%= render_one_fact(fact, partial_name, thumb_size, clear_left_css_class.to_s).to_s %>
 
   <% end %>
 </div>

data/config/locales/ru.yml

@@ -0,0 +1,4 @@
+ru:
+  c80_news:
+    news_widget:
+      h3_title: 'Новости'

data/lib/c80_news/version.rb

@@ -1,3 +1,3 @@
 module C80News
-  VERSION = "0.1.0.11"
+  VERSION = "0.1.0.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_news
 version: !ruby/object:Gem::Version
-  version: 0.1.0.11
+  version: 0.1.0.12
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -116,6 +116,7 @@ files:
 - app/assets/stylesheets/c80_news.scss
 - app/assets/stylesheets/c80_news/_mixins/style_photostudio.scss
 - app/assets/stylesheets/c80_news/news_block.scss
+- app/assets/stylesheets/c80_news/will_paginate.scss
 - app/controllers/c80_news/application_controller.rb
 - app/helpers/c80_news/application_helper.rb
 - app/models/c80_news/fact.rb
@@ -132,6 +133,7 @@ files:
 - bin/console
 - bin/setup
 - c80_news.gemspec
+- config/locales/ru.yml
 - config/routes.rb
 - db/migrate/20151213202020_create_news_fact.rb
 - db/migrate/20151213203030_create_news_fphotos.rb