publify_core 9.1.0 → 9.2.0

data/app/views/admin/feedback/edit.html.erb

@@ -1,46 +1,45 @@
 <% content_for :page_heading do %>
   <h2 class="page-title">
-    <i class="glyphicon glyphicon-large glyphicon-comment"></i>
-    <%= t(".comments_for_html", article_link: link_to(h(@comment.article.title), controller: '/admin/content', action: 'edit', id: @comment.article.id).html_safe) %>
+    <%= t('.comments_for_html', article_link: link_to(h(@comment.article.title), controller: '/admin/content', action: 'edit', id: @comment.article.id).html_safe) %>
   </h2>
 <% end %>
 
-<%= form_tag :action => "update", :id => @comment.id do %>
+<%= form_tag action: 'update', id: @comment.id do %>
 
   <%= error_messages_for 'comment' %>
   <%= hidden_field_tag 'article_id', @article.id %>
 
   <fieldset>
-    <legend><%= t(".edit_a_comment") %></legend>
+    <legend><%= t('.edit_a_comment') %></legend>
     <div class='row'>
       <div class="form-group col-md-4">
-        <label for="comment_author" class='control-label'><%= t(".author") %></label>
-        <%= text_field 'comment', 'author', :class => 'form-control' %>
+        <label for="comment_author" class='control-label'><%= t('.author') %></label>
+        <%= text_field 'comment', 'author', class: 'form-control' %>
       </div>
     </div>
     <div class='row'>
       <div class='form-group col-md-4'>
-        <label for="comment_email" class='control-label'><%= t(".email") %></label>
-          <%= text_field 'comment', 'email', :class => 'form-control' %>
+        <label for="comment_email" class='control-label'><%= t('.email') %></label>
+          <%= text_field 'comment', 'email', class: 'form-control' %>
       </div>
     </div>
     <div class='row'>
       <div class='form-group col-md-4'>
-        <label for="comment_url" class='control-label'><%= t(".url") %></label>
-        <%= text_field 'comment', 'url', :class => 'form-control' %>
+        <label for="comment_url" class='control-label'><%= t('.url') %></label>
+        <%= text_field 'comment', 'url', class: 'form-control' %>
       </div>
     </div>
     <div class='row'>
       <div class='form-group col-md-12'>
-        <label for='comment_body' class='control-label'><%= t(".your_comment") %></label>
-        <script type="text/javascript">edToolbar('comment_body', '<%= current_user.default_text_filter.name %>');</script>
-        <%= text_area 'comment', 'body', { :rows => '10', :class => 'form-control'} %>
+        <label for='comment_body' class='control-label'><%= t('.your_comment') %></label>
+        <script type="text/javascript">edToolbar('comment_body', '<%= @comment.text_filter_name %>');</script>
+        <%= text_area 'comment', 'body', rows: '10', class: 'form-control' %>
       </div>
     </div>
     <div class='row'>
       <div class='form-group col-md-12'>
-        <hr>
-        <%= t(".action_or_other_html", first_action: link_to(t(".cancel"), {action: 'index'}), second_action: submit_tag(t(".save"), class: 'btn btn-primary')) %>
+        <hr />
+        <%= t('.action_or_other_html', first_action: link_to(t('.cancel'), action: 'index'), second_action: submit_tag(t('.save'), class: 'btn btn-primary')) %>
       </div>
     </div>
     </div>

data/app/views/admin/feedback/index.html.erb

@@ -1,53 +1,55 @@
 <% content_for :page_heading do %>
   <h2>
-    <i class="glyphicon glyphicon-large glyphicon-comment"></i>
-    <%= t(".feedback") %>
+    <%= t('.feedback') %>
   </h2>
 <% end %>
 
-<%= render 'shared/flash', flash: flash %>
-<%= form_tag({action: 'index'}, method: :get, class: 'form-inline') do %>
+<%= form_tag({ action: 'index' }, { method: :get, class: 'form-inline' }) do %>
   <p>
-    <%= link_to(t(".all"), {controller: 'admin/feedback', action: :index}, {class: 'label label-default'}) %>
-    <%= link_to(t(".unapproved_comments"), {controller: 'admin/feedback', action: :index, only: 'unapproved'}, {class: 'label label-info'}) %>
-    <%= link_to(t(".presumed_ham"), {controller: 'admin/feedback', action: :index, only: 'presumed_ham'}, {class: 'label label-primary'}) %>
-    <%= link_to(t(".ham"), {controller: 'admin/feedback', action: :index, only: 'ham'}, {class: 'label label-success'}) %>
-    <%= link_to(t(".presumed_spam"), {controller: 'admin/feedback', action: :index, only: 'presumed_spam'}, {class: 'label label-warning'}) %>
-    <%= link_to(t(".spam"), {controller: 'admin/feedback', action: :index, only: 'spam'}, {class: 'label label-danger'}) %>
+    <%= link_to(t('.all'), { controller: 'admin/feedback', action: :index }, { class: 'label label-default' }) %>
+    <%= link_to(t('.unapproved_comments'), { controller: 'admin/feedback', action: :index, only: 'unapproved' }, { class: 'label label-info' }) %>
+    <%= link_to(t('.presumed_ham'), { controller: 'admin/feedback', action: :index, only: 'presumed_ham' }, { class: 'label label-primary' }) %>
+    <%= link_to(t('.ham'), { controller: 'admin/feedback', action: :index, only: 'ham' }, { class: 'label label-success' }) %>
+    <%= link_to(t('.presumed_spam'), { controller: 'admin/feedback', action: :index, only: 'presumed_spam' }, { class: 'label label-warning' }) %>
+    <%= link_to(t('.spam'), { controller: 'admin/feedback', action: :index, only: 'spam' }, { class: 'label label-danger' }) %>
   </p>
 <% end %>
 
-<%= form_tag({:action => 'bulkops'}, {class: 'form-inline'}) do %>
+<%= form_tag({ action: 'bulkops' }, { class: 'form-inline' }) do %>
 
-  <%= hidden_field_tag "page", params[:page]%>
+  <%= hidden_field_tag 'page', params[:page] %>
 
-  <%= render 'button', { :position => 'top' } %>
+  <%= render 'button', position: 'top' %>
   <table class='table hover'>
     <thead>
       <tr class='noborder'>
-        <th colspan='5'>
-          <input type="checkbox" name="checkall" id="checkall" onclick="check_all(this);">
-          <%= t(".select_all") %>
+        <th>
+          <input type="checkbox" name="checkall" id="checkall" onclick="check_all(this);" />
         </th>
+        <th><%= t(".author") %></th>
+        <th><%= t(".created_at") %></th>
+        <th><%= t(".status") %></th>
+        <th><%= t(".content") %></th>
+        <th><%= t(".actions") %></th>
       </tr>
     </thead>
     <% if @feedback.empty? %>
       <tr>
         <td colspan="5">
-          <%= t(".no_feedback") %>
+          <%= t('.no_feedback') %>
         </td>
       </tr>
     <% end %>
     <% @feedback.each do |comment| %>
-      <%= render 'feedback', {:comment => comment} %>
+      <%= render 'feedback', comment: comment %>
     <% end %>
-    <%= display_pagination(@feedback, 5) %>
+    <%= display_pagination(@feedback, 7) %>
     <tr>
-      <th><input type="checkbox" name="checkall" id="checkall" onclick="check_all(this);"></th>
-      <th colspan='4'><%= t(".select_all") %></th>
+      <th><input type="checkbox" name="checkall" id="checkall" onclick="check_all(this);" /></th>
+      <th colspan='6'><%= t('.select_all') %></th>
     </tr>
   </table>
-  <%= render 'button', { position: 'bottom' } %>
+  <%= render 'button', position: 'bottom' %>
 <% end %>
 
-<br class='clear'>
+<br class='clear' />

data/app/views/admin/migrations/show.html.erb

@@ -1,22 +1,21 @@
 <% content_for :page_heading do %>
   <h2>
-    <i class="glyphicon glyphicon-large glyphicon-cog"></i>
-    <%= t(".database_migration") %>
+    <%= t('.database_migration') %>
   </h2>
 <% end %>
 
 <div class='alert alert-warning'>
-  <h3><%= t(".information") %></h3>
+  <h3><%= t('.information') %></h3>
   <p>
-    <strong><%= t(".current_database_version") %>:</strong>
+    <strong><%= t('.current_database_version') %>:</strong>
     <%= @current_version %>
   </p>
   <% unless @needed_migrations.blank? %>
     <p>
-      <strong><%= t(".migrations")%>:</strong>
-      <%= t(".migration_pending", count: @needed_migrations.count) %>
+      <strong><%= t('.migrations') %>:</strong>
+      <%= t('.migration_pending', count: @needed_migrations.count) %>
     </p>
-    <p><%= t(".needed_migrations")%>:</p>
+    <p><%= t('.needed_migrations') %>:</p>
     <ul>
       <% for migration in @needed_migrations %>
       <li><%= migration.name %></li>
@@ -27,12 +26,12 @@
     <%= form_tag admin_migrations_path do %>
       <% if @needed_migrations.blank? %>
         <div class='info'>
-          <p><strong><%= t(".you_are_up_to_date")%></strong></p>
+          <p><strong><%= t('.you_are_up_to_date') %></strong></p>
         </div>
       <% else %>
-        <hr>
-        <%= submit_tag(t(".update_database_now"), class: 'btn btn-success') %>
-        <small><%= t(".may_take_a_moment")%></small>
+        <hr />
+        <%= submit_tag(t('.update_database_now'), class: 'btn btn-success') %>
+        <small><%= t('.may_take_a_moment') %></small>
       <% end %>
     <% end %>
   </div>

data/app/views/admin/notes/_form.html.erb

@@ -1,37 +1,37 @@
-<%= n.hidden_field :text_filter, value: current_user.text_filter_name %>
+<%= n.hidden_field :text_filter_name, value: current_user.text_filter_name %>
 <div class='form-group'>
-  <%= n.text_area :body, {class: 'form-control', rows: '7', placeholder: t(".compose_new_note")} %>
+  <%= n.text_area :body, class: 'form-control', rows: '7', placeholder: t('.compose_new_note') %>
 </div>
 
 <fieldset class="hidden-phone">
-  <legend><%= t(".publish_settings") %></legend>
+  <legend><%= t('.publish_settings') %></legend>
   <% unless twitter_available?(this_blog, current_user) %>
     <%= render 'admin/shared/twitter_alert' %>
   <% else %>
     <div class="checkbox">
       <label for="push_to_twitter">
         <%= check_box_tag 'push_to_twitter', true, true %>
-        <%= t(".posse_to_twitter")%>
+        <%= t('.posse_to_twitter') %>
       </label>
     </div>
     <div class="form-group">
-      <label for="note_in_reply_to_status_id"><%= t(".in_reply_to") %></label>
-      <%= n.text_field :in_reply_to_status_id, class: 'form-control', placeholder: t(".tweet_id_like") %>
+      <label for="note_in_reply_to_status_id"><%= t('.in_reply_to') %></label>
+      <%= n.text_field :in_reply_to_status_id, class: 'form-control', placeholder: t('.tweet_id_like') %>
     </div>
   <% end %>
   <div class='form-group'>
-    <label for="note_permalink"><%= t(".permanent_link") %></label>
+    <label for="note_permalink"><%= t('.permanent_link') %></label>
     <%= n.text_field :permalink, class: 'form-control' %>
   </div>
   <div class='form-group'>
-    <label for='note_published_at'><%= t(".publish_at") %></label>
+    <label for='note_published_at'><%= t('.publish_at') %></label>
     <%= n.text_field :published_at, class: 'form-control datepicker',
-      placeholder: t('.now'), data: { locale: I18n.locale } %>
+                                    placeholder: t('.now'), data: { locale: I18n.locale } %>
   </div>
   <div class='form-group'>
-    <hr>
-    <%= link_to(t(".cancel"), {action: 'index'}) %>
-    <%= t(".or") %>
-    <%= submit_tag(t(".publish"), class: 'btn btn-success') %>
+    <hr />
+    <%= link_to(t('.cancel'), action: 'index') %>
+    <%= t('.or') %>
+    <%= submit_tag(t('.publish'), class: 'btn btn-success') %>
   </div>
 </fieldset>

data/app/views/admin/notes/_list.html.erb

@@ -1,13 +1,24 @@
 <div class='col-md-8'>
   <table class="table table-striped">
-    <% if @notes.empty? %>
-      <tr>
-        <td colspan="2">
-          <%= t("admin.notes.form.no_notes") %>
-        </td>
+    <thead>
+      <tr class='noborder'>
+        <th><%= t('.title') %></th>
+        <th><%= t('.author') %></th>
+        <th><%= t(".created_at") %></th>
+        <th><%= t(".text_filter") %></th>
+        <th><%= t(".actions") %></th>
       </tr>
-    <% end %>
-    <%= render @notes %>
-    <%= display_pagination(@notes, 3, 'first', 'last')%>
+    </thead>
+    <tbody>
+      <% if @notes.empty? %>
+        <tr>
+          <td colspan="5">
+            <%= t('admin.notes.form.no_notes') %>
+          </td>
+        </tr>
+      <% end %>
+      <%= render @notes %>
+      <%= display_pagination(@notes, 5, 'first', 'last') %>
+    </tbody>
   </table>
 </div>

data/app/views/admin/notes/_note.html.erb

@@ -1,14 +1,19 @@
 <tr>
   <td>
     <%= h(note.body.strip_html.slice(0..140)) %>
-    <div class='action'>
-      <%= link_to(content_tag(:span, '', class: 'glyphicon glyphicon-pencil'), {action: 'edit', id: note.id}, {class: 'btn btn-primary btn-xs btn-action'}) %>
-      <%= link_to(content_tag(:span, '', class: 'glyphicon glyphicon-trash'), admin_note_path(note), {class: 'btn btn-danger btn-xs btn-action'}) %>
-      <%= link_to(content_tag(:span, '', class: 'glyphicon glyphicon-link'), note.short_url, {class: 'btn btn-success btn-xs btn-action'}) %>
-    </div>
   </td>
   <td>
-    <%= author_link(note)%><br>
-    <small><%= l(note.published_at) %></small>
+    <%= author_link(note) %><br />
+  </td>
+  <td>
+    <%= l(note.published_at) %>
+  </td>
+  <td>
+    <%= note.text_filter_name %>
+  </td>
+  <td>
+    <%= button_to_edit note %>
+    <%= button_to_delete note %>
+    <%= button_to_short_url note %>
   </td>
 </tr>

data/app/views/admin/notes/edit.html.erb

@@ -1,4 +1,9 @@
-<%= render 'header' %>
+<% content_for :page_heading do %>
+  <h2>
+    <%= t('.notes') %>
+  </h2>
+<% end %>
+
 
 <div class='row'>
   <div class='col-md-4'>

data/app/views/admin/notes/index.html.erb

@@ -1,4 +1,8 @@
-<%= render 'header' %>
+<% content_for :page_heading do %>
+  <h2>
+    <%= t('.notes') %>
+  </h2>
+<% end %>
 
 <div class='row'>
   <div class='col-md-4'>

data/app/views/admin/notes/show.html.erb

@@ -4,11 +4,11 @@
 <% end %>
 
 <p>
-  <%= t(".are_you_sure", note: @note)%>
+  <%= t('.are_you_sure', note: @note) %>
 </p>
 
 <%= form_for @note, url: admin_note_path(@note), method: :delete do %>
   <div class='form-actions'>
-    <%= t(".action_or_other_html", first_action: link_to(t(".cancel"), {action: 'index'}), second_action: submit_tag(t(".delete"), class: "btn btn-danger")) %>
+    <%= t('.action_or_other_html', first_action: link_to(t('.cancel'), action: 'index'), second_action: submit_tag(t('.delete'), class: 'btn btn-danger')) %>
   </div>
 <% end %>

data/app/views/admin/pages/_form.html.erb

@@ -1,101 +1,110 @@
-<%= form_for([:admin, @page]) do |f| %>
-  <% if @page.errors.any? %>
-    <div id="error_explanation">
-      <h2><%= pluralize(@page.errors.count, "error") %> prohibited this post from being saved:</h2>
+<% if @page.errors.any? %>
+  <div id="error_explanation">
+    <h2><%= pluralize(@page.errors.count, 'error') %> prohibited this post from being saved:</h2>
 
-      <ul>
+    <ul>
       <% @page.errors.full_messages.each do |message| %>
         <li><%= message %></li>
       <% end %>
-      </ul>
-    </div>
-  <% end %>
+    </ul>
+  </div>
+<% end %>
 
-  <input type="hidden" name="user_textfilter" id="user_textfilter" value="<%= current_user.text_filter_name %>">
+<%= hidden_field_tag 'user_textfilter', current_user.text_filter_name %>
 
-  <div class='row save-bar'>
-    <div class='col-md-8 col-md-offset-2'>
-      <span class='pull-right'>
-        <%= link_to(t('.cancel'), {action: 'index'}, {class: 'btn btn-default'}) %>
-        <!-- Button trigger modal -->
-        <button class="btn btn-success" data-toggle="modal" type="button" data-target="#publish">
-          <%= controller.action_name == "new" ? t(".publish") : t(".save") %>
-        </button>
-      </span>
+<div class="row save-bar">
+  <div class="col-md-8 col-md-offset-2">
+    <div class="pull-right">
+      <%= link_to(t('.cancel'), { action: 'index' }, { class: 'btn btn-default' }) %>
+      <!-- Button trigger modal -->
+      <button class="btn btn-success" data-toggle="modal" type="button" data-target="#publishOptions">
+        <%= controller.action_name == 'new' ? t('.publish') : t('.save') %>
+      </button>
     </div>
   </div>
+</div>
 
-  <div class='row'>
-    <div class='col-md-8 col-md-offset-2' style='padding-top: 20px'>
-      <%= error_messages_for 'page' %>
-    </div>
+<div class="row">
+  <div class="col-md-8 col-md-offset-2" style="padding-top: 20px">
+    <%= error_messages_for 'page' %>
   </div>
+</div>
 
-  <div class='row'>
-    <div class='col-md-2' id='quicktags-block'>
-      <div id='quicktags' class='pull-right'>
-        <script type="text/javascript">edToolbar('page_body', '<%= @page.text_filter.name %>');</script>
-      </div>
+<div class="row">
+  <div class="col-md-2" id="quicktags-block">
+    <div id="quicktags" class="pull-right">
+      <script type="text/javascript">edToolbar('page_body', '<%= @page.text_filter_name %>');</script>
     </div>
-
-    <div class='col-md-8'>
-      <%= text_field 'page', 'title', :class => 'form-control', :placeholder => t('.title')  %>
-
-      <div id='editor'>
-        <%= text_area('page', 'body', {:class => 'form-control ', style: 'height: 360px', :rows => '20', placeholder: t('.type_your_post'), :"data-widearea" => "enable"}) %>
-      </div>
+  </div>
+  <div class="col-md-8">
+    <%= text_field 'page', 'title', class: 'form-control', placeholder: t('.title') %>
+    <div id="editor">
+      <%= text_area('page', 'body', class: 'form-control ', style: 'height: 360px', rows: '20', placeholder: t('.type_your_post')) %>
     </div>
   </div>
+</div>
 
-  <!-- Modal -->
-  <div class="modal fade" id="publish" tabindex="-1" role="dialog" aria-labelledby="publish" aria-hidden="true">
-    <div class="modal-dialog">
-      <div class="modal-content">
-        <div class="modal-header">
-          <h2 class="modal-title" id="publish">
-            <%= t('.publish') %>
-            <%= submit_tag( t(".publish"), class: 'btn btn-success pull-right') %>
-          </h2>
-        </div>
-        <div class="modal-body">
-          <div class='well'>
-            <h4><%= t(".permanent_link")%></h4>
-            <div>
-              <%= text_field 'page', 'name', :class => 'form-control' %>
-            </div>
+<!-- Modal -->
+<div class="modal fade" id="publishOptions" tabindex="-1" role="dialog" aria-labelledby="publish" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h2 class="modal-title" id="publishTitle">
+          <%= t('.publish') %>
+          <%= submit_tag(t('.publish'), class: 'btn btn-success pull-right') %>
+        </h2>
+      </div>
+      <div class="modal-body">
+        <div class="well">
+          <h4><%= t('.permanent_link') %></h4>
+          <div class="form-group">
+            <%= text_field 'page', 'name', class: 'form-control' %>
           </div>
+        </div>
 
-          <div class='well'>
-            <fieldset>
-              <legend><%= t(".publish_settings") %></legend>
-              <div class='control-group'>
-                <%= t(".status") %>: <strong><%= @page.state  %></strong>
-                <%= toggle_element('status') %>
-                <div id='status' class='collapse'>
-                  <label for="page_published" class='checkbox'>
-                    <%= check_box 'page', 'state', {}, 'published', ''  %>
-                    <%= t(".online")%>
-                  </label>
-                  <p><span class='btn btn-default btn-mini'><%= toggle_element 'status', "OK" %></span></p>
-                </div>
+        <div class="well">
+          <fieldset>
+            <legend><%= t('.publish_settings') %></legend>
+            <div class='control-group'>
+              <p>
+              <%= t('.status') %>: <strong><%= @page.state %></strong>
+              <%= toggle_element('status') %>
+              </p>
+              <div id="status" class="collapse">
+                <label for="page_published" class="checkbox">
+                  <%= check_box 'page', 'state', {}, 'published', '' %>
+                  <%= t('.online') %>
+                </label>
+                <p>
+                <span class="btn btn-mini btn-default">
+                  <%= toggle_element 'status', 'OK' %>
+                </span>
+                </p>
               </div>
-              <div class='control-group'>
-                <%= t(".article_filter") %>: <strong><%= @page.text_filter.description %></strong> <%= toggle_element 'text_filter' %>
-                <div id='text_filter' class='collapse'>
-                  <select name="page[text_filter_id]" id="text_filter" class='form-control'>
-                  <%= options_for_select text_filter_options_with_id, @page.text_filter.id %>
+            </div>
+            <div class="control-group">
+              <p>
+              <%= t('.article_filter') %>: <strong><%= @page.text_filter.description %></strong>
+              <%= toggle_element 'text_filter' %>
+              </p>
+              <div id="text_filter" class="collapse">
+                <select name="page[text_filter_name]" id="text_filter_name" class='form-control'>
+                  <%= options_for_select text_filter_options, @page.text_filter_name %>
                 </select>
-                <p><span class='btn btn-mini btn-default'><%= toggle_element 'text_filter', "OK" %></span></p>
-                </div>
+                <p>
+                <span class="btn btn-mini btn-default">
+                  <%= toggle_element 'text_filter', 'OK' %>
+                </span>
+                </p>
               </div>
-            </fieldset>
-          </div>
-        </div>
-        <div class="modal-footer">
-          <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-          <%= submit_tag( t(".publish"), class: 'btn btn-success') %>
+            </div>
+          </fieldset>
         </div>
       </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+        <%= submit_tag(t('.publish'), class: 'btn btn-success') %>
+      </div>
     </div>
   </div>
-<% end %>
+</div>