drg_blog_news_forum 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45e516c4354491ad4f7ff2471ffe5ba3f070c4a0
-  data.tar.gz: 7f0685e4f74699c8a2eea92858cfb0ea4f87b049
+  metadata.gz: 559f79314aca5006d0e1a4d9d69e36bc7348f9f4
+  data.tar.gz: 0580df1d75a613069ffdefcec44cb25e5d0945c2
 SHA512:
-  metadata.gz: 57c7114fccdaed2c123acd2a25cdb5e78f3fd97bfac40ef715aa10fe9ee7d14fbeefc420e3fb258d5533354ec183d31cd340a94dc51d1f31e8b6307c4dda561e
-  data.tar.gz: b54765d4fe626cf2dcb33303403accabab62148e5f5758f8f40a0db072bf48341bbd570348e8421aad1af3487a142d4595837c4059a1085e08d187eb847d6474
+  metadata.gz: 5b5672ea31510550a15b5429d866ff8b9bcfaaa1d7082850502f8ce66c692e20a3cf848b1b4fdacf05a95d15420d5586cae3fb64e9785f73e4c9852136d2112b
+  data.tar.gz: 2057a2828b65a6da3c82ce3caf2d00e927a55083f431b94ba7c4e078c6a315cc3b17244ead5efa20ce4a20543def2ab3a246b3ba3aa822b32f8acf9752f2f83c

data/app/controllers/drgcms_controls/dc_news_dc_reply_control.rb

@@ -37,13 +37,13 @@ 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]
 end
 
 ######################################################################
 # Called before save. Reloads browser.
 ######################################################################
 def dc_before_save()
-  @record.created_by_name = session[:user_name]
   params[:return_to] = 'parent.reload'
 end
 

data/app/forms/dc_blog.yml

@@ -1,5 +1,3 @@
-## YAML Template for Blog
----
 table: dc_blog
 
 index:
@@ -27,13 +25,13 @@ form:
       name: subject
       type: text_field
       html:
-        size: 50
+        size: 80
 
     20:
       name: link
       type: text_field
       html:
-        size: 50
+        size: 80
 
     30:
       name: body
@@ -41,7 +39,7 @@ form:
       options: 'height: 500'      
 
     50:
-      name: replies
+      name: dc_replies
       type: embedded
       formname: dc_reply
       table: dc_reply

data/app/forms/dc_forum.yml

@@ -1,5 +1,3 @@
-## YAML Template for Polls
----
 table: dc_forum
 
 index:

data/app/forms/dc_forum_policy_rule.yml

@@ -1,4 +1,2 @@
-## YAML Template for Polls
----
 extend: dc_policy_rule
 table: dc_forum_policy_rule

data/app/forms/dc_forum_topic.yml

@@ -1,5 +1,3 @@
-## YAML Template for Polls
----
 table: dc_forum_topic
 
 

data/app/forms/dc_news.yml

@@ -0,0 +1,47 @@
+table: dc_news
+
+index:
+  filter: subject, created_by_name
+  actions: standard
+
+result_set:
+  actions: standard
+
+  columns:
+    1:  
+      name: subject
+    2:  
+      name: created_by_name
+    4: 
+      name: created_at
+
+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: body
+      type: html_field
+      options: 'height: 500'      
+
+    50:
+      name: dc_replies
+      type: embedded
+      formname: dc_reply
+      table: dc_reply
+      html:
+        height: 400  

data/app/forms/dc_reply.yml

@@ -1,12 +1,19 @@
-## YAML Template for Polls
----
 table: dc_reply
 
+result_set:
+  actions: standard
+
+  columns:
+    1:  
+      name: created_by_name
+    2:  
+      name: subject
+    3:  
+      name: created_at
+
 form:
   height: 750
-  labels_pos: top
-  actions: 
-    1: save
+  actions: standard
 
   fields:
     10:

data/app/forms/reply.yml

@@ -0,0 +1,27 @@
+
+table: dc_reply
+
+form:
+  height: 750
+  labels_pos: top
+  actions: 
+    1: save
+
+  fields:
+    10:
+      name: created_by_name
+      type: text_field
+      html:
+        size: 30
+      
+    20:
+      name: subject
+      type: text_field
+      html:
+        size: 80
+
+    30:
+      name: body
+      type: html_field
+      options: "height: 420, toolbar: 'basic', allowedContent: false" 
+      

data/app/helpers/dc_forum_renderer.rb

@@ -27,6 +27,7 @@
 class DcForumRenderer < DcRenderer
 include DcApplicationHelper
 
+  
 ########################################################################
 # 
 ########################################################################
@@ -47,7 +48,7 @@ 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(5)
+  replies = topic.dc_replies.where(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,44 +28,33 @@ class DcNewsRenderer < DcRenderer
 include DcApplicationHelper
 
 ########################################################################
-# Show one blog entry
+# Show one news entry
 ########################################################################
 def show_entry
-#  blog = @parent.params[:blog_id] ? DcNews.find(@parent.params[:blog_id]) : DcNews.last
-  entry = DcNews.find_by(created_by_name: @parent.params[:name], link: @parent.params[:link])
-  return t('dc_blog.entry_not_found') if entry.nil?
+  entry = DcNews.find_by(link: @parent.params[:link])
+  return t('dc_news.entry_not_found') if entry.nil?
   
   replies = entry.dc_replies.where(active: true).order(created_at: 1).
-            page(@parent.params[:page]).per(5)
+            page(@parent.params[:page]).per(10)          
   @parent.render partial: 'dc_news/entry', formats: [:html], 
                  locals: { entry: entry, replies: replies, opts: @opts }
 end
 
 ########################################################################
-# List all blogs from one bloger
+# List all news
 ########################################################################
 def list_all
   entries = DcNews.only(:created_by_name, :link, :subject, :created_at)
-                  .where(created_by_name: @parent.params[:name]).order_by(created_at: -1)
+                  .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 } 
 end
 
-########################################################################
-# List all blogers
-########################################################################
-def list_blogers
-  blogers = DcNews.all.distinct(:created_by_name)
-  @parent.render partial: 'dc_news/blogers', formats: [:html], locals: { blogers: blogers } 
-end
-
 ########################################################################
 # Default method will dispatch to proper method.
 ########################################################################
 def default
-  if @parent.params[:name].nil?
-    list_blogers
-  elsif @parent.params[:link].nil? or @parent.params[:link] == 'all'
+  if @parent.params[:link].nil?
     list_all
   else
     show_entry

data/app/models/dc_blog.rb

@@ -53,7 +53,7 @@ included do
 ########################################################################
 def do_before_save
   if self.link.size < 5
-    self.link = Time.now.strftime('%Y-%m-%d-') + UnicodeUtils.downcase(self.subject)
+    self.link = UnicodeUtils.downcase(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_news.rb

@@ -28,6 +28,8 @@ class DcNews
   field :subject,     type: String,  default: ''
   field :body,        type: String,  default: ''
   field :active,      type: Boolean, default: true
+  field :link,        type: String
+  
   field :valid_from,  type: Date
   field :valid_to,    type: Date
   field :categories,  type: Array
@@ -35,10 +37,23 @@ class DcNews
   field :created_by,  type: BSON::ObjectId
   field :created_by_name, type: String
 
-  embeds_many :replies
+  embeds_many :dc_replies, as: :replies
 
   validates_length_of :subject, minimum: 4  
   validates_length_of :body,    minimum: 10
   
+  before_save :do_before_save  
   
+########################################################################
+# Update link when left blank.
+########################################################################
+def do_before_save
+  if self.link.size < 5
+    self.link = UnicodeUtils.downcase(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
+  end
+end
+
 end

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

@@ -11,7 +11,7 @@
   <div class="blog-subject"><%= blog.subject %></div>
   <div style="clear:both;"></div>
 
-  <div class="blog-body"><%= blog.body%></div>
+  <div class="blog-body"><%= blog.body %></div>
 
   <div class="blog-replies">
     <%= render partial: 'dc_reply/reply', formats: [:html], 

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

@@ -1,13 +1,10 @@
-<div class="blog-title">
-  <h1><%= params[:name] %>, <%= t('dc_blog.my_blog') %></h1>
+<div class="news-title">
+  <h1><%= t('dc_news.news') %></h1>
 </div>
 <% for entry in entries %>
 
-  <div class="blog-entry">
-
-      <%= link_to( entry.subject, 
-          { path: 'blog', name: params[:name], link: entry.link } )%>
-
-    <div class="blog-date"><h3><%= dc_pretty_date(entry.created_at) %></h3></div>
+  <div class="news-entry">
+    <h3><%= link_to( entry.subject, { path: 'news', link: entry.link } )%></h3>
+        <%= dc_pretty_date(entry.created_at) %>
   </div>
 <% end %>

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

@@ -5,9 +5,10 @@
   <%= dc_link_for_edit(controller: 'cmsedit', table: 'dc_news', title: 'dc_news.edit_entry', id: entry.id ) %>
 <% end %>
 
-<div class="news-subject"><h1><%= entry.subject %></h1></div>
-<div class="news-date"><h3><%= t('dc_blog.author') + ' ' + dc_pretty_date(entry.created_at) %></h3></div>
-<div class="news-date"><h3><%= t('dc_blog.published') + ' ' + dc_pretty_date(entry.created_by_name) %></h3></div>
+<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>

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

@@ -4,7 +4,7 @@
   <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", 
-                   formname: 'dc_reply', action: 'new', ids: parent_id, 
+                   formname: 'reply', action: 'new', ids: parent_id, 
                    reply_to: reply.id}, target: 'iframe_edit') %>
     </span>
     <b><%= reply.subject %></b><br>
@@ -17,7 +17,7 @@
 <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", 
-               formname: 'dc_reply', action: 'new', ids: parent_id }, 
+               formname: 'reply', action: 'new', ids: parent_id }, 
                target: 'iframe_edit') %>
   </td>
   <td style="text-align: right; width: 100%;"><%= paginate replies %></td>    

data/config/locales/dc_forum_en.yml

@@ -36,6 +36,7 @@ en:
     last: Last
     
   dc_blog:
+    author: Author
     blogers: List of our blogers
     published: Published on,
     new_entry: New blog entry
@@ -43,5 +44,9 @@ en:
     entry_not_found: Blog entry not found
     my_blog: my blog
     comments: Comments
-    
 
+  dc_news:
+    news: News
+    new_entry: Create new news article
+    edit_entry: Edit news entry
+    entry_not_found: News article not found

data/config/locales/dc_forum_sl.yml

@@ -36,6 +36,7 @@ sl:
     last: Zadnji
 
   dc_blog:
+    author: Avtor
     blogers: Seznam naših blogerjev
     published: Objava,
     new_entry: Nov vpis v blog
@@ -44,5 +45,13 @@ sl:
     my_blog: moj blog
     comments: Komentarji
     
+  dc_news:
+    news: Novice
+    new_entry: Nova novica
+    edit_entry: Urejanje novice
+    entry_not_found: Novica ne obstaja
+    
+    
+    
 
     

data/config/locales/models_en.yml

@@ -80,6 +80,18 @@ en:
         link: Link 
         active: Active        
 
+      dc_news:
+        tabletitle: News
+
+        subject: Subject
+        body: Body
+        replies: Replies
+        created_at: Created at
+        created_by_id: Creator
+        created_by_name: Creator
+        link: Link 
+        active: Active        
+
     help:
       dc_forum:
         name: Forum name (short description)
@@ -118,4 +130,13 @@ en:
         created_by_name: Name of the creator
         link: Link to blog entry
         active: Active        
+        
+      dc_news:
+        subject: Subject of the news
+        body: Body
+        created_at: Time of creation
+        created_by: ID of the creator
+        created_by_name: Name of the creator
+        link: Link to blog entry
+        active: Active        
       

data/config/locales/models_sl.yml

@@ -64,6 +64,30 @@ sl:
         body: Vsebina
         created_at: Ustvarjeno
         created_by_name: Ustvaril
+        active: Aktiven  
+   
+      dc_blog:
+        tabletitle: Blogi
+
+        subject: Zadeva
+        body: Vsebina
+        replies: Odgovori
+        created_at: Ustvarjeno
+        created_by_id: Ustvaril
+        created_by_name: Ustvaril
+        link: Povezava 
+        active: Aktiven        
+
+      dc_news:
+        tabletitle: Novice
+
+        subject: Zadeva
+        body: Vsebina
+        replies: Odgovori
+        created_at: Ustvarjeno
+        created_by_id: Ustvaril
+        created_by_name: Ustvaril
+        link: Povezava 
         active: Aktiven        
         
     help:
@@ -97,4 +121,21 @@ sl:
         dc_forum_topic_id: Tema
         active: Aktiven        
         
-      
+      dc_blog:
+        subject: Naslov bloga
+        body: Vsebina (tekst) bloga
+        created_at: Ustvarjeno
+        created_by: Ustvaril
+        created_by_name: Ustvaril ime
+        link: Povezava do bloga
+        active: Blog zapis je aktiven
+        
+      dc_news:
+        subject: Naslov novice
+        body: Vsebina (tekst) novice
+        created_at: Ustvarjeno
+        created_by: Ustvaril
+        created_by_name: Ustvaril ime
+        link: Povezava do novice
+        active: Novica je aktivna
+              

data/lib/drg_blog_news_forum/version.rb

@@ -1,3 +1,3 @@
 module DrgBlogNewsForum
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_blog_news_forum
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Damjan Rems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -59,7 +59,9 @@ files:
 - 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/reply.yml
 - app/helpers/application_helper.rb
 - app/helpers/dc_blog_renderer.rb
 - app/helpers/dc_forum_helper.rb
@@ -114,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: 'DRG CMS: Blog, news and forum plugin for DRG CMS'