publify_core 9.0.0.pre6 → 9.2.1

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

@@ -1,3 +1,3 @@
-<div id="viewpage" >
-  <%= html @page %>
+<div id="viewpage">
+  <%= raw html @page %>
 </div>

data/app/views/authors/show.html.erb

@@ -1,40 +1,30 @@
 <div class="post">
   <h2><%= @author.nickname %></h2>
   <%= display_user_avatar(@author, 'thumb', 'alignright') %>
-
   <%= author_description @author %>
-
-  <h2><%= t(".contact_information") %></h2>
+  <h2><%= t('.contact_information') %></h2>
   <ul>
-    <%= display_profile_item @author.url, t(".web_site") %>
-    <%= display_profile_item @author.msn, t(".msn") %>
-    <%= display_profile_item @author.yahoo, t(".yahoo") %>
-    <%= display_profile_item @author.jabber, t(".jabber") %>
-    <%= display_profile_item @author.aim, t(".aim") %>
-    <%= display_profile_item @author.twitter, t(".twitter") %>
+    <%= display_profile_item @author.url, t('.web_site') %>
+    <%= display_profile_item @author.msn, t('.msn') %>
+    <%= display_profile_item @author.yahoo, t('.yahoo') %>
+    <%= display_profile_item @author.jabber, t('.jabber') %>
+    <%= display_profile_item @author.aim, t('.aim') %>
+    <%= display_profile_item @author.twitter, t('.twitter') %>
   </ul>
 </div>
 
 <% if @articles.empty? %>
   <div class="post">
-  <p><%= t(".this_author_has_not_published_any_article_yet")%></p>
-</div>
-<% else
-currentmonth = 0
-currentyear = 0
-for article in @articles
-  if (article.published_at.month != currentmonth || article.published_at.year != currentyear)
-    currentmonth = article.published_at.month
-    currentyear = article.published_at.year %>
-  <h3 class="archivemonth"><%= l(article.published_at, format: :letters_month_with_year) %></h3>
-  <% end %>
-    <div class="archivepost">
-      <%= article.published_at.mday %> -
-      <%= link_to_permalink(article,h(article.title)) %>
-      <% if !article.tags.empty? %> <%= t(".posted_in") %>
-        <%= article.tags.collect {|c| link_to_permalink c,c.name }.join(", ") %>
+    <p><%= t('.this_author_has_not_published_any_article_yet') %></p>
+  </div>
+<% else %>
+  <%= cache [@articles, params[:page]] do %>
+    <% @articles.group_by(&:publication_month).each do |_month, articles| %>
+      <h3 class="archivemonth">
+        <%= l(articles.first.published_at, format: :letters_month_with_year) %>
+      </h3>
+      <%= render partial: 'articles/archives_article', collection: articles, as: :article %>
     <% end %>
-    </div>
   <% end %>
-    <%= paginate @articles, :next_label => "#{t(".next_page")} &raquo;", :previous_label => "&laquo; #{t('.previous_page')}" %>
-  <%  end %>
+  <%= paginate @articles %>
+<% end %>

data/app/views/authors/show_atom_feed.atom.builder

@@ -1,8 +1,9 @@
-atom_feed do |feed|
-  render "shared/atom_header", {:feed => feed, :items => @articles}
+# frozen_string_literal: true
+
+atom_feed root_url: author_url(@author) do |feed|
+  render "shared/atom_header", feed: feed, items: @articles
 
   @articles.each do |item|
-    render "shared/atom_item_article", {:feed => feed, :item => item}
+    render "shared/atom_item_article", feed: feed, item: item
   end
 end
-

data/app/views/authors/show_rss_feed.rss.builder

@@ -1,20 +1,20 @@
-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.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",
-        "xmlns:trackback" => "http://madskills.com/public/xml/rss/module/trackback/" do
+        "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.gsub("_", "-").downcase
+    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
 
     @articles.each do |item|
-      render "shared/rss_item_article", {:xm => xml, :item => item}
+      render "shared/rss_item_article", xm: xml, item: item
     end
   end
 end
-

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

@@ -1,16 +1,17 @@
-<li id="comment-<%= comment.id %>" <%= 'class="author_comment"' if comment.user %> <%= onhover_show_admin_tools(:comment, comment.id) %>>
-  <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>
-  <%= t(".said")%> <%= display_date_and_time comment.created_at %>:
-  </p>
-  <div class="content">
-    <%= raw nofollowify_links comment.generate_html(:body) %>
-    <% unless comment.published %>
-      <div class="spamwarning">
-        <%= t(".this_comment_has_been_flagged_for_moderator_approval")%>
-      </div>
-    <% end %>
-  </div>
-</li>
-
+<% cache comment do %>
+  <li id="comment-<%= comment.id %>" <%= 'class="author_comment"' if comment.user %> <%= onhover_show_admin_tools(:comment, comment.id) %>>
+    <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>
+    <%= t('.said') %> <%= display_date_and_time comment.created_at %>:
+    </p>
+    <div class="content">
+      <%= raw nofollowify_links comment.generate_html(:body) %>
+      <% unless comment.published? %>
+        <div class="spamwarning">
+          <%= t('.this_comment_has_been_flagged_for_moderator_approval') %>
+        </div>
+      <% end %>
+    </div>
+  </li>
+<% end %>

data/app/views/devise/mailer/reset_password_instructions.html.erb

@@ -1,13 +1,11 @@
 <% require 'devise/version' %>
-<%
-  # TODO: Link user to blog so we can do @resource.blog
-  blog = Blog.first
-%>
-<p><%= t('.greeting', :recipient => @resource.login, :default => "Hello #{@resource.login}!") %></p>
+<%# TODO: Link user to blog so we can do @resource.blog
+  blog = Blog.first %>
+<p><%= t('.greeting', recipient: @resource.login, default: "Hello #{@resource.login}!") %></p>
 
-<p><%= t('.instruction', :default => "Someone has requested a link to change your password, and you can do this through the link below.") %></p>
+<p><%= t('.instruction', default: 'Someone has requested a link to change your password, and you can do this through the link below.') %></p>
 
-<p><%= link_to t('.action', :default => "Change my password"), edit_password_url(@resource, reset_password_token: @token, host: blog.base_url) %></p>
+<p><%= link_to t('.action', default: 'Change my password'), edit_password_url(@resource, reset_password_token: @token, host: blog.base_url) %></p>
 
-<p><%= t('.instruction_2', :default => "If you didn't request this, please ignore this email.") %></p>
-<p><%= t('.instruction_3', :default => "Your password won't change until you access the link above and create a new one.") %></p>
+<p><%= t('.instruction_2', default: "If you didn't request this, please ignore this email.") %></p>
+<p><%= t('.instruction_3', default: "Your password won't change until you access the link above and create a new one.") %></p>

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

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

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

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+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.description this_blog.blog_subtitle
+
+    @feedback.each do |item|
+      render "shared/rss_item_#{item.type.downcase}", feed: xml, item: item
+    end
+  end
+end

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>