ecm_news2 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92117ec33a4996ea9fd8f734fc64fc37cdfc5c33
-  data.tar.gz: 15df3bdbade4410589f2cce1ed29eda1fafeb480
+  metadata.gz: bfe2bb061335bad29daf124507abd7962c932da8
+  data.tar.gz: 1916f68d81c518a486e9681c1b87a25fe107ae26
 SHA512:
-  metadata.gz: 9176da2d8544f1d4df6de194dbb1e0108c63aef136b666ad8e6dc234a4ff24112ae99aae0935786c2eedb30c1178eb5b7e386f392ded5cd2bd1bbf65bcd3f9bd
-  data.tar.gz: f6de96a1bf4e47e1dad03fa07cd69ebc48b0f8efe512d319a6431515b62d03755f2faca6bae8f5a5d54cb4d64058223f03ff2beb4397aacde237ba076133dabe
+  metadata.gz: a6de097f72f00b3ab82dcad0fddab798ac2a4fa580aa8bd597012a0d729d35a09262aca9e4e810134262c8cc693263f688c5af3147afebbe6589e386b7d68122
+  data.tar.gz: 0ef53e73917cd56301c47d07c9b7147c533a3d648ac1ec0fc280383ecaffc78b01c03892ad47c3c7d1baba734fdf656b1418bba0fdf588991231d43253490a9e

data/app/helpers/ecm/news_helper.rb

@@ -1,6 +1,5 @@
 module Ecm::NewsHelper
-  def render_news(count = nil)
-    count = count ||= Ecm::News::Configuration.render_news_default_count
+  def render_news(count = Ecm::News::Configuration.render_news_default_count)
     items = Ecm::News::Item.published.where(:locale => I18n.locale.to_s).order("published_at DESC").limit(count)
     return I18n.t('ecm.news.item.messages.empty') if items.empty?
     output = ''

data/app/views/ecm/news/_render_news_footer.html.erb

@@ -1,2 +1,2 @@
-<%= link_to(ecm_news_items_path, :class => 'btn list-link') do %><i class="icon-list"></i>&nbsp;<%= I18n.t('ecm.news.item.actions.all') %><% end %>
+<%= link_to(t('ecm.news.item.actions.all'), ecm_news_items_path, :class => 'btn btn-default list-link') %>
 

data/app/views/ecm/news/items/_item.html.erb

@@ -1,9 +1,14 @@
 <div class="news-item show">
   <h1><%= item.title %></h1>
-  <small class="item-published_at"><%= I18n.l(item.published_at) %></small>
+
+  <% if Ecm::News::Configuration.show_publish_time %>
+    <small class="item-published_at"><%= I18n.l(item.published_at) %></small>
+  <% end %>
+
   <% if item.preview_picture.present? %>
     <img class="img-responsive" src="<%= item.preview_picture.image.url %>" alt="...">
   <% end %>
-  <p class="item-body"><%= mu(item, :body) %></p>
+
+  <div class="item-body"><%= mu(item, :body) %></div>
 </div>
 

data/app/views/ecm/news/items/_item_for_render_news.html.erb

@@ -1,8 +1,12 @@
 <div class="news-item small-preview">
-  <h2 class="item-title"><%= item.title %></h2>
-  <small class="item-published_at"><%= I18n.l(item.published_at) %></small>
-  <p class="item-body"><%= truncate(mu(item, :body), :length => Ecm::News::Configuration.news_item_preview_length, :separator => ' ').html_safe %></p>
-  <%= link_to(item, :class => 'btn more-link') do %><i class="icon-arrow-right"></i> <%= I18n.t('ecm.news.item.actions.more') %><% end %>
-  <hr />
+  <h4 class="item-title"><%= item.title %></h4>
+  <% if Ecm::News::Configuration.show_publish_time %>
+    <small class="item-published_at"><%= I18n.l(item.published_at) %></small>
+  <% end %>
+  <div class="item-body truncate lines-<%= Ecm::News::Configuration.news_item_preview_lines %> bottom-margin-2"><%= mu(item, :body) %></div>
+
+  <div class="item-actions bottom-margin-2">
+    <%= link_to(t('ecm.news.item.actions.more'), item, :class => 'btn btn-primary btn-xs more-link') %>
+  </div>
 </div>
 

data/app/views/ecm/news/items/_item_in_list.html.erb

@@ -10,7 +10,7 @@
   </div>
   <div class="media-body">
     <h4 class="media-heading"><%= item.title %></h4>
-    <div class="news-body truncate lines-3 bottom-margin-1">
+    <div class="news-body truncate lines-<%= Ecm::News::Configuration.news_item_preview_lines %> bottom-margin-1">
       <%= mu(item, :body) %>
     </div>
     <div class="object-actions">

data/lib/ecm/news/configuration.rb

@@ -14,17 +14,21 @@ module Ecm
       end
 
       mattr_accessor :markup_languages do
-        []
+        ['textile']
       end
 
-      mattr_accessor :news_item_preview_length do
-        250
+      mattr_accessor :news_item_preview_lines do
+        3
       end
 
       mattr_accessor :render_news_default_count do
         2
       end
 
+      mattr_accessor :show_publish_time do
+        true
+      end
+
       mattr_accessor :base_controller do
         'ApplicationController'
       end

data/lib/ecm/news/version.rb

@@ -1,6 +1,6 @@
 module Ecm
   module News
-    VERSION = "1.0.0"
+    VERSION = "1.0.2"
   end
 end
 

data/lib/ecm_news2.rb

@@ -3,6 +3,7 @@ require 'acts_as_published'
 require 'friendly_id'
 require 'kaminari'
 require 'bootstrap-kaminari-views'
+require 'ecm_pictures2'
 
 require 'ecm/news/engine'
 require 'ecm/news/configuration'

data/lib/generators/ecm/news/install/templates/ecm_news.rb

@@ -1,8 +1,8 @@
 Ecm::News.configure do |config|
-  # Number of characters to render in news preview
+  # Number of lines to render in news preview
   #
-  # default: config.news_preview_length = 250
-  config.news_item_preview_length = 250
+  # default: config.news_item_preview_lines = 3
+  config.news_item_preview_lines = 3
 
   # Number of items that will be shown in #render_news
   #
@@ -11,14 +11,19 @@ Ecm::News.configure do |config|
 
   # Accepted markup languages
   #
-  # default: config.markup_languages = %w[ markdown rdoc textile ]
-  config.markup_languages = %w[ markdown rdoc textile ]
+  # default: config.markup_languages = %w[ textile ]
+  config.markup_languages = %w[ textile ]
 
   # Default markup language
   #
   # default: config.default_markup_language = 'textile'
   config.default_markup_language = 'textile'
 
+  # Show or hide the publishing time for news
+  #
+  # Default: config.show_publish_time = true
+  config.show_publish_time = true
+
   # Set the base controller for the contact form
   #
   # Default: config.base_controller = 'ApplicationController'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecm_news2
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,20 +30,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
-- !ruby/object:Gem::Dependency
-  name: activeadmin
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0.pre2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0.pre2
 - !ruby/object:Gem::Dependency
   name: acts_as_markup
   requirement: !ruby/object:Gem::Requirement
@@ -212,6 +198,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activeadmin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0.pre2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0.pre2
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement