drg_blog_news_forum 0.5.51.1 → 0.5.52.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cd602fc22625d9c548b208a24437d089661603d
-  data.tar.gz: bd6a9948321595a12e92c020fdfa998c5651f2ca
+  metadata.gz: 21376b47f6aebf241e6cd3053fe434b6cc1b430a
+  data.tar.gz: f7cbc383f3882a7fa36a385b0dd311d653f1eee4
 SHA512:
-  metadata.gz: 9759f43c526f5d5345466df123d11b70313602923538696b51c50cb0ee67db78bdab84cb7d1a5478a06cb9c7d6d0d0faf330b55a6fe66621f613641da251bade
-  data.tar.gz: ee2cfffa7d0e6a8a68b11e35b1caa03273753cdc880f458020a2e4ad1e0663f173b9aaf8e1a92c037b0a34965d927c97b2891a07af6adae40b869f4f6a0d0ebb
+  metadata.gz: 58171ad983f8d78c280f409be0992fef784cf64b7350fdf9e06710900fca5c8f17ce6025632c8e971f4d2162045c81cd75d2511c8ae7a60d399b6d690bf21e0e
+  data.tar.gz: 804ccf7bb9b4dded3b05684c8cf26616b52037d55f0e392d98f791a216d472844b107c0f8f22428869d72cd454c7456e15a889f3b761b8ce0828f4aec42bac4a

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2014 YOURNAME
+Copyright 2014+ Damjan Rems
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/app/assets/stylesheets/drg_blog_news_forum.css

@@ -74,10 +74,10 @@ height: 1px;
 
 #dc-reply-menu {
 border: none;
-padding: 5px 0px;
+padding: 1em 0px;
 }
 
-#dc-forum .reply-top-odd, #dc-forum .reply-top-even {
+#dc-forum .reply-top.odd, #dc-forum .reply-top.even {
   margin-top: 10px;
   padding: 4px;
   background: #eee;
@@ -86,7 +86,7 @@ padding: 5px 0px;
   border-top-right-radius: 3px; 
 }
 
-#dc-forum .reply-body-odd, #dc-forum .reply-body-even {
+#dc-forum .reply-body.odd, #dc-forum .reply-body.even {
   padding: 4px;
   background: #f8f8f8;
   border: 1px solid #ddd;
@@ -135,6 +135,10 @@ border-radius: 2px;
 }
 
 /******* dc_blog *******/
+#blogs .title {
+  font-size: 1.4em;
+    padding-bottom: 5px;
+}
 .blog-subject {
 font-size: 1.4em;
 font-weight: bold;
@@ -149,16 +153,16 @@ margin-bottom: 20px;
 }
 .blog-replies {
 }
-.reply-top-even {
+.reply-top.even {
 padding:5px;
 background-color: #fff;
 }
-.reply-top-odd {
+.reply-top.odd {
 padding:5px;
 background-color: #eee;
 }
 
-.reply-body-even p, .reply-body-odd p {  
+.reply-body.even p, .reply-body.odd p {  
 margin-top: 0em; 
 margin-bottom: 0em;
 }
@@ -176,3 +180,8 @@ margin-bottom: 40px;
 padding-top: 5px;
 padding-bottom: 5px;
 }
+
+/**** news  ****/
+.news.one .author {
+  font-size: 1.2em;
+} 

data/app/controllers/drgcms_controls/dc_news_dc_reply_control.rb

@@ -32,8 +32,10 @@ module DrgcmsControls::DcNewsDcReplyControl
 ######################################################################
 def dc_new_record()
 # fill with quote when reply_to is present  
-  if params[:reply_to]
-    replyto = @record._parent.dc_replies.find(params[:reply_to])
+    bla
+    if params[:reply_to]
+  
+    replyto = DcReply.find(params[:reply_to])
     @record.subject = "Re: #{replyto.subject}"
     @record.body = "<div class='dc-forum-quote'>#{replyto.body}</div><br>"
   end

data/app/controllers/drgcms_controls/reply_control.rb

@@ -0,0 +1,52 @@
+#encoding: utf-8
+#--
+# 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.
+#++
+
+######################################################################
+# DrgcmsControls for DcBlog.DcReply form
+######################################################################
+module DrgcmsControls::ReplyControl
+
+######################################################################
+# Called when new empty record is created
+######################################################################
+def dc_new_record()
+# fill with quote when reply_to is present 
+  if params[:reply_to]
+    replyto = DcReply.find(params[:reply_to])
+    @record.subject = (replyto.subject.match('Re:') ? '' : 'Re: ') + replyto.subject
+    @record.body = "<div class='dc-forum-quote'>#{replyto.body}</div><br>"
+  end
+  @record.created_by_name = session[:user_name] if session[:user_name]
+end
+
+######################################################################
+# Called before save. Reloads browser.
+######################################################################
+def dc_before_save()
+  params[:return_to] = 'parent.reload'
+# simple automatic robot trap  
+  return false unless params[:record][:honey].blank?
+end
+
+end 

data/app/forms/dc_forum.yml

@@ -10,10 +10,7 @@ result_set:
   columns:
     1:  
       name: name
-    2:  
-      name: site_id
-      eval: dc_name4_id,dc_site,name
-    3: 
+    2: 
       name: order
     4: 
       name: active
@@ -28,28 +25,32 @@ form:
     10:
       name: name
       type: text_field
-      html:
-        size: 50
+      size: 50
 
     20:
+      name: link
+      type: text_field
+      size: 50
+
+    30:
       name: description
       type: text_area
-      html:
-        size: 80x10
+      size: 80x8
 
-    30:
-      name: site_id
+    40:
+      name: forum_groups
       type: select
-      eval: DcSite.choices4_site
+      multiple: true
+      eval: dc_big_table 'forum-groups'
       html:
-        include_blank: true
-    40:
+        include_blank: true           
+
+    50:
       name: order
       type: text_field
-      html:
-        size: 3
+      size: 3
        
-    50:
+    60:
       name: dc_policy_rules
       type: embedded
       form_name: dc_policy_rule

data/app/forms/dc_forum_topic.yml

@@ -9,12 +9,15 @@ form:
 
   fields:
     10:
+      name: created_by_name
+      type: readonly
+    
+    20:
       name: subject
       type: text_field
-      html:
-        size: 80
+      size: 80
 
-    20:
+    30:
       name: body
       type: html_field
       options: "height: 420, toolbar: 'basic'" 
@@ -22,7 +25,3 @@ form:
     100:
       name: dc_forum_id
       type: hidden_field
-    110:
-      name: created_by_name
-      type: hidden_field
-

data/app/forms/dc_news.yml

@@ -36,16 +36,17 @@ form:
     30:
       name: created_at
       type: datetime_picker
-
+      
     40:
+      name: categories
+      type: select
+      multiple: true
+      eval: dc_big_table 'news-categories'
+      html:
+        include_blank: true           
+
+    50:
       name: body
       type: html_field
       options: 'height: 500'      
 
-    50:
-      name: dc_replies
-      type: embedded
-      form_name: dc_reply
-      table: dc_reply
-      html:
-        height: 400  

data/app/forms/dc_reply.yml

@@ -32,4 +32,3 @@ form:
       name: body
       type: html_field
       options: "height: 420, toolbar: 'basic', allowedContent: false" 
-      

data/app/forms/forum_settings.yml

@@ -0,0 +1,56 @@
+## Form for news settings
+table: dc_memory
+title: dc_forum.settings
+controls: design_element_settings
+
+form:
+  actions: 
+    1: save
+
+  fields:
+      
+    10:
+      name: forum_groups
+      type: select
+      multiple: true
+      eval: dc_big_table 'forum-groups'
+      text: helpers.label.dc_forum.forum_groups
+      help: helpers.help.dc_forum.forum_groups
+      html:
+        include_blank: true           
+
+    100:
+      name: title
+      type: text_field
+      size: 30
+      text: dc_forum.title
+      help: dc_forum.title_help
+      top-line: 1
+      
+    110:
+      name: clas
+      type: text_field
+      size: 10
+      text: dc_news.clas
+      help: dc_news.clas_help
+      
+    120:
+      name: list
+      type: text_field
+      size: 30
+      text: dc_news.list
+      help: dc_news.list_help
+
+    130:
+      name: show
+      type: text_field
+      size: 30
+      text: dc_news.show
+      help: dc_news.show_help
+      
+    140:
+      name: link
+      type: text_field
+      size: 30
+      text: dc_news.link
+      help: dc_news.link_help

data/app/forms/news_settings.yml

@@ -0,0 +1,91 @@
+## Form for news settings
+table: dc_memory
+title: dc_news.settings
+controls: design_element_settings
+
+form:
+  actions: 
+    1: save
+
+  fields:
+      
+    10:
+      name: categories
+      type: select
+      multiple: true
+      eval: dc_big_table 'news-categories'
+      text: dc_news.categories
+      help: dc_news.categories_help
+      html:
+        include_blank: true        
+      
+    20:
+      name: number
+      type: text_field
+      size: 3
+      text: dc_news.number
+      help: dc_news.number_help
+      
+    30:
+      name: paging
+      type: check_box
+      text: dc_news.paging
+      help: dc_news.paging_help
+      
+    40:
+      name: small
+      type: text_field
+      size: 2
+      text: dc_news.small
+      help: dc_news.small_help
+      group: 3
+      
+    50:
+      name: medium
+      type: text_field
+      size: 2
+      text: dc_news.medium
+      help: dc_news.medium_help
+      
+    60:
+      name: large
+      type: text_field
+      size: 2
+      text: dc_news.large
+      help: dc_news.large_help
+      
+    100:
+      name: title
+      type: text_field
+      size: 30
+      text: dc_news.title
+      help: dc_news.title_help
+      top-line: 1
+      
+    110:
+      name: clas
+      type: text_field
+      size: 10
+      text: dc_news.clas
+      help: dc_news.clas_help
+      
+    120:
+      name: list
+      type: text_field
+      size: 30
+      text: dc_news.list
+      help: dc_news.list_help
+
+    130:
+      name: show
+      type: text_field
+      size: 30
+      text: dc_news.show
+      help: dc_news.show_help
+      
+    140:
+      name: link
+      type: text_field
+      size: 30
+      text: dc_news.link
+      help: dc_news.link_help

data/app/forms/reply.yml

@@ -1,5 +1,7 @@
 
 table: dc_reply
+title: Reply
+controls: reply
 
 form:
   height: 750
@@ -25,3 +27,16 @@ form:
       type: html_field
       options: "height: 420, toolbar: 'basic', allowedContent: false" 
       
+    100:
+      name: doc_id
+      type: hidden_field
+      
+    110:
+      name: doc_class
+      type: hidden_field
+     
+    120:
+      name: honey
+      type: hidden_field
+     
+      

data/app/helpers/dc_blog_renderer.rb

@@ -30,25 +30,23 @@ include DcApplicationHelper
 ########################################################################
 # Show one blog entry
 ########################################################################
-def show_entry
-#  blog = @parent.params[:blog_id] ? DcBlog.find(@parent.params[:blog_id]) : DcBlog.last
-  entry = DcBlog.find_by(created_by_name: @parent.params[:name], link: @parent.params[:link])
+def show(link)
+  entry = DcBlog.find_by(link: link)
   return t('dc_blog.entry_not_found') if entry.nil?
   
-  replies = entry.dc_replies.where(active: true).order(created_at: 1).
-            page(@parent.params[:page]).per(20)
-  @parent.render partial: 'dc_blog/entry', formats: [:html], 
-                 locals: { entry: entry, replies: replies, opts: @opts }
+  replies = DcReply.where(doc_id: entry.id, active: true).order(created_at: 1)
+  @parent.render partial: 'dc_blog/show', formats: [:html], 
+                 locals: { document: entry, replies: replies, opts: @opts }
 end
 
 ########################################################################
 # List all blogs from one bloger
 ########################################################################
-def list_all
-  entries = DcBlog.only(:created_by_name, :link, :subject, :created_at)
-                  .where(created_by_name: @parent.params[:name]).order_by(created_at: -1)
+def list(bloger)
+  documents = DcBlog.only(:created_by_name, :link, :subject, :created_at)
+                  .where(active: true).order_by(created_at: -1)
                   .page(@parent.params[:page]).per(10)
-  @parent.render partial: 'dc_blog/entries', formats: [:html], locals: { entries: entries } 
+  @parent.render partial: 'dc_blog/list', formats: [:html], locals: { documents: documents } 
 end
 
 ########################################################################
@@ -65,22 +63,14 @@ end
 def last_blogs
   limit = @opts[:limit] || 3
   entries = DcBlog.only(:created_by_name, :link, :subject, :created_at)
-                  .where(active: true) #, :created_at.gt => 6.months.ago)
+                  .where(active: true) 
                   .order_by(created_at: -1).limit(limit).to_a
-=begin
-  if entries.size > 0
-# for document link.    
-    path = @opts[:path] || 'blog'    
-    @parent.render partial: 'dc_blog/last_blogs', formats: [:html], locals: { entries: entries, path: path } 
-  else
-    ''
-  end
-=end
-  entries.inject('') do |result, element|
-    result << @parent.link_to("/blog/#{element.created_by_name}/#{element.link}") do 
+
+  entries.inject('') do |result, document|
+    result << @parent.link_to("/blog/#{document.link}") do 
       %Q[
-    <span class="date">#{@parent.dc_pretty_date(element.created_at)} : </span>
-    <span class="title">#{element.subject}</span><br><br> 
+    <span class="date">#{@parent.dc_pretty_date(document.created_at)} : </span>
+    <span class="title">#{document.subject}</span><br><br> 
       ].html_safe
     end
   end
@@ -92,12 +82,14 @@ end
 # Default method will dispatch to proper method.
 ########################################################################
 def default
-  if @parent.params[:name].nil?
+  document_link = @opts[:path].last
+  p @opts[:path]
+  if @opts[:path].size == 1 or document_link == 'blogers'
     list_blogers
-  elsif @parent.params[:link].nil? or @parent.params[:link] == 'all'
-    list_all
+  elsif @opts[:path].size == 2 
+    list(document_link)
   else
-    show_entry
+    show(document_link)
   end
 end
 

data/app/helpers/{dc_forum_helper.rb → dc_bnf_helper.rb}

@@ -21,7 +21,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-module DcForumHelper
+module DcBnfHelper
 #include DcApplicationHelper  
 
 ########################################################################
@@ -36,4 +36,21 @@ def dc_pretty_date(time)
   end
 end
 
+########################################################################
+# Link for editing news settings
+########################################################################
+def news_settings(opts)
+  return '' unless opts[:edit_mode] > 1
+# settings can be saved in dc_site or dc_page document 
+  table = opts[:table] || @page.class.to_s
+  id    = (table == 'dc_site') ? @site.id : @page.id
+%Q[<div>  
+  #{dc_link_for_edit(table: 'dc_memory', title: 'helpers.news.settings', 
+                             form_name: 'news_settings', icon: 'cog lg',
+                             id: id, location: table, action: 'new',
+                             element: opts[:element] )}
+  #{dc_link_for_create(table: 'dc_news', title: 'helpers.news.create')}
+</div>].html_safe
+end
+
 end

data/app/helpers/dc_forum_renderer.rb

@@ -48,7 +48,8 @@ include DcApplicationHelper
 def topic
   forum = DcForum.find(@parent.params[:forum])
   topic = DcForumTopic.find(@parent.params[:topic])
-  replies = topic.dc_replies.where(active: true).order(created_at: 1).page(@parent.params[:page]).per(10)
+  replies = DcReply.where(doc_id: topic.id, active: true).order(created_at: 1)
+                   .page(@parent.params[:page]).per(10)
   @parent.render partial: 'dc_forum/topic', formats: [:html], 
                  locals: { forum: forum, topic: topic, replies: replies }
 end

data/app/helpers/dc_news_renderer.rb

@@ -28,45 +28,60 @@ class DcNewsRenderer < DcRenderer
 include DcApplicationHelper
 
 ########################################################################
-# Show one news entry
+# Collects documents for list
 ########################################################################
-def show_entry
-  entry = DcNews.find_by(link: @parent.params[:link])
-  return t('dc_news.entry_not_found') if entry.nil?
+def collect_documents()
+  categories = @opts.dig(:settings, @opts[:element], 'categories')
+  query = if categories
+    categories.map! {|e| (e.class == String and BSON::ObjectId.legal?(e)) ? BSON::ObjectId.from_string(e) : e }
+    DcNews.where(:categories.in => categories, active: true)
+  else
+    DcNews.where(active: true)
+  end
+  query = query.only(:id, :created_at, :subject, :created_by_name, :link)
+# paging 
+  if @opts.dig(:settings, @opts[:element], 'paging') == '1'
+    per_page = @opts.dig(:settings, @opts[:element], 'docs_per_page') || 15
+    query.order_by(created_at: -1).page(@parent.params[:page]).per(per_page)
+  else
+    query = query.and({"$or" => [{valid_from: nil}, {:valid_from.gt => Time.now.beginning_of_day}]})
+
+    limit = @opts.dig(:settings, @opts[:element], 'docs_per_view') || 5
+    query.order_by(created_at: -1).limit(limit)
+  end
+end
+
+########################################################################
+# Show one news document
+########################################################################
+def show(link)
+  document = DcNews.find_by(link: link)
+  return t('dc_news.entry_not_found') if document.nil?
   
-  replies = entry.dc_replies.where(active: true).order(created_at: 1).
-            page(@parent.params[:page]).per(10)          
-  @parent.render partial: 'dc_news/entry', formats: [:html], 
-                 locals: { entry: entry, replies: replies, opts: @opts }
+  replies = DcReply.where(doc_id: document.id, active: true).order(created_at: 1)
+  partial = @opts.dig(:settings, @opts[:element], 'show') || 'dc_news/show'
+  @parent.render partial: partial, 
+                 locals: { document: document, replies: replies, opts: @opts }
 end
 
 ########################################################################
-# List all news
+# List news
 ########################################################################
-def list_all
-  entries = DcNews.only(:created_by_name, :link, :subject, :created_at)
-                  .where(active: true).order_by(created_at: -1)
-                  .page(@parent.params[:page]).per(10)
-  @parent.render partial: 'dc_news/entries', formats: [:html], locals: { entries: entries } 
+def list
+  partial   = @opts.dig(:settings, @opts[:element], 'view') || 'dc_news/list'
+  documents = collect_documents.to_a
+  @parent.render(partial: partial, formats: [:html], locals: { documents: documents, opts: @opts } )
 end
 
 ########################################################################
-# List last news on home page. But no more than 3 entries and not older than 2 months.
+# List last 3 news in footer.
 ########################################################################
 def last_news
   limit = @opts[:limit] || 3
   entries = DcNews.only(:created_by_name, :link, :subject, :created_at)
-                  .where(active: true) #, :created_at.gt => 6.months.ago)
+                  .where(active: true) 
                   .order_by(created_at: -1).limit(limit).to_a
-=begin
-  if entries.size > 0
-# for document link.    
-    path = @opts[:path] || 'news'
-    @parent.render partial: 'dc_news/last_news', formats: [:html], locals: { entries: entries, path: path } 
-  else
-    ''
-  end
-=end
+
   entries.inject('') do |result, element|
     result << @parent.link_to("/news/#{element.link}") do 
       %Q[
@@ -81,10 +96,12 @@ end
 # Default method will dispatch to proper method.
 ########################################################################
 def default
-  if @parent.params[:link].nil?
-    list_all
+# if last part of url is page link show list otherwise it is document link 
+  document_link = @opts[:path].last
+  if document_link == @parent.page.subject_link or document_link == @parent.site.homepage_link
+    list
   else
-    show_entry
+    show(document_link)
   end
 end
 

data/app/models/dc_forum.rb

@@ -30,17 +30,15 @@
 #  created_at           Time                 created_at
 #  updated_at           Time                 updated_at
 #  name                 String               Forum name (short description)
+#  link                 String               Forum link
 #  description          String               Long description of what is forum about
-#  site_id              BSON::ObjectId       Site that forums belongs to
 #  order                Integer              Order
 #  topics               Integer              No of topics
 #  replies              Integer              replies
 #  forum_groups         Array                forum_groups
-#  active               Mongoid::Boolean     active
+#  active               Boolean              Is active
 #  created_by           BSON::ObjectId       created_by
 #  updated_by           BSON::ObjectId       updated_by
-#  created_by_name      String               created_by_name
-#  updated_by_name      String               updated_by_name
 #  dc_policy_rules      Embedded:DcPolicyRule dc_policy_rules
 #########################################################################
 class DcForum
@@ -48,8 +46,8 @@ class DcForum
   include Mongoid::Timestamps
   
   field :name,        type: String,  default: ''
+  field :link,        type: String
   field :description, type: String,  default: ''
-  field :site_id,     type: BSON::ObjectId
   field :order,       type: Integer, default: 10
   field :topics,      type: Integer, default: 0
   field :replies,     type: Integer, default: 0
@@ -58,10 +56,23 @@ class DcForum
   field :active,      type: Boolean, default: true 
   field :created_by,  type: BSON::ObjectId
   field :updated_by,  type: BSON::ObjectId
-  field :created_by_name, type: String
-  field :updated_by_name, type: String
   
   embeds_many :dc_policy_rules, as: :policy_rules
   
-  index( { name: 1 } )
+  index( { link: 1 } )
+  
+  validates_length_of :name, minimum: 4    
+  
+  before_save :do_before_save  
+  
+########################################################################
+# Update link when left blank.
+########################################################################
+def do_before_save
+  if self.link.size < 5
+    self.link = self.name.strip.downcase.gsub(' ','-')
+  end
+end  
+
+
 end

data/app/models/dc_reply.rb

@@ -32,6 +32,8 @@
 #  subject              String               Subject, short description of reply
 #  body                 String               Body text of reply
 #  active               Mongoid::Boolean     Reply is active
+#  doc_id               BSON::ObjectId       Replied document id
+#  doc_class            String               Document origin class
 #  created_by           BSON::ObjectId       Created by
 #  created_by_name      String               Reply author's name
 ########################################################################
@@ -42,12 +44,12 @@ class DcReply
   field :subject,     type: String,  default: ''
   field :body,        type: String,  default: ''
   field :active,      type: Boolean, default: true
+  field :doc_id,      type: BSON::ObjectId
+  field :doc_class,   type: String
 
   field :created_by,      type: BSON::ObjectId
   field :created_by_name, type: String
 
-  embedded_in :replies, polymorphic: true 
-
   validates_length_of :subject,           minimum: 4  
   validates_length_of :body,              minimum: 10
   validates_length_of :created_by_name,   minimum: 5

data/app/views/dc_blog/_blogers.html.erb

@@ -8,7 +8,7 @@
 
 <% for bloger in blogers %>
   <div class="blog-entry">
-     <%= link_to( bloger, { path: 'blog', name: bloger} )%>
+     <%= link_to( bloger, { path: "blog/#{bloger}"} )%>
   </div>
 <% end %>
 </div>

data/app/views/dc_blog/_list.html.erb

@@ -0,0 +1,13 @@
+
+<div class="wrap">
+  <div id="blogs">
+  <h3><%= t('dc_blog.blogs') %></h3>
+
+  <% for document in documents %>
+    <div class="entry">
+      <div class="date"><%= dc_pretty_date(document.created_at) %></div>
+      <div class="title"><%= link_to( document.subject, path: "#{@page.link}/#{document.created_by_name}/#{document.link}" )%></div>
+    </div>
+  <% end %>
+  </div>
+</div>

data/app/views/dc_blog/{_entry.html.erb → _show.html.erb}

@@ -1,20 +1,20 @@
 <div class="wrap">
 <% if session[:edit_mode] > 1 %>
-  <%= dc_link_for_create(controller: 'cmsedit', table: 'dc_blog', title: 'dc_blog.new_entry' ) %>
+  <%= dc_link_for_create(controller: 'cmsedit', table: 'dc_blog', title: 'dc_blog.new_document' ) %>
   <br><br>
-  <%= dc_link_for_edit(controller: 'cmsedit', table: 'dc_blog', title: 'dc_blog.edit_entry', id: entry.id ) %>
+  <%= dc_link_for_edit(controller: 'cmsedit', table: 'dc_blog', title: 'dc_blog.edit_document', id: document.id ) %>
 <% end %>
 
-<div class="blog-subject"><h1><%= entry.subject %></h1></div>
-<div class="blog-date"><h4><%= t('dc_blog.published') + ' ' + dc_pretty_date(entry.created_at) %></h4></div>
+<div class="blog-subject"><h2><%= document.subject %></h2></div>
+<div class="blog-date"><h4><%= t('dc_blog.published') + ' ' + dc_pretty_date(document.created_at) %></h4></div>
 
-<div class="blog-body"><%= entry.body.html_safe %></div>
+<div class="blog-body"><%= document.body.html_safe %></div>
 <div class="social-sites"><%=  social_sites %></div>
 
 <div class="blog-replies">
   <h2><%= t('dc_blog.comments') %></h2>
   <%= render partial: 'dc_replay/reply', formats: [:html], 
-             locals: { replies: replies, parent_id: entry.id, parent_document: 'dc_blog' } %>
+             locals: { replies: replies, parent_doc: document } %>
 </div>
 
 <iframe id="iframe_edit" name="iframe_edit" scrolling="no"></iframe>

data/app/views/dc_news/_last_news.erb

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

data/app/views/dc_news/_list.html.erb

@@ -0,0 +1,24 @@
+<% 
+clas   = (opts.dig(:settings, opts[:element], 'clas') || 'news') + ' list'
+small  = (opts.dig(:settings, opts[:element], 'small') || 1).to_i
+medium = (opts.dig(:settings, opts[:element], 'medium') || small).to_i
+large  = (opts.dig(:settings, opts[:element], 'large') || medium).to_i
+paging = opts.dig(:settings, opts[:element], 'paging') == '1' 
+link   = opts.dig(:settings, opts[:element], 'link') || @page.subject_link
+title  = opts.dig(:settings, opts[:element], 'title') || t('dc_news.news')
+%>
+
+<div class="<%= clas %>">
+  <%= news_settings(opts) %>
+  <% unless title == '-'  %><h2><%= title %></h2><% end %>
+  <%= if opts[:edit_mode] > 1 
+    dc_link_for_create(controller: 'cmsedit', table: 'dc_news', title: 'dc_blog.new_entry' )
+  end %>
+  
+  <% for document in documents %>
+    <div class="document">
+      <%= dc_pretty_date(document.created_at) %>
+      <h4><%= link_to( document.subject, { path: "#{link}/#{document.link}" } )%></h4>          
+    </div>
+  <% end %>
+</div>

data/app/views/dc_news/_show.html.erb

@@ -0,0 +1,26 @@
+<% 
+clas = (opts.dig(:settings, opts[:element], 'clas') || 'news') + ' one'
+%>
+
+<div class="<%= clas %>">
+<% if session[:edit_mode] > 1 %>
+  <%= dc_link_for_edit(table: 'dc_news', title: 'dc_news.edit_document', id: document.id ) %>
+  <%= dc_link_for_create( table: 'dc_news', title: 'dc_news.new_document' ) %>
+<% end %>
+
+<h2><%= document.subject %></h2>
+<div class="author">
+  <%= "#{t('dc_blog.author')} #{document.created_by_name}, #{dc_pretty_date(document.created_at)}" %>
+</div><br>
+
+<div class="body"><%= document.body.html_safe %></div>
+<div class="social-sites"><%= social_sites %></div>
+
+<div class="news-replies">
+  <h2><%= t('dc_blog.comments') %></h2>
+  <%= render partial: 'dc_replay/reply', formats: [:html], 
+             locals: { replies: replies, parent_doc: document } %>
+</div>
+ 
+<iframe id="iframe_edit" name="iframe_edit" scrolling="no"></iframe>
+</div>

data/app/views/dc_replay/_reply.html.erb

@@ -1,24 +1,26 @@
 
 <% for reply in replies %>
   <% oddeven = cycle("odd", "even") %>
-  <div class="reply-top-<%= oddeven %>">
+  <div class="reply-top <%= oddeven %>">
     <span style="float: right; top-margin: 5px;">
-      <%= link_to( t('dc_forum.new_reply'), { controller: 'cmsedit', table: "#{parent_document};dc_reply", 
-                   form_name: 'reply', action: 'new', ids: parent_id, 
-                   reply_to: reply.id}, target: 'iframe_edit') %>
+      <%= link_to( t('dc_forum.new_reply'), { table: 'dc_reply', form_name: 'reply', 
+                   controller: :cmsedit, action: 'new', reply_to: reply.id,
+                   p_doc_id: parent_doc.id, p_doc_class: parent_doc.class.to_s }, 
+                   target: 'iframe_edit') %>
     </span>
     <b><%= reply.subject %></b><br>
     <%= t('dc_forum.replied_by') %>: <%= reply.created_by_name %>, 
     <%= dc_pretty_date(reply.created_at) %>&nbsp;&nbsp;<br><br>
-    <div class="reply-body-<%= oddeven %>"><%= reply.body.html_safe %></div>
+    <div class="reply-body <%= oddeven %>"><%= reply.body.html_safe %></div>
   </div>
 <% end %>
 
-<table id="dc-reply-menu"><tr>
-  <td class="dc-link dc-animate" style="white-space: nowrap;">
-  <%= link_to( t('dc_forum.new_reply'), { controller: 'cmsedit', table: "#{parent_document};dc_reply", 
-               form_name: 'reply', action: 'new', ids: parent_id }, 
-               target: 'iframe_edit') %>
-  </td>
-  <td style="text-align: right; width: 100%;"><%= paginate replies %></td>    
-</tr></table>
+<div id="dc-reply-menu">
+  <div class="dc-link dc-animate" style="float: left;">
+  <%= link_to( t('dc_forum.new_reply'), { controller: 'cmsedit', table: "dc_reply", 
+               form_name: 'reply', action: 'new', 
+               p_doc_id: parent_doc.id, p_doc_class: parent_doc.class.to_s}, 
+               {target: 'iframe_edit', class: 'dc-animate'}) %>
+  </div>
+  <%# = paginate replies %>   
+</div>

data/config/locales/{dc_forum_en.yml → dc_bnf_en.yml}

@@ -45,6 +45,7 @@ en:
     my_blog: my blog
     comments: Comments
     last_blogs: Last blogs
+    blogs: Blogs
 
   dc_news:
     news: News
@@ -52,3 +53,28 @@ en:
     edit_entry: Edit news entry
     entry_not_found: News article not found
     last_news: Last news
+    
+    settings: News settings
+    categories: Categories
+    categories_help: Define categories shown by news agregator
+    number: Articles number
+    number_help: Number of articles shown by news agregator
+    paging: Add paging
+    paging_help: Add paging links for the agregator
+    small: Small
+    small_help: Number of articles per line on small screen
+    medium: Medium
+    medium_help: Number of articles per line on medium screen
+    large: Large
+    large_help: Number of articles per line on large screen
+    title: Title 
+    title_help: Title displayed on top of news agregator. - for no title.
+    clas: CSS Class
+    clas_help: CSS Class wrapped around news agregator
+    list: List view
+    list_help: Rails view used for render news agregator. Default is dc_news/list.
+    show: Show view
+    show_help: Rails view used for render document. Default is dc_news/show.
+    link: Link 
+    link_help: Link used to show document. Default is current page link.
+    

data/config/locales/{dc_forum_sl.yml → dc_bnf_sl.yml}

@@ -45,6 +45,7 @@ sl:
     my_blog: moj blog
     comments: Komentarji
     last_blogs: Zadnje objave na blogu
+    blogs: Blogi
     
   dc_news:
     news: Novice
@@ -53,7 +54,26 @@ sl:
     entry_not_found: Novica ne obstaja
     last_news: Zadnje novice
     
-    
-    
-
-    
+    settings: Nastavitve za novice
+    categories: Kategorije
+    categories_help: Določi kategorije za prikaz novic
+    number: Število novic
+    number_help: Število novic prikazanih na eno strani
+    paging: Strani
+    paging_help: Dodaj kontrolnik za pomik po straneh
+    small: Mali
+    small_help: Število documentov v vrstici na malem zaslonu
+    medium: Srednji
+    medium_help: Število documentov v vrstici na srednjem zaslonu
+    large: Velik
+    large_help: Število documentov v vrstici na velikem zaslonu
+    title: Naslov 
+    title_help: Naslov prikazan nad seznamom novic. - za brez naslova.
+    clas: CSS Class
+    clas_help: CSS razred v katerega bo ovit prikaz novic
+    list: Prikaz seznama
+    list_help: Rails view za prikaz seznama novic. Privzeto dc_news/list.
+    show: Prikaz dokumenta
+    show_help: Rails view za prikaz dokumenta. Privzeto dc_news/show.
+    link: Link 
+    link_help: Nadrejena povezava za prikaz dokumenta. Privzeto je to povezava trenutne strani.

data/lib/drg_blog_news_forum/version.rb

@@ -1,3 +1,3 @@
 module DrgBlogNewsForum
-  VERSION = "0.5.51.1"
+  VERSION = "0.5.52.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_blog_news_forum
 version: !ruby/object:Gem::Version
-  version: 0.5.51.1
+  version: 0.5.52.0
 platform: ruby
 authors:
 - Damjan Rems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-07 00:00:00.000000000 Z
+date: 2018-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -54,17 +54,19 @@ files:
 - app/controllers/drgcms_controls/dc_forum_topic_control.rb
 - app/controllers/drgcms_controls/dc_forum_topic_dc_reply_control.rb
 - app/controllers/drgcms_controls/dc_news_dc_reply_control.rb
+- app/controllers/drgcms_controls/reply_control.rb
 - app/forms/cms_menu.yml
 - app/forms/dc_blog.yml
 - app/forms/dc_forum.yml
-- app/forms/dc_forum_policy_rule.yml
 - app/forms/dc_forum_topic.yml
 - app/forms/dc_news.yml
 - app/forms/dc_reply.yml
+- app/forms/forum_settings.yml
+- app/forms/news_settings.yml
 - app/forms/reply.yml
 - app/helpers/application_helper.rb
 - app/helpers/dc_blog_renderer.rb
-- app/helpers/dc_forum_helper.rb
+- app/helpers/dc_bnf_helper.rb
 - app/helpers/dc_forum_renderer.rb
 - app/helpers/dc_news_renderer.rb
 - app/models/dc_blog.rb
@@ -75,19 +77,18 @@ files:
 - app/models/dc_reply.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_blog/_list.html.erb
+- app/views/dc_blog/_show.html.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/_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_news/_list.html.erb
+- app/views/dc_news/_show.html.erb
 - app/views/dc_replay/_reply.html.erb
-- config/locales/dc_forum_en.yml
-- config/locales/dc_forum_sl.yml
+- config/locales/dc_bnf_en.yml
+- config/locales/dc_bnf_sl.yml
 - config/locales/models_en.yml
 - config/locales/models_sl.yml
 - lib/drg_blog_news_forum.rb
@@ -117,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: 'DRG CMS: Blog, news and forum plugin for DRG CMS'

data/app/forms/dc_forum_policy_rule.yml

@@ -1,2 +0,0 @@
-extend: dc_policy_rule
-table: dc_forum_policy_rule

data/app/views/dc_blog/_entries.html.erb

@@ -1,19 +0,0 @@
-<div class="wrap">
-<div class="blog-title">
-  <h1><%= params[:name] %>, <%= t('dc_blog.my_blog') %></h1>
-</div>
-
-<%= if session[:edit_mode] > 1 
-  dc_link_for_create(controller: 'cmsedit', table: 'dc_blog', title: 'dc_blog.new_entry' )
-    end %>
-
-<% for entry in entries %>
-  <div class="blog-entry">
-
-      <%= link_to( entry.subject, 
-          { path: 'blog', name: params[:name], link: entry.link } )%>
-
-    <div class="blog-date"><h4><%= dc_pretty_date(entry.created_at) %></h4></div>
-  </div>
-<% end %>
-</div>

data/app/views/dc_news/_entries.html.erb

@@ -1,15 +0,0 @@
-<div class="wrap">
-<div class="news-title">
-  <h1><%= t('dc_news.news') %></h1>
-</div>
-<%= if session[:edit_mode] > 1 
-  dc_link_for_create(controller: 'cmsedit', table: 'dc_news', title: 'dc_blog.new_entry' )
-    end %>
-<% for entry in entries %>
-
-  <div class="news-entry">
-    <h4><%= link_to( entry.subject, { path: 'news', link: entry.link } )%></h4>
-        <%= dc_pretty_date(entry.created_at) %>
-  </div>
-<% end %>
-</div>

data/app/views/dc_news/_entry.html.erb

@@ -1,23 +0,0 @@
-<div class="wrap">
-<% if session[:edit_mode] > 1 %>
-  <%= dc_link_for_create(controller: 'cmsedit', table: 'dc_news', title: 'dc_news.new_entry' ) %>
-  <br><br>
-  <%= dc_link_for_edit(controller: 'cmsedit', table: 'dc_news', title: 'dc_news.edit_entry', id: entry.id ) %>
-<% end %>
-
-<div class="news-subject"><h2><%= entry.subject %></h2></div>
-<div class="news-date"><h3>
-<%= t('dc_blog.author') + ' ' + entry.created_by_name + ', ' + dc_pretty_date(entry.created_at) %>
-  </h3></div><br>
-
-<div class="news-body"><%= entry.body.html_safe %></div>
-<div class="social-sites"><%=  social_sites %></div>
-
-<div class="news-replies">
-  <h2><%= t('dc_blog.comments') %></h2>
-  <%= render partial: 'dc_replay/reply', formats: [:html], 
-             locals: { replies: replies, parent_id: entry.id, parent_document: 'dc_news' } %>
-</div>
-
-<iframe id="iframe_edit" name="iframe_edit" scrolling="no"></iframe>
-</div>

data/app/views/dc_news/_news.html.erb

@@ -1,26 +0,0 @@
-<div class="wrap">
-<div class="news-title">
-  <%= title %>
-</div>
-
-<%= if session[:edit_mode] > 1 
-  dc_link_for_create(controller: 'cmsedit', table: 'dc_news', title: 'dc_blog.new_entry' )
-    end %>
-
-<% if news %>
-  <div class="news-date"><%= dc_pretty_date(news.created_at) %></div>
-  <div class="news-subject"><%= news.subject %></div>
-  <div style="clear:both;"></div>
-
-  <div class="news-body"><%= news.body%></div>
-
-  <div class="news-replies">
-    <%= render partial: 'dc_reply/reply', formats: [:html], 
-               locals: { replies: replies, parent_id: news.id } %>
-  </div>
-
-  <iframe id="iframe_edit" name="iframe_edit" scrolling="no"></iframe>
-<% else %>
-  <br><br><br>Sorry no news. Yet ;-)
-<% end %>
-</div>