publify_core 9.0.0 → 9.2.2

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

@@ -1,3 +1,3 @@
 <p class='alert alert-warning'>
-<%= t(".how_to_setup_twitter_html", twitter_settings_link: link_to(t(".fill_the_twitter_credentials"), controller: 'admin/settings', action: 'write'), twitter_registration_link: link_to(t(".registered_your_application"), "https://dev.twitter.com/apps/new")) %>
+<%= t('.how_to_setup_twitter_html', twitter_settings_link: link_to(t('.fill_the_twitter_credentials'), controller: 'admin/settings', action: 'write'), twitter_registration_link: link_to(t('.registered_your_application'), 'https://dev.twitter.com/apps/new')) %>
 </p>

data/app/views/admin/sidebar/_config.html.erb

@@ -1,10 +1,10 @@
 <div id="sidebar-config" class='row'>
   <div id="available" class='col-md-6'>
     <div class='well'>
-      <h3><%= t(".available_items") %></h3>
+      <h3><%= t('.available_items') %></h3>
       <div id="available_box">
         <% if available_sidebars.blank? %>
-        <p class='alert-message warning'><%= t(".you_have_no_plugins_installed") %>.</p>
+        <p class='alert-message warning'><%= t('.you_have_no_plugins_installed') %>.</p>
         <% else %>
           <%= render partial: 'available', collection: available_sidebars %>
         <% end %>
@@ -15,9 +15,9 @@
   <div id="cnt-active" class='col-md-6'>
     <div class='well'>
       <h3 id="hdr-active">
-        <%= t(".active_sidebar_items") %>
-        <%= image_tag "spinner-blue.gif", id: 'update_spinner',
-          style: 'display:none;' %>
+        <%= t('.active_sidebar_items') %>
+        <%= image_tag 'spinner-blue.gif', id: 'update_spinner',
+                                          style: 'display:none;' %>
       </h3>
       <div id="active">
         <%= render 'target', ordered_sidebars: ordered_sidebars %>

data/app/views/admin/sidebar/_target_sidebar.html.erb

@@ -1,7 +1,7 @@
-<li id="sidebar_<%= sidebar.id %>" class="sidebar_item" data-sortable="sidebar_<%= sidebar.id %>" >
-  <%= link_to 'X', admin_sidebar_path(sidebar), {class: 'deletion_link', remote: true, method: :delete, :'data-confirm'=>'Are you sure?'} %>
-  <%= form_tag admin_sidebar_path(sidebar.id), {remote: true, method: :put} do |f| %>
-    <div class="active alert <%= class_for_admin_state(sidebar, sortable_index)%>">
+<li id="sidebar_<%= sidebar.id %>" class="sidebar_item" data-sortable="sidebar_<%= sidebar.id %>">
+  <%= link_to 'X', admin_sidebar_path(sidebar), class: 'deletion_link', remote: true, method: :delete, 'data-confirm': 'Are you sure?' %>
+  <%= form_tag admin_sidebar_path(sidebar.id), remote: true, method: :put do |f| %>
+    <div class="active alert <%= class_for_admin_state(sidebar, sortable_index) %>">
       <h3 class='light'><%= sidebar.display_name %></h3>
       <div class='widget-content'>
         <p><%= sidebar.description %></p>

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

@@ -1,19 +1,19 @@
 <% content_for :page_heading do %>
   <i class="icon-large icon-sidebar"></i>
-  <h2 class="page-title"><%= t(".sidebar") %></h2>
+  <h2 class="page-title"><%= t('.sidebar') %></h2>
 <% end %>
 
 <div class='alert alert-info'>
   <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-  <p><%= t(".explain_how_its_works") %></p>
-  <p><%= t(".download_more_plugins_html") %></p>
+  <p><%= t('.explain_how_its_works') %></p>
+  <p><%= t('.download_more_plugins_html') %></p>
 </div>
 <p class='help-block'></p>
 
 <%= form_tag(url_for(action: 'publish'), method: :put) do %>
   <div class='form-actions'>
-    <%= link_to(t(".cancel"), {action: 'index'}) %>
-    <%= t(".or") %>
+    <%= link_to(t('.cancel'), action: 'index') %>
+    <%= t('.or') %>
     <%= submit_tag(t('.publish_changes'), class: 'btn btn-success') %>
   </div>
 <% end %>
@@ -24,8 +24,8 @@
 
 <%= form_tag(url_for(action: 'publish'), method: :put) do %>
   <div class='form-group'>
-    <%= link_to(t(".cancel"), {action: 'index'}) %>
-    <%= t(".or") %>
+    <%= link_to(t('.cancel'), action: 'index') %>
+    <%= t('.or') %>
     <%= submit_tag(t('.publish_changes'), class: 'btn btn-success') %>
   </div>
 <% end %>

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

@@ -1,6 +1,5 @@
 <% content_for :page_heading do %>
 <h2>
-  <i class="glyphicon glyphicon-large glyphicon-tags"></i>
   <%= t('.manage_tags') %>
 </h2>
 <% end %>
@@ -17,13 +16,13 @@
       <% end %>
 
       <div class="form-group">
-        <%= f.text_field :display_name, class: 'form-control', placeholder: "Name" %>
+        <%= f.text_field :display_name, class: 'form-control', placeholder: 'Name' %>
       </div>
       <div class="form-group">
-        <hr>
-        <%= link_to(t(".cancel"), {action: 'index'}) %>
-        <%= t(".or") %>
-        <%= f.submit t(".save"), class: 'btn btn-success' %>
+        <hr />
+        <%= link_to(t('.cancel'), action: 'index') %>
+        <%= t('.or') %>
+        <%= f.submit t('.save'), class: 'btn btn-success' %>
       </div>
     <% end %>
   </div>
@@ -32,23 +31,23 @@
       <thead>
         <tr class='noborder'>
           <th><%= t('.display_name') %></th>
-          <th><%= t('.name')  %></th>
+          <th><%= t('.name') %></th>
         </tr>
       </thead>
       <% if @tags.empty? %>
         <tr>
           <td colspan="3">
-            <%= t(".no_tags") %>
+            <%= t('.no_tags') %>
           </td>
         </tr>
       <% end %>
       <% for tag in @tags %>
         <tr>
           <td>
-            <%= link_to tag.display_name, edit_admin_tag_path(tag), { class: 'edit' } %>
-            <%= link_to content_tag(:span, '', class: 'glyphicon glyphicon-pencil'), edit_admin_tag_path(tag), { class: 'btn btn-primary btn-xs btn-action' } %>
-            <%= link_to content_tag(:span, '', class: 'glyphicon glyphicon-trash'), admin_tag_path(tag), method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger btn-xs btn-action' %>
-            <%= link_to_permalink(tag, "#{tag.contents.size} <span class='glyphicon glyphicon-link'></span>".html_safe, nil, 'btn btn-success btn-xs').html_safe %>
+            <%= 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') %>
           </td>
           <td><%= tag.name %></td>
         </tr>

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

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

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

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

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

@@ -1,7 +1,6 @@
 <% content_for :page_heading do %>
   <h2>
-    <i class="glyphicon icon-large glyphicon-picture"></i>
-    <%= t(".choose_a_theme") %>
+    <%= t('.choose_a_theme') %>
   </h2>
 <% end %>
 
@@ -11,16 +10,16 @@
   <div class='col-md-6'>
     <% if theme.path == @active.path %>
       <div class='well'>
-        <h3><%= t(".active_theme", name: theme.name) %></h3>
+        <h3><%= t('.active_theme', name: theme.name) %></h3>
         <%= image_tag(preview_url, class: 'img-responsive img-thumbnail') %>
         <%= raw theme.description_html %>
       </div>
     <% else %>
       <div>
-        <h3><%= link_to(theme.name, switch_url, title: t(".use_this_theme")) %></h3>
-        <%= link_to(image_tag(preview_url, class: 'img-thumbnail'), switch_url, title: t(".use_this_theme")) %>
+        <h3><%= link_to(theme.name, switch_url, title: t('.use_this_theme')) %></h3>
+        <%= link_to(image_tag(preview_url, class: 'img-thumbnail'), switch_url, title: t('.use_this_theme')) %>
         <%= raw theme.description_html %>
-        <p><%= link_to(t(".use_this_theme"), switch_url, class: 'btn btn-info') %></p>
+        <p><%= link_to(t('.use_this_theme'), switch_url, class: 'btn btn-info') %></p>
       </div>
     <% end %>
   </div>

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

@@ -1,6 +1,6 @@
 <% if user.errors.any? %>
   <div id="error_explanation">
-    <h2><%= pluralize(user.errors.count, "error") %> prohibited this user from being saved:</h2>
+    <h2><%= pluralize(user.errors.count, 'error') %> prohibited this user from being saved:</h2>
 
     <ul>
       <% user.errors.full_messages.each do |message| %>
@@ -11,40 +11,40 @@
 <% end %>
 
 <fieldset class='form-horizontal'>
-  <legend><%= t('.account_settings')%></legend>
+  <legend><%= t('.account_settings') %></legend>
   <div class='form-group'>
-    <label class='control-label col-sm-2' for="user_login"><%= t('.login')%></label>
+    <label class='control-label col-sm-2' for="user_login"><%= t('.login') %></label>
     <div class='col-sm-5'>
       <%= f.text_field :login, class: 'form-control' %>
     </div>
   </div>
   <div class='form-group'>
-    <label class='control-label col-sm-2' for="user_password"><%= t('.password')%></label>
+    <label class='control-label col-sm-2' for="user_password"><%= t('.password') %></label>
     <div class='col-sm-5'>
       <%= f.password_field :password, class: 'form-control' %>
     </div>
   </div>
   <div class='form-group'>
-    <label class='control-label col-sm-2' for="user_password_confirmation"><%= t('.password_confirmation')%></label>
+    <label class='control-label col-sm-2' for="user_password_confirmation"><%= t('.password_confirmation') %></label>
     <div class='col-sm-5'>
-      <%= f.password_field :password_confirmation, :class => 'form-control' %>
+      <%= f.password_field :password_confirmation, class: 'form-control' %>
     </div>
   </div>
   <div class='form-group'>
-    <label class='control-label col-sm-2' for="user_email"><%= t('.email')%></label>
+    <label class='control-label col-sm-2' for="user_email"><%= t('.email') %></label>
     <div class='col-sm-5'>
       <%= f.text_field :email, class: 'form-control' %>
     </div>
   </div>
   <% if controller.controller_name == 'users' %>
     <div class='form-group'>
-      <label class='control-label col-sm-2' for="user_profile"><%= t('.profile')%></label>
+      <label class='control-label col-sm-2' for="user_profile"><%= t('.profile') %></label>
       <div class='col-sm-5'>
-        <%= f.select :profile, [:admin, :publisher, :contributor], { include_blank: false }, class: 'form-control' %>
+        <%= f.select :profile, [:admin, :publisher, :contributor], { include_blank: false }, { class: 'form-control' } %>
       </div>
     </div>
     <div class='form-group'>
-      <label class='control-label col-sm-2' for="user_state"><%= t('.user_status')%></label>
+      <label class='control-label col-sm-2' for="user_state"><%= t('.user_status') %></label>
       <div class='col-sm-5'>
         <select name="user[state]" class='form-control'>
           <% User::STATUS.each do |state| %>
@@ -57,7 +57,7 @@
 </fieldset>
 
 <fieldset class='form-horizontal'>
-  <legend><%= t('.profile_settings')%></legend>
+  <legend><%= t('.profile_settings') %></legend>
   <div class='form-group'>
     <label class='control-label col-sm-2' for="user_firstname"><%= t('.firstname') %></label>
     <div class='col-sm-5'>
@@ -87,16 +87,16 @@
     </div>
   <% end %>
   <div class='form-group'>
-    <label class='control-label col-sm-2' for="text_filter"><%= t('.article_filter') %></label>
+    <label class='control-label col-sm-2' for="text_filter_name"><%= t('.article_filter') %></label>
     <div class='col-sm-5'>
-      <select name="user[text_filter_id]" id="text_filter" class='form-control'>
-        <%= options_for_select text_filter_options_with_id, user.text_filter.id %>
+      <select name="user[text_filter_name]" id="text_filter_name" class='form-control'>
+        <%= options_for_select text_filter_options, user.text_filter_name %>
       </select>
     </div>
   </div>
 </fieldset>
 
-<% unless controller.controller_name == 'users'%>
+<% unless controller.controller_name == 'users' %>
   <fieldset class='form-horizontal'>
     <legend><%= t('.avatar') %></legend>
     <p><%= display_user_avatar(current_user, 'thumb') %> <%= t('.avatar_current') %></p>
@@ -139,67 +139,67 @@
       <%= render 'admin/shared/twitter_alert' %>
     <% end %>
     <div class='form-group'>
-      <label class='control-label col-sm-2' for="user_twitter_account"><%= t('.twitter_account')%></label>
+      <label class='control-label col-sm-2' for="user_twitter_account"><%= t('.twitter_account') %></label>
       <div class='col-sm-5'>
-        <%= f.text_field :twitter_account, {class: 'form-control', disabled: twitter_available?(this_blog, current_user)} %>
+        <%= f.text_field :twitter_account, class: 'form-control', disabled: twitter_available?(this_blog, current_user) %>
         <p class='help-block'>The Twitter account you want to post with</p>
       </div>
     </div>
     <div class='form-group'>
-      <label class='control-label col-sm-2' for="user_twitter_oauth_token"><%= t('.twitter_oauth')%></label>
+      <label class='control-label col-sm-2' for="user_twitter_oauth_token"><%= t('.twitter_oauth') %></label>
       <div class='col-sm-5'>
-        <%= f.text_field :twitter_oauth_token, {class: 'form-control', disabled: twitter_available?(this_blog, current_user)} %>
+        <%= f.text_field :twitter_oauth_token, class: 'form-control', disabled: twitter_available?(this_blog, current_user) %>
       </div>
     </div>
     <div class='form-group'>
-      <label class='control-label col-sm-2' for="user_twitter_oauth_token_secret"><%= t('.twitter_oauth_secret')%></label>
+      <label class='control-label col-sm-2' for="user_twitter_oauth_token_secret"><%= t('.twitter_oauth_secret') %></label>
       <div class='col-sm-5'>
-        <%= f.text_field :twitter_oauth_token_secret, {class: 'form-control', disabled: twitter_available?(this_blog, current_user)} %>
+        <%= f.text_field :twitter_oauth_token_secret, class: 'form-control', disabled: twitter_available?(this_blog, current_user) %>
       </div>
     </div>
   </fieldset>
 
   <fieldset class='form-horizontal'>
-    <legend><%= t('.contact_settings')%></legend>
+    <legend><%= t('.contact_settings') %></legend>
     <div class='alert alert-info'><%= t('.contact_explain_html', link: link_to(t('.author_page'), author_path(id: current_user.login))) %></div>
     <div class='form-group'>
-      <label class='control-label col-sm-2' for="user_description"><%= t('.about')%></label>
+      <label class='control-label col-sm-2' for="user_description"><%= t('.about') %></label>
       <div class='col-sm-5'>
-        <%= f.text_area :description, {class: 'form-control', rows: 5} %>
+        <%= f.text_area :description, class: 'form-control', rows: 5 %>
       </div>
     </div>
     <div class='form-group'>
-      <label class='control-label col-sm-2' for="user_url"><%= t('.website')%></label>
+      <label class='control-label col-sm-2' for="user_url"><%= t('.website') %></label>
       <div class='col-sm-5'>
         <%= f.text_field :url, class: 'form-control' %>
       </div>
     </div>
     <div class='form-group'>
-      <label class='control-label col-sm-2' for="user_msn"><%= t('.msn')%></label>
+      <label class='control-label col-sm-2' for="user_msn"><%= t('.msn') %></label>
       <div class='col-sm-5'>
         <%= f.text_field :msn, class: 'form-control' %>
       </div>
     </div>
     <div class='form-group'>
-      <label class='control-label col-sm-2' for="user_yahoo"><%= t('.yahoo')%></label>
+      <label class='control-label col-sm-2' for="user_yahoo"><%= t('.yahoo') %></label>
       <div class='col-sm-5'>
         <%= f.text_field :yahoo, class: 'form-control' %>
       </div>
     </div>
     <div class='form-group'>
-      <label class='control-label col-sm-2' for="user_jabber"><%= t('.jabber')%></label>
+      <label class='control-label col-sm-2' for="user_jabber"><%= t('.jabber') %></label>
       <div class='col-sm-5'>
         <%= f.text_field :jabber, class: 'form-control' %>
       </div>
     </div>
     <div class='form-group'>
-      <label class='control-label col-sm-2' for="user_aim"><%= t('.aim')%></label>
+      <label class='control-label col-sm-2' for="user_aim"><%= t('.aim') %></label>
       <div class='col-sm-5'>
         <%= f.text_field :aim, class: 'form-control' %>
       </div>
     </div>
     <div class='form-group'>
-      <label class='control-label col-sm-2' for="user_twitter"><%= t('.twitter')%></label>
+      <label class='control-label col-sm-2' for="user_twitter"><%= t('.twitter') %></label>
       <div class='col-sm-5'>
         <%= f.text_field :twitter, class: 'form-control' %>
       </div>
@@ -208,8 +208,8 @@
 <% end %>
 
 <div class='form-actions'>
-  <hr>
-  <%= link_to(t(".cancel"), {action: 'index'}) %>
-  <%= t(".or") %>
-  <%= submit_tag(t(".save"), class: 'btn btn-success') %>
+  <hr />
+  <%= link_to(t('.cancel'), action: 'index') %>
+  <%= t('.or') %>
+  <%= submit_tag(t('.save'), class: 'btn btn-success') %>
 </div>

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

@@ -1,8 +1,8 @@
 <% content_for :page_heading do %>
   <i class="icon-large icon-user-add"></i>
-  <h2 class="page-title"><%= t(".edit_user") %></h2>
+  <h2 class="page-title"><%= t('.edit_user') %></h2>
 <% end %>
 
 <%= form_for([:admin, @user]) do |f| %>
-  <%= render partial: "form", locals: { f: f, user: @user } %>
+  <%= render partial: 'form', locals: { f: f, user: @user } %>
 <% end %>

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

@@ -1,21 +1,20 @@
 <% content_for :page_heading do %>
 <h2>
-  <i class="glyphicon glyphicon-large glyphicon-user"></i>
-  <%= t(".users") %>
-  <%= link_to(t(".new_user"), new_admin_user_path, id: 'dialog-link', class: 'btn btn-info pull-right') %>
+  <%= t('.users') %>
+  <%= link_to(t('.new_user'), new_admin_user_path, id: 'dialog-link', class: 'btn btn-info pull-right') %>
 </h2>
 <% end %>
 
 <table class="table table-hover">
   <thead>
     <tr>
-      <th><%= t(".login") %></th>
-      <th><%= t(".name") %></th>
-      <th><%= t(".email") %></th>
-      <th><%= t(".profile") %></th>
-      <th><%= t(".articles") %></th>
-      <th><%= t(".comments") %></th>
-      <th><%= t(".state") %></th>
+      <th><%= t('.login') %></th>
+      <th><%= t('.name') %></th>
+      <th><%= t('.email') %></th>
+      <th><%= t('.profile') %></th>
+      <th><%= t('.articles') %></th>
+      <th><%= t('.comments') %></th>
+      <th><%= t('.state') %></th>
     </tr>
   </thead>
   <% for user in @users %>
@@ -23,8 +22,7 @@
       <td>
         <%= link_to user.login, author_path(id: user.login) %>
         <div class='action'>
-          <%= link_to(content_tag(:span, '', class: 'glyphicon glyphicon-pencil'), edit_admin_user_path(user), class: 'btn btn-primary btn-xs btn-action' ) %>
-          <%= link_to(content_tag(:span, '', class: 'glyphicon glyphicon-link'), author_path(id:user.login), class: 'btn btn-success btn-xs btn-action' ) %>
+          <%= button_to_edit user %>
         </div>
       </td>
       <td><%= user.nickname %></td>

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

@@ -1,8 +1,8 @@
 <% content_for :page_heading do %>
   <i class="icon-large icon-user-add"></i>
-  <h2 class="page-title"><%= t(".add_user") %></h2>
+  <h2 class="page-title"><%= t('.add_user') %></h2>
 <% end %>
 
 <%= form_for([:admin, @user]) do |f| %>
-  <%= render partial: "form", locals: { f: f, user: @user } %>
+  <%= render partial: 'form', locals: { f: f, user: @user } %>
 <% end %>

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

@@ -3,9 +3,9 @@
   <div class="sidebar-body">
     <ul id="archives">
       <% sidebar.archives.each do |month| %>
-        <% counter = sidebar.show_count ? "<em>(#{month[:article_count]})</em>" : "" %>
+        <% counter = sidebar.show_count ? "<em>(#{month[:article_count]})</em>" : '' %>
         <li>
-          <%= link_to"#{month[:name]} #{counter}".html_safe,  articles_by_month_path(month[:year], "%02i" % month[:month]) %>
+          <%= link_to "#{month[:name]} #{counter}".html_safe, articles_by_month_path(month[:year], '%02i' % month[:month]) %>
         </li>
       <% end %>
     </ul>

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

@@ -1,9 +1,9 @@
 <%= cache article do %>
   <div class="archivepost">
     <%= article.published_at.mday %> -
-    <%= link_to_permalink(article,h(article.title)) %>
-    <% if !article.tags.empty? %> <%= t(".posted_in") %>
-      <%= safe_join(article.tags.collect {|t| link_to_permalink t,t.display_name }, ", ") %>
+    <%= link_to_permalink(article, h(article.title)) %>
+    <% if !article.tags.empty? %> <%= t('.posted_in') %>
+      <%= safe_join(article.tags.map { |t| link_to_permalink t, t.display_name }, ', ') %>
     <% end %>
   </div>
 <% end %>