publify_core 9.0.0.pre5 → 9.2.0

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

@@ -1,7 +1,7 @@
 <% if @pages.empty? %>
   <tr>
     <td colspan="5">
-      <%= t(".no_pages") %>
+      <%= t('.no_pages') %>
     </td>
   </tr>
 <% end %>
@@ -10,11 +10,18 @@
   <tr>
     <td>
       <%= link_to_permalink(page, page.title) %>
-      <%= show_actions page %>
     </td>
     <td>
-      <%= author_link(page) %><br>
-      <small><%= l(page.created_at) %></small>
+      <%= author_link(page) %><br />
+    </td>
+    <td>
+      <%= l(page.created_at) %>
+    </td>
+    <td>
+      <%= page.text_filter&.name %>
+    </td>
+    <td>
+      <%= show_actions page %>
     </td>
   </tr>
 <% end %>

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

@@ -1 +1,3 @@
-<%= render 'form' %>
+<%= form_for([:admin, @page]) do |f| %>
+  <%= render 'form' %>
+<% end %>

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

@@ -1,17 +1,21 @@
 <% content_for :page_heading do %>
 <h2>
-  <i class="glyphicon glyphicon-large glyphicon-folder-open"></i>
-  <%= t(".manage_pages") %>
-  <%= link_to(t(".new_page"), {controller: 'pages', action: 'new'}, id: 'dialog-link', class: 'btn btn-info pull-right') %>
+  <%= t('.manage_pages') %>
+  <%= link_to(t('.new_page'), { controller: 'pages', action: 'new' }, { id: 'dialog-link', class: 'btn btn-info pull-right' }) %>
 </h2>
 <% end %>
 
 <table class='table table-striped'>
   <thead>
     <tr class='noborder'>
-      <th><%= t(".title") %></th>
-      <th><%= t(".author")%></th>
+      <th><%= t('.title') %></th>
+      <th><%= t('.author') %></th>
+      <th><%= t(".created_at") %></th>
+      <th><%= t(".text_filter") %></th>
+      <th><%= t(".actions") %></th>
     </tr>
   </thead>
-  <%= render 'pages' %>
+  <tbody>
+    <%= render 'pages' %>
+  </tbody>
 </table>

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

@@ -1 +1,3 @@
-<%= render 'form' %>
+<%= form_for([:admin, @page]) do |f| %>
+  <%= render 'form' %>
+<% end %>

data/app/views/admin/post_types/_index_and_form.html.erb

@@ -1,7 +1,6 @@
 <% content_for :page_heading do %>
 <h2>
-  <i class="glyphicon glyphicon-large glyphicon-cog"></i>
-  <%= t(".post_types") %>
+  <%= t('.post_types') %>
 </h2>
 <% end %>
 
@@ -18,15 +17,15 @@
       <% end %>
 
       <div class="form-group">
-        <%= f.text_field :name, class: 'form-control', placeholder: "Name" %>
+        <%= f.text_field :name, class: 'form-control', placeholder: 'Name' %>
       </div>
       <div class="form-group">
-        <%= f.text_area :description, rows: 5, class: 'form-control', placeholder: "Description" %>
+        <%= f.text_area :description, rows: 5, class: 'form-control', placeholder: 'Description' %>
       </div>
       <div class="form-group">
-        <hr>
-        <%= link_to(t(".cancel"), {action: 'index'}) %>
-        <%= t(".or") %>
+        <hr />
+        <%= link_to(t('.cancel'), action: 'index') %>
+        <%= t('.or') %>
         <%= f.submit t('.save'), class: 'btn btn-success' %>
       </div>
     <% end %>
@@ -36,23 +35,23 @@
     <table class='table table-hover'>
       <thead>
         <tr class='noborder'>
-          <th><%= t(".name") %></th>
-          <th><%= t(".description") %></th>
-          <th><%= t(".template_name") %></th>
+          <th><%= t('.name') %></th>
+          <th><%= t('.description') %></th>
+          <th><%= t('.template_name') %></th>
         </tr>
       </thead>
       <tr class='shade'>
-        <td><%= t(".default") %></td>
-        <td><%= t(".publify_default_post_type") %></td>
+        <td><%= t('.default') %></td>
+        <td><%= t('.publify_default_post_type') %></td>
         <td>read</td>
       </tr>
       <% @post_types.each do |post_type| %>
         <tr>
           <td>
-            <%= post_type.name %><br>
+            <%= post_type.name %><br />
             <div class='action'>
-              <%= link_to content_tag(:span, '', class: 'glyphicon glyphicon-pencil'), edit_admin_post_type_path(post_type), { class: 'btn btn-primary btn-xs btn-action' } %>
-              <%= link_to content_tag(:span, '', class: 'glyphicon glyphicon-trash'), admin_post_type_path(post_type), method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger btn-xs btn-action' %>
+              <%= button_to_edit post_type %>
+              <%= button_to_delete post_type %>
             </div>
           </td>
           <td><%= post_type.description %></td>
@@ -60,6 +59,6 @@
         </tr>
       <% end %>
     </table>
-    <p class="help-block"><%= t(".explain") %></p>
+    <p class="help-block"><%= t('.explain') %></p>
   </div>
 </div>

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

@@ -1 +1 @@
-<%= render "index_and_form" %>
+<%= render 'index_and_form' %>

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

@@ -1 +1 @@
-<%= render "index_and_form" %>
+<%= render 'index_and_form' %>

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

@@ -1,10 +1,9 @@
 <% content_for :page_heading do %>
   <h2>
-    <i class="glyphicon glyphicon-large glyphicon-user"></i>
-    <%= t(".your_profile") %>
+    <%= t('.your_profile') %>
   </h2>
 <% end %>
 
 <%= form_for([:admin, @user], url: admin_profile_path(current_user)) do |f| %>
-  <%= render partial: "admin/users/form", locals: { f: f, user: @user } %>
+  <%= render partial: 'admin/users/form', locals: { f: f, user: @user } %>
 <% end %>

data/app/views/admin/redirects/_index_and_form.html.erb

@@ -1,7 +1,6 @@
 <% content_for :page_heading do %>
 <h2>
-  <i class="glyphicon glyphicon-large glyphicon-share-alt"></i>
-  <%= t(".redirects") %>
+  <%= t('.redirects') %>
 </h2>
 <% end %>
 
@@ -21,15 +20,15 @@
         <%= f.text_field :from_path, class: 'form-control', placeholder: "From #{this_blog.base_url}/" %>
       </div>
       <p class='help-block'>
-        <small><%= t(".leave_empty_to_shorten_a_link") %></small>
+        <small><%= t('.leave_empty_to_shorten_a_link') %></small>
       </p>
       <div class="form-group">
-        <%= f.text_field :to_path, class: 'form-control', placeholder: "To" %>
+        <%= f.text_field :to_path, class: 'form-control', placeholder: 'To' %>
       </div>
       <div class="form-group">
-        <hr>
-        <%= link_to(t(".cancel"), {action: 'index'}) %>
-        <%= t(".or") %>
+        <hr />
+        <%= link_to(t('.cancel'), action: 'index') %>
+        <%= t('.or') %>
         <%= f.submit t('.save'), class: 'btn btn-success' %>
       </div>
     <% end %>
@@ -39,21 +38,21 @@
     <table class="table table-hover">
       <thead>
         <tr class='noborder'>
-          <th><%= t(".from") %></th>
-          <th><%= t(".to") %></th>
+          <th><%= t('.from') %></th>
+          <th><%= t('.to') %></th>
         </tr>
       </thead>
       <% if @redirects.empty? %>
       <tr>
         <td colspan="2">
-          <%= t(".no_redirects") %>
+          <%= t('.no_redirects') %>
         </td>
       </tr>
       <% end %>
       <% for redirect in @redirects %>
       <tr>
         <td>
-          <%= link_to("#{redirect.from_url}", "#{redirect.from_url}") %>
+          <%= link_to(redirect.from_url.to_s, redirect.from_url.to_s) %>
           <div class="action">
             <%= button_to_edit redirect %>
             <%= button_to_delete redirect %>

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

@@ -1 +1 @@
-<%= render "index_and_form" %>
+<%= render 'index_and_form' %>

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

@@ -1 +1 @@
-<%= render "index_and_form" %>
+<%= render 'index_and_form' %>

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

@@ -1,18 +1,17 @@
 <% content_for :page_heading do %>
   <h2>
-    <i class="glyphicon glyphicon-large glyphicon-picture"></i>
-    <%= t(".media_library") %>
+    <%= t('.media_library') %>
   </h2>
 <% end %>
 
-<%= form_tag({action: 'upload'}, {enctype: "multipart/form-data", class: 'form-inline'}) do %>
+<%= form_tag({ action: 'upload' }, { enctype: 'multipart/form-data', class: 'form-inline' }) do %>
   <div class='well well-small'>
     <h3><%= t('.upload_a_file_to_your_site') %></h3>
     <div class="form-group">
       <%= file_field_tag(:upload, class: 'input-file') %>
     </div>
     <div class="form-group">
-      <%= submit_tag(t('.upload'), {class: 'btn btn-success'}) %>
+      <%= submit_tag(t('.upload'), class: 'btn btn-success') %>
     </div>
   </div>
 <% end %>
@@ -20,16 +19,16 @@
 <table class="table table-hover">
   <thead>
     <tr>
-      <th><%= t(".filename")%> <small>(<%= t('.right_click_for_link') %>)</small></th>
-      <th><%= t(".content_type")%></th>
-      <th><%= t(".file_size")%></th>
-      <th><%= t(".date")%></th>
+      <th><%= t('.filename') %> <small>(<%= t('.right_click_for_link') %>)</small></th>
+      <th><%= t('.content_type') %></th>
+      <th><%= t('.file_size') %></th>
+      <th><%= t('.date') %></th>
     </tr>
   </thead>
   <% if @resources.empty? %>
     <tr>
       <td colspan="6">
-        <%= t(".no_resources") %>
+        <%= t('.no_resources') %>
       </td>
     </tr>
   <% end %>
@@ -47,22 +46,26 @@
       <p>
         <small>
           <% if upload.mime =~ /image/ %>
-            <%= link_to(t(".thumbnail"), upload.upload.thumb.url) %> |
-            <%= link_to(t(".medium_size"), upload.upload.medium.url) %> |
-            <%= link_to(t(".original_size"), upload.upload.url) %> |
+            <%= link_to(t('.thumbnail'), upload.upload.thumb.url) %> |
+            <%= link_to(t('.medium_size'), upload.upload.medium.url) %> |
+            <%= link_to(t('.original_size'), upload.upload.url) %> |
           <% end %>
-          <%= link_to(t(".delete"),
+          <%= link_to(t('.delete'),
                       { action: 'destroy', id: upload.id, search: params[:search], page: params[:page] },
-                      confirm: t(".are_you_sure"), method: :delete) %>
+                      { confirm: t('.are_you_sure'), method: :delete }) %>
         </small>
       </p>
     </td>
     <td>
       <%= upload.mime %>
     </td>
-    <td><%=h upload.size rescue 0 %> bytes</td>
+    <td><%= begin
+              h upload.size
+            rescue StandardError
+              0
+            end %> bytes</td>
     <td><%= l(upload.created_at, format: :short) %></td>
   </tr>
   <% end %>
-  <%= display_pagination(@resources, 6)%>
+  <%= display_pagination(@resources, 6) %>
 </table>

data/app/views/admin/seo/_general.html.erb

@@ -1,39 +1,44 @@
 <fieldset class='form-horizontal'>
-  <legend><%= t(".general_settings") %></legend>
+  <legend><%= t('.general_settings') %></legend>
   <div class='form-group'>
-    <label class='control-label col-sm-2'><%= t(".meta_keywords")%></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_meta_description"><%= t('.meta_description') %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
+      <%= text_area(:setting, :meta_description, rows: 3, class: 'form-control') %>
+    </div>
+  </div>
+  <div class='form-group'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t('.use_meta_keywords') %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <div class='checkbox'>
         <label for="setting_use_meta_keyword">
-          <%= check_box(:setting, :use_meta_keyword)%>
-          <%= t(".use_meta_keywords")%>
+          <%= check_box(:setting, :use_meta_keyword) %>
+          <%= t('.use_meta_keywords') %>
         </label>
       </div>
-      <%= text_area(:setting, :meta_keywords, rows: 3, class: 'form-control') %>
     </div>
   </div>
-    <div class='form-group'>
-    <label class='control-label col-sm-2' for="setting_meta_description"><%= t(".meta_description")%></label>
-    <div class='col-sm-5'>
-      <%= text_area(:setting, :meta_description, rows: 3, class: 'form-control') %>
+  <div class='form-group'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t('.meta_keywords') %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
+      <%= text_area(:setting, :meta_keywords, rows: 3, class: 'form-control') %>
     </div>
   </div>
   <div class='form-group'>
-    <label class='control-label col-sm-2'><%= t(".use_rss_description") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t('.use_rss_description') %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <div class='checkbox'>
         <label for="setting_rss_description">
           <%= check_box(:setting, :rss_description) %>
-          <%= t(".use_rss_description") %>
+          <%= t('.use_rss_description') %>
         </label>
       </div>
       <small class='help-block'><%= t('.this_will_display') %></small>
-      <%= Article.first.get_rss_description if Article.first %>
+      <%= Article.first&.rss_description %>
     </div>
   </div>
   <div class='form-group'>
-    <label class='control-label col-sm-2' for="setting_rss_description_text"><%= t(".rss_description_message") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_rss_description_text"><%= t('.rss_description_message') %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <%= text_area(:setting, :rss_description_text, rows: 10, class: 'form-control') %>
       <small class='help-block'><%= t('.explain_rss_description') %></small>
     </div>
@@ -41,83 +46,59 @@
 </fieldset>
 
 <fieldset class='form-horizontal'>
-  <legend><%= t(".indexing") %></legend>
+  <legend><%= t('.indexing') %></legend>
   <div class='form-group'>
-    <label class='control-label col-sm-2'><%= t(".indexing") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t('.indexing') %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <div class='checkbox'>
         <label for="setting_unindex_tags">
           <%= check_box(:setting, :unindex_tags) %>
-          <%= t(".do_not_index_tags")%>
+          <%= t('.do_not_index_tags') %>
         </label>
-        <small class='help-block'><%= t(".explain_tag_index_html") %></small>
+        <small class='help-block'><%= t('.explain_tag_index_html') %></small>
       </div>
     </div>
   </div>
   <div class='form-group'>
-    <label class='control-label col-sm-2' for="setting_robots"><%= t(".robots_txt") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_robots"><%= t('.robots_txt') %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <%= text_area(:setting, :robots, rows: 10, class: 'form-control') %>
     </div>
   </div>
 
   <div class='form-group'>
-    <label class='control-label col-sm-2'><%= t(".dofollow") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2'><%= t('.dofollow') %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <div class='checkbox'>
         <label for="setting_dofollowify">
-          <%= t(".use_dofollow_in_comments") %>
           <%= check_box(:setting, :dofollowify) %>
+          <%= t('.use_dofollow_in_comments') %>
         </label>
-        <small class='help-block'><%= t(".explain_moderate_feedback") %></small>
+        <small class='help-block'><%= t('.explain_moderate_feedback') %></small>
       </div>
-  </div>
-</div>
-<div class='form-group'>
-  <label class='control-label col-sm-2'><%= t(".canonical_url") %></label>
-  <div class='col-sm-5'>
-    <div class='checkbox'>
-      <label for="setting_use_canonical_url">
-        <%= check_box(:setting, :use_canonical_url) %>
-        <%= t(".use_canonical_url")%>
-      </label>
-      <small class='help-block'><%= t(".read_more_about_html", link: link_to("rel='canonical'", "http://support.google.com/webmasters/bin/answer.py?hl=en&answer=139394")) %></small>
-    </div>
-  </div>
-</div>
-</fieldset>
-
-<fieldset class='form-horizontal'>
-  <legend><%= t(".human") %></legend>
-  <div class='form-group'>
-    <label class='control-label col-sm-2' for="setting_humans"><%= t(".humans_txt") %></label>
-    <div class='col-sm-5'>
-      <%= text_area(:setting, :humans, rows: 10, class: 'form-control') %>
-      <small class='help-block'><%= t(".explain_humans_txt") %></small>
     </div>
   </div>
 </fieldset>
 
 <fieldset class='form-horizontal'>
-  <legend><%= t(".google") %></legend>
+  <legend><%= t('.google') %></legend>
   <div class='form-group'>
-    <label class='control-label col-sm-2' for="setting_google_analytics"><%= t(".google_analytics") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_google_analytics"><%= t('.google_analytics') %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <%= text_field(:setting, :google_analytics, class: 'form-control') %>
     </div>
   </div>
   <div class='form-group'>
-    <label class='control-label col-sm-2' for="setting_google_verification"><%= t(".google_webmaster_tools_validation_link") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_google_verification"><%= t('.google_webmaster_tools_validation_link') %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <%= text_field(:setting, :google_verification, class: 'form-control') %>
     </div>
   </div>
   <div class='form-group'>
-    <label class='control-label col-sm-2' for="setting_custom_tracking_field"><%= t(".custom_tracking_code") %></label>
-    <div class='col-sm-5'>
+    <label class='control-label col-sm-4 col-md-3 col-lg-2' for="setting_custom_tracking_field"><%= t('.custom_tracking_code') %></label>
+    <div class='col-sm-8 col-md-6 col-lg-4'>
       <%= text_area(:setting, :custom_tracking_field, rows: 3, class: 'form-control') %>
-      <small class='help-block'><%= t(".explain") %></small>
+      <small class='help-block'><%= t('.explain') %></small>
     </div>
   </div>
 </fieldset>
-