publify_core 10.0.3 → 11.0.0

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

@@ -1,68 +1,60 @@
-<nav class='navbar navbar-default navbar-fixed-top' role="navigation">
-  <div class="navbar-header">
-    <%= link_to t(".home"), { controller: 'admin/dashboard' }, { class: 'navbar-brand' } %>
-    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#sidebar-top">
-      <span class="sr-only">Toggle navigation</span>
-      <span class="icon-bar"></span>
-      <span class="icon-bar"></span>
-      <span class="icon-bar"></span>
+<nav class="navbar navbar-expand-lg bg-light fixed-top" role="navigation">
+  <div class="container-fluid">
+    <a class="navbar-brand" href="<%= admin_dashboard_path %>"><%= t(".home") %></a>
+    <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#sidebar-top" aria-controls="sidebar-top" aria-expanded="false" aria-label="Toggle navigation">
+      <span class="navbar-toggler-icon"></span>
     </button>
-  </div>
-  <div class="collapse navbar-collapse" id="sidebar-top">
-    <ul class='nav navbar-nav'>
-      <% if can? :index, 'admin/articles' %>
-        <li class='dropdown'>
-          <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-            <%= t('.articles') %>
-            <b class="caret"></b>
-          </a>
-          <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-            <%= menu_item(t('.all_articles'), admin_articles_path) %>
-            <%= menu_item(t('.new_article'), new_admin_article_path) %>
-            <%= menu_item(t('.feedback'), admin_feedback_index_path) %>
-            <%= menu_item(t('.tags'), admin_tags_path) %>
-            <%= menu_item(t('.article_types'), admin_post_types_path) %>
-            <%= menu_item(t('.redirects'), admin_redirects_path) %>
-          </ul>
-        </li>
+    <div class="collapse navbar-collapse" id="sidebar-top">
+      <ul class="navbar-nav me-auto">
+        <% if can? :index, 'admin/articles' %>
+          <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              <%= t('.articles') %>
+            </a>
+            <ul class="dropdown-menu">
+              <%= menu_item(t('.all_articles'), admin_articles_path) %>
+              <%= menu_item(t('.new_article'), new_admin_article_path) %>
+              <%= menu_item(t('.feedback'), admin_feedback_index_path) %>
+              <%= menu_item(t('.tags'), admin_tags_path) %>
+              <%= menu_item(t('.article_types'), admin_post_types_path) %>
+              <%= menu_item(t('.redirects'), admin_redirects_path) %>
+            </ul>
+          </li>
       <% end %>
       <% if can? :index, 'admin/notes' %>
-        <%= menu_item(t('.notes'), admin_notes_path) %>
+        <%= top_menu_item(t('.notes'), admin_notes_path) %>
       <% end %>
       <% if can? :index, 'admin/pages' %>
-        <li class='dropdown'>
-          <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        <li class="nav-item dropdown">
+          <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             <%= t('.pages') %>
-            <b class="caret"></b>
           </a>
-          <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
+          <ul class="dropdown-menu">
             <%= menu_item(t('.all_pages'), admin_pages_path) %>
             <%= menu_item(t('.new_page'), new_admin_page_path) %>
           </ul>
         </li>
       <% end %>
       <% if can? :index, 'admin/resources' %>
-        <%= menu_item(t('.media_library'), admin_resources_path) %>
+        <%= top_menu_item(t('.media_library'), admin_resources_path) %>
       <% end %>
       <% if can? :index, 'admin/themes' %>
-        <li class='dropdown'>
-          <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        <li class="nav-item dropdown">
+          <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             <%= t('.design') %>
-            <b class="caret"></b>
           </a>
-          <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
+          <ul class="dropdown-menu">
             <%= menu_item(t('.choose_theme'), admin_themes_path) %>
             <%= menu_item(t('.customize_sidebar'), admin_sidebar_index_path) %>
           </ul>
         </li>
       <% end %>
       <% if can? :index, 'admin/settings' %>
-        <li class='dropdown'>
-          <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        <li class="nav-item dropdown">
+          <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             <%= t('.settings') %>
-            <b class="caret"></b>
           </a>
-          <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
+          <ul class="dropdown-menu">
             <%= menu_item(t('.general_settings'), admin_settings_path) %>
             <%= menu_item(t('.write'), write_admin_settings_path) %>
             <%= menu_item(t('.display'), display_admin_settings_path) %>
@@ -72,49 +64,45 @@
         </li>
       <% end %>
       <% if can? :index, 'admin/seo' %>
-        <li class='dropdown'>
-          <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+        <li class="nav-item dropdown">
+          <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             <%= t('.seo') %>
-            <b class="caret"></b>
           </a>
-          <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
+          <ul class="dropdown-menu">
             <%= menu_item(t('.global_seo_settings'), admin_seo_path(section: 'general')) %>
             <%= menu_item(t('.permalinks'), admin_seo_path(section: 'permalinks')) %>
             <%= menu_item(t('.titles'), admin_seo_path(section: 'titles')) %>
           </ul>
         </li>
       <% end %>
-      <%= menu_item(t('.view_blog'), this_blog.base_url) %>
+      <%= top_menu_item(t('.view_blog'), this_blog.base_url) %>
     </ul>
-    <ul class='nav navbar-nav pull-right'>
-      <li class='dropdown'>
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+    <ul class="navbar-nav mb-auto">
+      <li class="nav-item dropdown">
+        <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
           <%= t('.logged_in_as', login: current_user.display_name) %>
-          <b class="caret"></b>
         </a>
-        <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-          <li><%= link_to t('.profile'), controller: 'admin/profiles', action: 'index' %></li>
-          <li role="presentation" class="divider"></li>
-          <li><%= link_to t('.documentation'), 'https://github.com/fdv/publify/wiki' %></li>
-          <li><%= link_to t('.report_a_bug'), 'https://github.com/fdv/publify/issues' %></li>
-          <li><%= link_to t('.in_page_plugins'), 'https://github.com/fdv/publify/wiki/In-Page-Plugins' %></li>
-          <li><%= link_to t('.sidebar_plugins'), 'https://github.com/fdv/publify/wiki/Sidebar-plugins' %></li>
-          <li role="presentation" class="divider"></li>
-          <li><%= link_to t('.logout_html'), destroy_user_session_path, method: :delete %></li>
+        <ul class="dropdown-menu">
+          <%= menu_item t('.profile'), { controller: 'admin/profiles', action: 'index' } %>
+          <div class="dropdown-divider"></div>
+          <%= menu_item t('.documentation'), 'https://github.com/fdv/publify/wiki' %>
+          <%= menu_item t('.report_a_bug'), 'https://github.com/fdv/publify/issues' %>
+          <%= menu_item t('.in_page_plugins'), 'https://github.com/fdv/publify/wiki/In-Page-Plugins' %>
+          <%= menu_item t('.sidebar_plugins'), 'https://github.com/fdv/publify/wiki/Sidebar-plugins' %>
+          <div class="dropdown-divider"></div>
+          <%= link_to t('.logout_html'), destroy_user_session_path, method: :delete, class: "dropdown-item" %>
         </ul>
       </li>
-    </ul>
-    <ul class='nav navbar-nav pull-right'>
-      <li class='dropdown'>
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+
+      <li class="nav-item dropdown">
+        <a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
           <%= t('.new') %>
-          <b class="caret"></b>
         </a>
-        <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-          <li><%= link_to(t('.new_article'), controller: 'articles', action: 'new') %></li>
-          <li><%= link_to(t('.new_page'), controller: 'pages', actions: 'new') %></li>
-          <li><%= link_to(t('.new_media'), controller: 'resources', action: 'index') %></li>
-          <li><%= link_to(t('.new_note'), controller: 'notes') %></li>
+        <ul class="dropdown-menu dropdown-menu-end">
+          <%= menu_item(t('.new_article'), { controller: 'articles', action: 'new' }) %>
+          <%= menu_item(t('.new_page'), { controller: 'pages', actions: 'new' }) %>
+          <%= menu_item(t('.new_media'), { controller: 'resources', action: 'index' }) %>
+          <%= menu_item(t('.new_note'), { controller: 'notes' }) %>
         </ul>
       </li>
     </ul>

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

@@ -1,27 +1,23 @@
 <div id="sidebar-config" class='row'>
-  <div id="available" class='col-md-6'>
-    <div class='well'>
-      <h3><%= t('.available_items') %></h3>
-      <div id="available_box">
-        <% if available_sidebars.blank? %>
+  <div id="available" class='col-lg-6'>
+    <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>
-        <% else %>
-          <%= render partial: 'available', collection: available_sidebars %>
-        <% end %>
-      </div>
+      <% else %>
+        <%= render partial: 'available', collection: available_sidebars %>
+      <% end %>
     </div>
   </div>
 
-  <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;' %>
-      </h3>
-      <div id="active">
-        <%= render 'target', ordered_sidebars: ordered_sidebars %>
-      </div>
+  <div id="cnt-active" class='col-lg-6'>
+    <h3 id="hdr-active">
+      <%= 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 %>
     </div>
   </div>
 </div>

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

@@ -1,9 +1,9 @@
-<ul class="sortable" data-callback_url="<%= sortable_admin_sidebar_index_path %>">
+<div class="sortable" data-callback_url="<%= sortable_admin_sidebar_index_path %>">
   <% ordered_sidebars.each_with_index do |sidebar, index| %>
     <% next unless sidebar.id %>
     <%= render 'target_sidebar', sidebar: sidebar, sortable_index: index %>
   <% end %>
   <% if ordered_sidebars.empty? %>
-    <li><%= t('.drag_some_plugins_here') %></li>
+    <div><%= t('.drag_some_plugins_here') %></div>
   <% end %>
-</ul>
+</div>

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

@@ -1,20 +1,21 @@
-<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?' %>
+<div id="sidebar_<%= sidebar.id %>" class="sidebar_item" data-sortable="sidebar_<%= sidebar.id %>">
   <%= form_tag admin_sidebar_path(sidebar.id), remote: true, method: :put do |f| %>
-    <div class="active alert <%= class_for_admin_state(sidebar, sortable_index) %>">
+    <div class="active alert <%= class_for_admin_state(sidebar, sortable_index) %> alert-dismissible">
+      <%= link_to "", admin_sidebar_path(sidebar), class: 'btn-close', remote: true, method: :delete, data: { confirm: 'Are you sure?' }, aria_label: "Delete" %>
       <h3 class='light'><%= sidebar.display_name %></h3>
       <div class='widget-content'>
         <p><%= sidebar.description %></p>
       </div>
-    <div>
-    <% sidebar.class.fields.each do |row| %>
-      <%= row.line_html(sidebar) %>
-    <% end %>
-    <% if sidebar.class.fields.length > 0 %>
-      <p>
-        <%= submit_tag(t('.update'), class: 'btn btn-sm btn-success') %>
-      </p>
-    <% end %>
+      <div>
+        <% sidebar.class.fields.each do |row| %>
+          <%= row.line_html(sidebar) %>
+        <% end %>
+        <% if sidebar.class.fields.length > 0 %>
+          <p>
+          <%= submit_tag(t('.update'), class: 'btn btn-sm btn-success') %>
+          </p>
+        <% end %>
+      </div>
     </div>
   <% end %>
-</li>
+</div>

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

@@ -3,8 +3,8 @@
   <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>
+<div class="alert alert-info alert-dismissible fade show">
+  <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
   <p><%= t('.explain_how_its_works') %></p>
   <p><%= t('.download_more_plugins_html') %></p>
 </div>

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

@@ -5,7 +5,7 @@
 <% end %>
 
 <div class='row'>
-  <div class='col-md-4'>
+  <div class='col-lg-4'>
     <%= form_for([:admin, @tag]) do |f| %>
       <% if @tag.errors.any? %>
         <ul>
@@ -26,7 +26,7 @@
       </div>
     <% end %>
   </div>
-  <div class='col-md-8'>
+  <div class='col-lg-8'>
     <table class="table table-hover">
       <thead>
         <tr class='noborder'>
@@ -48,7 +48,7 @@
             <%= button_to_edit tag %>
             <%= button_to_delete tag %>
             <%= link_to_permalink(tag, "#{tag.contents.size} #{t(".view")}".html_safe,
-                                  style: 'btn btn-success btn-xs') %>
+                                  style: 'btn btn-success btn-sm') %>
           </td>
           <td><%= tag.name %></td>
         </tr>

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

@@ -4,23 +4,25 @@
   </h2>
 <% end %>
 
-<% for theme in @themes %>
-  <% preview_url = url_for(action: 'preview', theme: theme.name) %>
-  <% switch_url = url_for(action: 'switchto', theme: theme.name) %>
-  <div class='col-md-6'>
-    <% if theme.path == @active.path %>
-      <div class='well'>
-        <h3><%= t('.active_theme', name: theme.name) %></h3>
-        <%= image_tag(preview_url, class: 'img-responsive img-thumbnail') %>
-        <%= raw theme.description_html %>
+<div class="row">
+  <% for theme in @themes %>
+    <% preview_url = url_for(action: 'preview', theme: theme.name) %>
+    <% switch_url = url_for(action: 'switchto', theme: theme.name) %>
+    <div class='col-lg-6'>
+      <div class='card'>
+        <div class='card-body'>
+          <% if theme.path == @active.path %>
+            <h3><%= t('.active_theme', name: theme.name) %></h3>
+            <%= image_tag(preview_url, class: 'img-thumbnail') %>
+            <%= raw theme.description_html %>
+          <% else %>
+            <h3><%= theme.name %></h3>
+            <%= image_tag(preview_url, class: 'img-thumbnail') %>
+            <%= raw theme.description_html %>
+            <p><%= button_to(t('.use_this_theme'), switch_url, class: 'btn btn-info') %></p>
+          <% end %>
+        </div>
       </div>
-    <% else %>
-      <div>
-        <h3><%= theme.name %></h3>
-        <%= image_tag(preview_url, class: 'img-thumbnail') %>
-        <%= raw theme.description_html %>
-        <p><%= button_to(t('.use_this_theme'), switch_url, class: 'btn btn-info') %></p>
-      </div>
-    <% end %>
-  </div>
-<% end %>
+    </div>
+  <% end %>
+</div>