RubyGems - clwiki - Versions diffs - 3.1.3 → 3.1.4 - Mend

clwiki 3.1.3 → 3.1.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (44) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba18a20142df92b4c3fd21dd47012b5048d79b0a3ca8051bca67e6f782ffb3b3
-  data.tar.gz: 9c0ad39b9dca596e9f78424fdeef2725af33c390cc74dac0bb7e89c2f944ac85
+  metadata.gz: f1975a9e3a84db8cc346f59c0a7aaf4f939c5c1258daa412b334ff141de7064d
+  data.tar.gz: dc58f70d9676c805b0b8a102be3566c01e27d56c25d4d75a087c0ade31ab4ed6
 SHA512:
-  metadata.gz: db9f7b6a687f3a185e3dfb88eb8097995bcb5f3e41e9a3d84ead8070006c1e445270045758c2db6303e43457b0e1d3fc24ff79dda5ef1c7728b0cefb0443c487
-  data.tar.gz: a75d19504fdd4e44cd0d3a8d37363d28dbfa805de30b6d4d911309f213b8b50cbdab6634ef0be3dfb4fb128b2146f2447bf87d56a015532dd7c1ff12f584472b
+  metadata.gz: a367e719902afa6212605f5b7096f4a6f18328a3a4a12b0de0d023d081d5ece9dcfa721ef9eabe7e464e63e71dfac4bbc3340fd5ea8fce059e9285eec47b18d0
+  data.tar.gz: 6a6047ee69812183548c3480fc436b0642714aa88112bc9187853d3d15d0fe7b953d90eb89d4bcdebfc14d64a19622b81383dc2a86ed616ae977d94a1a7ea987

data/app/assets/javascripts/cl_wiki/shortcuts.js CHANGED Viewed

@@ -1,23 +1,36 @@
-function navigateToFind() {
+function navigateToPage(page) {
   let url = new URL(window.location.href).href;
-  window.location.href = url.substring(0, url.lastIndexOf('/')) + '/find';
+  window.location.href = url.substring(0, url.lastIndexOf('/')) + '/' + page;
+}
+function commonShortcuts(e) {
+  if (e.key === "f") {
+    navigateToPage('find');
+  } else if (e.key === "h") {
+    navigateToPage('FrontPage');
+  } else if (e.key === "r") {
+    navigateToPage('recent');
+  }
 }
 $(document).keydown(function (e) {
+  const anyModifiers = (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey);
+  if (anyModifiers) {
+    return;
+  }
   if (window.location.href.endsWith("/edit")) {
   } else if (window.location.href.endsWith("/find")) {
   } else if (window.location.href.endsWith("/login")) {
     // this is important otherwise typing `e` while logging in refreshes the
     // page - doh!
   } else if (window.location.href.endsWith("/recent")) {
-    if (e.key === "f") {
-      navigateToFind();
-    }
+    commonShortcuts(e);
   } else {
     if (e.key === "e") {
       window.location.href = window.location.href + "/edit";
-    } else if (e.key === "f") {
-      navigateToFind();
+    } else {
+      commonShortcuts(e);
     }
   }
 });

data/app/views/cl_wiki/page/edit.html.erb CHANGED Viewed

@@ -1,3 +1,5 @@
+<% content_for :title, "ClWiki: #{@page.name} (edit)" %>
 <%= form_tag(page_show_path(:page_name => @page.page_name)) do %>
   <%= hidden_field_tag 'client_mod_time', @page.mtime.to_i.to_s %>

data/app/views/cl_wiki/page/find.html.erb CHANGED Viewed

@@ -1,3 +1,5 @@
+<% content_for :title, "ClWiki: Find" %>
 <%= @formatter.header("Find").html_safe %>
 <div class='findInput'>

data/app/views/cl_wiki/page/recent.html.erb CHANGED Viewed

@@ -1,6 +1,8 @@
+<% content_for :title, "ClWiki: Recent" %>
 <% @pages.each do |page| %>
   <div class='wikiHeader'>
     <span class='pageName'><%= @formatter.convert_to_link(page.name).html_safe %></span>
   </div>
   <%= page.content.html_safe %>
-<% end %>
+<% end %>

data/app/views/cl_wiki/page/show.html.erb CHANGED Viewed

@@ -1 +1,3 @@
-<%= @page.content.html_safe %>
+<% content_for :title, "ClWiki: #{@page.name}" %>
+<%= @page.content.html_safe %>

data/app/views/layouts/cl_wiki/application.html.erb CHANGED Viewed

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>ClWiki</title>
+  <title><%= yield(:title) %></title>
   <%= stylesheet_link_tag    "cl_wiki/application", media: "all", "data-turbolinks-track" => true %>
   <%= javascript_include_tag "cl_wiki/application", "data-turbolinks-track" => true %>
   <%= csrf_meta_tags %>

data/lib/cl_wiki/page.rb CHANGED Viewed

@@ -6,7 +6,7 @@ require 'singleton'
 module ClWiki
   class Page
     attr_reader :content, :mtime, :name, :page_name, :raw_content,
-                :file_full_path_and_name
+      :file_full_path_and_name
     def initialize(page_name, wiki_path: $wiki_conf.wiki_path, owner: PublicUser.new)
       raise "Fix this - no slashes! #{page_name}" if %r{/}.match?(page_name)
@@ -178,7 +178,7 @@ module ClWiki
       dirs = dirs[1..-1] if !dirs.empty? && dirs[0].empty?
       full_dirs = (0..dirs.length - 1).each { |i| full_dirs[i] = ('/' + dirs[0..i].join('/')) }
       head = String.new("<div class='wikiHeader'>")
-      head << core_footer_links(full_page_name).sub('wikiFooter', 'wikiFooter wikiFooterFloat')
+      head << core_footer_links(full_page_name, -1).sub('wikiFooter', 'wikiFooter wikiFooterFloat')
       if [FIND_PAGE_NAME, FIND_RESULTS_NAME].include?(full_page_name)
         head << "<span class='pageName'>#{full_page_name}</span>"
       else
@@ -217,17 +217,21 @@ module ClWiki
       custom_footer << core_footer_links(page.page_name)
     end
-    def core_footer_links(wiki_name)
+    def core_footer_links(wiki_name, tab_index=0)
       # refactor string constants
       footer = String.new("<div class='wikiFooter'>")
       footer << '<ul>'
       if $wiki_conf.editable
         unless [FIND_PAGE_NAME, FIND_RESULTS_NAME].include?(wiki_name)
-          footer << "<li><span class='wikiAction'><a href='#{wiki_name}/edit'>Edit</a></span></li>"
+          footer << "<li><span class='wikiAction'><a href='#{wiki_name}/edit' tabindex=#{tab_index}>Edit</a></span></li>"
         end
       end
-      footer << "<li><span class='wikiAction'><a href='find'>Find</a></span></li>"
-      footer << "<li><span class='wikiAction'><a href='recent'>Recent</a></span></li>"
+      footer << "<li><span class='wikiAction'><a href='find' tabindex=#{tab_index}>Find</a></span></li>"
+      if $wiki_conf.publishTag
+        footer << "<li><span class='wikiAction'><a href='recent' tabindex=#{tab_index}>Recent</a></span></li>"
+      else
+        footer << "<li><span class='wikiAction'><a href='FrontPage' tabindex=#{tab_index}>Home</a></span></li>"
+      end
       footer << '</ul></div>'
       footer
     end

data/lib/cl_wiki/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module ClWiki
-  VERSION = '3.1.3'
+  VERSION = '3.1.4'
 end