publify_core 10.0.0 → 10.0.2

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

@@ -8,7 +8,7 @@
 <%= form_tag({ action: 'index' }, { method: :get, name: 'article', remote: true, class: 'form-inline spinnable', "data-update-success": 'articleList' }) do %>
 
   <% if params[:search] and params[:search]['state'] %>
-    <input type="hidden" name="search[state]" value="<%= params[:search]['state'] %>" />
+    <input type="hidden" name="search[state]" value="<%= params[:search]['state'] %>">
   <% end %>
 
   <p>
@@ -20,7 +20,7 @@
   </p>
 
   <div class="panel panel-default">
-    <div class="panel-heading">
+    <div class="panel-heading clearfix">
       <div class="pull-right">
         <div class="form-group">
           <%= select_tag('search[user_id]', options_from_collection_for_select(User.all, 'id', 'name'), prompt: t('.select_an_author'), class: 'form-control') %>
@@ -29,14 +29,13 @@
           <%= select_tag('search[published_at]', options_for_select(Article.publication_months), prompt: t('.publication_date'), class: 'form-control') %>
         </div>
         <div class="form-group">
-          <input id="search" type="text" name="search[searchstring]" class="form-control" />
+          <input id="search" type="text" name="search[searchstring]" class="form-control" autocomplete="off">
         </div>
         <div class="form-group">
           <%= submit_tag(t('.search'), class: 'btn btn-success') %>
-          <span id="spinner" style="display:none;"><%= image_tag('spinner.gif') %></span>
+          <span id="spinner" class="hidden"><%= image_tag('spinner.gif') %></span>
         </div>
       </div>
-      <br style="clear: both" />
     </div>
   </div>
   <table class="table table-hover">

data/app/views/admin/dashboard/_comment.html.erb

@@ -12,7 +12,7 @@
     <%= comment.html.strip_html.slice(0..300) %>
     </p>
     <%= button_to_conversation(comment) %>
-    <hr />
+    <hr>
     </li>
   <% end %>
 <% end %>

data/app/views/admin/dashboard/_drafts.html.erb

@@ -16,7 +16,7 @@
             <%= display_date_and_time(post.created_at) %>
           </h5>
           <p><%= post.body&.strip_html&.slice(0, 300) %></p>
-          <hr />
+          <hr>
           </li>
         <% end %>
       <% end %>

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

@@ -1,5 +1,5 @@
 <td>
-  <input class="feedback_check" type="checkbox" name="feedback_check[<%= comment.id %>]" />
+  <input class="feedback_check" type="checkbox" name="feedback_check[<%= comment.id %>]">
 </td>
 <td>
   <%= avatar_tag(email: comment.email, url: comment.url, size: 36, class: 'img-circle') %>

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

@@ -16,7 +16,7 @@
     <thead>
       <tr class='noborder'>
         <th>
-          <input type="checkbox" name="checkall" id="checkall" onclick="check_all(this);" />
+          <input type="checkbox" name="checkall" id="checkall">
         </th>
         <th><%= t(".author") %></th>
         <th><%= t(".created_at") %></th>

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

@@ -50,7 +50,7 @@
     </div>
     <div class='row'>
       <div class='form-group col-md-12'>
-        <hr />
+        <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>

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

@@ -27,7 +27,7 @@
     <thead>
       <tr class='noborder'>
         <th>
-          <input type="checkbox" name="checkall" id="checkall" onclick="check_all(this);" />
+          <input type="checkbox" name="checkall" id="checkall">
         </th>
         <th><%= t(".author") %></th>
         <th><%= t(".created_at") %></th>
@@ -52,4 +52,4 @@
   </table>
 <% end %>
 
-<br class='clear' />
+<br class='clear'>

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

@@ -29,7 +29,7 @@
           <p><strong><%= t('.you_are_up_to_date') %></strong></p>
         </div>
       <% else %>
-        <hr />
+        <hr>
         <%= submit_tag(t('.update_database_now'), class: 'btn btn-success') %>
         <small><%= t('.may_take_a_moment') %></small>
       <% end %>

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

@@ -25,11 +25,10 @@
   </div>
   <div class='form-group'>
     <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 } %>
+    <%= n.datetime_field :published_at, class: 'form-control' %>
   </div>
   <div class='form-group'>
-    <hr />
+    <hr>
     <%= link_to(t('.cancel'), action: 'index') %>
     <%= t('.or') %>
     <%= submit_tag(t('.publish'), class: 'btn btn-success') %>

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

@@ -3,10 +3,10 @@
     <%= h(note.body.strip_html.slice(0..140)) %>
   </td>
   <td>
-    <%= author_link(note) %><br />
+    <%= author_link(note) %><br>
   </td>
   <td>
-    <%= l(note.published_at) %>
+    <%= l(note.published_at) if note.published_at %>
   </td>
   <td>
     <%= note.text_filter_name %>

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

@@ -4,7 +4,6 @@
   </h2>
 <% end %>
 
-
 <div class='row'>
   <div class='col-md-4'>
     <%= form_for @note, url: admin_note_path(@note) do |n| %>

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

@@ -12,7 +12,7 @@
       <%= link_to_permalink(page, page.title) %>
     </td>
     <td>
-      <%= author_link(page) %><br />
+      <%= author_link(page) %><br>
     </td>
     <td>
       <%= l(page.created_at) %>

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

@@ -23,7 +23,7 @@
         <%= f.text_area :description, rows: 5, class: 'form-control', placeholder: 'Description' %>
       </div>
       <div class="form-group">
-        <hr />
+        <hr>
         <%= link_to(t('.cancel'), action: 'index') %>
         <%= t('.or') %>
         <%= f.submit t('.save'), class: 'btn btn-success' %>
@@ -48,7 +48,7 @@
       <% @post_types.each do |post_type| %>
         <tr>
           <td>
-            <%= post_type.name %><br />
+            <%= post_type.name %><br>
             <div class='action'>
               <%= button_to_edit post_type %>
               <%= button_to_delete post_type %>

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

@@ -26,7 +26,7 @@
         <%= f.text_field :to_path, class: 'form-control', placeholder: 'To' %>
       </div>
       <div class="form-group">
-        <hr />
+        <hr>
         <%= link_to(t('.cancel'), action: 'index') %>
         <%= t('.or') %>
         <%= f.submit t('.save'), class: 'btn btn-success' %>
@@ -58,7 +58,7 @@
             <%= button_to_delete redirect %>
           </div>
         </td>
-        <td><%= link_to(redirect.to_path, redirect.to_path) %></td>
+        <td><%= link_to(redirect.to_path, redirect.full_to_path) %></td>
       </tr>
       <% end %>
       <%= display_pagination(@redirects, 2) %>

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

@@ -30,7 +30,7 @@
 
   <%= hidden_field_tag 'section', @section %>
   <div class='form-group'>
-    <hr />
+    <hr>
     <%= link_to(t('.cancel'), admin_seo_path(section: @section)) %>
     <%= t('.or') %>
     <%= submit_tag(t('.update_settings'), class: 'btn btn-success') %>

data/app/views/admin/settings/display.html.erb

@@ -92,7 +92,7 @@
   </fieldset>
   <%= hidden_field_tag 'from', 'display' %>
   <div class='form-group'>
-    <hr />
+    <hr>
     <%= link_to(t('.cancel'), action: 'index') %>
     <%= t('.or') %>
     <%= submit_tag(t('.update_settings'), class: 'btn btn-success') %>

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

@@ -109,7 +109,7 @@
 
   <%= hidden_field_tag 'from', 'feedback' %>
   <div class='form-group'>
-    <hr />
+    <hr>
     <%= link_to(t('.cancel'), action: 'index') %>
     <%= t('.or') %>
     <%= submit_tag(t('.update_settings'), class: 'btn btn-success') %>

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

@@ -64,7 +64,7 @@
 
   <%= hidden_field_tag 'from', 'index' %>
   <div class='form-group'>
-    <hr />
+    <hr>
     <%= link_to(t('.cancel'), action: 'index') %>
     <%= t('.or') %>
     <%= submit_tag(t('.update_settings'), class: 'btn btn-success') %>

data/app/views/admin/settings/write.html.erb

@@ -60,7 +60,7 @@
 
   <%= hidden_field_tag 'from', 'write' %>
   <div class='form-group'>
-    <hr />
+    <hr>
     <%= link_to(t('.cancel'), action: 'index') %>
     <%= t('.or') %>
     <%= submit_tag(t('.update_settings'), class: 'btn btn-success') %>

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

@@ -19,7 +19,7 @@
         <%= f.text_field :display_name, class: 'form-control', placeholder: 'Name' %>
       </div>
       <div class="form-group">
-        <hr />
+        <hr>
         <%= link_to(t('.cancel'), action: 'index') %>
         <%= t('.or') %>
         <%= f.submit t('.save'), class: 'btn btn-success' %>

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

@@ -208,7 +208,7 @@
 <% end %>
 
 <div class='form-actions'>
-  <hr />
+  <hr>
   <%= link_to(t('.cancel'), action: 'index') %>
   <%= t('.or') %>
   <%= submit_tag(t('.save'), class: 'btn btn-success') %>

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

@@ -1,7 +1,7 @@
 <%= form_tag @article.comment_url, id: 'comment_form', remote: true do %>
   <div class="comment-box">
-    <div id="errors" style="display: none"></div>
-    <div id="preview" style="display: none"></div>
+    <div id="errors" class="hidden"></div>
+    <div id="preview" class="hidden"></div>
 
     <a name="respond"></a>
     <table cellpadding="4" cellspacing="0" class="frm-tbl">
@@ -10,17 +10,17 @@
         <td>
           <%= text_field 'comment', 'author', size: 20 %>
           <small>
-            <%= link_to '#', onclick: "$('.optional_field').fadeToggle();return false" do %>
+            <%= link_to '#', class: "optional-field-toggle" do %>
               (<%= t('.leave_url_email') %> &#187;)
             <% end %>
           </small>
         </td>
       </tr>
-      <tr class="optional_field" style="display: none">
+      <tr class="optional_field">
         <td><p><label for="comment_url"><%= t('.your_blog') %></label></p></td>
         <td> <%= text_field 'comment', 'url' %></td>
       </tr>
-      <tr class="optional_field" style="display: none">
+      <tr class="optional_field">
         <td><p><label for="comment_email"><%= t('.your_email') %></label></p></td>
         <td> <%= text_field 'comment', 'email' %></td>
       </tr>
@@ -39,8 +39,10 @@
       <tr>
         <td colspan="2" id="frm-btns">
           <%= markup_help_popup TextFilter.make_filter(this_blog.comment_text_filter), t('.comment_markup_help') %>
-          <a href="#" onclick="$.post('<%= @article.preview_comment_url %>', $('#comment_form').serialize());return false"><%= t('.preview_comment') %></a>
-          <input type="submit" name="submit" id="form-submit-button" value="submit" class="button" />
+          <%= link_to "#", data: { preview_url: @article.preview_comment_url, target_form: "#comment_form" }, class: "preview-comment-link" do %>
+            <%= t('.preview_comment') %>
+          <% end %>
+          <input type="submit" name="submit" id="form-submit-button" value="submit" class="button">
         </td>
       </tr>
     </table>

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

@@ -1,4 +1,4 @@
 <%= avatar_tag(email: comment.email, url: comment.url) %>
 <cite><strong><%= h comment[:author] %></strong></cite>
-<%= t('.is_about_to_say') %>:<br />
+<%= t('.is_about_to_say') %>:<br>
 <%= comment.html %>

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

@@ -1,6 +1,6 @@
-<li id="trackback-<%= trackback.id %>"<%= onhover_show_admin_tools(:trackback, trackback.id) %>>
+<li id="trackback-<%= trackback.id %>">
   <a name="trackback-<%= trackback.id %>"></a>
-  <%= t('.from') %> <strong><%= trackback.blog_name %></strong><br />
-  <a href="<%= trackback.url %>" rel="nofollow"><%= h trackback.title %></a><br />
+  <%= t('.from') %> <strong><%= trackback.blog_name %></strong><br>
+  <a href="<%= trackback.url %>" rel="nofollow"><%= h trackback.title %></a><br>
   <%= trackback.excerpt %>
 </li>

data/app/views/articles/comment_failed.js.erb

@@ -1,3 +1,3 @@
 var message = "<%= j render 'articles/comment_errors', comment: @comment %>";
 $('#preview').hide();
-$('#errors').hide().html(message).fadeIn();
+$('#errors').hide().removeClass("hidden").html(message).fadeIn();

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

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

data/app/views/comments/_comment.html.erb

@@ -1,5 +1,5 @@
 <% cache comment do %>
-  <li id="comment-<%= comment.id %>" <%= 'class="author_comment"' if comment.user %> <%= onhover_show_admin_tools(:comment, comment.id) %>>
+  <li id="comment-<%= comment.id %>" <%= 'class="author_comment"' if comment.user %>>
     <p class="author">
     <%= avatar_tag(email: comment.email, url: comment.url) %>
     <cite><strong><%= link_to_unless(comment.url.blank?, h(comment.author), comment.url) %></strong></cite>

data/app/views/comments/preview.js.erb

@@ -1,3 +1,3 @@
 var preview = "<%= j render 'articles/comment_preview', comment: @comment %>";
 $('#errors').hide();
-$('#preview').hide().html(preview).fadeIn();
+$('#preview').hide().removeClass("hidden").html(preview).fadeIn();

data/app/views/devise/passwords/edit.html.erb

@@ -8,15 +8,15 @@
   <%= f.hidden_field :reset_password_token %>
 
   <div class="form-group">
-    <%= f.label :password, t('.new_password') %><br />
+    <%= f.label :password, t('.new_password') %><br>
     <% if @minimum_password_length %>
-      <em>(<%= t('devise_custom.characters_minimum', min: @minimum_password_length) %>)</em><br />
+      <em>(<%= t('devise_custom.characters_minimum', min: @minimum_password_length) %>)</em><br>
     <% end %>
     <%= f.password_field :password, class: 'form-control', autofocus: true, autocomplete: 'off' %>
   </div>
 
   <div class="form-group">
-    <%= f.label :password_confirmation, t('.confirm_new_password') %><br />
+    <%= f.label :password_confirmation, t('.confirm_new_password') %><br>
     <%= f.password_field :password_confirmation, class: 'form-control', autocomplete: 'off' %>
   </div>
 

data/app/views/devise/passwords/new.html.erb

@@ -7,7 +7,7 @@
   <fieldset>
 
     <div class='form-group'>
-      <%= f.label :email %><br />
+      <%= f.label :email %><br>
       <%= f.email_field :email, class: 'form-control' %>
     </div>
 

data/app/views/devise/registrations/new.html.erb

@@ -18,13 +18,13 @@
   <div class="form-group">
     <%= f.label :password %>
     <% if @minimum_password_length %>
-      <em>(<%= t('devise_custom.characters_minimum', min: @minimum_password_length) %>)</em><br />
+      <em>(<%= t('devise_custom.characters_minimum', min: @minimum_password_length) %>)</em><br>
     <% end %>
     <%= f.password_field :password, class: 'form-control', autofocus: true, autocomplete: 'off' %>
   </div>
 
   <div class="form-group">
-    <%= f.label :password_confirmation %><br />
+    <%= f.label :password_confirmation %><br>
     <%= f.password_field :password_confirmation, class: 'form-control', autocomplete: 'off' %>
   </div>
 

data/app/views/devise/sessions/new.html.erb

@@ -5,12 +5,12 @@
 <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
   <fieldset>
     <div class="form-group">
-      <%= f.label :login %><br />
+      <%= f.label :login %><br>
       <%= f.text_field :login, class: 'form-control', autofocus: true %>
     </div>
 
     <div class="form-group">
-      <%= f.label :password %><br />
+      <%= f.label :password %><br>
       <%= f.password_field :password, class: 'form-control', autocomplete: 'off' %>
     </div>
 

data/app/views/devise/shared/_links.html.erb

@@ -1,14 +1,14 @@
 <small>
   <%- if controller_name != 'sessions' %>
-    <%= link_to t('accounts.back_to_login'), new_session_path(resource_name) %><br />
+    <%= link_to t('accounts.back_to_login'), new_session_path(resource_name) %><br>
   <% end -%>
 
   <%- if controller_name != 'registrations' && this_blog.allow_signup? %>
-    <%= link_to t('accounts.create_account'), new_registration_path(resource_name) %><br />
+    <%= link_to t('accounts.create_account'), new_registration_path(resource_name) %><br>
   <% end -%>
 
   <%- if controller_name != 'passwords' && controller_name != 'registrations' %>
-    <%= link_to t('accounts.lost_my_password'), new_password_path(resource_name) %><br />
+    <%= link_to t('accounts.lost_my_password'), new_password_path(resource_name) %><br>
   <% end -%>
 
   <%= link_to(t('accounts.back_to_html', place: this_blog.blog_name), this_blog.base_url) %>

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

@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>
       <%= yield :page_title %>
     </title>
-    <meta http-equiv="imagetoolbar" content="no" />
+    <meta http-equiv="imagetoolbar" content="no">
     <%= javascript_include_tag 'publify_admin', async: Rails.env.production? %>
     <%= stylesheet_link_tag 'accounts' %>
   </head>

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

@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8">
     <title><%= this_blog.blog_name %> – <%= controller.controller_name %></title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta http-equiv="imagetoolbar" content="no" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="imagetoolbar" content="no">
     <%= javascript_include_tag 'publify_admin', async: Rails.env.production? %>
     <%= stylesheet_link_tag 'publify_admin' %>
     <%= csrf_meta_tags %>
@@ -12,9 +12,7 @@
   <body>
     <%= render 'admin/shared/menu' %>
     <div class='container-fluid'>
-      <div style='margin-top:20px'>
-        <%= render 'shared/flash', flash: flash %>
-      </div>
+      <%= render 'shared/flash', flash: flash %>
       <% if content_for?(:page_heading) %>
         <div class='page-header'>
           <%= yield :page_heading %>

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

@@ -4,7 +4,7 @@
     <%= render 'shared/page_header' %>
     <%= themeable_stylesheet_link_tag :theme %>
     <%= themeable_javascript_include_tag :theme %>
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1">
     <title><%= h page_title %></title>
   </head>
 

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

@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+  <meta http-equiv="Content-type" content="text/html; charset=utf-8">
   <title><%= this_blog.blog_name %> – <%= controller.controller_name %></title>
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <meta http-equiv="imagetoolbar" content="no" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta http-equiv="imagetoolbar" content="no">
   <%= javascript_include_tag 'publify_admin', async: Rails.env.production? %>
   <%= stylesheet_link_tag 'publify_admin' %>
   <%= csrf_meta_tags %>

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

@@ -7,7 +7,7 @@
         <small><%= link_to_permalink(note, display_date_and_time(note.published_at)) %></small>
       </footer>
     </article>
-        <hr />
+    <hr>
   </div>
   <% end %>
 </div>

data/app/views/notes/show_in_reply.html.erb

@@ -5,7 +5,7 @@
         <%= image_tag(@reply['user']['profile_image_url'], class: 'alignleft', alt: @reply['user']['name']) %>
       <% end %>
       <strong><%= get_reply_context_url(@reply) %></strong>
-      <p><%= nofollowify_links(PublifyApp::Textfilter::Twitterfilter.filtertext(@reply['text'])) %></p>
+      <p><%= nofollowify_links(PublifyCore::TextFilter::Twitterfilter.filtertext(@reply['text'])) %></p>
       <p>
       <small>
         <%= get_reply_context_twitter_link(@reply) %>

data/app/views/notification_mailer/comment.html.erb

@@ -6,7 +6,7 @@
   <h2><%= h @comment.title %></h2>
   <cite><strong><%= @comment.url.blank? ? h(@comment.author) : link_to(h(@comment.author), @comment.url) %></strong> </cite>
   <%= link_to('said', @comment.permalink_url) %>
-  <%= display_date_and_time @comment.created_at %> <br />
+  <%= display_date_and_time @comment.created_at %> <br>
   <%= html @comment %>
 <% end %>
 <%= render 'mail_footer' %>

data/app/views/search_sidebar/_content.html.erb

@@ -3,8 +3,7 @@
 </h3>
 <div class="sidebar-body">
   <%= form_tag({ controller: 'articles', action: 'search' }, { method: 'get', id: 'sform' }) do %>
-    <input type="text" id="q" name="q" value="" size="15" />
-    <input type="submit" value="<%= t('.search') %>" />
+    <input type="text" id="q" name="q" value="" size="15" autocomplete="off">
+    <input type="submit" value="<%= t('.search') %>">
   <% end %>
 </div>
-<br style="clear: right" />

data/app/views/settings/install.html.erb

@@ -3,8 +3,8 @@
 
 <% for field in @fields %>
 
-  <%= field.desc %><br />
-  <%= settings_field field %><br />
+  <%= field.desc %><br>
+  <%= settings_field field %><br>
   <% end %>
 
   <%= submit_tag %>