publify_core 10.0.3 → 11.0.0

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

@@ -10,43 +10,43 @@
   </div>
 <% end %>
 
-<fieldset class='form-horizontal'>
+<fieldset class='mb-4'>
   <legend><%= t('.account_settings') %></legend>
-  <div class='form-group'>
-    <label class='control-label col-sm-2' for="user_login"><%= t('.login') %></label>
-    <div class='col-sm-5'>
+  <div class='form-group row'>
+    <label class='col-form-label col-md-2' for="user_login"><%= t('.login') %></label>
+    <div class='col-md-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>
-    <div class='col-sm-5'>
+  <div class='form-group row'>
+    <label class='col-form-label col-md-2' for="user_password"><%= t('.password') %></label>
+    <div class='col-md-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>
-    <div class='col-sm-5'>
+  <div class='form-group row'>
+    <label class='col-form-label col-md-2' for="user_password_confirmation"><%= t('.password_confirmation') %></label>
+    <div class='col-md-5'>
       <%= 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>
-    <div class='col-sm-5'>
+  <div class='form-group row'>
+    <label class='col-form-label col-md-2' for="user_email"><%= t('.email') %></label>
+    <div class='col-md-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>
-      <div class='col-sm-5'>
-        <%= f.select :profile, [:admin, :publisher, :contributor], { include_blank: false }, { class: 'form-control' } %>
+    <div class='form-group row'>
+      <label class='col-form-label col-md-2' for="user_profile"><%= t('.profile') %></label>
+      <div class='col-md-5'>
+        <%= f.select :profile, [:admin, :publisher, :contributor], { include_blank: false }, { class: 'form-select' } %>
       </div>
     </div>
-    <div class='form-group'>
-      <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'>
+    <div class='form-group row'>
+      <label class='col-form-label col-md-2' for="user_state"><%= t('.user_status') %></label>
+      <div class='col-md-5'>
+        <select name="user[state]" class='form-select'>
           <% User::STATUS.each do |state| %>
             <option value="<%= state %>" <%= 'selected' if user.state == state %>><%= t("user.status.#{state}") %></option>
           <% end %>
@@ -56,40 +56,40 @@
   <% end %>
 </fieldset>
 
-<fieldset class='form-horizontal'>
+<fieldset class='mb-4'>
   <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'>
+  <div class='form-group row'>
+    <label class='col-form-label col-md-2' for="user_firstname"><%= t('.firstname') %></label>
+    <div class='col-md-5'>
       <%= f.text_field :firstname, class: 'form-control' %>
     </div>
   </div>
-  <div class='form-group'>
-    <label class='control-label col-sm-2' for="user_lastname"><%= t('.lastname') %></label>
-    <div class='col-sm-5'>
+  <div class='form-group row'>
+    <label class='col-form-label col-md-2' for="user_lastname"><%= t('.lastname') %></label>
+    <div class='col-md-5'>
       <%= f.text_field :lastname, class: 'form-control' %>
     </div>
   </div>
-  <div class='form-group'>
-    <label class='control-label col-sm-2' for="user_nickname"><%= t('.nickname') %></label>
-    <div class='col-sm-5'>
+  <div class='form-group row'>
+    <label class='col-form-label col-md-2' for="user_nickname"><%= t('.nickname') %></label>
+    <div class='col-md-5'>
       <%= f.text_field :nickname, class: 'form-control' %>
     </div>
   </div>
   <% unless user.login.nil? %>
-    <div class='form-group'>
-      <label class='control-label col-sm-2' for="user_name"><%= t('.display_name') %></label>
-      <div class='col-sm-5'>
-        <select name="user[name]" id="user_name" class='form-control'>
+    <div class='form-group row'>
+      <label class='col-form-label col-md-2' for="user_name"><%= t('.display_name') %></label>
+      <div class='col-md-5'>
+        <select name="user[name]" id="user_name" class='form-select'>
           <%= options_for_select(user.display_names, user.name) %>
         </select>
       </div>
     </div>
   <% end %>
-  <div class='form-group'>
-    <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_name]" id="text_filter_name" class='form-control'>
+  <div class='form-group row'>
+    <label class='col-form-label col-md-2' for="text_filter_name"><%= t('.article_filter') %></label>
+    <div class='col-md-5'>
+      <select name="user[text_filter_name]" id="text_filter_name" class='form-select'>
         <%= options_for_select text_filter_options, user.text_filter_name %>
       </select>
     </div>
@@ -97,12 +97,12 @@
 </fieldset>
 
 <% unless controller.controller_name == 'users' %>
-  <fieldset class='form-horizontal'>
+  <fieldset class='mb-4'>
     <legend><%= t('.avatar') %></legend>
     <p><%= display_user_avatar(current_user, 'thumb') %> <%= t('.avatar_current') %></p>
-    <div class='form-group'>
-      <label class='control-label col-sm-2' for="avatar"><%= t('.upload') %></label>
-      <div class='col-sm-5'>
+    <div class='form-group row'>
+      <label class='col-form-label col-md-2' for="avatar"><%= t('.upload') %></label>
+      <div class='col-md-5'>
         <%= f.file_field :filename, class: 'input-file' %>
         <p class='help-block'><%= t('.upload_file') %></p>
       </div>
@@ -110,11 +110,11 @@
   </fieldset>
 <% end %>
 
-<fieldset class='form-horizontal'>
+<fieldset class='mb-4'>
   <legend><%= t('.notification_settings') %></legend>
-  <div class='form-group'>
-    <label class='control-label col-sm-2'><%= t('.notifications') %></label>
-    <div class='col-sm-5'>
+  <div class='form-group row'>
+    <label class='col-form-label col-md-2'><%= t('.notifications') %></label>
+    <div class='col-md-5'>
       <label class='checkbox' for="user_notify_via_email">
         <%= f.check_box :notify_via_email %>
         <%= t('.notification_email') %>
@@ -133,74 +133,74 @@
 
 <% unless controller.controller_name == 'users' %>
 
-  <fieldset class='form-horizontal'>
+  <fieldset class='mb-4'>
     <legend><%= t('.twitter') %></legend>
     <% unless twitter_available?(this_blog, current_user) %>
       <%= 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>
-      <div class='col-sm-5'>
+    <div class='form-group row'>
+      <label class='col-form-label col-md-2' for="user_twitter_account"><%= t('.twitter_account') %></label>
+      <div class='col-md-5'>
         <%= 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>
-      <div class='col-sm-5'>
+    <div class='form-group row'>
+      <label class='col-form-label col-md-2' for="user_twitter_oauth_token"><%= t('.twitter_oauth') %></label>
+      <div class='col-md-5'>
         <%= 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>
-      <div class='col-sm-5'>
+    <div class='form-group row'>
+      <label class='col-form-label col-md-2' for="user_twitter_oauth_token_secret"><%= t('.twitter_oauth_secret') %></label>
+      <div class='col-md-5'>
         <%= f.text_field :twitter_oauth_token_secret, class: 'form-control', disabled: twitter_available?(this_blog, current_user) %>
       </div>
     </div>
   </fieldset>
 
-  <fieldset class='form-horizontal'>
+  <fieldset class='mb-4'>
     <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>
-      <div class='col-sm-5'>
+    <div class='form-group row'>
+      <label class='col-form-label col-md-2' for="user_description"><%= t('.about') %></label>
+      <div class='col-md-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>
-      <div class='col-sm-5'>
+    <div class='form-group row'>
+      <label class='col-form-label col-md-2' for="user_url"><%= t('.website') %></label>
+      <div class='col-md-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>
-      <div class='col-sm-5'>
+    <div class='form-group row'>
+      <label class='col-form-label col-md-2' for="user_msn"><%= t('.msn') %></label>
+      <div class='col-md-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>
-      <div class='col-sm-5'>
+    <div class='form-group row'>
+      <label class='col-form-label col-md-2' for="user_yahoo"><%= t('.yahoo') %></label>
+      <div class='col-md-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>
-      <div class='col-sm-5'>
+    <div class='form-group row'>
+      <label class='col-form-label col-md-2' for="user_jabber"><%= t('.jabber') %></label>
+      <div class='col-md-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>
-      <div class='col-sm-5'>
+    <div class='form-group row'>
+      <label class='col-form-label col-md-2' for="user_aim"><%= t('.aim') %></label>
+      <div class='col-md-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>
-      <div class='col-sm-5'>
+    <div class='form-group row'>
+      <label class='col-form-label col-md-2' for="user_twitter"><%= t('.twitter') %></label>
+      <div class='col-md-5'>
         <%= f.text_field :twitter, class: 'form-control' %>
       </div>
     </div>

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

@@ -2,7 +2,7 @@
  <div class="post">
    <h2><%= link_to_permalink article, article.title %></h2>
    <% if article.password.blank? %>
-     <%= article.html(:body).gsub(%r{</?[^>]*>}, '').slice(0..300) %>...
+     <%= article.excerpt_text(300) %>
    <% end %>
   </div>
 <% end %>

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

@@ -13,19 +13,17 @@
   <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">
+        <div class="col-lg-4 offset-lg-4">
+          <div class="card">
+            <div class="card-body">
+              <h1 class="card-title"><%= link_to('Publify', 'https://publify.github.io') %></h1>
               <%= render 'shared/flash', flash: flash %>
               <%= yield %>
+              <% if content_for?(:account_links) %>
+                <%= yield :account_links %>
+              <% end %>
             </div>
           </div>
-          <% if content_for?(:account_links) %>
-            <%= yield :account_links %>
-          <% end %>
         </div>
       </div>
     </div>

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

@@ -12,9 +12,9 @@
   <body>
     <%= render 'admin/shared/menu' %>
     <div class='container-fluid'>
-      <%= render 'shared/flash', flash: flash %>
+      <%= render 'admin/shared/flash', flash: flash %>
       <% if content_for?(:page_heading) %>
-        <div class='page-header'>
+        <div class="pb-2 mt-4 mb-4 border-bottom">
           <%= yield :page_heading %>
         </div>
       <% end %>

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

@@ -1,5 +1,20 @@
 <div class="hfeed">
   <div class='h-entry hentry h-as-note'>
+    <% if @reply %>
+      <article class=' well well-small'>
+        <% if @reply['user']['profile_image_url'] %>
+          <%= image_tag(@reply['user']['profile_image_url'], class: 'alignleft', alt: @reply['user']['name']) %>
+        <% end %>
+        <strong><%= get_reply_context_url(@reply) %></strong>
+        <p><%= nofollowify_links(@note.generate_html(:in_reply_to, @reply['text'])) %></p>
+        <p>
+        <small>
+          <%= get_reply_context_twitter_link(@reply) %>
+        </small>
+        </p>
+      </article>
+    <% end %>
+
     <%= render partial: 'note', object: @note %>
   </div>
 </div>

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

@@ -1,5 +1,5 @@
 <div class="row">
-  <div class="col-md-8 col-md-offset-2" id="error-message-page">
+  <div class="col-lg-8 offset-lg-2" id="error-message-page">
     <% if this_blog.errors.any? %>
       <div id="error_explanation">
         <h2><%= t("errors.template.header", model: 'blog', count: this_blog.errors.count) %></h2>

data/app/views/shared/_atom_item_article.atom.builder

@@ -7,9 +7,7 @@ feed.entry(item, id: "urn:uuid:#{item.guid}", published: item.published_at,
   end
 
   if item.is_a?(Note)
-    truncated_body = truncate(item.html(:body).strip_html,
-                              length: 80, separator: " ", omissions: "...")
-    entry.title truncated_body, "type" => "html"
+    entry.title truncated_body(item), "type" => "html"
   else
     entry.title item.title, "type" => "html"
   end

data/app/views/shared/_rss_item_article.rss.builder

@@ -2,8 +2,7 @@
 
 xm.item do
   if item.is_a?(Note)
-    xm.title truncate(item.html(:body).strip_html, length: 80, separator: " ",
-                                                   omissions: "...")
+    xm.title truncated_body(item)
   else
     xm.title item.title
   end

data/config/i18n-tasks.yml

@@ -46,6 +46,5 @@ ignore_missing:
 ## Consider these keys used:
 ignore_unused:
   - 'time.formats.*'
-  - 'layouts.default.designed_by'
   - 'date.*'
   - 'activerecord.errors.models.*'

data/config/locales/ar.yml

@@ -19,6 +19,8 @@ ar:
           attributes:
             title:
               blank: لا يمكن تركها فارغة
+        user:
+          weak_password: is too weak
   admin:
     articles:
       access_granted:
@@ -842,8 +844,7 @@ ar:
   layouts:
     administration:
       powered_by: بفخر تُشغل بواسطة
-    default:
-      designed_by: صُممت بواسطة %{designed_by}
+    application:
       powered_by_html: مشغل بواسطة %{powered_by}
   notes:
     note:

data/config/locales/da.yml

@@ -19,6 +19,8 @@ da:
           attributes:
             title:
               blank: can't be blank
+        user:
+          weak_password: is too weak
   admin:
     articles:
       access_granted:
@@ -809,8 +811,7 @@ da:
   layouts:
     administration:
       powered_by: is proudly powered by
-    default:
-      designed_by: Designed by %{designed_by}
+    application:
       powered_by_html: Powered by %{powered_by}
   notes:
     note:

data/config/locales/de.yml

@@ -19,6 +19,8 @@ de:
           attributes:
             title:
               blank: can't be blank
+        user:
+          weak_password: is too weak
   admin:
     articles:
       access_granted:
@@ -813,8 +815,7 @@ de:
   layouts:
     administration:
       powered_by: is proudly powered by
-    default:
-      designed_by: Designed by %{designed_by}
+    application:
       powered_by_html: Powered by %{powered_by}
   notes:
     note:

data/config/locales/en.yml

@@ -19,6 +19,8 @@ en:
           attributes:
             title:
               blank: can't be blank
+        user:
+          weak_password: is too weak
   admin:
     articles:
       access_granted:
@@ -808,8 +810,7 @@ en:
   layouts:
     administration:
       powered_by: is proudly powered by
-    default:
-      designed_by: Designed by %{designed_by}
+    application:
       powered_by_html: Powered by %{powered_by}
   notes:
     note:

data/config/locales/es-MX.yml

@@ -19,6 +19,8 @@ es-MX:
           attributes:
             title:
               blank: no puede ser vacío
+        user:
+          weak_password: is too weak
   admin:
     articles:
       access_granted:
@@ -811,8 +813,7 @@ es-MX:
   layouts:
     administration:
       powered_by: is proudly powered by
-    default:
-      designed_by: Designed by %{designed_by}
+    application:
       powered_by_html: Powered by %{powered_by}
   notes:
     note:

data/config/locales/fr.yml

@@ -19,6 +19,8 @@ fr:
           attributes:
             title:
               blank: ne peut être laissé vide
+        user:
+          weak_password: is too weak
   admin:
     articles:
       access_granted:
@@ -826,8 +828,7 @@ fr:
   layouts:
     administration:
       powered_by: Tourne fièrement sous
-    default:
-      designed_by: Design par %{designed_by}
+    application:
       powered_by_html: Propulsé par %{powered_by}
   notes:
     note:

data/config/locales/he.yml

@@ -19,6 +19,8 @@ he:
           attributes:
             title:
               blank: can't be blank
+        user:
+          weak_password: is too weak
   admin:
     articles:
       access_granted:
@@ -804,8 +806,7 @@ he:
   layouts:
     administration:
       powered_by: is proudly powered by
-    default:
-      designed_by: עוצב על ידי %{designed_by}
+    application:
       powered_by_html: מופעל על ידי %{powered_by}
   notes:
     note:

data/config/locales/it.yml

@@ -19,6 +19,8 @@ it:
           attributes:
             title:
               blank: can't be blank
+        user:
+          weak_password: is too weak
   admin:
     articles:
       access_granted:
@@ -810,8 +812,7 @@ it:
   layouts:
     administration:
       powered_by: is proudly powered by
-    default:
-      designed_by: Designed by %{designed_by}
+    application:
       powered_by_html: Powered by %{powered_by}
   notes:
     note:

data/config/locales/ja.yml

@@ -19,6 +19,8 @@ ja:
           attributes:
             title:
               blank: can't be blank
+        user:
+          weak_password: is too weak
   admin:
     articles:
       access_granted:
@@ -792,8 +794,7 @@ ja:
   layouts:
     administration:
       powered_by: is proudly powered by
-    default:
-      designed_by: Designed by %{designed_by}
+    application:
       powered_by_html: Powered by %{powered_by}
   notes:
     note:

data/config/locales/lt.yml

@@ -19,6 +19,8 @@ lt:
           attributes:
             title:
               blank: can't be blank
+        user:
+          weak_password: is too weak
   admin:
     articles:
       access_granted:
@@ -825,8 +827,7 @@ lt:
   layouts:
     administration:
       powered_by: is proudly powered by
-    default:
-      designed_by: Designed by %{designed_by}
+    application:
       powered_by_html: Powered by %{powered_by}
   notes:
     note:

data/config/locales/nb.yml

@@ -19,6 +19,8 @@ nb:
           attributes:
             title:
               blank: kan ikke være blank
+        user:
+          weak_password: is too weak
   admin:
     articles:
       access_granted:
@@ -804,8 +806,7 @@ nb:
   layouts:
     administration:
       powered_by: drives stolt av
-    default:
-      designed_by: Utformet av %{designed_by}
+    application:
       powered_by_html: Drives av %{powered_by}
   notes:
     note:

data/config/locales/nl.yml

@@ -19,6 +19,8 @@ nl:
           attributes:
             title:
               blank: mag niet leeg zijn
+        user:
+          weak_password: is too weak
   admin:
     articles:
       access_granted:
@@ -812,8 +814,7 @@ nl:
   layouts:
     administration:
       powered_by: wordt trots aangedreven door
-    default:
-      designed_by: Ontworpen door %{designed_by}
+    application:
       powered_by_html: Powered by %{powered_by}
   notes:
     note:

data/config/locales/pl.yml

@@ -19,6 +19,8 @@ pl:
           attributes:
             title:
               blank: nie może być puste
+        user:
+          weak_password: is too weak
   admin:
     articles:
       access_granted:
@@ -837,8 +839,7 @@ pl:
   layouts:
     administration:
       powered_by: dumnie działa na
-    default:
-      designed_by: Designed by %{designed_by}
+    application:
       powered_by_html: Powered by %{powered_by}
   notes:
     note:

data/config/locales/pt-BR.yml

@@ -19,6 +19,8 @@ pt-BR:
           attributes:
             title:
               blank: não pode ser vazio
+        user:
+          weak_password: is too weak
   admin:
     articles:
       access_granted:
@@ -812,8 +814,7 @@ pt-BR:
   layouts:
     administration:
       powered_by: é orgulhosamente desenvolvido por
-    default:
-      designed_by: Designed by %{designed_by}
+    application:
       powered_by_html: Powered by %{powered_by}
   notes:
     note: