dokno 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43b733c58c27a4d573269c75b1d47ba35aa570796535de91f9619429ce0cc017
-  data.tar.gz: 199666be242bb2a24a57552d377f4d3c9f84a1d0f5e92e99817c4786a80ba5c6
+  metadata.gz: d6832c4cb6bd12af77ec2e917a511ff8e1e321ef075fea55d3fda293d215086d
+  data.tar.gz: 031e5cd22170d331739f92304ee740804703cb692839c92b8ddea8dc7aded424
 SHA512:
-  metadata.gz: 4a5b2583ecedf613308ac35ce4f55df892ca69593a34698d9cf8584ae61c8f0fa9d0d3444957941c76a9f501b383b49b517d63cac0b18d9012a3fc5201901708
-  data.tar.gz: a06162fecccb4d41751e8fcbb0f503427f3fe280fbd67fab5af761a3976a4d1646bc1d1861641da7bb9d06299c5e05281cc2a7b97b2a47349537a119eebe3fce
+  metadata.gz: 31cc72ec145aadaa3aaa34be3d650387b35c905799b5bf19d38a0effed21db7e51dec651c12e252ea87670a17b6f5439e26cbbacb1b8887dca043dc0eb7602da
+  data.tar.gz: 7dafaa4a7431c3216234a2de4551f749874ffb2aaf8f25ec0002e544828002581a74f648fdc8139bb6406eb8fde28a8694600364050de9b0c38b1ad22795a306

data/README.md

@@ -119,6 +119,8 @@ $ bundle exec rspec
 ```
 
 ## Hat Tips
+- [tailwindcss](https://tailwindcss.com/)
+  - CSS framework
 - [diffy](https://github.com/samg/diffy)
   - Text diffing Ruby gem
 - [Feather Icons](https://github.com/feathericons/feather)

data/app/assets/javascripts/dokno.js

@@ -1,5 +1,23 @@
+const dokno__search_hotkey_listener = function(e) {
+  if (e.key === '/') { handleSearchHotKey(); }
+}
+
+function handleSearchHotKey() {
+  const search_input = elem('input#search_term');
+  search_input.focus();
+  search_input.select();
+}
+
+function enableSearchHotkey() {
+  document.addEventListener('keyup', dokno__search_hotkey_listener, false);
+}
+
+function disableSearchHotkey() {
+  document.removeEventListener('keyup', dokno__search_hotkey_listener, false);
+}
+
 function copyToClipboard(text) {
-  window.prompt('Copy to clipboard: CTRL+C, Enter', text);
+  window.prompt('Copy to clipboard: CTRL + C, Enter', text);
 }
 
 function elem(selector) {
@@ -22,19 +40,20 @@ function selectOption(id, value) {
   }
 }
 
-function changeCategory(category_code, term, order) {
+function applyCategoryCriteria(category_code, term, order) {
   goToPage(dokno__base_path + category_code + '?search_term=' + term + '&order=' + order);
 }
 
-function search(term, order) {
-  goToPage('?search_term=' + term + '&order=' + order);
-}
-
 function goToPage(url) {
   var param_join = url.indexOf('?') >= 0 ? '&' : '?';
   location.href=url + param_join + '_=' + Math.round(new Date().getTime());
 }
 
+function reloadPage() {
+  window.onbeforeunload = function () { window.scrollTo(0, 0); }
+  location.reload();
+}
+
 function sendRequest(url, data, callback, method) {
   const request = new XMLHttpRequest();
   request.open(method, url, true);
@@ -55,23 +74,13 @@ function sendRequest(url, data, callback, method) {
   request.send(JSON.stringify(data));
 }
 
-function deactiveArticle(slug) {
-  const callback = function(_data) {
-    elem('button#article-deactivate-button').classList.add('hidden');
-    elem('div#article-deprecated-alert').classList.remove('hidden');
-    elem('button#article-activate-button').classList.remove('hidden');
-    reloadLogs();
-  }
+function deactivateArticle(slug) {
+  const callback = function(_data) { reloadPage(); }
   sendRequest(dokno__base_path + 'article_status', { slug: slug, active: false }, callback, 'POST');
 }
 
-function activeArticle(slug) {
-  const callback = function(_data) {
-    elem('button#article-activate-button').classList.add('hidden');
-    elem('div#article-deprecated-alert').classList.add('hidden');
-    elem('button#article-deactivate-button').classList.remove('hidden');
-    reloadLogs();
-  }
+function activateArticle(slug) {
+  const callback = function(_data) { reloadPage(); }
   sendRequest(dokno__base_path + 'article_status', { slug: slug, active: true }, callback, 'POST');
 }
 
@@ -148,18 +157,6 @@ function toggleVisibility(selector_id) {
   initIcons();
 }
 
-function reloadLogs() {
-  var $log_container = elem('div#dokno-article-log-container');
-  var category_id = $log_container.getAttribute('data-category-id');
-  var article_id = $log_container.getAttribute('data-article-id');
-
-  const callback = function(markup) {
-    elem('div#dokno-article-log-container').innerHTML = markup;
-    initIcons();
-  }
-  sendRequest(dokno__base_path + 'article_log', { category_id: category_id, article_id: article_id }, callback, 'POST');
-}
-
 // Pass containers_selector as class name (no prefix)
 function highlightTerm(terms, containers_selector) {
   var containers = elems(containers_selector);

data/app/controllers/dokno/articles_controller.rb

@@ -8,7 +8,13 @@ module Dokno
 
     def show
       redirect_to root_path if @article.blank?
+
       @search_term = params[:search_term]
+      @order       = params[:order]
+      @category    = Category.find_by(code: params[:cat_code].to_s.strip) if params[:cat_code].present?
+      @category    = @article.categories.first if @category.blank?
+
+      flash.now[:yellow] = 'This article is no longer active' unless @article.active
     end
 
     def new
@@ -79,12 +85,6 @@ module Dokno
       render json: {}, layout: false
     end
 
-    # Ajax-fetched article change log
-    def article_log
-      render partial: '/partials/logs',
-        locals: { article: Article.find_by(id: params[:article_id].to_i) }, layout: false
-    end
-
     private
 
     def article_params

data/app/models/dokno/article.rb

@@ -18,6 +18,7 @@ module Dokno
     before_save :log_changes
     before_save :track_slug
 
+    scope :active,        -> { where(active: true) }
     scope :alpha_order,   -> { order(active: :desc, title: :asc) }
     scope :view_order,    -> { order(active: :desc, views: :desc, title: :asc) }
     scope :newest_order,  -> { order(active: :desc, created_at: :desc, title: :asc) }

data/app/models/dokno/category.rb

@@ -59,7 +59,7 @@ module Dokno
 
     # Used to invalidate the fragment cache of the hierarchical category select options
     def self.cache_key
-      maximum :updated_at
+      [maximum(:updated_at), Article.maximum(:updated_at)].max
     end
 
     # The given Category and all child Categories. Useful for filtering associated articles.
@@ -109,7 +109,8 @@ module Dokno
       return '' if category.id == exclude_category_id
 
       selected = selected_category_codes&.include?(category.code)
-      %(<option value="#{category.code}" #{'selected="selected"' if selected}>#{('&nbsp;&nbsp;' * level)}#{category.name}</option>)
+      article_count = category.articles_in_branch.size
+      %(<option value="#{category.code}" #{'selected="selected"' if selected}>#{('&nbsp;&nbsp;' * level)}#{category.name}#{' (' + article_count.to_s + ')' if article_count.positive?}</option>)
     end
 
     # Never allow setting of parent to self

data/app/views/dokno/_article_formatting.html.erb

@@ -2,8 +2,8 @@
   /* Article formatting */
   .dokno-article-content-markup {
     font-weight: 400;
-    line-height: 1.75rem;
-    font-size: 1rem;
+    line-height: 1.75em;
+    font-size: 1em;
   }
 
   .dokno-article-content-markup code {
@@ -23,7 +23,7 @@
   .dokno-article-content-markup ol,
   .dokno-article-content-markup hr,
   .dokno-article-content-markup table {
-    margin-bottom: 1.25rem;
+    margin-bottom: 1.25em;
   }
 
   .dokno-article-content-markup h1,
@@ -32,28 +32,28 @@
   .dokno-article-content-markup h4,
   .dokno-article-content-markup h5,
   .dokno-article-content-markup h6 {
-    margin-bottom: 1.25rem;
+    margin-bottom: 1.25em;
     font-weight: 600;
   }
 
   .dokno-article-content-markup h1 {
-    font-size: 1.625rem;
+    font-size: 1.625em;
   }
 
   .dokno-article-content-markup h2 {
-    font-size: 1.25rem;
+    font-size: 1.25em;
   }
 
   .dokno-article-content-markup h3,
   .dokno-article-content-markup h4,
   .dokno-article-content-markup h5,
   .dokno-article-content-markup h6 {
-    font-size: 1rem;
+    font-size: 1em;
   }
 
   .dokno-article-content-markup blockquote {
     border-left: 4px solid #edf2f7;
-    padding-left: 1.25rem;
+    padding-left: 1.25em;
   }
 
   .dokno-article-content-markup ul,
@@ -75,10 +75,10 @@
 
   .dokno-article-content-markup table th,
   .dokno-article-content-markup table td {
-    padding-left: 1rem;
-    padding-right: 1rem;
-    padding-top: 0.5rem;
-    padding-bottom: 0.5rem;
+    padding-left: 1em;
+    padding-right: 1em;
+    padding-top: 0.5em;
+    padding-bottom: 0.5em;
     font-weight: normal;
   }
 

data/app/views/dokno/articles/_article_form.html.erb

@@ -47,14 +47,14 @@
       <a id="markdown_write_link" href="javascript:;" onclick="writeArticleToggle();" class="float-right hidden"><i data-feather="pen-tool" class="inline"></i> Write</a>
       <a id="markdown_preview_link" href="javascript:;" onclick="previewArticleToggle();" class="float-right"><i data-feather="eye" class="inline"></i> Preview</a>
     </div>
-    <textarea placeholder="Full article content" name="markdown" id="markdown" class="rounded text-xl shadow-inner bg-gray-100 p-3 mt-2 w-full" rows="10"><%= article.persisted? ? article.markdown : (article.markdown.presence || @template) %></textarea>
+    <textarea placeholder="Full article content" name="markdown" id="markdown" class="rounded text-xl shadow-inner bg-gray-100 p-3 mt-2 w-full" rows="20"><%= article.persisted? ? article.markdown : (article.markdown.presence || @template) %></textarea>
     <div id="markdown_preview" class="dokno-article-content-markup hidden text-lg overflow-hidden overflow-y-auto rounded p-10 mt-2 bg-gray-100 shadow-inner"></div>
     <div class="text-gray-500 mt-2">Detailed documentation of the described topic. Basic HTML &amp; <a target="_blank" href="https://commonmark.org/help/" title="Markdown formatting examples">markdown</a> OK.</div>
   </div>
 
-  <div class="mt-10">
+  <div class="mt-10 text-right">
+    <span class="text-lg mr-5"><a class="no-underline" href="<%= article.persisted? ? article_path(article.slug) : root_path %>">Cancel</a></span>
     <button type="submit" class="bg-gray-700 text-gray-300 hover:bg-gray-900 hover:text-white rounded py-2 px-3 font-bold"><i data-feather="check" class="inline h-5"></i> SAVE ARTICLE</button>
-    <span class="text-lg ml-5"><a class="no-underline" href="<%= article.persisted? ? article_path(article.slug) : root_path %>">Cancel</a></span>
   </div>
 
 </section>

data/app/views/dokno/articles/show.html.erb

@@ -1,30 +1,25 @@
 <%= render 'dokno/article_formatting' %>
 
-<section>
-  <% if @article.categories.present? %>
-    <div class="text-gray-500 mb-5">
-      <% @article.categories.each do |category| %>
-        <div><a href="<%= article_index_path(category.code) %>"><%= category.breadcrumb %></a></div>
-      <% end %>
-    </div>
-  <% end %>
+<% if @category.present? %>
+  <div class="no-print text-gray-500 mb-5">
+    <div>Category: <a href="<%= article_index_path(@category.code) %>?search_term=<%= CGI.escape(@search_term.to_s) %>&order=<%= @order %>"><%= @category.breadcrumb %></a></div>
+  </div>
+<% end %>
 
+<%= render 'partials/category_header' %>
+
+<div class="my-10 no-print"><hr /></div>
+
+<section>
   <div class="flex">
     <div id="dokno-article-sidebar" class="w-2/5 pr-10">
-      <div id="article-deprecated-alert" class="<%= 'hidden' if @article.active %> bg-yellow-700 p-4 mb-5 rounded text-lg border-t-4 border-yellow-900 text-white font-base">
-        <i data-feather="alert-circle" class="inline-block mr-2"></i> This article is no longer active
-      </div>
-
-      <h1 class="dokno-article-content-highlight text-4xl mb-10 leading-tight font-light"><%= @article.title %></h1>
+      <h1 class="dokno-article-content-highlight text-4xl mb-8 leading-tight font-light"><%= @article.title %></h1>
 
       <div>
-        <div class="mb-10 no-print">
-          <button title="Email article" class="bg-gray-600 text-gray-300 hover:text-white rounded mr-3 py-2 px-3 font-bold text-xs" onclick="window.open('mailto:?subject=<%= CGI.escape(@article.title) %>&body=<%= CGI.escape(article_url(@article.slug)) %>');"><i data-feather="send" class="inline h-4"></i> EMAIL THIS</button>
-          <button title="Print article" class="bg-gray-600 text-gray-300 hover:text-white rounded mr-3 py-2 px-3 font-bold text-xs" onclick="window.print();"><i data-feather="printer" class="inline h-4"></i> PRINT THIS</button>
-
-          <% if can_edit? %>
-            <button title="Edit article" class="bg-blue-900 text-gray-300 hover:text-white rounded py-2 px-3 font-bold text-xs" onclick="location.href='<%= edit_article_path(@article.slug) %>';"><i data-feather="edit" class="inline h-4"></i> EDIT THIS</button>
-          <% end %>
+        <div class="mb-8 no-print">
+          <button title="Copy link" class="bg-gray-600 text-gray-300 hover:text-white rounded my-2 mr-2 py-2 px-3 font-bold text-sm" onclick="copyToClipboard('<%= @article.permalink(request.base_url) %>');"><i data-feather="clipboard" class="inline h-5"></i> COPY</button>
+          <button title="Email article" class="bg-gray-600 text-gray-300 hover:text-white rounded my-2 mr-2 py-2 px-3 font-bold text-sm" onclick="window.open('mailto:?subject=<%= CGI.escape(@article.title.to_s) %>&body=<%= CGI.escape(article_url(@article.slug)) %>');"><i data-feather="send" class="inline h-5"></i> EMAIL</button>
+          <button title="Print article" class="bg-gray-600 text-gray-300 hover:text-white rounded my-2 py-2 px-3 font-bold text-sm" onclick="window.print();"><i data-feather="printer" class="inline h-5"></i> PRINT</button>
         </div>
 
         <div class="flex">
@@ -93,12 +88,11 @@
           </div>
         <% end %>
 
-        <% if @article.categories.exists? %>
+        <% if (category_name_list = @article.category_name_list(context_category_id: @category&.id)).present? %>
           <div class="mt-5 flex no-print">
             <div class="no-print w-8"><i data-feather="folder" class="inline-block h-5"></i></div>
             <div class="w-full">
-              <%= 'Category'.pluralize @article.categories.count %>:<br />
-              <%= @article.category_name_list.split(':').last.html_safe %>
+              <%= category_name_list.sub(':', ':<br />').html_safe %>
             </div>
           </div>
         <% end %>
@@ -118,21 +112,22 @@
       <% if @article.summary.blank? && @article.markdown.blank? %>
         <div class="mb-10">No content</div>
       <% end %>
-
-      <% if can_edit? %>
-        <div class="no-print">
-          <hr class="mt-5" />
-          <div class="mt-10 text-right">
-            <button title="Deactivate article" id="article-deactivate-button" class="bg-yellow-700 text-gray-300 hover:text-white rounded mr-3 py-2 px-3 font-bold text-xs <% if !@article.active %>hidden<% end %>" onclick="deactiveArticle('<%= @article.slug %>');"><i data-feather="sunset" class="inline h-4"></i> DEACTIVATE THIS</button>
-            <button title="Re-activate article" id="article-activate-button" class="bg-green-700 text-gray-300 hover:text-white rounded mr-3 py-2 px-3 font-bold text-xs <% if @article.active %>hidden<% end %>" onclick="activeArticle('<%= @article.slug %>');"><i data-feather="sunrise" class="inline h-4"></i> RE-ACTIVATE THIS</button>
-            <button title="Permanently delete article" class="bg-red-700 text-gray-300 hover:text-white rounded py-2 px-3 font-bold text-xs" onclick="deleteArticle('<%= @article.id %>');"><i data-feather="trash" class="inline h-4"></i> DELETE THIS</button>
-          </div>
-        </div>
-      <% end %>
     </div>
   </div>
 </section>
 
-<% if @search_term.present? %>
-  <script>highlightTerm(['<%= j @search_term.strip %>'], 'dokno-article-content-highlight');</script>
+<% if can_edit? %>
+  <div class="no-print">
+    <hr class="mt-5 mb-10" />
+    <div class="text-right">
+      <button title="Edit article" class="bg-blue-900 text-gray-300 hover:text-white rounded mr-5 py-2 px-3 font-bold text-sm" onclick="location.href='<%= edit_article_path(@article.slug) %>';"><i data-feather="edit" class="inline h-5"></i> EDIT</button>
+
+      <% if @article.active %>
+        <button title="Deactivate article" id="article-deactivate-button" class="bg-yellow-700 text-gray-300 hover:text-white rounded mr-5 py-2 px-3 font-bold text-base" onclick="deactivateArticle('<%= @article.slug %>');"><i data-feather="sunset" class="inline h-5"></i> DEACTIVATE</button>
+      <% else %>
+        <button title="Re-activate article" id="article-activate-button" class="bg-green-700 text-gray-300 hover:text-white rounded mr-5 py-2 px-3 font-bold text-base" onclick="activateArticle('<%= @article.slug %>');"><i data-feather="sunrise" class="inline h-5"></i> RE-ACTIVATE</button>
+      <% end %>
+      <button title="Permanently delete article" class="bg-red-700 text-gray-300 hover:text-white rounded py-2 px-3 font-bold text-base" onclick="deleteArticle('<%= @article.id %>');"><i data-feather="trash" class="inline h-5"></i> DELETE</button>
+    </div>
+  </div>
 <% end %>

data/app/views/dokno/categories/index.html.erb

@@ -4,23 +4,9 @@
   </div>
 <% end %>
 
-<div class="flex items-center mb-10">
-  <% if Dokno::Category.exists? %>
-    <div class="w-1/2 pr-5">
-
-      <select aria-label="Category" name="category" id="category" size="1" class="rounded text-xl shadow-inner bg-gray-100 p-2 w-full max-w-full" onchange="changeCategory(this.value, elem('#search_term').value, '<%= @order %>');">
-        <option value="">Select a category</option>
-        <% cache Dokno::Category do %>
-          <%= Dokno::Category.select_option_markup.html_safe %>
-        <% end %>
-      </select>
-
-    </div>
-  <% end %>
-  <div class="w-<%= Dokno::Category.exists? ? '1/2 pl-5' : 'full' %>">
-    <input onsearch="search(this.value, '<%= @order %>');" placeholder="Search article content, titles, and slugs" type="search" name="search_term" id="search_term" value="<%= @search_term %>" class="rounded text-xl shadow-inner bg-gray-100 p-2 w-full" />
-  </div>
-</div>
+<% if Dokno::Category.exists? || Dokno::Article.exists? %>
+  <%= render 'partials/category_header' %>
+<% end %>
 
 <% if @articles.blank? %>
 
@@ -46,10 +32,10 @@
     </div>
     <div class="w-1/3 text-right">
       <i data-feather="corner-right-down" class="h-5 inline-block" title="Sort order"></i>
-      <a class="ml-3 pb-1 <%= 'border-b-2 border-blue-900' if @order == 'updated' %>" href="?search_term=<%= CGI.escape @search_term.to_s %>&order=updated">Updated</a>
-      <a class="ml-3 pb-1 <%= 'border-b-2 border-blue-900' if @order == 'newest' %>" href="?search_term=<%= CGI.escape @search_term.to_s %>&order=newest">Newest</a>
-      <a class="ml-3 pb-1 <%= 'border-b-2 border-blue-900' if @order == 'views' %>" href="?search_term=<%= CGI.escape @search_term.to_s %>&order=views">Views</a>
-      <a class="ml-3 pb-1 <%= 'border-b-2 border-blue-900' if @order == 'alpha' %>" href="?search_term=<%= CGI.escape @search_term.to_s %>&order=alpha">Title</a>
+      <a id="dokno-order-link-updated" class="ml-3 pb-1 <%= 'border-b-2 border-blue-900' if @order == 'updated' %>" href="?search_term=<%= CGI.escape @search_term.to_s %>&order=updated">Updated</a>
+      <a id="dokno-order-link-newest" class="ml-3 pb-1 <%= 'border-b-2 border-blue-900' if @order == 'newest' %>" href="?search_term=<%= CGI.escape @search_term.to_s %>&order=newest">Newest</a>
+      <a id="dokno-order-link-views" class="ml-3 pb-1 <%= 'border-b-2 border-blue-900' if @order == 'views' %>" href="?search_term=<%= CGI.escape @search_term.to_s %>&order=views">Views</a>
+      <a id="dokno-order-link-alpha" class="ml-3 pb-1 <%= 'border-b-2 border-blue-900' if @order == 'alpha' %>" href="?search_term=<%= CGI.escape @search_term.to_s %>&order=alpha">Title</a>
     </div>
   </div>
 
@@ -60,7 +46,7 @@
           <div class="flex">
             <div class="no-print w-10 text-gray-300"><i data-feather="chevron-right" class="inline-block"></i></div>
             <div class="w-full">
-              <a class="" href="<%= article_path article.slug %>?search_term=<%= @search_term %>" title="View article"><%= article.title %></a>
+              <a class="dokno-article-title <% unless article.active %>text-gray-500 italic<% end %>" href="<%= article_path article.slug %>?search_term=<%= @search_term %>&cat_code=<%= @category&.code %>&order=<%= @order %>" title="View article"><%= article.title %></a>
             </div>
           </div>
         </div>
@@ -71,10 +57,14 @@
             </div>
           <% end %>
 
-          <span class="dokno-article-content-highlight"><%= article.summary.presence || 'No summary provided' %></span>
+          <div class="dokno-article-content-highlight mb-2"><%= article.summary.presence || 'No summary provided' %></div>
+
+          <div class="text-base text-gray-500">
+            <%= article.category_name_list(context_category_id: @category&.id, order: @order, search_term: @search_term) %>
+          </div>
 
           <% unless @order == 'alpha' %>
-            <div class="text-base mt-2">
+            <div class="text-base">
               <% if @order == 'views' %>
                 <div class="text-gray-500">Viewed <%= number_with_delimiter(article.views, delimiter: ',') %> <%= 'time'.pluralize(article.views) %></div>
               <% elsif @order == 'updated' %>
@@ -97,11 +87,6 @@
   </div>
 <% end %>
 
-<script>
-  // Client-side select of cached select list
-  selectOption('category', '<%= j @category&.code %>');
-</script>
-
-<% if @search_term.present? %>
-  <script> highlightTerm(['<%= j @search_term.strip %>'], 'dokno-article-content-highlight'); </script>
+<% if @search_term.present? && @articles.blank? %>
+  <script> handleSearchHotKey(); </script>
 <% end %>

data/app/views/layouts/dokno/application.html.erb

@@ -12,7 +12,7 @@
     var dokno__base_path = '<%= root_path %>';
   </script>
 </head>
-<body class="bg-white font-sans font-light subpixel-antialiased">
+<body class="bg-white font-sans font-light subpixel-antialiased text-lg">
 
   <nav id="dokno-nav-container" class="bg-blue-900 text-white py-10 px-16 text-lg">
     <div class="flex items-center m-auto w-full max-w-screen-xl">
@@ -40,6 +40,13 @@
     </div>
   </nav>
 
+  <% flash.each do |color, msg| %>
+    <div class="bg-<%= color %>-700 text-lg text-white font-base py-10 px-16">
+      <i data-feather="<%= (color == 'green' ? 'check-circle' : (color == 'yellow' ? 'alert-circle' : 'x-circle')) %>" class="inline mr-2"></i>
+      <%= msg %>
+    </div>
+  <% end %>
+
   <main class="py-10 px-16">
     <% if @article.blank? && (@category.blank? || @search_term.present?) %>
       <div class="text-center m-auto mb-10 w-full max-w-screen-xl">
@@ -63,13 +70,6 @@
     <% end %>
 
     <div id="dokno-content-container" class="w-full max-w-screen-xl m-auto print-this">
-      <% flash.each do |color, msg| %>
-        <div class="bg-<%= color %>-700 p-4 mb-5 rounded text-lg border-t-4 border-<%= color %>-900 text-white font-base">
-          <i data-feather="<%= (color == 'green' ? 'check-circle' : (color == 'yellow' ? 'alert-circle' : 'x-circle')) %>" class="inline mr-2"></i>
-          <%= msg %>
-        </div>
-      <% end %>
-
       <%= yield %>
     </div>
   </main>
@@ -101,5 +101,9 @@
   </footer>
 
   <%= javascript_include_tag 'init' %>
+
+  <% if @search_term.present? %>
+    <script>highlightTerm(['<%= j @search_term.strip %>'], 'dokno-article-content-highlight');</script>
+  <% end %>
 </body>
 </html>

data/app/views/partials/_category_header.html.erb

@@ -0,0 +1,29 @@
+<div class="no-print flex items-center mb-10">
+  <% if Dokno::Category.exists? %>
+    <div class="w-1/2 pr-5">
+      <select aria-label="Category" name="category" id="category" size="1" class="rounded text-xl shadow-inner bg-gray-100 p-2 w-full max-w-full" onchange="applyCategoryCriteria(this.value, elem('#search_term').value, '<%= @order %>');">
+        <option value="">Uncategorized</option>
+
+        <optgroup label="Categories">
+          <% cache Dokno::Category do %>
+            <%= Dokno::Category.select_option_markup.html_safe %>
+          <% end %>
+        </optgroup>
+      </select>
+    </div>
+  <% end %>
+
+  <% if Dokno::Article.exists? %>
+    <div class="relative w-<%= Dokno::Category.exists? ? '1/2 pl-5' : 'full' %>">
+      <i data-feather="search" class="absolute ml-4 mt-3 inline-block text-gray-300" title="Search"></i>
+      <input title="Press / to search" onsearch="applyCategoryCriteria('<%= @category&.code %>', this.value, '<%= @order %>');" onfocus="disableSearchHotkey();" onblur="enableSearchHotkey();" placeholder="Search<%= @category.present? ? ' under this category' : ', hotkey /' %>" type="search" name="search_term" id="search_term" value="<%= @search_term %>" class="pl-12 pr-8 py-2 rounded text-xl shadow-inner bg-gray-100 w-full" />
+      <% if @category.present? %><div title="Press / to search" class="absolute -ml-6 mt-2 inline-block text-gray-300 font-semibold">/</div><% end %>
+    </div>
+  <% end %>
+</div>
+
+<script>
+  // Client-side select of cached select list
+  selectOption('category', '<%= j @category&.code %>');
+  enableSearchHotkey();
+</script>

data/app/views/partials/_form_errors.html.erb

@@ -1,5 +1,4 @@
 <div id="error_explanation" class="bg-white mb-10">
-  <i data-feather="alert-octagon" class="float-right"></i>
   <h2 class="font-semibold">
     There
     <% if errors.count == 1 %>

data/app/views/partials/_logs.html.erb

@@ -2,7 +2,7 @@
   <div class="py-10 px-16 text-gray-200 bg-gray-900">
     <div class="w-full max-w-screen-xl m-auto">
       <div class="text-xl text-gray-600 cursor-pointer" onclick="toggleVisibility('change-log');">
-        Change log for this article
+        Change history for this article
 
         <div class="inline toggle-visibility-indicator-container change-log">
           <i data-feather="chevron-left" class="inline toggle-visibility-indicator change-log"></i>

data/config/routes.rb

@@ -4,7 +4,6 @@ Dokno::Engine.routes.draw do
 
   get '/(:cat_code)',          to: 'categories#index',     as: :article_index
   get 'article_panel/(:slug)', to: 'articles#panel',       as: :panel
-  post 'article_log',          to: 'articles#article_log', as: :article_log
   post 'article_preview',      to: 'articles#preview',     as: :preview
   post 'article_status',       to: 'articles#status',      as: :status
   root 'categories#index'

data/lib/dokno/version.rb

@@ -1,3 +1,3 @@
 module Dokno
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dokno
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Courtney Payne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-06 00:00:00.000000000 Z
+date: 2020-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
@@ -38,6 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: bullet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.1'
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.34'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.34'
 - !ruby/object:Gem::Dependency
   name: database_cleaner-active_record
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: faker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.15'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.15'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -86,6 +128,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.9'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -127,47 +183,59 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.0.1
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: '3.142'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.142.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: '3.142'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.142.7
 - !ruby/object:Gem::Dependency
-  name: bullet
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: 0.19.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
-  name: faker
+  name: webdrivers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.15'
+        version: '4.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.15'
+        version: '4.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.4.1
 description: Dokno allows you to easily mount a self-contained knowledgebase / wiki
   / help system to your Rails app.
 email:
@@ -210,6 +278,7 @@ files:
 - app/views/dokno/categories/index.html.erb
 - app/views/dokno/categories/new.html.erb
 - app/views/layouts/dokno/application.html.erb
+- app/views/partials/_category_header.html.erb
 - app/views/partials/_form_errors.html.erb
 - app/views/partials/_logs.html.erb
 - app/views/partials/_pagination.html.erb