drg_blog_news_forum 0.5.52.0 → 0.5.52.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21376b47f6aebf241e6cd3053fe434b6cc1b430a
-  data.tar.gz: f7cbc383f3882a7fa36a385b0dd311d653f1eee4
+  metadata.gz: bb7ee75586683204eb1f405464282a1e220b417d
+  data.tar.gz: 1cc753d310225e1a2ee45cead6ae072547677701
 SHA512:
-  metadata.gz: 58171ad983f8d78c280f409be0992fef784cf64b7350fdf9e06710900fca5c8f17ce6025632c8e971f4d2162045c81cd75d2511c8ae7a60d399b6d690bf21e0e
-  data.tar.gz: 804ccf7bb9b4dded3b05684c8cf26616b52037d55f0e392d98f791a216d472844b107c0f8f22428869d72cd454c7456e15a889f3b761b8ce0828f4aec42bac4a
+  metadata.gz: 6150f740cbe57a19ed9780d322e8e39170b19666c08037062f1d9c37eaf4bdf6ae7c7997c8825fa225a6d4cc84676d4620d3c702ee57c53080ab7fc9b9360ae0
+  data.tar.gz: e6395612293542900ac3824bc28bc189e145364a3ddc8686869e00211aa5ef8b5c3854c3fe06879855c70bc10d20a5057cfc287571cee240dc833aa81c98ce0d

data/MIT-LICENSE

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

data/README.md

@@ -12,20 +12,13 @@ Add this line to your Gemfile:
 
 Usage: 
 
-Create dc_page documents with blog, news and forum links.
+Create dc_page documents with blog, news or forum links.
 
 Create related dc_design documents and use one of this lines for rendering html code.  
 ```irb
-<div id="dc-blog"><%= dc_render(:dc_blog) %></div>
-<div id="dc-news"><%= dc_render(:dc_news) %></div>
-<div id="dc-forum"><%= dc_render(:dc_forum) %></div>
-```
-
-Add this lines to routes.rb.
-```ruby
-  get '/blog/:name/:link' => 'dc_main#page', :defaults => { path: 'blog' }
-  get '/blog/:name' => 'dc_main#page', :defaults => { path: 'blog', link: 'all' }
-  get '/news/:link' => 'dc_main#page', :defaults => { path: 'news' }
+<%= dc_render(:dc_blog) %>
+<%= dc_render(:dc_news) %>
+<%= dc_render(:dc_forum) %>
 ```
 
 Documentation
@@ -37,7 +30,7 @@ Please see the DRG CMS website for up-to-date documentation:
 License
 -------
 
-Copyright (c) 2014-2015 Damjan Rems
+Copyright (c) 2014-2018 Damjan Rems
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,3 +1,25 @@
+#--
+# Copyright (c) 2014-2018 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.
+#++
 begin
   require 'bundler/setup'
 rescue LoadError

data/app/helpers/dc_blog_renderer.rb

@@ -67,7 +67,7 @@ def last_blogs
                   .order_by(created_at: -1).limit(limit).to_a
 
   entries.inject('') do |result, document|
-    result << @parent.link_to("/blog/#{document.link}") do 
+    result << @parent.link_to("/blog/#{document.created_by_name}/#{document.link}") do 
       %Q[
     <span class="date">#{@parent.dc_pretty_date(document.created_at)} : </span>
     <span class="title">#{document.subject}</span><br><br> 
@@ -83,7 +83,6 @@ end
 ########################################################################
 def default
   document_link = @opts[:path].last
-  p @opts[:path]
   if @opts[:path].size == 1 or document_link == 'blogers'
     list_blogers
   elsif @opts[:path].size == 2 

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

@@ -1,4 +1,4 @@
-<div class="wrap">
+
 <div class="blog-title">
   <%= title %>
 </div>
@@ -23,4 +23,3 @@
 <% else %>
   <br><br><br>This blog has no posts. Yet ;-)
 <% end %>
-</div>

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

@@ -1,4 +1,4 @@
-<div class="wrap">
+
 <% if session[:edit_mode] > 1 %>
   <%= dc_link_for_create(controller: 'cmsedit', table: 'dc_blog', title: 'dc_blog.new_entry' ) %>
 <% end %>
@@ -11,4 +11,3 @@
      <%= link_to( bloger, { path: "blog/#{bloger}"} )%>
   </div>
 <% end %>
-</div>

data/app/views/dc_blog/_last_blogs.erb

@@ -1,3 +1,4 @@
+<!-- NOT USED ANYMORE -->
 <div class="wrap">
 <div id="last-blogs">
 <h3><%= t('dc_blog.last_blogs') %></h3>

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

@@ -1,13 +1,11 @@
 
-<div class="wrap">
-  <div id="blogs">
-  <h3><%= t('dc_blog.blogs') %></h3>
+<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 %>
+<% 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>
-</div>
+<% end %>
+</div>

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

@@ -1,4 +1,4 @@
-<div class="wrap">
+
 <% if session[:edit_mode] > 1 %>
   <%= dc_link_for_create(controller: 'cmsedit', table: 'dc_blog', title: 'dc_blog.new_document' ) %>
   <br><br>
@@ -18,4 +18,3 @@
 </div>
 
 <iframe id="iframe_edit" name="iframe_edit" scrolling="no"></iframe>
-</div>

data/lib/drg_blog_news_forum/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_blog_news_forum
 version: !ruby/object:Gem::Version
-  version: 0.5.52.0
+  version: 0.5.52.1
 platform: ruby
 authors:
 - Damjan Rems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-27 00:00:00.000000000 Z
+date: 2018-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails