publify_core 9.0.0 → 9.2.2

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

@@ -1,5 +1,5 @@
 <% content_for :page_title do %>
-  <%= "#{this_blog.blog_name} - #{t('.change_your_password', :default => 'Change your password')}" %>
+  <%= "#{this_blog.blog_name} - #{t('.change_your_password', default: 'Change your password')}" %>
 <% end %>
 
 <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
@@ -12,12 +12,12 @@
     <% if @minimum_password_length %>
       <em>(<%= t('devise_custom.characters_minimum', min: @minimum_password_length) %>)</em><br />
     <% end %>
-    <%= f.password_field :password, class: 'form-control', autofocus: true, autocomplete: "off" %>
+    <%= 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.password_field :password_confirmation, class: 'form-control', autocomplete: "off" %>
+    <%= f.password_field :password_confirmation, class: 'form-control', autocomplete: 'off' %>
   </div>
 
   <div class="actions">
@@ -25,4 +25,4 @@
   </div>
 <% end %>
 
-<%= render "devise/shared/links" %>
+<%= render 'devise/shared/links' %>

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

@@ -1,5 +1,5 @@
 <% content_for :page_title do %>
-  <%= "#{this_blog.blog_name} - #{t('.forgot_your_password', :default => 'Forgot your password?')}" %>
+  <%= "#{this_blog.blog_name} - #{t('.forgot_your_password', default: 'Forgot your password?')}" %>
 <% end %>
 
 <%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>

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

@@ -1,9 +1,9 @@
 <% content_for :page_title do %>
-  <%= "#{this_blog.blog_name} - #{t('.sign_up', :default => "Sign up")}" %>
+  <%= "#{this_blog.blog_name} - #{t('.sign_up', default: 'Sign up')}" %>
 <% end %>
 
 <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
-  <%= devise_error_messages! %>
+  <%= render "devise/shared/error_messages", resource: resource %>
 
   <div class="form-group">
     <%= f.label :login %>
@@ -20,12 +20,12 @@
     <% if @minimum_password_length %>
       <em>(<%= t('devise_custom.characters_minimum', min: @minimum_password_length) %>)</em><br />
     <% end %>
-    <%= f.password_field :password, class: 'form-control', autofocus: true, autocomplete: "off" %>
+    <%= f.password_field :password, class: 'form-control', autofocus: true, autocomplete: 'off' %>
   </div>
 
   <div class="form-group">
     <%= f.label :password_confirmation %><br />
-    <%= f.password_field :password_confirmation, class: 'form-control', autocomplete: "off" %>
+    <%= f.password_field :password_confirmation, class: 'form-control', autocomplete: 'off' %>
   </div>
 
   <div class="actions">
@@ -33,4 +33,4 @@
   </div>
 <% end %>
 
-<%= render "devise/shared/links" %>
+<%= render 'devise/shared/links' %>

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

@@ -1,5 +1,5 @@
 <% content_for :page_title do %>
-  <%= "#{this_blog.blog_name} - #{t('.sign_in', :default => "Sign in")}" %>
+  <%= "#{this_blog.blog_name} - #{t('.sign_in', default: 'Sign in')}" %>
 <% end %>
 
 <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
@@ -15,7 +15,7 @@
     </div>
 
     <div class="checkbox">
-      <%= f.label :remember_me do%>
+      <%= f.label :remember_me do %>
         <%= f.check_box :remember_me %>
         <%= User.human_attribute_name(:remember_me) %>
       <% end %>
@@ -28,5 +28,5 @@
 <% end %>
 
 <% content_for :account_links do %>
-  <%= render "devise/shared/links" %>
+  <%= render 'devise/shared/links' %>
 <% end %>

data/app/views/errors/404.html.erb

@@ -1,2 +1,2 @@
-<h2><%= t("errors.page_not_found") %></h2>
-<p><%= t("errors.the_page_you_are_looking_for") %></p>
+<h2><%= t('errors.page_not_found') %></h2>
+<p><%= t('errors.the_page_you_are_looking_for') %></p>

data/app/views/feedback/index.atom.builder

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 atom_feed root_url: this_blog.base_url do |feed|
-  render 'shared/atom_header', feed: feed, items: @feedback
+  render "shared/atom_header", feed: feed, items: @feedback
 
   @feedback.each do |item|
     render "shared/atom_item_#{item.type.downcase}", feed: feed, item: item

data/app/views/feedback/index.rss.builder

@@ -1,15 +1,16 @@
-xml.instruct! :xml, version: '1.0', encoding: 'UTF-8'
-xml.instruct! 'xml-stylesheet', type: 'text/css', href: url_for('/stylesheets/rss.css')
+# frozen_string_literal: true
 
-xml.rss 'version' => '2.0', 'xmlns:dc' => 'http://purl.org/dc/elements/1.1/',
-        'xmlns:atom' => 'http://www.w3.org/2005/Atom',
-        'xmlns:trackback' => 'http://madskills.com/public/xml/rss/module/trackback/' do
+xml.instruct! :xml, version: "1.0", encoding: "UTF-8"
+xml.instruct! "xml-stylesheet", type: "text/css", href: url_for("/stylesheets/rss.css")
+
+xml.rss "version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/",
+        "xmlns:atom" => "http://www.w3.org/2005/Atom" do
   xml.channel do
     xml.title feed_title
     xml.link this_blog.base_url
-    xml.atom :link, href: request.url, rel: 'self', type: 'application/rss+xml'
-    xml.language this_blog.lang.tr('_', '-').downcase
-    xml.ttl '40'
+    xml.atom :link, href: request.url, rel: "self", type: "application/rss+xml"
+    xml.language this_blog.lang.tr("_", "-").downcase
+    xml.ttl "40"
     xml.description this_blog.blog_subtitle
 
     @feedback.each do |item|

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

@@ -1,33 +1,33 @@
 <!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">
-  <title>
-    <%= yield :page_title %>
-  </title>
-  <meta http-equiv="imagetoolbar" content="no">
-  <%= javascript_include_tag 'publify_admin', async: Rails.env.production? %>
-  <%= stylesheet_link_tag "accounts" %>
-</head>
-<body>
-  <div class="container">
-    <div class="row">
-      <div class="col-md-4 col-md-offset-4">
-        <div class="panel panel-default">
-          <div class="panel-heading">
-            <h1 class='panel-title'><%= link_to("Publify", "http://publify.co") %></h1>
+  <head>
+    <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" />
+    <%= javascript_include_tag 'publify_admin', async: Rails.env.production? %>
+    <%= stylesheet_link_tag 'accounts' %>
+  </head>
+  <body>
+    <div class="container">
+      <div class="row">
+        <div class="col-md-4 col-md-offset-4">
+          <div class="panel panel-default">
+            <div class="panel-heading">
+              <h1 class='panel-title'><%= link_to('Publify', 'https://publify.github.io') %></h1>
+            </div>
+            <div class="panel-body">
+              <%= render 'shared/flash', flash: flash %>
+              <%= yield %>
+            </div>
           </div>
-          <div class="panel-body">
-            <%= render 'shared/flash', flash: flash %>
-            <%= yield %>
-          </div>
-        </div>
-        <% if content_for?(:account_links) %>
+          <% if content_for?(:account_links) %>
             <%= yield :account_links %>
-        <% end %>
+          <% end %>
+        </div>
       </div>
     </div>
-  </div>
-</body>
+  </body>
 </html>

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

@@ -1,37 +1,37 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <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">
-  <%= javascript_include_tag 'publify_admin', async: Rails.env.production? %>
-  <%= stylesheet_link_tag 'publify_admin' %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-  <%= render 'admin/shared/menu' %>
-  <div id='main'>
-    <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 %>
+  <head>
+    <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" />
+    <%= javascript_include_tag 'publify_admin', async: Rails.env.production? %>
+    <%= stylesheet_link_tag 'publify_admin' %>
+    <%= csrf_meta_tags %>
+  </head>
+  <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>
-        <% end %>
-        <%= yield  %>
-      </div>
-    </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 %> – Icons courtesy of <a href='http://glyphicons.com/'>Glyphicons</a>
+          <% if content_for?(:page_heading) %>
+            <div class='page-header'>
+              <%= yield :page_heading %>
+            </div>
+          <% end %>
+          <%= yield %>
+        </div>
       </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>
+        </div>
+      </footer>
     </div>
-  </footer>
-</div>
-</body>
+  </body>
 </html>

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

@@ -3,8 +3,9 @@
   <head>
     <%= render 'shared/page_header' %>
     <%= themeable_stylesheet_link_tag :theme %>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title><%=h page_title %></title>
+    <%= themeable_javascript_include_tag :theme %>
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title><%= h page_title %></title>
   </head>
 
   <body>
@@ -24,7 +25,7 @@
 
       <div class="footer">
         <p class="legal">
-        <%= t(".powered_by_html", powered_by: link_to('Publify', 'http://publify.co')) %>
+        <%= t('.powered_by_html', powered_by: link_to('Publify', 'https://publify.github.io')) %>
         </p>
       </div>
     </div>

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

@@ -1,31 +1,17 @@
 <!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' %>
-  <style type="text/css">
-    #carousel-content .slide { width: <%= this_blog.image_thumb_size %>; }
-    @font-face {
-      font-family: 'Open Sans';
-      font-style: normal;
-      font-weight: 400;
-      src: local('Open Sans'), local('OpenSans'), url(<%= File.join(this_blog.base_url, 'stylesheets', 'fonts', 'open-sans.woff') %>) format('woff');
-    }
-    @font-face {
-      font-family: 'Open Sans';
-      font-style: normal;
-      font-weight: 700;
-      src: local('Open Sans Bold'), local('OpenSans-Bold'), url(<%= File.join(this_blog.base_url, 'stylesheets', 'fonts', 'open-sans-bold.woff') %>) format('woff');
-    }
-  </style>
+  <%= csrf_meta_tags %>
 </head>
 <body>
   <div id='main'>
-    <%= yield  %>
+    <%= yield %>
   </div>
 </body>
 </html>

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

@@ -2,7 +2,7 @@
 <div class="sidebar-body">
   <ul>
     <li><%= link_to(t('.rss_feed'), feed_rss) %></li>
-    <li><%= link_to(t('.admin'), :controller => 'admin/dashboard') %></li>
-    <li><a href="http://publify.co"><%= t('.powered_by_publify') %></a></li>
+    <li><%= link_to(t('.admin'), controller: 'admin/dashboard') %></li>
+    <li><a href="https://publify.github.io"><%= t('.powered_by_publify') %></a></li>
   </ul>
 </div>

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

@@ -8,7 +8,7 @@
         <%= link_to note.redirect.from_url, note.redirect.from_url %> |
         <%= author_link note %>
         <% unless note.twitter_id.blank? %>
-          <%=  " | #{link_to(t(".view_on_twitter"), note.twitter_url, {class: 'u-syndication', rel: 'syndication'})}" %>
+          <%= " | #{link_to(t('.view_on_twitter'), note.twitter_url, class: 'u-syndication', rel: 'syndication')}" %>
         <% end %>
       </small>
     </footer>

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

@@ -2,7 +2,7 @@
   <div class='h-entry hentry h-as-note'>
     <article class=' well well-small'>
       <% if @reply['user']['profile_image_url'] %>
-        <%= image_tag(@reply['user']['profile_image_url'], class: "alignleft", alt: @reply['user']['name']) %>
+        <%= 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>

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

@@ -1,5 +1,5 @@
-<p><em>This is being sent to <%=h @user.name %> because you asked to be notified via email whenever
-new content is posted to  <a href="<%= @blog.base_url%>"><%= @blog.blog_name %></a>
+<p><em>This is being sent to <%= h @user.name %> because you asked to be notified via email whenever
+new content is posted to  <a href="<%= @blog.base_url %>"><%= @blog.blog_name %></a>
 To unsubscribe, go to
-<a href="<%= @link_url = @blog.url_for(:controller => '/admin/users', :action => 'edit', :id => @user.id) %>"><%=h @link_url%></a>
+<a href="<%= @link_url = @blog.url_for(controller: '/admin/users', action: 'edit', id: @user.id) %>"><%= h @link_url %></a>
 and change your user settings.</p>

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

@@ -1,7 +1,7 @@
-<p>A new article has been posted on <%=h @blog.blog_name %>:</p>
+<p>A new article has been posted on <%= h @blog.blog_name %>:</p>
 
 <%= render 'mail_header' do %>
-  <h2><%=h @article.title %></h2>
+  <h2><%= h @article.title %></h2>
   <%= html @article, :body %>
 <% end %>
 <%= render 'mail_footer' %>

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

@@ -1,12 +1,12 @@
 <p>A new comment has been posted on
-    <a href="<%= @blog.base_url%>"><%= @blog.blog_name %></a>, responding to
-    <a href="<%= @comment.article.permalink_url %>"><%=h(@comment.article.title) %></a>.</p>
+    <a href="<%= @blog.base_url %>"><%= @blog.blog_name %></a>, responding to
+    <a href="<%= @comment.article.permalink_url %>"><%= h(@comment.article.title) %></a>.</p>
 
 <%= render 'mail_header' do %>
-  <h2><%=h @comment.title %></h2>
-  <cite><strong><%= (@comment.url.blank?) ? h(@comment.author) : link_to(h(@comment.author), @comment.url) %></strong> </cite>
+  <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/notification_mailer/notif_user.html.erb

@@ -1,6 +1,6 @@
 <html>
 <body>
-  <p>Your <a href="<%= @blog.base_url%>"><%= @blog.blog_name %></a> account has been created.</p>
+  <p>Your <a href="<%= @blog.base_url %>"><%= @blog.blog_name %></a> account has been created.</p>
 
   <%= render 'mail_header' do %>
     <p>Your can log in using your chosen login name, <%= h @user.login %>, and your password.</p>

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

@@ -1,5 +1,5 @@
 <% unless sidebar.pages.blank? %>
-  <h3 class="sidebar-title"><%= t(".pages")%></h3>
+  <h3 class="sidebar-title"><%= t('.pages') %></h3>
   <div class="sidebar-body">
     <ul>
       <% for page in sidebar.pages %>

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

@@ -2,9 +2,9 @@
   <label for="q"><%= sidebar.title %></label>
 </h3>
 <div class="sidebar-body">
-  <%= form_tag({:controller => 'articles',  :action => 'search'}, {:method => 'get', :id => 'sform'}) do %>
+  <%= 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="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 %>