drg_blog_news_forum 0.5.52.2 → 0.5.52.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df3654faf8249615292d74cc3e8e4bfffe783055
-  data.tar.gz: 62493c2c36520bffe5feeb7929e8fb9326386bb7
+  metadata.gz: a6bb9dc40b9a207b65a6fe1a20e66c3da166d148
+  data.tar.gz: c44f57540098d50a8ce8a655c8da98b4d7dd8f7c
 SHA512:
-  metadata.gz: e819a01d19b77034c842c281ecabf5718592b59044edc2a8bef8c31181925925d00e7af4bd69913af547e3b484a0c854d98bbfe667728d28a90e7beff2227b04
-  data.tar.gz: bf6c9b7eda130ed6a96c952a7398d0d771f90e223d5abdca45516a166477e29bfe4f87738b3bdc7cbf3ee0ccdf7fb9adb4c601ac25b0fae1872379ce42e1b21b
+  metadata.gz: 47fc095be02c9f29f21fb3e6e3a9a593e5848129a90305eafadb45981d550fd16c0422cbd1c21e76e39e1daece6b5ada8cfc2c5018a5930fa5221cafbac9d078
+  data.tar.gz: e6d49af74ae0e8bc84c4e7a4f9949d3fb8e4759c61d5bfb69cb5e03e864b982afa208ff23a7a299f5715080f2d16b92f7185b0439ac87fa611f2403b3078b981

data/app/assets/stylesheets/drg_blog_news_forum.css

@@ -142,7 +142,6 @@ border-radius: 2px;
 .blog-subject {
 font-size: 1.4em;
 font-weight: bold;
-margin-top: 20px;
 }
 .blog-date {
 font-size: 1em;  
@@ -150,6 +149,7 @@ color: #aaa;
 margin-bottom: 20px;
 }
 .blog-body {
+  font-size: 1.2em;
 }
 .blog-replies {
 }

data/app/helpers/dc_blog_renderer.rb

@@ -40,21 +40,21 @@ def show(link)
 end
 
 ########################################################################
-# List all blogs from one bloger
+# List all blogs from single blogger
 ########################################################################
-def list(bloger)
+def list(blogger)
   documents = DcBlog.only(:created_by_name, :link, :subject, :created_at)
-                  .where(active: true).order_by(created_at: -1)
+                  .where(created_by_name: blogger, active: true).order_by(created_at: -1)
                   .page(@parent.params[:page]).per(10)
   @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.all.distinct(:created_by_name)
+  @parent.render partial: 'dc_blog/bloggers', formats: [:html], locals: { bloggers: bloggers } 
 end
 
 ########################################################################
@@ -62,9 +62,9 @@ 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 
@@ -83,8 +83,8 @@ 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)
   else

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

@@ -3,11 +3,11 @@
   <%= 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, { path: "blog/#{blogger}"} )%>
   </div>
 <% end %>

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

@@ -1,4 +1,6 @@
+<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>
@@ -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">
+  <h5>More blogs by<br><%= document.created_by_name %></h5>
+  <%= dc_render(:dc_blog, method: 'last_blogs', limit: 10, blogger: document.created_by_name) %>
+</div>
+  
+</div>

data/config/locales/dc_bnf_en.yml

@@ -38,7 +38,7 @@ en:
     
   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

@@ -38,7 +38,7 @@ sl:
 
   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/lib/drg_blog_news_forum/version.rb

@@ -1,3 +1,3 @@
 module DrgBlogNewsForum
-  VERSION = "0.5.52.2"
+  VERSION = "0.5.52.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.5.52.3
 platform: ruby
 authors:
 - Damjan Rems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-12 00:00:00.000000000 Z
+date: 2018-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -76,7 +76,7 @@ files:
 - app/models/dc_news.rb
 - app/models/dc_reply.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