drg_blog_news_forum 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22ddad8c605ed8303a940594c896c6e221252009
-  data.tar.gz: 130307d97ac3e1834e48e9c57b2a345a4f51f8ea
+  metadata.gz: d4837fd6c77dad9f6f476277d07d9ed7cbebaa9a
+  data.tar.gz: aaa48e13bb70f838d7a2ffdc2a8fb61455e84564
 SHA512:
-  metadata.gz: f25660676278eb78992e5db0adb2629d7ceb45be4fa8a69c91bce4bc091f0c8db5a5c5282d4f812e0c8a14b4062b78b5b8971fa690c1e8b311384e0a6020579d
-  data.tar.gz: d62f37100fe7193da265ff3c3547ee604a820ddad4348fc78659a0b8a8493b34b5f4ced07448761120a140469ff7de88838940e49ed0dc9fbae323ad7335d86c
+  metadata.gz: fe493dfb684ef435a6b428fd433655e960543c00af1e938d724e8fd0756d023b47b4a734cbaf23d65880002b2bb2f1b292fc8ec8988c2248d90f4da6644c3cdc
+  data.tar.gz: 11c27a3adc9b8a012837ec3f5ce9fb419e59152eb25d8b15a56ce17e51f8e3db66465371e6f3230a7eeef4640fe735ed0ad40648c6da3d71ee1e89608e7f6744

data/README.md

@@ -1,29 +1,17 @@
 # DrgBlogNewsForum
 
-DRG CMS DrgBlogNewsForum plugin implements basic funcionality for enabling blog, news or forum on your web site.
+DRG CMS DrgBlogNewsForum plugin implements basic funcionality for enabling blog, news or forum on DRG CMS enabled web site.
 
 Configuration
 ----------------
 
-Add this line to your gem file:
+Add this line to your Gemfile:
 ```ruby
   gem 'drg_blog_news_forum'
 ```  
 
-Usage:
-```yaml
-    fields:
-      10:
-        name: body
-        type: html_field
-        options: "height: 500, width: 550, toolbar: 'basic'" 
-		
-      20:
-        name: picture
-        type: file_select
-        html:
-          size: 50
-```
+Usage: Add this line to design.
+div id="dc-blog"><%= dc_render(:dc_blog) %></div>
 
 Optional configuration in Site document:
 ```yaml

data/app/assets/stylesheets/drg_blog_news_forum.css

@@ -142,11 +142,10 @@ color: #aaa;
 .blog-body {
 }
 .blog-replies {
-margin: 5px;
 }
 .reply-top-even {
 padding:5px;
-background-color: #ddd;
+background-color: #fff;
 }
 .reply-top-odd {
 padding:5px;
@@ -161,10 +160,8 @@ font-weight: bold;
 }
 
 .social-sites {
-margin-top: 20px;
-margin-bottom: 20px;
+margin-top: 30px;
+margin-bottom: 40px;
 padding-top: 5px;
 padding-bottom: 5px;
-border-top: 1px solid #888;
-border-bottom: 1px solid #888;
 }

data/app/controllers/drgcms_controls/dc_news_dc_reply_control.rb

@@ -0,0 +1,50 @@
+#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::DcNewsDcReplyControl
+
+######################################################################
+# Called when new empty record is created
+######################################################################
+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])
+    @record.subject = "Re: #{replyto.subject}"
+    @record.body = "<div class='dc-forum-quote'>#{replyto.body}</div><br>"
+  end
+end
+
+######################################################################
+# Called before save. Reloads browser.
+######################################################################
+def dc_before_save()
+  @record.created_by_name = session[:user_name]
+  params[:return_to] = 'parent.reload'
+end
+
+end 

data/app/forms/cms_menu.yml

@@ -27,7 +27,19 @@ menu:
       10: 
         caption: helpers.label.dc_forum.tabletitle
         controller: cmsedit
-        picture: partner.png
+        picture: forum.png
         params:
           table: dc_forum
+      20: 
+        caption: helpers.label.dc_blog.tabletitle
+        controller: cmsedit
+        picture: blog.png
+        params:
+          table: dc_blog
+      30: 
+        caption: helpers.label.dc_news.tabletitle
+        controller: cmsedit
+        picture: news.png
+        params:
+          table: dc_news
                        

data/app/forms/dc_reply.yml

@@ -3,23 +3,26 @@
 table: dc_reply
 
 form:
-  height: 600
+  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
 
-    20:
+    30:
       name: body
       type: html_field
-      options: "height: 420, toolbar: 'basic'" 
+      options: "height: 420, toolbar: 'basic', allowedContent: false" 
       
-    110:
-      name: created_by_name
-      type: hidden_field

data/app/helpers/dc_news_renderer.rb

@@ -0,0 +1,75 @@
+#--
+# 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.
+#++
+
+########################################################################
+#
+########################################################################
+class DcNewsRenderer < DcRenderer
+include DcApplicationHelper
+
+########################################################################
+# Show one blog 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?
+  
+  replies = entry.dc_replies.where(active: true).order(created_at: 1).
+            page(@parent.params[:page]).per(5)
+  @parent.render partial: 'dc_news/entry', formats: [:html], 
+                 locals: { entry: entry, replies: replies, opts: @opts }
+end
+
+########################################################################
+# List all blogs from one bloger
+########################################################################
+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)
+                  .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'
+    list_all
+  else
+    show_entry
+  end
+end
+
+end

data/app/models/dc_news.rb

@@ -39,4 +39,6 @@ class DcNews
 
   validates_length_of :subject, minimum: 4  
   validates_length_of :body,    minimum: 10
+  
+  
 end

data/app/models/dc_reply.rb

@@ -34,6 +34,7 @@ class DcReply
 
   embedded_in :replies, polymorphic: true 
 
-  validates_length_of :subject, minimum: 4  
-  validates_length_of :body,    minimum: 10
+  validates_length_of :subject,           minimum: 4  
+  validates_length_of :body,              minimum: 10
+  validates_length_of :created_by_name,   minimum: 5
 end

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

@@ -1,3 +1,6 @@
+<% 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>
 </div>

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

@@ -1,5 +1,5 @@
 
-<% if opts[:edit_mode] > 1 %>
+<% if session[:edit_mode] > 1 %>
   <%= dc_link_for_create(controller: 'cmsedit', table: 'dc_blog', title: 'dc_blog.new_entry' ) %>
   <br><br>
   <%= dc_link_for_edit(controller: 'cmsedit', table: 'dc_blog', title: 'dc_blog.edit_entry', id: entry.id ) %>
@@ -12,6 +12,7 @@
 <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' } %>
 </div>

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

@@ -1,4 +1,4 @@
-<%= if opts[:edit_mode] > 1 
+<%= if session[:edit_mode] > 1 
   dc_link_for_create(controller: 'cmsedit', table: 'dc_forum', title: 'dc_forum.add_new_forum' )
     end %>
 
@@ -9,7 +9,7 @@
   
   <% for forum in forums %>
     <div class="topic-<%= cycle("odd", "even") %>">
-      <%= if opts[:edit_mode] > 1 then
+      <%= if session[:edit_mode] > 1 then
           dc_link_for_edit(controller: 'cmsedit', table: 'dc_forum', id: forum._id, title: 'dc_forum.edit_forum' ); end %>
       <div class="name">  
         <%= link_to(forum.name,{ path: params[:path], forum: forum.id} ) %>

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

@@ -0,0 +1,13 @@
+<div class="blog-title">
+  <h1><%= params[:name] %>, <%= t('dc_blog.my_blog') %></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>
+<% end %>

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

@@ -0,0 +1,21 @@
+
+<% 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"><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-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>

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

@@ -0,0 +1,24 @@
+<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 %>

data/config/locales/dc_forum_en.yml

@@ -24,6 +24,7 @@
 # English (en) localization for dc_forum
 en:
   dc_forum:
+    menu_caption: Forums, news and blogs
     forums_list: All forums
     new_reply: New reply
     new_topic: New topic
@@ -41,5 +42,6 @@ en:
     edit_entry: Edit blog entry
     entry_not_found: Blog entry not found
     my_blog: my blog
+    comments: Comments
     
 

data/config/locales/dc_forum_sl.yml

@@ -24,6 +24,7 @@
 # Slovenian (sl) localization for dc_forum
 sl:
   dc_forum:
+    menu_caption: Forumi, novice and blogi
     forums_list: Vsi forumi
     new_reply: Nov odgovor
     new_topic: Nova tema
@@ -41,6 +42,7 @@ sl:
     edit_entry: Uredi vpis v blog
     entry_not_found: Vpis v blog ne obstaja
     my_blog: moj blog
+    comments: Komentarji
     
 
     

data/lib/drg_blog_news_forum/version.rb

@@ -1,3 +1,3 @@
 module DrgBlogNewsForum
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_blog_news_forum
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Damjan Rems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-07 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,8 +38,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: DrgBlogNewsForum plugin implements basic funcionality for enabling blog,
-  news or forum on your web site.
+description: 'DRG CMS: drg_blog_news_forum plugin implements basic funcionality for
+  enabling blog, news or forum.'
 email:
 - damjan.rems@gmail.com
 executables: []
@@ -53,6 +53,7 @@ files:
 - 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/forms/cms_menu.yml
 - app/forms/dc_blog.yml
 - app/forms/dc_forum.yml
@@ -63,6 +64,7 @@ files:
 - app/helpers/dc_blog_renderer.rb
 - app/helpers/dc_forum_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
@@ -77,6 +79,9 @@ files:
 - 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/_news.html.erb
 - app/views/dc_replay/_reply.html.erb
 - config/locales/dc_forum_en.yml
 - config/locales/dc_forum_sl.yml