drg_blog_news_forum 0.5.52.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: df3654faf8249615292d74cc3e8e4bfffe783055
-  data.tar.gz: 62493c2c36520bffe5feeb7929e8fb9326386bb7
+SHA256:
+  metadata.gz: 72ed58040560740422402bad4242efe137bec31681dbd74754d9b503abc03ef2
+  data.tar.gz: 2ea79957ac9959149b97465049f687bd1acf2960013f2e0c1e7c3242d4b052c5
 SHA512:
-  metadata.gz: e819a01d19b77034c842c281ecabf5718592b59044edc2a8bef8c31181925925d00e7af4bd69913af547e3b484a0c854d98bbfe667728d28a90e7beff2227b04
-  data.tar.gz: bf6c9b7eda130ed6a96c952a7398d0d771f90e223d5abdca45516a166477e29bfe4f87738b3bdc7cbf3ee0ccdf7fb9adb4c601ac25b0fae1872379ce42e1b21b
+  metadata.gz: 95005b8b47db2fd05b1055fcbaee1b50c71eaebdf9ad62db6d8ad1f6df2ff7af41fc33c5277c18eb0f93166565d2bf4dd2e675b071b563130414558e89371c50
+  data.tar.gz: d3b8e1993a75a0562d14ae4d35a375022fc0aebc168b879297635d052d2774b4e75e15ef158aa58e8a43892c9b0dde2caa6ad78c46f3556d308bb0671e74209a

data/README.md

@@ -30,7 +30,7 @@ Please see the DRG CMS website for up-to-date documentation:
 License
 -------
 
-Copyright (c) 2014-2018 Damjan Rems
+Copyright (c) 2014-2022 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

@@ -135,23 +135,32 @@ border-radius: 2px;
 }
 
 /******* dc_blog *******/
+
 #blogs .title {
   font-size: 1.4em;
     padding-bottom: 5px;
 }
-.blog-subject {
-font-size: 1.4em;
+
+#blogs h1 {
+  font-size: 2.2em;
+  font-weight: 600;
+}
+
+
+.blog-subject h1 {
+font-size: 2.2em;
 font-weight: bold;
-margin-top: 20px;
 }
 .blog-date {
-font-size: 1em;  
+font-size: 1.2em;  
 color: #aaa;  
 margin-bottom: 20px;
 }
 .blog-body {
+  font-size: 1.2em;
 }
-.blog-replies {
+.blog-replies h2 {
+  font-size: 2em;
 }
 .reply-top.even {
 padding:5px;
@@ -170,8 +179,8 @@ margin-bottom: 0em;
 margin-top: 10px;
 }
 .blog-entry a {
-font-size: 1.6em;
-font-weight: bold;
+font-size: 1.4em;
+font-weight: 600;
 }
 
 .social-sites {
@@ -184,4 +193,16 @@ padding-bottom: 5px;
 /**** news  ****/
 .news.one .author {
   font-size: 1.2em;
+  font-weight: 600;
 } 
+
+.news .body {
+  font-size: 1.2em;
+}
+.news .document {
+  font-size: 1.2em;
+}
+
+.news h2 {
+  font-size: 1.4em;
+}

data/app/{controllers/drgcms_controls → controls}/dc_blog_dc_reply_control.rb

@@ -25,7 +25,7 @@
 ######################################################################
 # DrgcmsControls for DcBlog.DcReply form
 ######################################################################
-module DrgcmsControls::DcBlogDcReplyControl
+module DcBlogDcReplyControl
 
 ######################################################################
 # Called when new empty record is created

data/app/{controllers/drgcms_controls → controls}/dc_forum_topic_control.rb

@@ -25,7 +25,7 @@
 ######################################################################
 # DrgcmsControls for DcForumTopic form
 ######################################################################
-module DrgcmsControls::DcForumTopicControl
+module DcForumTopicControl
 ######################################################################
 # Called when new empty record is created
 ######################################################################

data/app/{controllers/drgcms_controls → controls}/dc_forum_topic_dc_reply_control.rb

@@ -25,7 +25,7 @@
 ######################################################################
 # DrgcmsControls for DcForum.DcReply form
 ######################################################################
-module DrgcmsControls::DcForumTopicDcReplyControl
+module DcForumTopicDcReplyControl
 
 ######################################################################
 # Called when new empty record is created
@@ -37,6 +37,9 @@ def dc_new_record()
     @record.subject = "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]  
+  @record.doc_id    = params[:parent_doc]
+  @record.doc_class = 'DcForum'
 end
 
 ######################################################################

data/app/{controllers/drgcms_controls → controls}/dc_news_dc_reply_control.rb

@@ -25,7 +25,7 @@
 ######################################################################
 # DrgcmsControls for DcBlog.DcReply form
 ######################################################################
-module DrgcmsControls::DcNewsDcReplyControl
+module DcNewsDcReplyControl
 
 ######################################################################
 # Called when new empty record is created

data/app/{controllers/drgcms_controls → controls}/reply_control.rb

@@ -25,7 +25,7 @@
 ######################################################################
 # DrgcmsControls for DcBlog.DcReply form
 ######################################################################
-module DrgcmsControls::ReplyControl
+module ReplyControl
 
 ######################################################################
 # Called when new empty record is created
@@ -35,7 +35,12 @@ def dc_new_record()
   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>"
+    @record.body = "<div class='dc-forum-quote'>[#{replyto.created_by_name}]#{replyto.body}</div><p><br></p>"
+  elsif params[:p_doc_id]
+    model = params[:p_doc_class].classify.constantize
+    doc = model.find(params[:p_doc_id])
+    @record.subject = "Re: #{doc.subject}"
+    
   end
   @record.created_by_name = session[:user_name] if session[:user_name]
 end
@@ -49,4 +54,16 @@ def dc_before_save()
   return false unless params[:_record][:_honey].blank?
 end
 
+######################################################################
+# Called after succesfull save.
+######################################################################
+def dc_after_save()
+  replies = DcReply.where(doc_id: @record.doc_id, active: true).count
+  parent = @record.doc_class.constantize
+  doc = parent.find_by(id: @record.doc_id)
+  doc.replies = replies
+  doc.updated_by_name = @record.created_by_name
+  doc.save
+end
+
 end 

data/app/forms/dc_blog.yml

@@ -1,4 +1,5 @@
 table: dc_blog
+include: dc_seo
 
 index:
   filter: subject, created_by_name
@@ -10,6 +11,7 @@ result_set:
   columns:
     1:  
       name: subject
+      width: 30%
     2:  
       name: created_by_name
     4: 
@@ -20,32 +22,33 @@ edit_title: subject
 form:
   actions: standard
 
-  fields:
-    10:
-      name: subject
-      type: text_field
-      html:
-        size: 80
-
-    20:
-      name: link
-      type: text_field
-      html:
-        size: 80
-
-    30:
-      name: created_at
-      type: datetime_picker
-
-    40:
-      name: body
-      type: html_field
-      options: 'height: 500'      
-
-    50:
-      name: dc_replies
-      type: embedded
-      form_name: dc_reply
-      table: dc_reply
-      html:
-        height: 400  
+  tabs:
+    1base:
+      10:
+        name: subject
+        type: text_field
+        html:
+          size: 80
+
+      20:
+        name: link
+        type: text_field
+        html:
+          size: 80
+
+      30:
+        name: created_at
+        type: datetime_picker
+
+      40:
+        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_forum_topic.yml

@@ -2,10 +2,16 @@ table: dc_forum_topic
 
 
 form:
-  height: 600
+  height: 625
   labels_pos: top
   actions: 
-    1: save
+    5: save
+    
+    1: 
+      type: script
+      caption: drgcms.back 
+      icon: arrow-left
+      js: parent.location.reload();    
 
   fields:
     10:
@@ -20,7 +26,7 @@ form:
     30:
       name: body
       type: html_field
-      options: "height: 420, toolbar: 'basic'" 
+      options: "height: 420, width: 700, toolbar: 'basic'" 
       
     100:
       name: dc_forum_id

data/app/forms/dc_news.yml

@@ -1,4 +1,5 @@
 table: dc_news
+include: dc_seo
 
 index:
   filter: subject, created_by_name
@@ -10,6 +11,8 @@ result_set:
   columns:
     1:  
       name: subject
+      width: 30%
+
     2:  
       name: created_by_name
     4: 
@@ -20,33 +23,31 @@ edit_title: subject
 form:
   actions: standard
 
-  fields:
-    10:
-      name: subject
-      type: text_field
-      html:
+  tabs:
+    1base:
+      10:
+        name: subject
+        type: text_field
         size: 80
 
-    20:
-      name: link
-      type: text_field
-      html:
+      20:
+        name: link
+        type: text_field
         size: 80
 
-    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'      
-
+      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'      

data/app/forms/dc_reply.yml

@@ -39,4 +39,4 @@ form:
     50:
       name: body
       type: html_field
-      options: "height: 420, toolbar: 'basic', allowedContent: false" 
+      options: "height: 420, width: 800, toolbar: 'basic', allowedContent: false" 

data/app/forms/dc_reply_public.yml

@@ -0,0 +1,37 @@
+table: dc_reply
+
+form:
+  actions:
+    1: 
+      type: save    
+    5: 
+      type: script
+      caption: Cancle 
+      js: parent.reload();
+    
+  height: 750
+  actions: standard
+
+  fields:
+    10:
+      name: doc_id
+      type: hidden_field
+
+    20:
+      name: doc_class
+      type: hidden_field
+
+    30:
+      name: created_by_name
+      type: text_field
+      size: 30
+      
+    40:
+      name: subject
+      type: text_field
+      size: 80
+
+    50:
+      name: body
+      type: html_field
+      options: "height: 420, width: 800, toolbar: 'basic', allowedContent: false" 

data/app/forms/reply.yml

@@ -4,28 +4,32 @@ title: Reply
 controls: reply
 
 form:
-  height: 750
+  height: 650
   labels_pos: top
   actions: 
-    1: save
+    1: 
+      type: script
+      caption: drgcms.back 
+      icon: arrow-left
+      js: parent.location.reload();
+
+    5: save
 
   fields:
     10:
       name: created_by_name
       type: text_field
-      html:
-        size: 30
+      size: 30
       
     20:
       name: subject
       type: text_field
-      html:
-        size: 80
+      size: 80
 
     30:
       name: body
       type: html_field
-      options: "height: 420, toolbar: 'basic', allowedContent: false" 
+      options: "height: 420, width: 700, toolbar: 'basic', allowedContent: false" 
     40:
        name: _honey
        type: text_field

data/app/helpers/dc_bnf_helper.rb

@@ -22,7 +22,7 @@
 #++
 
 module DcBnfHelper
-#include DcApplicationHelper  
+include CmsCommonHelper
 
 ########################################################################
 # 

data/app/models/dc_blog.rb

@@ -46,11 +46,15 @@ included do
 
   field :subject,     type: String,  default: ''
   field :body,        type: String,  default: ''
-  field :active,      type: Boolean, default: true
+  field :active,      type: Mongoid::Boolean, default: true
   field :link,        type: String
+  field :replies,     type: Integer, default: 0  
 
   field :created_by,  type: BSON::ObjectId
   field :created_by_name, type: String
+  
+  # SEO
+  include DcSeoConcern
 
   embeds_many :dc_replies, as: :replies
   
@@ -66,11 +70,11 @@ included do
 ########################################################################
 def do_before_save
   if self.link.size < 5
-    self.link = UnicodeUtils.downcase(self.subject).gsub(' ','-') + Time.now.strftime('-%Y-%m-%d')
-  end
-  if self.created_by_name.nil?
-    self.created_by_name = DcUser.find(self.created_by).name
+    self.link = UnicodeUtils.downcase(DcPage.clear_link(self.subject)) + Time.now.strftime('-%Y-%m-%d')
   end
+  #if self.created_by_name.nil?
+    self.created_by_name = DcUser.find(self.created_by).name.downcase.gsub(' ','-')
+  #end
 end
   
 ########################################################################

data/app/models/dc_forum.rb

@@ -56,6 +56,7 @@ class DcForum
   field :active,      type: Boolean, default: true 
   field :created_by,  type: BSON::ObjectId
   field :updated_by,  type: BSON::ObjectId
+  field :updated_by_name, type: String  
   
   embeds_many :dc_policy_rules, as: :policy_rules
   

data/app/models/dc_forum_topic.rb

@@ -57,8 +57,7 @@ class DcForumTopic
   field :created_by,  type: BSON::ObjectId
   field :updated_by,  type: BSON::ObjectId
   field :created_by_name, type: String
-  field :updated_by_name, type: String
-  
+  field :updated_by_name, type: String  
   
   index( { dc_forum_id: 1 } )
   

data/app/models/dc_news.rb

@@ -48,10 +48,14 @@ class DcNews
   field :body,        type: String,  default: ''
   field :active,      type: Boolean, default: true
   field :link,        type: String
+  field :replies,     type: Integer, default: 0  
   
   field :valid_from,  type: Date
   field :valid_to,    type: Date
   field :categories,  type: Array
+  
+  # SEO
+  include DcSeoConcern
 
   field :created_by,  type: BSON::ObjectId
   field :created_by_name, type: String
@@ -67,8 +71,8 @@ class DcNews
 # Update link when left blank.
 ########################################################################
 def do_before_save
-  if self.link.size < 5
-    self.link = UnicodeUtils.downcase(self.subject).gsub(' ','-') + Time.now.strftime('-%Y-%m-%d')
+  if self.link.blank?
+    self.link = UnicodeUtils.downcase(DcPage.clear_link(self.subject)) + Time.now.strftime('-%Y-%m-%d')
   end
   if self.created_by_name.nil?
     self.created_by_name = DcUser.find(self.created_by).name

data/app/models/dc_reply.rb

@@ -49,8 +49,10 @@ class DcReply
 
   field :created_by,      type: BSON::ObjectId
   field :created_by_name, type: String
+  
+  index( { doc_id: 1 } )
 
-  validates_length_of :subject,           minimum: 4  
-  validates_length_of :body,              minimum: 10
+  validates_length_of :subject,           minimum: 5  
+  validates_length_of :body,              minimum: 5
   validates_length_of :created_by_name,   minimum: 5
 end

data/app/{helpers → renderers}/dc_blog_renderer.rb

@@ -26,6 +26,7 @@
 ########################################################################
 class DcBlogRenderer < DcRenderer
 include DcApplicationHelper
+include CmsCommonHelper
 
 ########################################################################
 # Show one blog entry
@@ -33,6 +34,11 @@ include DcApplicationHelper
 def show(link)
   entry = DcBlog.find_by(link: link)
   return t('dc_blog.entry_not_found') if entry.nil?
+# SEO
+  @parent.page_title = entry.title.blank? ? entry.subject : entry.title
+  @parent.page.canonical_link = nil
+  @parent.dc_add_meta_tag(:name, 'description', entry.meta_description) unless entry.meta_description.blank?
+  @parent.dc_add_json_ld(entry.get_json_ld)
   
   replies = DcReply.where(doc_id: entry.id, active: true).order(created_at: 1)
   @parent.render partial: 'dc_blog/show', formats: [:html], 
@@ -40,21 +46,32 @@ def show(link)
 end
 
 ########################################################################
-# List all blogs from one bloger
+# List all blogs from single blogger
 ########################################################################
-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)
+def list(path)
+  # get blogger id from document path
+  blogger_id = path.last.split('-').last
+  documents  = if BSON::ObjectId.legal?(blogger_id)
+    DcBlog.only(:created_by, :link, :subject, :created_at)
+          .where(created_by: blogger_id, active: true).order_by(created_at: -1)
+          .page(@parent.params[:page]).per(10)
+  else
+    blogger_name = path.last
+    DcBlog.only(:created_by, :link, :subject, :created_at)
+          .where(created_by_name: blogger_name, active: true).order_by(created_at: -1)
+          .page(@parent.params[:page]).per(10)
+  end
+  
   @parent.render partial: 'dc_blog/list', formats: [:html], locals: { documents: documents } 
 end
 
 ########################################################################
-# List all blogers
+# List all bloggers
 ########################################################################
-def list_blogers
-  blogers = DcBlog.all.distinct(:created_by_name)
-  @parent.render partial: 'dc_blog/blogers', formats: [:html], locals: { blogers: blogers } 
+def list_bloggers
+  bloggers = DcBlog.distinct(:created_by)
+  bloggers = DcUser.only(:id, :name).where(:_id.in => bloggers).to_a
+  @parent.render partial: 'dc_blog/bloggers', formats: [:html], locals: { bloggers: bloggers } 
 end
 
 ########################################################################
@@ -62,19 +79,17 @@ end
 ########################################################################
 def last_blogs
   limit = @opts[:limit] || 3
-  entries = DcBlog.only(:created_by_name, :link, :subject, :created_at)
-                  .where(active: true) 
-                  .order_by(created_at: -1).limit(limit).to_a
-
+  entries = DcBlog.only(:created_by_name, :link, :subject, :created_at).where(active: true)
+  entries = entries.and(created_by_name: @opts[:blogger]) if @opts[:blogger]
+  entries = entries.order_by(created_at: -1).limit(limit).to_a
   entries.inject('') do |result, document|
     result << @parent.link_to("/blog/#{document.created_by_name}/#{document.link}") do 
-      %Q[
+      %Q[<div>
     <span class="date">#{@parent.dc_pretty_date(document.created_at)} : </span>
-    <span class="title">#{document.subject}</span><br><br> 
-      ].html_safe
+    <span class="title">#{document.subject}</span><br>
+      </div>].html_safe
     end
   end
-
 end
 
 
@@ -83,10 +98,10 @@ end
 ########################################################################
 def default
   document_link = @opts[:path].last
-  if @opts[:path].size == 1 or document_link == 'blogers'
-    list_blogers
+  if @opts[:path].size == 1 or document_link == 'bloggers'
+    list_bloggers
   elsif @opts[:path].size == 2 
-    list(document_link)
+    list(@opts[:path])
   else
     show(document_link)
   end

data/app/{helpers → renderers}/dc_forum_renderer.rb

@@ -26,7 +26,7 @@
 ########################################################################
 class DcForumRenderer < DcRenderer
 include DcApplicationHelper
-
+include CmsCommonHelper
   
 ########################################################################
 # 
@@ -49,9 +49,9 @@ def topic
   forum = DcForum.find(@parent.params[:forum])
   topic = DcForumTopic.find(@parent.params[:topic])
   replies = DcReply.where(doc_id: topic.id, active: true).order(created_at: 1)
-                   .page(@parent.params[:page]).per(10)
+                   .page(@parent.params[:page]).per(15)
   @parent.render partial: 'dc_forum/topic', formats: [:html], 
-                 locals: { forum: forum, topic: topic, replies: replies }
+                 locals: { forum: forum, topic: topic, replies: replies, opts: @opts  }
 end
 
 ########################################################################
@@ -64,7 +64,7 @@ def topics
   topics = DcForumTopic.only(:id, :created_by_name, :updated_by_name, :subject, :created_at, :updated_at, :replies)
            .where(dc_forum_id: forum._id, active: true).order(updated_at: -1)
            .page(@parent.params[:page]).per(10)
-  @parent.render partial: 'dc_forum/topics', formats: [:html], locals: { forum: forum, topics: topics }
+  @parent.render partial: 'dc_forum/topics', formats: [:html], locals: { forum: forum, topics: topics, opts: @opts  }
 end
 
 ########################################################################

data/app/{helpers → renderers}/dc_news_renderer.rb

@@ -26,6 +26,7 @@
 ########################################################################
 class DcNewsRenderer < DcRenderer
 include DcApplicationHelper
+include CmsCommonHelper
 
 ########################################################################
 # Collects documents for list
@@ -84,10 +85,10 @@ def last_news
 
   entries.inject('') do |result, element|
     result << @parent.link_to("/news/#{element.link}") do 
-      %Q[
+      %Q[<div>
     <span class="date">#{@parent.dc_pretty_date(element.created_at)} : </span>
-    <span class="title">#{element.subject}</span><br><br> 
-      ].html_safe
+    <span class="title">#{element.subject}</span>
+      </div>].html_safe
     end
   end
 end

data/app/views/dc_blog/{_blogers.html.erb → _bloggers.html.erb}

@@ -2,12 +2,13 @@
 <% if session[:edit_mode] > 1 %>
   <%= dc_link_for_create(controller: 'cmsedit', table: 'dc_blog', title: 'dc_blog.new_entry' ) %>
 <% end %>
+
 <div class="blog-title">
-  <h1><%= t('dc_blog.blogers') %></h1>
+  <h1><%= t('dc_blog.bloggers') %></h1>
 </div>
 
-<% for bloger in blogers %>
+<% for blogger in bloggers %>
   <div class="blog-entry">
-     <%= link_to( bloger, { path: "blog/#{bloger}"} )%>
+     <%= link_to( blogger.name, { path: "blog/#{blogger.name.downcase.gsub(' ','-')}" } )%>
   </div>
 <% end %>

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

@@ -1,11 +1,15 @@
 
 <div id="blogs">
-<h3><%= t('dc_blog.blogs') %></h3>
+<h1><%= t('dc_blog.blogs') %></h1>
 
 <% 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 class="title">
+      <%= link_to( path: "#{(@options[:path] + [document.link]).join('/')}" ) do %>
+        <h2><%= document.subject %> </h2>
+      <% end %>
+    </div>
   </div>
 <% end %>
 </div>

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

@@ -1,15 +1,17 @@
+<div class="row">
 
+<div class="column small-12 medium-9">
 <% if session[:edit_mode] > 1 %>
   <%= 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_document', id: document.id ) %>
 <% end %>
 
-<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-subject"><h1><%= document.subject %></h1></div>
+<div class="blog-date"><%= t('dc_blog.published') + ' ' + dc_pretty_date(document.created_at) %></div>
 
 <div class="blog-body"><%= document.body.html_safe %></div>
-<div class="social-sites"><%=  social_sites %></div>
+<div class="social-sites"><%= social_sites %></div>
 
 <div class="blog-replies">
   <h2><%= t('dc_blog.comments') %></h2>
@@ -18,3 +20,11 @@
 </div>
 
 <iframe id="iframe_edit" name="iframe_edit" scrolling="no"></iframe>
+</div>
+
+<div class="column small-12 medium-3 more-blogs">
+  <h2>More blogs by<br><%= document.created_by_name %></h2>
+  <%= dc_render(:dc_blog, method: 'last_blogs', limit: 10, blogger: document.created_by_name) %>
+</div>
+  
+</div>

data/app/views/dc_forum/_forums.html.erb

@@ -1,11 +1,13 @@
-<div class="wrap">
+
+<%= "<div id=\"#{opts[:div_id]}\">".html_safe if opts[:div_id] %>
+
 <%= if session[:edit_mode] > 1 
   dc_link_for_create(controller: 'cmsedit', table: 'dc_forum', title: 'dc_forum.add_new_forum' )
     end %>
 
 <div class="forum-topics">
   <div class="forum-title">
-    <h1><%= t 'dc_forum.forums_list' %></h1>
+    <h3><%= t 'dc_forum.forums_list' %></h3>
   </div>
   
   <% for forum in forums %>
@@ -15,20 +17,29 @@
       <div class="name">  
         <%= link_to(forum.name,{ path: params[:path], forum: forum.id} ) %>
       </div>
-      <div class='description'>
-        <%= forum.description %><hr>
-         <b><%= t('dc_forum.topics') %>:</b>
-         <%= forum.topics %> &nbsp;|&nbsp; 
 
+      <div class='description'>
+        <%= forum.description %><br>
+        <b><%= t('dc_forum.topics') %>:</b>
+         <%= forum.topics %> &nbsp;|&nbsp;
+         
+<% zadnja_sprememba = DcForumTopic.where(dc_forum_id: forum.id).order_by(updated_at: -1).first; if zadnja_sprememba %>
+         <b><%= t('dc_forum.last_change') %>:</b>
+         <%= dc_pretty_date(zadnja_sprememba.updated_at) %> &nbsp;|&nbsp; 
+         <%= link_to(zadnja_sprememba.subject, { path: params[:path], forum: forum.id, topic: zadnja_sprememba._id } ) %>
+<% end %>         
+         
+<% if false %>
          <b><%= t('dc_forum.replies') %>:</b>
          <%= forum.replies %> &nbsp;|&nbsp; 
 
          <b><%= t('dc_forum.last') %>:</b>
          <%= forum.updated_by_name %>
          <%= dc_pretty_date(forum.updated_at) %>
-      
+<% end %>      
       </div>
     </div>
   <% end %>
-</div>  
 </div>
+
+<%= "</div>".html_safe if opts[:div_id] %>

data/app/views/dc_forum/_topic.html.erb

@@ -1,53 +1,43 @@
-<div class="wrap">
+
+<%= "<div id=\"#{opts[:div_id]}\">".html_safe if opts[:div_id] %>
+  
 <div class="forum-topics">
   <div id="back-list">
     <%= link_to( t('dc_forum.forums_list'), {path: params[:path]} ) %> / 
     <%= link_to( forum.name, {path: params[:path], forum: forum.id} ) %> 
   </div>
-  <table id="dc-forum-menu"><tr>
-    <td class="dc-link dc-animate" style="white-space: nowrap;">
-    <%= link_to( t('dc_forum.new_reply'), { controller: 'cmsedit', table: 'dc_forum_topic;dc_reply', 
-                 form_name: 'dc_reply', action: 'new', ids: topic.id, forum: forum._id}, 
-                 target: 'iframe_edit') %>
-    </td>
-    <td style="text-align: right; width: 100%;"><%= paginate replies %></td>    
-  </tr></table>
   
-  <div class="forum-title">
-  <h1><%= forum.name %></h1></div>
-
-  <div class="topic-top"><h2><%= topic.subject %></h2>
-    <%= t('dc_forum.created_by') %>: <%= topic.created_by_name %> <%= dc_pretty_date(topic.created_at) %>
+  <div id="dc-forum-menu">
+    <div class="dc-link">
+      <%= link_to( 'Nazaj', {path: params[:path], forum: forum.id}, class: 'dc-animate' ) %>
+    </div>
+    <div class="dc-link">
+      <%= link_to( t('dc_forum.new_reply'), { table: 'dc_reply', form_name: 'reply', 
+                   controller: :cmsedit, action: 'new',
+                   p_doc_id: topic.id, p_doc_class: topic.class.to_s }, 
+                   target: 'iframe_edit', class: 'dc-animate', ref: 'nofollow') %>
+    </div>
+    <div class="dc-link">
+      <%= link_to( t('dc_forum.new_topic'), 
+          {controller: 'cmsedit', table: 'dc_forum_topic', form_name: 'dc_forum_topic', 
+          action: 'new', forum: forum._id}, target: 'iframe_edit', class: 'dc-animate', ref: 'nofollow') %>
+    </div>
+    <div style="text-align: right; width: 100%;"><%= paginate replies %></div>    
   </div>
   
+  <h2><%= forum.name %></h2>
+
+  <div class="topic-top"><h3><%= topic.subject %></h3>
+    <%= t('dc_forum.created_by') %>: <%= dc_pretty_date(topic.created_at) %>, <%= topic.created_by_name %> 
+  </div>
   <div class="topic-body"><%= topic.body.html_safe %></div>
   
-  <% for reply in replies %>
-    <% oddeven = cycle("odd", "even") %>
-
-    <div class="reply-top-<%= oddeven %>">
-      <span style="float: right; top-margin: 5px;">
-        <%= link_to( t('dc_forum.new_reply'), { controller: 'cmsedit', table: 'dc_forum_topic;dc_reply', 
-                     form_name: 'dc_reply', action: 'new', ids: topic.id, 
-                     forum: forum._id, reply_to: reply.id}, 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;
-    </div>
-    <div class="reply-body-<%= oddeven %>"><%= reply.body.html_safe %></div>
-  <% end %>
-    
-  <table id="dc-forum-menu"><tr>
-    <td class="dc-link dc-animate" style="white-space: nowrap;">
-    <%= link_to( t('dc_forum.new_reply'), { controller: 'cmsedit', table: 'dc_forum_topic;dc_reply', 
-                 form_name: 'dc_reply', action: 'new', ids: topic.id, forum: forum._id}, 
-                 target: 'iframe_edit') %>
-    </td>
-    <td style="text-align: right; width: 100%;"><%= paginate replies %></td>    
-  </tr></table>
+  <div class="news-replies">
+    <h4>Odgovori</h4>
+    <%= render partial: 'dc_replay/reply', formats: [:html], 
+               locals: { replies: replies, parent_doc: topic } %>
+  </div> 
 </div>
-
+ 
 <iframe id="iframe_edit" name="iframe_edit" scrolling="no"></iframe>
-</div>
+<%= "</div>".html_safe if opts[:div_id] %>

data/app/views/dc_forum/_topics.html.erb

@@ -1,46 +1,42 @@
-<div class="wrap">
+
+<%= "<div id=\"#{opts[:div_id]}\">".html_safe if opts[:div_id] %>
+  
 <div class="forum-topics">
   <div id="back-list"><%= link_to( t('dc_forum.forums_list'), { path: params[:path] }) %> </div>
-  
-  <table id="dc-forum-menu"><tr>
-    <td class="dc-link dc-animate" style="white-space: nowrap;">
+
+  <div id="dc-forum-menu">
+    <div class="dc-link" style="white-space: nowrap;">
       <%= link_to( t('dc_forum.new_topic'), 
           {controller: 'cmsedit', table: 'dc_forum_topic', form_name: 'dc_forum_topic', 
-          action: 'new', forum: forum._id}, target: 'iframe_edit') %>
-    </td>
-    <td style="text-align: right; width: 100%;"><%= paginate topics %></td>    
-  </tr></table>
+          action: 'new', forum: forum._id}, target: 'iframe_edit', class:  'dc-animate', ref: 'nofollow') %>
+    </div>
+    <div style="text-align: right; width: 100%;"><%= paginate topics %></div>
+  </div>
   
   <div class="forum-title">
-    <h1><%= forum.name %></h1>
+    <h2><%= forum.name %></h2>
   </div>
   
   <% for topic in topics %>
     <div class="topic-<%= cycle("odd", "even") %>">
-      <%= link_to(topic.subject, { path: params[:path], forum: params[:forum], topic: topic._id } ) %><hr>
+    <%= link_to(topic.subject, { path: params[:path], forum: params[:forum], topic: topic._id } ) %><br>
+      
       <b><%= t('dc_forum.created_by') %>:</b> <%= topic.created_by_name %> 
-      <%= dc_pretty_date(topic.created_at) %> &nbsp;|&nbsp;
+      &nbsp;|&nbsp; <%= dc_pretty_date(topic.created_at) %> &nbsp;|&nbsp;
 
       <b><%= t('dc_forum.replies') %>:</b>
       <%= topic.replies %>
       
       <% if topic.updated_at != topic.created_at %>
-         &nbsp;|&nbsp; <b><%= t('dc_forum.last') %>:</b>
+        &nbsp;|&nbsp; <b><%= t('dc_forum.last') %>:</b>
         <%= topic.updated_by_name %>
-        <%= dc_pretty_date(topic.updated_at) %>
+        &nbsp;|&nbsp; <%= dc_pretty_date(topic.updated_at) %>
       <% end %>
     </div>
   <% end %>
 
-  <table id="dc-forum-menu"><tr>
-    <td class="dc-link dc-animate" style="white-space: nowrap;">
-      <%= link_to( t('dc_forum.new_topic'), 
-          {controller: 'cmsedit', table: 'dc_forum_topic', form_name: 'dc_forum_topic', 
-          action: 'new', forum: forum._id}, target: 'iframe_edit') %>
-    </td>
-    <td style="text-align: right; width: 100%;"><%= paginate topics %></td>    
-  </tr></table>
 </div>
 
 <iframe id="iframe_edit" name="iframe_edit" scrolling="no"></iframe>
-</div>
+<%= "</div>".html_safe if opts[:div_id] %>
+

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

@@ -10,7 +10,7 @@ title  = opts.dig(:settings, opts[:element], 'title') || t('dc_news.news')
 
 <div class="<%= clas %>">
   <%= news_settings(opts) %>
-  <% unless title == '-'  %><h2><%= title %></h2><% end %>
+  <% unless title == '-'  %><h1><%= title %></h1><% end %>
   <%= if opts[:edit_mode] > 1 
     dc_link_for_create(controller: 'cmsedit', table: 'dc_news', title: 'dc_blog.new_entry' )
   end %>
@@ -18,7 +18,9 @@ title  = opts.dig(:settings, opts[:element], 'title') || t('dc_news.news')
   <% for document in documents %>
     <div class="document">
       <%= dc_pretty_date(document.created_at) %>
-      <h4><%= link_to( document.subject, { path: "#{link}/#{document.link}" } )%></h4>          
+      <%= link_to( { path: "#{link}/#{document.link}" } ) do %>
+        <h2><%= document.subject %></h2>
+      <% end %>
     </div>
   <% end %>
 </div>

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

@@ -8,9 +8,9 @@ clas = (opts.dig(:settings, opts[:element], 'clas') || 'news') + ' one'
   <%= dc_link_for_create( table: 'dc_news', title: 'dc_news.new_document' ) %>
 <% end %>
 
-<h2><%= document.subject %></h2>
+<h1><%= document.subject %></h1>
 <div class="author">
-  <%= "#{t('dc_blog.author')} #{document.created_by_name}, #{dc_pretty_date(document.created_at)}" %>
+  <%= "#{t('dc_blog.author')}: #{document.created_by_name}, #{dc_pretty_date(document.created_at)}" %>
 </div><br>
 
 <div class="body"><%= document.body.html_safe %></div>

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

@@ -2,25 +2,24 @@
 <% for reply in replies %>
   <% oddeven = cycle("odd", "even") %>
   <div class="reply-top <%= oddeven %>">
-    <span style="float: right; top-margin: 5px;">
+    <span style="float:right;">
       <%= 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') %>
+                   target: 'iframe_edit', ref: 'nofollow') %>
     </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>
+    <%= t('dc_forum.replied_by') %>: <%= dc_pretty_date(reply.created_at) %>, <%= reply.created_by_name %> <br>
   </div>
+  <div class="reply-body <%= oddeven %>"><%= reply.body.html_safe %></div>
 <% end %>
 
 <div id="dc-reply-menu">
   <div class="dc-link dc-animate" style="float: left;">
-  <%= link_to( t('dc_forum.new_comment'), { controller: 'cmsedit', table: "dc_reply", 
+  <%= 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'}) %>
+               {target: 'iframe_edit', class: 'dc-animate', ref: 'nofollow'}) %>
   </div>
   <%# = paginate replies %>   
 </div>

data/config/locales/dc_bnf_en.yml

@@ -35,10 +35,11 @@ en:
     topics: Topics
     replies: Replies
     last: Last
+    last_change: Last change
     
   dc_blog:
     author: Author
-    blogers: List of our blogers
+    bloggers: List of our bloggers
     published: Published on,
     new_entry: New blog entry
     edit_entry: Edit blog entry

data/config/locales/dc_bnf_sl.yml

@@ -35,10 +35,11 @@ sl:
     topics: Teme
     replies: Odgovorov
     last: Zadnji
+    last_change: Zadnja sprememba
 
   dc_blog:
     author: Avtor
-    blogers: Seznam naših blogerjev
+    bloggers: Seznam naših blogerjev
     published: Objava,
     new_entry: Nov vpis v blog
     edit_entry: Uredi vpis v blog

data/config/locales/models_en.yml

@@ -70,6 +70,7 @@ en:
    
       dc_blog:
         tabletitle: Blogs
+        1base: Base
 
         subject: Subject
         body: Body
@@ -82,6 +83,7 @@ en:
 
       dc_news:
         tabletitle: News
+        1base: Base
 
         subject: Subject
         body: Body

data/config/locales/models_sl.yml

@@ -52,6 +52,7 @@ sl:
         body: Vsebina
         created_at: Ustvarjeno
         dc_user_id: Ustvaril
+        created_by_name: Ustvaril
         dc_forum_id: Forum
         active: Aktiven  
         replies: Odgovorov
@@ -68,6 +69,7 @@ sl:
    
       dc_blog:
         tabletitle: Blogi
+        1base: Osnovno
 
         subject: Zadeva
         body: Vsebina
@@ -80,6 +82,7 @@ sl:
 
       dc_news:
         tabletitle: Novice
+        1base: Osnovno
 
         subject: Zadeva
         body: Vsebina

data/lib/drg_blog_news_forum/version.rb

@@ -1,3 +1,3 @@
 module DrgBlogNewsForum
-  VERSION = "0.5.52.2"
+  VERSION = "0.6.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_blog_news_forum
 version: !ruby/object:Gem::Version
-  version: 0.5.52.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Damjan Rems
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-09-12 00:00:00.000000000 Z
+date: 2022-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -50,33 +50,34 @@ files:
 - README.md
 - Rakefile
 - app/assets/stylesheets/drg_blog_news_forum.css
-- app/controllers/drgcms_controls/dc_blog_dc_reply_control.rb
-- 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/controls/dc_blog_dc_reply_control.rb
+- app/controls/dc_forum_topic_control.rb
+- app/controls/dc_forum_topic_dc_reply_control.rb
+- app/controls/dc_news_dc_reply_control.rb
+- app/controls/reply_control.rb
 - app/forms/cms_menu.yml
 - app/forms/dc_blog.yml
 - app/forms/dc_forum.yml
 - app/forms/dc_forum_topic.yml
 - app/forms/dc_news.yml
 - app/forms/dc_reply.yml
+- app/forms/dc_reply_public.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_bnf_helper.rb
-- app/helpers/dc_forum_renderer.rb
-- app/helpers/dc_news_renderer.rb
 - app/models/dc_blog.rb
 - app/models/dc_forum.rb
 - app/models/dc_forum_policy_rule.rb
 - app/models/dc_forum_topic.rb
 - app/models/dc_news.rb
 - app/models/dc_reply.rb
+- app/renderers/dc_blog_renderer.rb
+- app/renderers/dc_forum_renderer.rb
+- app/renderers/dc_news_renderer.rb
 - app/views/dc_blog/_blog.html.erb
-- app/views/dc_blog/_blogers.html.erb
+- app/views/dc_blog/_bloggers.html.erb
 - app/views/dc_blog/_last_blogs.erb
 - app/views/dc_blog/_list.html.erb
 - app/views/dc_blog/_show.html.erb
@@ -102,7 +103,7 @@ homepage: http://www.drgcms.org
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -117,12 +118,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.1
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: 'DRG CMS: Blog, news and forum plugin for DRG CMS'
 test_files:
-- test/test_helper.rb
-- test/integration/navigation_test.rb
 - test/drg_blog_news_forum_test.rb
+- test/integration/navigation_test.rb
+- test/test_helper.rb