drg_blog_news_forum 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3f2bcf9149eb30a3d7d8739b8cb6d9a3586ea5c
-  data.tar.gz: 6b7c3bed9658f9399fee24c05478606fb94f1401
+  metadata.gz: 91f2d65be879d27057f55fdc392ef96979710d3d
+  data.tar.gz: 91886f9216f41b20d84c1805547cd7ade47432d4
 SHA512:
-  metadata.gz: 07141aed1b47f5fe2a0e294dfbfb4872e9b4547d62665d8ec36bf94fe4a2f0f7a542ebd5a40f0bef87e41cfc04db94969eab544e3a8c16d04960f252f77ff250
-  data.tar.gz: 8343b36ab04dd047514d3db2dae22e6be106b7994420c46a982a4b67a982e537aef0cf5eb25c8dd937b84d4c3c3b4747753a9e4985f0dfd54aa4b95fd6fa02e7
+  metadata.gz: 79e6b274b42ad04ba727b936b6a789b2471f4f88f1d02a018e3ce17eb0b6036b8acbe6489284d673cdbba50e45c8ba576f88826152d878ad2fac25ba9dd8b6fa
+  data.tar.gz: 69d5f431ec4553278d6cc3da26377c0221a41374f45a0c076ddbc591f44a35e8e6b2c0398d629d621ae66298d8fd8d0d3d954632f7738bf8d44fc6710e9cd2eb

data/app/assets/stylesheets/drg_blog_news_forum.css

@@ -72,6 +72,11 @@ height: 1px;
   border-top: none;
 }
 
+#dc-reply-menu {
+border: none;
+padding: 5px 0px;
+}
+
 #dc-forum .reply-top-odd, #dc-forum .reply-top-even {
   margin-top: 10px;
   padding: 4px;

data/app/forms/cms_menu.yml

@@ -23,23 +23,21 @@
 menu:
   80_dc_forum_menu:
     caption: dc_forum.menu_caption
+    icon: cubes lg
     items:
       10: 
-        caption: helpers.label.dc_forum.tabletitle
+        caption: helpers.label.dc_blog.tabletitle
         controller: cmsedit
-        picture: forum.png
-        params:
-          table: dc_forum
+        icon: comment-o lg
+        table: dc_blog
       20: 
-        caption: helpers.label.dc_blog.tabletitle
+        caption: helpers.label.dc_news.tabletitle
         controller: cmsedit
-        picture: blog.png
-        params:
-          table: dc_blog
+        icon: info lg
+        table: dc_news
       30: 
-        caption: helpers.label.dc_news.tabletitle
+        caption: helpers.label.dc_forum.tabletitle
         controller: cmsedit
-        picture: news.png
-        params:
-          table: dc_news
+        icon: server lg
+        table: dc_forum
                        

data/app/helpers/dc_blog_renderer.rb

@@ -59,6 +59,22 @@ def list_blogers
   @parent.render partial: 'dc_blog/blogers', formats: [:html], locals: { blogers: blogers } 
 end
 
+########################################################################
+# List last blogs on home page. But no more than 3 entries and not older than 2 months.
+########################################################################
+def last_blogs
+  limit = @opts[:limit] || 3
+  entries = DcBlog.only(:created_by_name, :link, :subject, :created_at)
+                  .where(active: true, :created_at.gt => 2.months.ago)
+                  .order_by(created_at: -1).limit(limit).to_a
+  if entries.size > 0
+    @parent.render partial: 'dc_blog/last_blogs', formats: [:html], locals: { entries: entries } 
+  else
+    ''
+  end
+end
+
+
 ########################################################################
 # Default method will dispatch to proper method.
 ########################################################################

data/app/helpers/dc_news_renderer.rb

@@ -50,6 +50,21 @@ def list_all
   @parent.render partial: 'dc_news/entries', formats: [:html], locals: { entries: entries } 
 end
 
+########################################################################
+# List last news on home page. But no more than 3 entries and not older than 2 months.
+########################################################################
+def last_news
+  limit = @opts[:limit] || 3
+  entries = DcNews.only(:created_by_name, :link, :subject, :created_at)
+                  .where(active: true, :created_at.gt => 2.months.ago)
+                  .order_by(created_at: -1).limit(limit).to_a
+  if entries.size > 0
+    @parent.render partial: 'dc_news/last_news', formats: [:html], locals: { entries: entries } 
+  else
+    ''
+  end
+end
+
 ########################################################################
 # Default method will dispatch to proper method.
 ########################################################################

data/app/views/dc_blog/_last_blogs.erb

@@ -0,0 +1,10 @@
+<div id="last-blogs">
+<h3><%= t('dc_blog.last_blogs') %></h3>
+
+<% for entry in entries %>
+  <div class="entry">
+    <span class="date"><%= dc_pretty_date(entry.created_at) %></span>
+    <span class="title"><%= link_to( entry.subject, { path: 'news', link: entry.link } )%></span>
+  </div>
+<% end %>
+</div>

data/app/views/dc_news/_last_news.erb

@@ -0,0 +1,10 @@
+<div id="last-news">
+<h3><%= t('dc_news.last_news') %></h3>
+
+<% for entry in entries %>
+  <div class="entry">
+    <span class="date"><%= dc_pretty_date(entry.created_at) %></span>
+    <span class="title"><%= link_to( entry.subject, { path: 'news', link: entry.link } )%></span>
+  </div>
+<% end %>
+</div>

data/config/locales/dc_forum_en.yml

@@ -44,9 +44,11 @@ en:
     entry_not_found: Blog entry not found
     my_blog: my blog
     comments: Comments
+    last_blogs: Last blogs
 
   dc_news:
     news: News
     new_entry: Create new news article
     edit_entry: Edit news entry
     entry_not_found: News article not found
+    last_news: Last news

data/config/locales/dc_forum_sl.yml

@@ -44,12 +44,14 @@ sl:
     entry_not_found: Vpis v blog ne obstaja
     my_blog: moj blog
     comments: Komentarji
+    last_blogs: Zadnje objave na blogu
     
   dc_news:
     news: Novice
     new_entry: Nova novica
     edit_entry: Urejanje novice
     entry_not_found: Novica ne obstaja
+    last_news: Zadnje novice
     
     
     

data/lib/drg_blog_news_forum/version.rb

@@ -1,3 +1,3 @@
 module DrgBlogNewsForum
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_blog_news_forum
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Damjan Rems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-18 00:00:00.000000000 Z
+date: 2015-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -73,17 +73,18 @@ files:
 - app/models/dc_forum_topic.rb
 - app/models/dc_news.rb
 - app/models/dc_reply.rb
-- app/models/dc_reply_concern.rb
 - app/views/dc_blog/_blog.html.erb
 - app/views/dc_blog/_blogers.html.erb
 - app/views/dc_blog/_entries.html.erb
 - app/views/dc_blog/_entry.html.erb
+- app/views/dc_blog/_last_blogs.erb
 - app/views/dc_forum/_forums.html.erb
 - app/views/dc_forum/_topic.html.erb
 - app/views/dc_forum/_topics.html.erb
 - app/views/dc_news/___news.html.erb
 - app/views/dc_news/_entries.html.erb
 - app/views/dc_news/_entry.html.erb
+- app/views/dc_news/_last_news.erb
 - app/views/dc_news/_news.html.erb
 - app/views/dc_replay/_reply.html.erb
 - config/locales/dc_forum_en.yml

data/app/models/dc_reply_concern.rb

@@ -1,45 +0,0 @@
-#--
-# Copyright (c) 2014+ Damjan Rems
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#++
-
-module DcReplyConcern
-extend ActiveSupport::Concern
-included do
-
-include Mongoid::Document
-include Mongoid::Timestamps
-
-field :subject,     type: String,  default: ''
-field :body,        type: String,  default: ''
-field :active,      type: Boolean, default: true
-
-field :created_by,  type: BSON::ObjectId
-
-embedded_in :dc_forum_topic
-
-index( { dc_forum_topic_id: 1 } )
-    
-validates_length_of :subject, minimum: 4  
-validates_length_of :body,    minimum: 10
-
-end
-end