refinerycms-blog 2.0.4 → 4.0.0

data/app/views/refinery/blog/admin/comments/_comment.html.erb

@@ -4,17 +4,9 @@
     <span class="preview"> - <%= truncate(comment.message, :length => 75) %></span>
   </span>
   <span class='actions'>
-    <%= link_to refinery_icon_tag("application_go.png"),
-                refinery.blog_post_path(comment.post, :anchor => "comment-#{comment.to_param}"),
-                :title => t('.view_live_html'),
-                :target => "_blank" unless comment.unmoderated? %>
-    <%= link_to refinery_icon_tag('zoom.png'), refinery.blog_admin_comment_path(comment),
-                :title => t('.read') %>
-    <%= link_to refinery_icon_tag("cross.png"),
-                refinery.rejected_blog_admin_comment_path(comment, :return_to => request.path.split('/').last.gsub(/^comments$/, 'index')),
-                :title => t('.reject') unless comment.rejected? %>
-    <%= link_to refinery_icon_tag("tick.png"),
-                refinery.approved_blog_admin_comment_path(comment, :return_to => request.path.split('/').last.gsub(/^comments$/, 'index')),
-                :title => t('.approve') unless comment.approved? %>
+    <%= action_icon(:preview, refinery.blog_post_path(comment.post, :anchor => "comment-#{comment.to_param}"), t('.view_live_html')) unless comment.unmoderated? %>
+    <%= action_icon(:search, refinery.blog_admin_comment_path(comment), t('.read')) %>
+    <%= action_icon(:failure, refinery.reject_blog_admin_comment_path(comment), t('.reject'), method: 'post') unless comment.rejected? %>
+    <%= action_icon(:success, refinery.approve_blog_admin_comment_path(comment), t('.approve'), method: 'post') unless comment.approved? %>
   </span>
 </li>

data/app/views/refinery/blog/admin/comments/_sortable_list.html.erb

@@ -1,7 +1,5 @@
 <ul id='sortable_list'>
   <%= render :partial => 'comment', :collection => @comments %>
 </ul>
-<%= render :partial => "/refinery/admin/sortable_list",
-           :locals => {
-             :continue_reordering => (defined?(continue_reordering) ? continue_reordering : true)
-           } %>
+<%= render "/refinery/admin/sortable_list",
+           :continue_reordering => (defined?(continue_reordering) ? continue_reordering : true) %>

data/app/views/refinery/blog/admin/comments/index.html.erb

@@ -1,30 +1,21 @@
-<%= render :partial => '/refinery/blog/admin/submenu' %>
+<%= render 'refinery/blog/admin/submenu' %>
+<%= render 'refinery/admin/search_header', :url => request.path %>
 <div id='records'>
-  <% if searching? %>
-    <h2><%= t('results_for', :scope => 'shared.admin.search', :query => params[:search]) %></h2>
-    <% if @comments.any? %>
-      <%= will_paginate @comments %>
+  <% if @comments.any? %>
+    <%= will_paginate @comments %>
 
-      <ul>
-        <%= render :partial => "blog_comments",
-                   :collection => @comments %>
-      </ul>
+    <%= render "sortable_list" %>
 
-      <%= will_paginate @comments %>
-    <% else %>
-      <p><%= t('search_no_results', :scope => 'admin') %></p>
-    <% end %>
+    <%= will_paginate @comments %>
   <% else %>
-    <% if @comments.any? %>
-      <%= will_paginate @comments %>
-
-      <%= render :partial => "sortable_list" %>
-
-      <%= will_paginate @comments %>
+    <% if searching? %>
+      <%= t('no_results', :scope => 'refinery.admin.search') %>
     <% else %>
-      <h3>
-        <%= t('.no_items_yet', :type => action_name.gsub('index', 'new').downcase) %>
-      </h3>
-    <% end %>
+      <p>
+        <strong>
+          <%= t('.no_items_yet', :type => action_name.gsub('index', 'new').downcase) %>
+        </strong>
+      </p>
   <% end %>
+<% end %>
 </div>

data/app/views/refinery/blog/admin/comments/show.html.erb

@@ -9,12 +9,14 @@
       <%= link_to t('.back'), refinery.blog_admin_comments_path, :class => "back_icon" %>
     </li>
     <li>
-      <%= link_to t('.reject'), refinery.rejected_blog_admin_comment_path(@comment, :return_to => 'rejected'),
-          :class => 'comment_cross_icon' unless @comment.rejected? %>
+    <%= link_to t('.reject'), refinery.reject_blog_admin_comment_path(@comment),
+                              :method => :post,
+                              :class => 'comment_cross_icon' unless @comment.rejected? %>
     </li>
     <li>
-      <%= link_to t('.approve'), refinery.approved_blog_admin_comment_path(@comment, :return_to => 'approved'),
-          :class => 'comment_tick_icon' unless @comment.approved? %>
+      <%= link_to t('.approve'), refinery.approve_blog_admin_comment_path(@comment),
+                                 :method => :post,
+                                 :class => 'comment_tick_icon' unless @comment.approved? %>
     </li>
   </ul>
 </div>

data/app/views/refinery/blog/admin/posts/_form.html.erb

@@ -1,9 +1,10 @@
 <%= form_for [refinery, :blog_admin, @post] do |f| -%>
-  <%= render :partial => "/refinery/admin/error_messages",
-             :locals => {
-               :object => f.object,
-               :include_object_name => true
-             } %>
+  <%= render "/refinery/admin/error_messages",
+             :object => f.object,
+             :include_object_name => true %>
+
+  <%= render '/refinery/admin/locale_picker',
+              :current_locale => Globalize.locale %>
 
   <div class='field'>
     <%= f.label :title -%>
@@ -14,10 +15,10 @@
     <div id='page-tabs' class='clearfix ui-tabs ui-widget ui-widget-content ui-corner-all'>
       <ul id='page_parts'>
         <li class='ui-state-default ui-state-active'>
-          <%= link_to t('body', :scope => 'activerecord.attributes.refinery/blog_post'), "#page_part_body" %>
+          <%= link_to t('body', :scope => 'activerecord.attributes.refinery/blog/post'), "#page_part_body" %>
         </li>
         <li class='ui-state-default'>
-          <%= link_to t('teaser', :scope => 'activerecord.attributes.refinery/blog_post'), "#page_part_teaser" %>
+          <%= link_to t('teaser', :scope => 'activerecord.attributes.refinery/blog/post'), "#page_part_teaser" %>
         </li>
         <% Refinery::Blog.tabs.each_with_index do |tab, tab_index| %>
           <li class='ui-state-default' id="custom_<%= tab.name %>_tab">
@@ -41,21 +42,12 @@
 
   <div class='field'>
     <%= f.label :tag_list, t('refinery.blog.shared.tags.title') -%>
-    <%= f.text_field :tag_list, :class => 'larger' -%>
+    <%= f.text_field :tag_list, value: @post.tag_list.to_s, :class => 'larger' -%>
   </div>
 
-  <div id='more_options_field'>
-    <p>
-      <%= link_to t('.advanced_options'), "#",
-                  :id => 'toggle_advanced_options',
-                  :title => t('.toggle_advanced_options') %>
-    </p>
-    <span id='draft_field'>
-      <%= f.check_box :draft %>
-      <%= f.label :draft, t('.save_as_draft'), :class => "stripped" %>
-    </span>
-  </div>
-  <div id='more_options' style="display:none;">
+  <%= render '/refinery/admin/form_advanced_options_menu', :f => f %>
+
+  <div id='more_options'>
     <div class="hemisquare">
       <h3><%= t('title', :scope => 'refinery.blog.admin.submenu.categories') %></h3>
       <ul class='blog_categories'>
@@ -102,7 +94,11 @@
           <%= f.label :user_id, t('.author') %>
           <%= refinery_help_tag t('.author_help') %>
           <br/>
-          <%= f.collection_select :user_id, ::Refinery::User.all, :id, :username %>
+          <% if @authors.present? %>
+            <%= f.collection_select :user_id, @authors, :id, :username %>
+          <% else %>
+            <%= f.text_field :username, id: :post_user_id, :class => "widest" %>
+          <% end %>
         </span>
       </div>
 
@@ -111,14 +107,21 @@
       <%= render '/seo_meta/form', :form => f %>
     </div>
   </div>
-  <%= render :partial => "/refinery/admin/form_actions",
-              :locals => {
-                :f => f,
-                :continue_editing => true,
-                :delete_title => t('delete', :scope => 'refinery.blog.admin.posts.post')
-              } %>
+  <%= render "/refinery/admin/form_actions",
+             :f => f,
+             :continue_editing => true,
+             :delete_title => t('delete', :scope => 'refinery.blog.admin.posts.post'),
+             :before_delete_button => (link_to(t('delete_translation', :scope => 'refinery.blog.admin.posts.post'),
+                                               refinery.delete_translation_blog_admin_post_path(@post, :locale_to_delete => Globalize.locale),
+                                               :method => :post,
+                                               :data => {
+                                                 :confirm => t('delete_translation_confirmation', :scope => 'refinery.blog.admin.posts.post')
+                                               },
+                                               :class => "button confirm-delete") if Refinery::I18n.frontend_locales.many? && @post.translations.size > 1) %>
 <% end -%>
 
 <% content_for :stylesheets, stylesheet_link_tag('refinery/blog/backend') %>
 <% content_for :javascripts, javascript_include_tag('refinery/blog/backend') %>
-<%= render 'refinery/shared/admin/autocomplete', :dom_id => '#blog_post_tag_list', :url => refinery.tags_blog_admin_posts_url %>
+<%= render 'refinery/shared/admin/autocomplete',
+           :dom_id => '#post_tag_list',
+           :url => refinery.tags_blog_admin_posts_url %>

data/app/views/refinery/blog/admin/posts/_form_part.html.erb

@@ -1,3 +1,3 @@
 <div class='page_part' id='page_part_body'>
-  <%= f.text_area :body, :rows => 20, :class => 'wymeditor widest' -%>
+  <%= f.text_area :body, :rows => 20, :class => 'visual_editor widest' -%>
 </div>

data/app/views/refinery/blog/admin/posts/_post.html.erb

@@ -1,21 +1,38 @@
 <li class='clearfix record <%= cycle("on", "on-hover") %>' id="<%= dom_id(post) -%>">
   <span class='title'>
-    <%= post.title %>
+    <%= post.title.presence || post.translations.detect {|t| t.title.present?}.title %>
     <span class="preview">
+      <% if Refinery::I18n.frontend_locales.many? %>
+        <span class='locales'>
+          <% post.translations.sort_by{ |t| Refinery::I18n.frontend_locales.index(t.locale)}.each do |translation| %>
+            <% if translation.title.present? %>
+              <%= link_to refinery.edit_blog_admin_post_path(post, :switch_locale => translation.locale), :class => 'locale', title: translation.locale.upcase do %>
+
+                <div class="<%=translation.locale %> locale_marker">
+                  <%= locale_text_icon(translation.locale.upcase) %>
+                </div>
+              <% end %>
+            <% end %>
+          <% end %>
+        </span>
+      <% end %>
+
       <%= post.published_at.try(:strftime, '%b %d, %Y') || 'draft' %>
       <%= " by #{post.author.username}" if post.author.present? %>
+      <% if post.draft? %>
+        <span class="label notice"><%= t('refinery.blog.admin.posts.post.draft') %></span>
+      <% else %>
+        <%= post.published_at.strftime('%b %d, %Y') %>
+      <% end %>
     </span>
   </span>
   <span class='actions'>
-    <%= link_to refinery_icon_tag("application_go.png"), refinery.blog_post_path(post),
-        :title => t('.view_live_html'),
-        :target => "_blank" %>
-    <%= link_to refinery_icon_tag("application_edit.png"), refinery.edit_blog_admin_post_path(post),
-         :title => t('.edit') %>
-    <%= link_to refinery_icon_tag("delete.png"), refinery.blog_admin_post_path(post),
-        :class => "cancel confirm-delete",
-        :title => t('.delete'),
-        :method => :delete,
-        :confirm => t('message', :scope => 'refinery.admin.delete', :title => post.title) %>
+    <%= action_icon(:preview, refinery.blog_post_path(post), t('.view_live_html')) %>
+    <%= action_icon(:edit,    refinery.edit_blog_admin_post_path(post), t('.edit') ) %>
+    <%= action_icon(:delete,  refinery.blog_admin_post_path(post), t('.delete'),
+      { class: "cancel confirm-delete",
+        data: {confirm: t('message',  scope: 'refinery.admin.delete', title: post.title)}}  ) %>
   </span>
 </li>
+
+

data/app/views/refinery/blog/admin/posts/_sortable_list.html.erb

@@ -1,7 +1,5 @@
 <ul id='sortable_list'>
   <%= render :partial => 'post', :collection => @posts %>
 </ul>
-<%= render :partial => "/refinery/admin/sortable_list",
-           :locals => {
-             :continue_reordering => (defined?(continue_reordering) ? continue_reordering : true)
-           } %>
+<%= render "/refinery/admin/sortable_list",
+           :continue_reordering => (defined?(continue_reordering) ? continue_reordering : true) %>

data/app/views/refinery/blog/admin/posts/_teaser_part.html.erb

@@ -1,5 +1,5 @@
 <div class='page_part' id='page_part_teaser'>
-  <%= f.text_area :custom_teaser, :rows => 20, :class => 'wymeditor widest' -%>
+  <%= f.text_area :custom_teaser, :rows => 20, :class => 'visual_editor widest' -%>
   <p>
     <span class='clearfix label_inline_with_link'>
       <%= link_to t('copy_body', :scope => 'refinery.blog.admin.posts.form'), "#",

data/app/views/refinery/blog/admin/posts/edit.html.erb

@@ -1 +1 @@
-<%= render :partial => "form" %>
+<%= render "form" %>

data/app/views/refinery/blog/admin/posts/index.html.erb

@@ -1,21 +1,15 @@
-<%= render :partial => '/refinery/blog/admin/submenu' %>
+<%= render '/refinery/blog/admin/submenu' %>
+<%= render 'refinery/admin/search_header', :url => request.path %>
 <div id='records'>
-  <% if searching? %>
-    <h2><%= t('results_for', :scope => 'refinery.admin.search', :query => params[:search]) %></h2>
-    <% if @posts.any? %>
-    <ul>
-      <%= render :partial => "post", :collection => @posts %>
-    </ul>
-    <% else %>
-      <p><%= t('no_results', :scope => 'refinery.admin.search') %></p>
-    <% end %>
-  <% else %>
-    <% if @posts.any? %>
-      <%= will_paginate @posts %>
+  <% if @posts.any? %>
+    <%= will_paginate @posts %>
 
-      <%= render :partial => "sortable_list" %>
+    <%= render "sortable_list" %>
 
-      <%= will_paginate @posts %>
+    <%= will_paginate @posts %>
+  <% else %>
+    <% if searching? %>
+      <%= t('no_results', :scope => 'refinery.admin.search') %>
     <% else %>
       <p>
         <strong>

data/app/views/refinery/blog/admin/posts/new.html.erb

@@ -1 +1 @@
-<%= render :partial => "form" %>
+<%= render "form" %>

data/app/views/refinery/blog/admin/posts/uncategorized.html.erb

@@ -1,4 +1,4 @@
-<%= render :partial => '/refinery/blog/admin/submenu' %>
+<%= render '/refinery/blog/admin/submenu' %>
 <div id='records'>
   <% if searching? %>
     <h2><%= t('results_for', :scope => 'refinery.admin.search', 
@@ -13,7 +13,7 @@
     <% if @posts.any? %>
       <%= will_paginate @posts %>
 
-      <%= render :partial => "sortable_list" %>
+      <%= render "sortable_list" %>
 
       <%= will_paginate @posts %>
     <% else %>

data/app/views/refinery/blog/admin/settings/notification_recipients.html.erb

@@ -14,11 +14,9 @@
     <%= t('.example') %>
   </p>
 
-  <%= render :partial => "/refinery/admin/form_actions",
-             :locals => {
-               :f => nil,
-               :continue_editing => false,
-               :cancel_url => refinery.blog_admin_posts_url,
-               :hide_delete => true
-             } %>
+  <%= render "/refinery/admin/form_actions",
+             :f => nil,
+             :continue_editing => false,
+             :cancel_url => refinery.blog_admin_posts_url,
+             :hide_delete => true %>
 <% end %>

data/app/views/refinery/blog/categories/show.html.erb

@@ -1,6 +1,6 @@
 <% content_for :body_content_title, @category.title %>
 
-<% content_for :body_content_left do %>
+<% content_for :body do %>
   <% if @posts.any? %>
     <section id="blog_posts">
       <%= render :partial => "/refinery/blog/shared/post", :collection => @posts %>
@@ -13,9 +13,9 @@
   <% end %>
 <% end %>
 
-<% content_for :body_content_right do %>
-  <%= render :partial => "/refinery/blog/shared/categories" %>
+<% content_for :side_body do %>
+  <%= render "/refinery/blog/shared/categories" %>
 <% end %>
 
-<%= render :partial => "/refinery/content_page" %>
+<%= render "/refinery/content_page" %>
 <% content_for :stylesheets, stylesheet_link_tag('refinery/blog/frontend') %>

data/app/views/refinery/blog/comment_mailer/notification.html.erb

@@ -11,6 +11,11 @@
 
 <%=raw t('.comment_ends') %>
 
+<%=raw link_to t('.approve'), refinery.approve_blog_admin_comment_url(@comment) -%>
+<%=raw t('.or') -%>
+<%=raw link_to t('.reject'), refinery.reject_blog_admin_comment_url(@comment) -%>
+<%=raw t('.this_comment') %>
+
 <%=raw t('.closing_line') %>,
 <%=raw Refinery::Core.site_name %>
 

data/app/views/refinery/blog/posts/_comment.html.erb

@@ -1,10 +1,10 @@
-<article class='blog_comment_message' id='<%= "comment-#{comment.to_param}" %>'>
-  <%= image_tag comment.avatar_url, :alt => comment.name, :class => 'avatar' %>
+<%= content_tag(:article, class: "blog_comment_message", id: ("comment-#{comment.to_param}")) do %>
+  <%= image_tag avatar_url(comment.email), :alt => comment.name, :class => 'avatar' %>
   <%= simple_format auto_link(comment.message.to_s) %>
-  <footer class='blog_comment_author'>
+  <footer class="blog_comment_author">
     <p>
       <%= t('by', :scope => 'refinery.blog.posts.comments', :who => comment.name) %>,
       <%= t('time_ago', :scope => 'refinery.blog.posts.comments', :time => time_ago_in_words(comment.created_at)) %>
     </p>
   </footer>
-</article>
+<% end %>

data/app/views/refinery/blog/posts/_comments.html.erb

@@ -1,40 +1,37 @@
 <aside id="comments">
-  <h2><%= t('title', :scope => 'refinery.blog.posts.show.comments') %></h2>
   <% if (comments = @post.comments.approved).any? %>
+    <h2><%= t('title', :scope => 'refinery.blog.posts.show.comments') %></h2>
     <%= render :partial => "comment", :collection => comments %>
-  <% else %>
-    <p>
-      <%= t('none', :scope => 'refinery.blog.shared.comments') %>.
-    </p>
   <% end %>
 
-  <% flash.each do |key, value| %>
-    <div id='flash' class="flash flash_<%= key %>">
-      <%= value %>
-    </div>
-  <% end %>
+  <% if Refinery::Blog::Post.comments_allowed? %>
+
+    <% flash.each do |key, value| %>
+      <div id="flash" class="flash flash_<%= key %>">
+        <%= value %>
+      </div>
+    <% end %>
 
-  <h2><%= t('add', :scope => 'refinery.blog.posts.show.comments') %></h2>
-  <%= form_for [refinery, :blog, @comment] do |f| %>
-    <%= render :partial => "/refinery/admin/error_messages",
-               :locals => {
+    <h2><%= t('add', :scope => 'refinery.blog.posts.show.comments') %></h2>
+    <%= form_for [refinery, :blog, @comment] do |f| %>
+      <%= render "/refinery/admin/error_messages",
                  :object => f.object,
-                 :include_object_name => true
-               } %>
-    <div class='field'>
-      <%= f.label :name %>
-      <%= f.text_field :name %>
-    </div>
-    <div class='field'>
-      <%= f.label :email %>
-      <%= f.email_field :email %>
-    </div>
-    <div class='field message_field'>
-      <%= f.label :message %>
-      <%= f.text_area :message, :rows => 6 %>
-    </div>
-    <div class='field form-actions'>
-      <%= f.submit t('submit', :scope => 'refinery.blog.posts.show') %>
-    </div>
+                 :include_object_name => true %>
+      <div class="field">
+        <%= f.label :name %>
+        <%= f.text_field :name %>
+      </div>
+      <div class="field">
+        <%= f.label :email %>
+        <%= f.email_field :email %>
+      </div>
+      <div class="field message_field">
+        <%= f.label :message %>
+        <%= f.text_area :message, :rows => 6 %>
+      </div>
+      <div class="field form-actions">
+        <%= f.submit t('submit', :scope => 'refinery.blog.posts.show') %>
+      </div>
+    <% end %>
   <% end %>
 </aside>