publify_core 9.2.10 → 10.0.0

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

@@ -1,5 +1,5 @@
 <% content_for :page_heading do %>
-  <h2>
+  <h2 class="page-title">
     <%= t('.feedback') %>
   </h2>
 <% end %>
@@ -19,7 +19,10 @@
 
   <%= hidden_field_tag 'page', params[:page] %>
 
-  <%= render 'button', position: 'top' %>
+  <% if @feedback.any? %>
+    <%= render 'button', position: 'top' %>
+  <% end %>
+
   <table class='table hover'>
     <thead>
       <tr class='noborder'>
@@ -33,6 +36,7 @@
         <th><%= t(".actions") %></th>
       </tr>
     </thead>
+
     <% if @feedback.empty? %>
       <tr>
         <td colspan="5">
@@ -45,12 +49,7 @@
       <%= render 'feedback', comment: comment %>
     <% end %>
     <%= display_pagination(@feedback, 7) %>
-    <tr>
-      <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' %>
 <% end %>
 
 <br class='clear' />

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

@@ -1,15 +1,3 @@
-<% if @page.errors.any? %>
-  <div id="error_explanation">
-    <h2><%= pluralize(@page.errors.count, 'error') %> prohibited this post from being saved:</h2>
-
-    <ul>
-      <% @page.errors.full_messages.each do |message| %>
-        <li><%= message %></li>
-      <% end %>
-    </ul>
-  </div>
-<% end %>
-
 <%= hidden_field_tag 'user_textfilter', current_user.text_filter_name %>
 
 <div class="row save-bar">
@@ -25,8 +13,19 @@
 </div>
 
 <div class="row">
-  <div class="col-md-8 col-md-offset-2" style="padding-top: 20px">
-    <%= error_messages_for 'page' %>
+  <div class="col-md-8 col-md-offset-2" id="error-message-page">
+    <%= render 'shared/flash', flash: flash %>
+    <% if @page.errors.any? %>
+      <div id="error_explanation">
+        <h2><%= t("errors.template.header", model: 'page', count: @page.errors.count) %></h2>
+        <p><%= t("errors.template.body") %></p>
+        <ul>
+          <% @page.errors.full_messages.each do |message| %>
+            <li><%= message %></li>
+          <% end %>
+        </ul>
+      </div>
+    <% end %>
   </div>
 </div>
 

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

@@ -8,7 +8,18 @@
   </h2>
 <% end %>
 
-<%= error_messages_for 'blog' %>
+<%= render 'shared/flash', flash: flash %>
+<% if @setting.errors.any? %>
+  <div id="error_explanation">
+    <h2><%= t("errors.template.header", model: 'blog', count: @setting.errors.count) %></h2>
+    <p><%= t("errors.template.body") %></p>
+    <ul>
+      <% @setting.errors.full_messages.each do |message| %>
+        <li><%= message %></li>
+      <% end %>
+    </ul>
+  </div>
+<% end %>
 
 <%= form_tag admin_seo_path, method: :put do %>
   <%= case @section

data/app/views/admin/shared/_menu.html.erb

@@ -10,15 +10,15 @@
   </div>
   <div class="collapse navbar-collapse" id="sidebar-top">
     <ul class='nav navbar-nav'>
-      <% if can? :index, 'admin/content' %>
+      <% if can? :index, 'admin/articles' %>
         <li class='dropdown'>
           <a class="dropdown-toggle" data-toggle="dropdown" href="#">
             <%= t('.articles') %>
             <b class="caret"></b>
           </a>
           <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-            <%= menu_item(t('.all_articles'), admin_content_index_path) %>
-            <%= menu_item(t('.new_article'), new_admin_content_path) %>
+            <%= menu_item(t('.all_articles'), admin_articles_path) %>
+            <%= menu_item(t('.new_article'), new_admin_article_path) %>
             <%= menu_item(t('.feedback'), admin_feedback_index_path) %>
             <%= menu_item(t('.tags'), admin_tags_path) %>
             <%= menu_item(t('.article_types'), admin_post_types_path) %>
@@ -84,6 +84,7 @@
           </ul>
         </li>
       <% end %>
+      <%= menu_item(t('.view_blog'), this_blog.base_url) %>
     </ul>
     <ul class='nav navbar-nav pull-right'>
       <li class='dropdown'>
@@ -110,7 +111,7 @@
           <b class="caret"></b>
         </a>
         <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-          <li><%= link_to(t('.new_article'), controller: 'content', action: 'new') %></li>
+          <li><%= link_to(t('.new_article'), controller: 'articles', action: 'new') %></li>
           <li><%= link_to(t('.new_page'), controller: 'pages', actions: 'new') %></li>
           <li><%= link_to(t('.new_media'), controller: 'resources', action: 'index') %></li>
           <li><%= link_to(t('.new_note'), controller: 'notes') %></li>

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

@@ -47,7 +47,8 @@
             <%= link_to tag.display_name, edit_admin_tag_path(tag), class: 'edit' %>
             <%= button_to_edit tag %>
             <%= button_to_delete tag %>
-            <%= link_to_permalink(tag, "#{tag.contents.size} #{t(".view")}".html_safe, nil, 'btn btn-success btn-xs') %>
+            <%= link_to_permalink(tag, "#{tag.contents.size} #{t(".view")}".html_safe,
+                                  style: 'btn btn-success btn-xs') %>
           </td>
           <td><%= tag.name %></td>
         </tr>

data/app/views/articles/_comment_errors.html.erb

@@ -1,2 +1,12 @@
 <p><%= t('.message') %></p>
-<%= error_messages_for('comment') %>
+<% if @comment.errors.any? %>
+  <div id="error_explanation">
+    <h2><%= t("errors.template.header", model: 'comment', count: @comment.errors.count) %></h2>
+    <p><%= t("errors.template.body") %></p>
+    <ul>
+      <% @comment.errors.full_messages.each do |message| %>
+        <li><%= message %></li>
+      <% end %>
+    </ul>
+  </div>
+<% end %>

data/app/views/articles/read.html.erb

@@ -1,5 +1,5 @@
 <div class="post"<%= onhover_show_admin_tools(:article) %>>
-  <%= link_to(t('.edit'), { controller: 'admin/content', action: 'edit', id: @article.id }, { class: 'admintools', style: 'display: none', id: 'admin_article' }) %>
+  <%= link_to(t('.edit'), { controller: 'admin/articles', action: 'edit', id: @article.id }, { class: 'admintools', style: 'display: none', id: 'admin_article' }) %>
   <% cache @article do %>
     <h2><%= link_to_permalink @article, @article.title %></h2>
     <%= render 'articles/article_author', article: @article %>

data/app/views/layouts/administration.html.erb

@@ -12,25 +12,17 @@
   <body>
     <%= render 'admin/shared/menu' %>
     <div class='container-fluid'>
-      <div class='row'>
-        <div class='col-md-12'>
-          <div style='margin-top:20px'>
-            <%= render 'shared/flash', flash: flash %>
-          </div>
-          <% if content_for?(:page_heading) %>
-            <div class='page-header'>
-              <%= yield :page_heading %>
-            </div>
-          <% end %>
-          <%= yield %>
-        </div>
+      <div style='margin-top:20px'>
+        <%= render 'shared/flash', flash: flash %>
       </div>
-      <footer>
-        <div class='row'>
-          <div class='col-md-12'>
-            <%= link_to(this_blog.blog_name, this_blog.base_url) %> <%= t('.powered_by') %> Publify <%= h PublifyCore::VERSION %>
-          </div>
+      <% if content_for?(:page_heading) %>
+        <div class='page-header'>
+          <%= yield :page_heading %>
         </div>
+      <% end %>
+      <%= yield %>
+      <footer>
+        <%= link_to(this_blog.blog_name, this_blog.base_url) %> <%= t('.powered_by') %> Publify <%= h PublifyCore::VERSION %>
       </footer>
     </div>
   </body>

data/config/i18n-tasks.yml

@@ -3,6 +3,8 @@
 # The "main" locale.
 base_locale: en
 
+<% rails_i18n_path = %x[bundle info --path rails-i18n].chomp %>
+
 # Read and write translations.
 data:
   # Locale files or `File.find` patterns where translations are read from:
@@ -10,6 +12,11 @@ data:
     - config/locales/%{locale}.yml
     - config/locales/**/*.%{locale}.yml
 
+  # External locale data (e.g. gems).
+  # This data is not considered unused and is never written to.
+  external:
+    - "<%= rails_i18n_path %>/rails/locale/%{locale}.yml"
+
   # Locale files to write new keys to, based on a list of key pattern => file
   # rules. Matched from top to bottom:
   # `i18n-tasks normalize -p` will force move the keys according to these rules
@@ -41,4 +48,4 @@ ignore_unused:
   - 'time.formats.*'
   - 'layouts.default.designed_by'
   - 'date.*'
-  - 'activerecord.{attributes,errors,models}.*'
+  - 'activerecord.errors.models.*'

data/config/initializers/devise.rb

@@ -47,7 +47,7 @@ Devise.setup do |config|
   # Configure which authentication keys should be case-insensitive.
   # These keys will be downcased upon creating or modifying a user and when used
   # to authenticate or find a user. Default is :email.
-  config.case_insensitive_keys = [:login]
+  config.case_insensitive_keys = [:login, :email]
 
   # Configure which authentication keys should have whitespace stripped.
   # These keys will have whitespace before and after removed upon creating or