camaleon_cms 2.1.2.0 → 2.1.2.1

data/app/models/concerns/camaleon_cms/metas.rb

@@ -96,6 +96,14 @@ module CamaleonCms::Metas extend ActiveSupport::Concern
   end
   alias_method :set_options, :set_multiple_options
 
+  # save multiple metas
+  # sample: set_metas({name: 'Owen', email: 'owenperedo@gmail.com'})
+  def set_metas(data_metas)
+    data_metas.each do |key, value|
+      self.set_meta(key, value)
+    end
+  end
+
   # permit to skip save_metas_options in specific models
   def save_metas_options_skip
     false

data/app/uploaders/camaleon_cms_uploader.rb

@@ -68,10 +68,12 @@ class CamaleonCmsUploader
 
 
   # convert current string path into file version_path, sample:
-  # /media/1/screen.png into /media/1/thumb/screen-png.png
-  # /media/1/screen.png into /media/1/crop_40x40/screen-png.png
-  def version_path(image_path, version_name = 'thumb')
-    File.join(File.dirname(image_path), version_name, "#{File.basename(image_path).parameterize}#{File.extname(image_path)}")
+  # version_path('/media/1/screen.png') into /media/1/thumb/screen-png.png (thumbs)
+  # Sample: version_path('/media/1/screen.png', '200x200') ==> /media/1/thumb/screen-png_200x200.png (image versions)
+  def version_path(image_path, version_name = nil)
+    res = File.join(File.dirname(image_path), 'thumb', "#{File.basename(image_path).parameterize}#{File.extname(image_path)}")
+    res = res.cama_add_postfix_file_name("_#{version_name}") if version_name.present?
+    res
   end
 
   # return the file format (String) of path (depends of file extension)

data/app/views/camaleon_cms/_flash_messages.html.erb

@@ -1,39 +1,43 @@
 <% if flash[:notice].present? || flash[:info].present? || flash[:error].present? || flash[:alert].present? %>
-    <div class="row">
-        <% if flash[:info] %>
+    <div class="cama_flash_messages">
+        <% if flash[:info].present? %>
             <div class="flash_messages">
               <div class="alert alert-info">
                 <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
                 <%= raw(flash[:info]) %>
               </div>
             </div>
+            <% flash[:info] = nil %>
         <% end %>
 
-        <% if flash[:notice] %>
+        <% if flash[:notice].present? %>
             <div class="flash_messages">
               <div class="alert alert-success">
                 <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
                 <%= raw(flash[:notice]) %>
               </div>
             </div>
+            <% flash[:notice] = nil %>
         <% end %>
 
-        <% if flash[:error] %>
+        <% if flash[:error].present? %>
             <div class="flash_messages">
               <div class="alert alert-danger">
                 <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
                 <%= raw(flash[:error]) %>
               </div>
             </div>
+            <% flash[:error] = nil %>
         <% end %>
 
-        <% if flash[:alert] %>
+        <% if flash[:alert].present? %>
             <div class="flash_messages">
               <div class="alert alert-warning">
                 <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
                 <%= raw(flash[:alert]) %>
               </div>
             </div>
+            <% flash[:alert] = nil %>
         <% end %>
     </div>
 <% end %>

data/app/views/camaleon_cms/admin/appearances/nav_menus/_menu_items.html.erb

@@ -12,7 +12,7 @@
                 <%= link_to('<i class="fa fa-cog"></i>'.html_safe, {action: :custom_settings, nav_menu_id: nav_menu.id, id: item.id, cama_skip_breadcrumb: true}, class: 'custom_settings_link', title: t('.edit_custom_settings', default: 'Edit Configurations')) if custom_fields %>
                 <%= link_to('<i class="fa fa-times-circle"></i>'.html_safe, url_for(action: :delete_menu_item, nav_menu_id: nav_menu.id, id: item.id), class: 'delete_menu_item') %>
             </div>
-            <%= render('menu_items', items: item.children, nav_menu: nav_menu) if item.children.any? %>
+            <%= render('menu_items', items: item.children.reorder(:term_order), nav_menu: nav_menu) if item.children.any? %>
         </li>
     <% end %>
 </ol>

data/app/views/camaleon_cms/admin/appearances/nav_menus/_menu_items_list.html.erb

@@ -5,7 +5,7 @@
         </div>
         <div class="panel-body">
             <div class="dd" id="menus_list" data-url="<%= url_for(action: :add_items, nav_menu_id: @nav_menu.id) %>" data-reorder_url="<%= url_for(action: :reorder_items, nav_menu_id: @nav_menu.id) %>">
-                <%= render 'menu_items', items: @nav_menu.children.all, nav_menu: @nav_menu %>
+                <%= render 'menu_items', items: @nav_menu.children.reorder(:term_order).all, nav_menu: @nav_menu %>
             </div>
         </div>
     </div>

data/app/views/camaleon_cms/admin/categories/_form.html.erb

@@ -1,10 +1,4 @@
-<%
-   if @category.nil?
-     @category = @post_type.categories.new
-   end
-
-
-%>
+<% @category = @post_type.categories.new if @category.nil? %>
 <%= form_for @category, as: "category", url:{action: @category.new_record? ? :create : :update},  html: {class: 'validate cama_ajax_request', id: 'form-category'}  do |f| %>
     <%= f.hidden_field :parent_id  %>
     <%= f.hidden_field :taxonomy %>
@@ -32,8 +26,6 @@
 
     <%= render partial: "camaleon_cms/admin/settings/custom_fields/render", locals: {record: @category, field_groups: @post_type.get_field_groups({kind: "Category"})} %>
 
-
-
     <div class="panel-footer">
       <a class="btn btn-default" role="back" href="<%= url_for action: :index %>"><%= t('camaleon_cms.admin.button.back')%></a>
       <button class="btn btn-primary pull-right" type="submit"><%= t('camaleon_cms.admin.button.submit')%></button>

data/app/views/camaleon_cms/admin/media/index.html.erb

@@ -1,4 +1,4 @@
-<div id="cama_media_gallery" data-url_actions="<%= actions_cama_admin_media_path(actions: @show_file_actions, dimension: params[:dimension]) %>" data-formats="<%= @media_formats.join(",") %>" data-folder="<%= @folder %>" data-url="<%= ajax_cama_admin_media_path(actions: @show_file_actions) %>" data-dimension="<%= params[:dimension] %>">
+<div id="cama_media_gallery" data-url_actions="<%= actions_cama_admin_media_path(actions: @show_file_actions, dimension: params[:dimension]) %>" data-versions="<%= params[:versions] %>" data-thumb_size="<%= params[:thumb_size] %>" data-formats="<%= @media_formats.join(",") %>" data-folder="<%= @folder %>" data-url="<%= ajax_cama_admin_media_path(actions: @show_file_actions) %>" data-dimension="<%= params[:dimension] %>">
   <div class="panel panel-default">
     <div class="panel-heading">
       <div class="row">

data/app/views/camaleon_cms/admin/posts/_sidebar.html.erb

@@ -76,6 +76,11 @@
                     <label class="control-label"><%= check_box("meta", "has_comments", {checked: ( params[:meta][:has_comments] == '1' rescue false || @post.can_commented?)  }) %> &nbsp; <%= t('camaleon_cms.admin.post_type.permit_comments')%></label>
                 </div>
             <% end %>
+            <% if @post_type.get_option('has_featured', false) %>
+                <div class="form-group">
+                    <label class="control-label"><%= f.check_box :is_feature %> &nbsp; <%= t('camaleon_cms.admin.post.is_featured', default: 'Is Featured?')%></label>
+                </div>
+            <% end %>
             <%= raw @post_form_extra_settings.join("") if @post_form_extra_settings.present? %>
         </div>
     </div>
@@ -115,7 +120,7 @@
     <% if @post.manage_picture?(@post_type) %>
         <div class="panel panel-default panel-lite">
             <div class="panel-heading">
-                <h3 class="panel-title"><%= t('camaleon_cms.admin.post_type.featured_image')%> </h3>
+                <h3 class="panel-title"><%= t(@post_type.get_option('posts_feature_image_label', 'camaleon_cms.admin.post_type.featured_image'), default: @post_type.get_option('posts_feature_image_label_default', 'Featured Image'))%> <%= "(#{@post_type.get_option('posts_image_dimension')})" if @post_type.get_option('posts_image_dimension').present? %></h3>
                 <ul class="panel-controls">
                     <li><a href="#" class="panel-collapse"><span class="fa fa-angle-down"></span></a></li>
                 </ul>
@@ -134,7 +139,8 @@
                         </a>
                         <input name="meta[thumb]" type="hidden" value="<%= params[:meta][:thumb] rescue false || @post.get_meta("thumb", "") %>"/>
                     </div>
-                    <a href="#" class="btn btn-default" onclick="upload_feature_image(); return false;"><i class="fa fa-upload"></i> <%= t('camaleon_cms.admin.post_type.upload_image')%></a>
+                    <!-- posts_thumb_versions ==> '200x200,400x450', posts_thumb_size ==> '100x100', posts_image_dimension ==> '1200x1200'-->
+                    <a href="#" class="btn btn-default" onclick="upload_feature_image({versions: '<%= @post_type.get_option('posts_thumb_versions') %>', thumb_size: '<%= @post_type.get_option('posts_thumb_size') %>', dimension: '<%= @post_type.get_option('posts_image_dimension') %>' }); return false;"><i class="fa fa-upload"></i> <%= t('camaleon_cms.admin.post_type.upload_image', default: 'Upload Image')%></a>
                 </div>
             </div>
         </div>

data/app/views/camaleon_cms/admin/sessions/register.html.erb

@@ -8,12 +8,12 @@
         <h4><%= t('camaleon_cms.admin.login.personal_info') %></h4>
         <div class="form-group">
             <div class="col-md-12">
-                <input type="text" class="form-control" placeholder="<%= t("camaleon_cms.admin.login.first_name", default: 'First Name') %>" name="meta[first_name]" value="<%= @first_name if @first_name.present? %>"/>
+                <%= f.text_field :first_name, class: 'form-control required', placeholder: t("camaleon_cms.admin.login.first_name", default: 'First Name') %>
             </div>
         </div>
         <div class="form-group">
             <div class="col-md-12">
-                <input type="text" class="form-control" placeholder="<%= t("camaleon_cms.admin.login.last_name", default: 'Last Name') %>" name="meta[last_name]" value="<%= @last_name if @last_name.present? %>"/>
+                <%= f.text_field :last_name, class: 'form-control', placeholder: t("camaleon_cms.admin.login.last_name", default: 'Last Name') %>
             </div>
         </div>
         <div class="form-group">

data/app/views/camaleon_cms/admin/settings/custom_fields/fields/_field_attrs.html.erb

@@ -1,8 +1,8 @@
 <div class="group-input-fields-content row" data-callback-set-value="custom_field_field_attrs_val">
     <div class="col-md-4">
-        <input type="text" name="<%= @field_name %>[<%= @field.slug %>][values][][attr]" placeholder="<%= t('camaleon_cms.admin.table.attribute') %>" class="<%= 'is_translate' if @field.options[:translate].to_s.to_bool %> form-control input-attr <%= "required" if @field.options[:required].to_s.to_bool %>" <%= "readonly" if @field.options[:readonly].present? %> <%= "disabled" if @field.options[:disabled].present? %>/>
+        <input type="text" name="<%= @field_name %>[<%= @field.slug %>][values][][attr]" placeholder="<%= t('camaleon_cms.admin.table.attribute') %>" class="<%= 'is_translate' if @field.get_option('translate') %> form-control input-attr <%= "required" if @field.options[:required].to_s.to_bool %>" <%= "readonly" if @field.options[:readonly].present? %> <%= "disabled" if @field.options[:disabled].present? %>/>
     </div>
     <div class="col-md-8">
-        <input type="text" name="<%= @field_name %>[<%= @field.slug %>][values][][value]"  placeholder="<%= t('camaleon_cms.admin.table.value') %>" class="<%= 'is_translate' if @field.options[:translate].to_s.to_bool %> form-control input-value" <%= "readonly" if @field.options[:readonly].present? %> <%= "disabled" if @field.options[:disabled].present? %>/>
+        <input type="text" name="<%= @field_name %>[<%= @field.slug %>][values][][value]"  placeholder="<%= t('camaleon_cms.admin.table.value') %>" class="<%= 'is_translate' if @field.get_option('translate') %> form-control input-value" <%= "readonly" if @field.options[:readonly].present? %> <%= "disabled" if @field.options[:disabled].present? %>/>
     </div>
 </div>

data/app/views/camaleon_cms/admin/settings/custom_fields/fields/_image.html.erb

@@ -1,4 +1,4 @@
 <div class="group-input-fields-content input-group">
-  <input data-dimension="<%= @field.options[:dimension] %>" type="url" name="<%= @field_name %>[<%= @field.slug %>][values][]" class="data-error-place-parent form-control input-value <%= "required" if @field.options[:required].to_s.to_bool %>" <%= "readonly" if @field.options[:readonly].present? %> <%= "disabled" if @field.options[:disabled].present? %>/>
-  <span class="input-group-addon btn_upload" onclick="load_upload_image_field(this);return false;"><i class="fa fa-upload"></i> <%= t('camaleon_cms.admin.button.upload_image')%></span>
+  <input data-dimension="<%= @field.options[:dimension] %>" data-versions="<%= @field.options[:versions] %>" data-thumb_size="<%= @field.options[:thumb_size] %>" type="url" name="<%= @field_name %>[<%= @field.slug %>][values][]" class="data-error-place-parent form-control input-value <%= "required" if @field.options[:required].to_s.to_bool %>" <%= "readonly" if @field.options[:readonly].present? %> <%= "disabled" if @field.options[:disabled].present? %>/>
+  <span class="input-group-addon btn_upload" onclick="load_upload_image_field(this);return false;"><i class="fa fa-upload"></i> <%= t('camaleon_cms.admin.button.upload_image')%> <%= "(#{@field.get_option('dimension')})" if @field.get_option('dimension').present? %></span>
 </div>

data/app/views/camaleon_cms/admin/settings/custom_fields/index.html.erb

@@ -7,7 +7,7 @@
         <div class="panel-heading">
             <div class="row">
                 <div class="col-md-12">
-                    <h4 class="pull-left"><span class="fa fa-cog"></span> <%= t('camaleon_cms.admin.settings.list_custom_fields_group') %></h4>
+                    <h4 class="pull-left"><span class="fa fa-cog"></span> <%= t('camaleon_cms.admin.settings.list_custom_fields_group') %> <%= @field_groups.count %></h4>
                     <%= link_to raw("<i class='fa fa-plus'></i> #{t('camaleon_cms.admin.settings.add_field_group')}"), {action: :new}, class: "btn btn-primary pull-right cama_ajax_request" %>
                 </div>
             </div>

data/app/views/camaleon_cms/admin/settings/post_types/_form.html.erb

@@ -91,6 +91,10 @@
                         </label>
                         <%= raw cama_html_tooltip("#{t('camaleon_cms.admin.post_type.tooltip.permission_reviews')}", 'right') %>
                     </div>
+                    <div class="form-group">
+                        <input name="meta[has_featured]" type="hidden" value="false"/>
+                        <label class="check0"><input name="meta[has_featured]" type="checkbox" class="icheckbox0" value="true" <%= 'checked' if @post_type.get_option('has_featured', false) %>/>&nbsp;   <%= t('camaleon_cms.admin.table.permit_is_featured', default: 'Permit Featured Articles') %></label>
+                    </div>
                     <div class="form-group">
                         <input name="meta[has_picture]" type="hidden" value="false"/>
                         <label class="check0"><input name="meta[has_picture]" type="checkbox" class="icheckbox0" value="true" <%= 'checked' if @post_type.get_option('has_picture', true) %>/>&nbsp;   <%= t('camaleon_cms.admin.table.manage_picture') %>

data/app/views/camaleon_cms/admin/settings/site.html.erb

@@ -72,7 +72,7 @@
             <% if show_theme_tab %>
                 <div id="tab-theme-configuration" class="<%= "active" if "theme" == params[:tab] %> tab-pane">
                     <% if File.exist?(current_theme.settings_file) %>
-                        <%= render file: current_theme.settings_file %>
+                        <%= render template: "themes/#{current_theme.settings_file.split('/app/apps/themes/').last}" %>
                         <%= render(partial: "camaleon_cms/admin/settings/custom_fields/render", locals: {record: current_theme, field_groups: theme_field_groups}) unless File.read(current_theme.settings_file).include?('.get_field_groups') %>
                     <% else %>
                         <%= render partial: "camaleon_cms/admin/settings/custom_fields/render", locals: {record: current_theme, field_groups: theme_field_groups} %>
@@ -95,7 +95,7 @@
     jQuery(function () {
         var panel = $("#site_settings_form");
         panel.validate();
-        panel.find('.unput_upload').input_upload();
+        panel.find('.unput_upload, .input_upload').input_upload();
 
         // smtp
         panel.find("#options_mailer_enabled").change(function () {

data/app/views/camaleon_cms/admin/users/form.html.erb

@@ -25,21 +25,17 @@
                         </div>
                     </div>
                     <div class="panel-body user-form-left form-group-separated">
-
                         <div class="">
                             <a href="#" class="btn btn-primary btn-block btn-rounded" data-toggle="modal" data-target="#modal_change_photo"><%= t('camaleon_cms.admin.button.change_photo')%></a>
                         </div>
-
                         <div class="">
                             <label class="control-label">#<%= t('camaleon_cms.admin.table.id')%></label>
                             <%= f.text_field :id, :class => "form-control required", disabled: "disabled" %>
                         </div>
-
                         <div class="">
                             <label class="control-label"><%= t('camaleon_cms.admin.table.login')%></label>
                             <%= f.text_field :username, :class => "form-control required" %>
                         </div>
-
                         <div class="">
                             <label class="control-label"><%= t('camaleon_cms.admin.table.e_mail')%></label>
                             <%= f.email_field :email, :class => "form-control required email"%>
@@ -54,7 +50,6 @@
                                 <%= f.password_field :password_confirm, :class => "form-control required",  "equalTo"=>"#user_password" %>
                             </div>
                         <% end %>
-
                         <div class="">
                             <%= f.label "#{t('camaleon_cms.admin.table.role')}", class: "control-label" %>
                             <div class="">
@@ -70,11 +65,10 @@
                                 <a href="#" class="btn btn-warning btn-block btn-rounded" data-toggle="modal" data-target="#modal_change_password"><%= t('camaleon_cms.admin.button.change_password') %></a>
                             </div>
                         <% end %>
-
                     </div>
-
                 </div>
             </div>
+
             <div class="col-md-6 col-sm-8">
                 <div class="panel panel-default">
                     <div class="panel-body form-group-separated">
@@ -83,19 +77,17 @@
                                 <%= t("camaleon_cms.admin.table.first_names")%>
                             </label>
                             <div class="col-md-9 col-xs-7">
-                                <input type="text" name="meta[first_name]" value="<%= @user.get_meta("first_name") %>" class="form-control required"/>
+                                <%= f.text_field :first_name, class: 'form-control required'  %>
                             </div>
                         </div>
-
                         <div class="form-group">
                             <label class="col-md-3 col-xs-5 control-label">
                                 <%= t("camaleon_cms.admin.table.last_names")%>
                             </label>
                             <div class="col-md-9 col-xs-7">
-                                <input type="text" name="meta[last_name]" value="<%= @user.get_meta("last_name") %>" class="form-control required"/>
+                                <%= f.text_field :last_name, class: 'form-control' %>
                             </div>
                         </div>
-
                         <div class="form-group">
                             <label class="col-md-3 col-xs-5 control-label"><%= t('camaleon_cms.admin.table.slogan') %></label>
                             <div class="col-md-9 col-xs-7">
@@ -126,18 +118,13 @@
                             <label class="col-md-4 col-xs-5 control-label"><%= t('camaleon_cms.admin.table.registration')%></label>
                             <div class="col-md-8 col-xs-7 line-height-30"><%= @user.created_at %></div>
                         </div>
-
                     </div>
                 </div>
-
                 <%= r = { html: ''}; hooks_run('user_update_more_actions_form', r); raw(r[:html]); %>
             </div>
         <% end %>
-
         <%= r = { html: ''}; hooks_run('user_update_more_actions', r); raw(r[:html]); %>
     </div>
-
-
 </div>
 <!-- END PAGE CONTENT WRAPPER -->
 

data/app/views/camaleon_cms/default_theme/partials/_categories_list.html.erb

@@ -7,7 +7,7 @@
                     <% _cats.each do |cat| %>
                         <div class="col-md-2">
                             <a href="<%= cat.the_url %>" class="thumbnail text-center">
-                                <img src="<%= cat.the_thumb_url %>" alt="Image" style="max-width:100%;">
+                                <i class='fa fa-folder'></i>
                                 <span class="category-title"><%= cat.the_title %> <%= cat.the_edit_link %></span>
                             </a>
                         </div>

data/app/views/camaleon_cms/default_theme/partials/_comments.html.erb

@@ -4,13 +4,13 @@
             <div class="col-md-12">
                 <h2 class="page-header"><%= ct('comments', default: 'Comments')%></h2>
                 <section class="comment-list">
-                    <%= render partial: "partials/comments_list", locals: { comments: post.the_comments, children: "" } %>
+                    <%= render partial: "partials/#{defined?(style2) ? 'comments_list2' : 'comments_list'}", locals: { comments: post.the_comments, children: "" } %>
                 </section>
             </div>
         </div>
     <% end %>
 
-    <div class="row">
+    <div class="row comment_form_panel">
         <div class="col-md-12 col-sm-12">
             <h3><%= ct('comment_new', default: 'New Comment')%></h3>
             <% if signin? %>

data/app/views/camaleon_cms/default_theme/partials/_comments_list2.html.erb

@@ -0,0 +1,24 @@
+<ul class="media-list comments-list">
+    <% comments.each do |comment| user = comment.comment_user.decorate %>
+        <li class="media">
+            <div class="media-left">
+                <%= link_to(image_tag(user.the_avatar, class: "media-object", style: 'width: 64px;'), user.the_url) %>
+            </div>
+            <div class="media-body">
+                <h4 class="media-heading"><%= link_to(user.the_name, user.the_url) %> <small class="pull-right"><%= comment.decorate.the_created_at %></small></h4>
+                <div><%= raw comment.content %></div>
+                <% comment.children.approveds.each do |answer| user2 = answer.comment_user.decorate %>
+                    <div class="media">
+                        <div class="media-left">
+                            <%= link_to(image_tag(user2.the_avatar, class: "media-object", style: 'width: 64px;'), user2.the_url) %>
+                        </div>
+                        <div class="media-body">
+                            <h4 class="media-heading"><%= link_to(user2.the_name, user.the_url) %> <small class="pull-right"><%= answer.decorate.the_created_at %></small></h4>
+                            <div><%= raw answer.content %></div>
+                        </div>
+                    </div>
+                <% end %>
+            </div>
+        </li>
+    <% end %>
+</ul>

data/app/views/camaleon_cms/default_theme/partials/_sidebar.html.erb

@@ -1,4 +1,4 @@
-<% if post.has_thumb? %>
+<% if post.has_thumb? && !defined?(skip_thumb) %>
     <div class="panel panel-default">
         <div class="panel-body">
             <%= raw post.the_link_thumb({}, {class: "img-responsive img-rounded col-md-12 col-lg-12"}) %>
@@ -7,7 +7,7 @@
 <%  end %>
 
 <% categories = post.the_categories.decorate %>
-<% if categories.present? %>
+<% if categories.present? && !defined?(skip_categories) %>
     <div class="panel panel-default">
         <div class="panel-heading"><%= ct("categories", default: 'Categories') %></div>
         <div class="panel-body">
@@ -20,33 +20,53 @@
     </div>
 <% end %>
 
-<div class="panel panel-default">
-    <div class="panel-heading">
-        <%= ct("latest_articles", default: 'Latest Articles') %>
-    </div>
-    <div class="panel-body">
-        <ul>
-            <% current_site.the_posts("post").latest.limit(7).decorate.each do |p| %>
-                <li><a href="<%= p.the_url %>"><%= p.the_title %></a></li>
-            <% end %>
-        </ul>
+<% if !defined?(skip_last_articles) %>
+    <div class="panel panel-default">
+        <div class="panel-heading">
+            <%= ct("latest_articles", default: 'Latest Articles') %>
+        </div>
+        <div class="panel-body">
+            <ul>
+                <% current_site.the_posts("post").latest.limit(7).decorate.each do |p| %>
+                    <li><a href="<%= p.the_url %>"><%= p.the_title %></a></li>
+                <% end %>
+            </ul>
+        </div>
     </div>
-</div>
+<% end %>
 
-<% tags = post.the_tags.decorate %>
-<% if tags.present? %>
+<% if !defined?(skip_similar_art) %>
     <div class="panel panel-default">
-        <div class="panel-heading"><%= ct("post_tag_list", default: 'Tags') %></div>
+        <div class="panel-heading">
+            <%= ct("related_articles", default: 'Related Articles') %>
+        </div>
         <div class="panel-body">
-            <% tags.each do |post_tag| %>
-                <a class="btn btn-default btn-xs" href="<%= post_tag.the_url %>"><%= post_tag.the_title %></a>
-            <% end %>
+            <ul>
+                <% post.the_related_posts.latest.limit(7).decorate.each do |p| %>
+                    <li><a href="<%= p.the_url %>"><%= p.the_title %></a></li>
+                <% end %>
+            </ul>
         </div>
     </div>
 <% end %>
 
+
+<% if !defined?(skip_tasg) %>
+    <% tags = post.the_tags.decorate %>
+    <% if tags.present? %>
+        <div class="panel panel-default">
+            <div class="panel-heading"><%= ct("post_tag_list", default: 'Tags') %></div>
+            <div class="panel-body">
+                <% tags.each do |post_tag| %>
+                    <a class="btn btn-default btn-xs" href="<%= post_tag.the_url %>"><%= post_tag.the_title %></a>
+                <% end %>
+            </div>
+        </div>
+    <% end %>
+<% end %>
+
 <!-- custom fields -->
-<% if post.render_fields.present? %>
+<% if post.render_fields.present? && !defined?(skip_fields) %>
     <div class="panel panel-default">
         <div class="panel-heading"><%= ct("extra_attributes", default: 'Extra Attributes') %></div>
         <div class="panel-body">