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

clwiki 3.1.2 → 3.1.4

Files changed (99) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df273686960aca123965a8df7958ef2bd854c74f5a7170e7402342afe9b89e2f
-  data.tar.gz: 6f1afd2d68f930f6e8a0dd76c4d5e3703d27f0dc417ad3e8c5823404296a30c4
+  metadata.gz: f1975a9e3a84db8cc346f59c0a7aaf4f939c5c1258daa412b334ff141de7064d
+  data.tar.gz: dc58f70d9676c805b0b8a102be3566c01e27d56c25d4d75a087c0ade31ab4ed6
 SHA512:
-  metadata.gz: 40782fd3ab86140a6f4a59ef36270de05a9699ba30c224e6e39be3d986ab8ce53f271904879b7be00e14186e2c0782933efe274fc06fc0545fd3f8b6c2319705
-  data.tar.gz: 92db3ec80e448c3cefa6f5562a150ec467c5f23675d3d89f60a855bbabc2d2d1d73c0efe2ae8c53bb368b91484cb43c92130b5d37dab2de84c0723dd18a9728f
+  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/assets/stylesheets/cl_wiki/application.css CHANGED Viewed

@@ -68,10 +68,18 @@ a:active {
 .wikiFooter li {
     display: inline;
-    /*font-size: 90%;*/
+    font-size: 90%;
     padding-right: 10px;
 }
+.wikiFooterFloat {
+    float: right;
+}
+.wikiFooterFloat ul {
+    margin-top: 0px;
+}
 .findInput {
     width: 40%;
     margin: 0 auto;

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,10 +1,11 @@
 <!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 %>
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
 </head>
 <body>

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)
@@ -177,13 +177,14 @@ module ClWiki
       dirs = page_path.split('/')
       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 = String.new("<div class='wikiHeader'>")
+      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
         head << "<span class='pageName'><a href='find?search_text=#{search_text}'>#{page_name}</a></span><br/>"
         full_dirs.each do |dir|
-          head << '<span class=\'pageTag\'>'
+          head << "'<span class='pageTag'>'"
           head << "<a href=#{cgifn}?page=#{dir}>#{File.split(dir)[-1]}</a></span>"
         end
         head << '<br/>'
@@ -212,23 +213,27 @@ module ClWiki
     def footer(page)
       return String.new unless page.is_a? ClWiki::Page
       custom_footer = process_custom_footers(page)
+      custom_footer << core_footer_links(page.page_name)
+    end
-      wiki_name = page.page_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>'
-      custom_footer << footer
+      footer
     end
     def src_url

data/lib/cl_wiki/version.rb CHANGED Viewed

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