showoff 0.20.0 → 0.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0b7ee2b970fed6e27a9500ff363c1ef95e013d5
-  data.tar.gz: c25a95a3c11e3d87f832771e92396204080cc645
+  metadata.gz: 604368cbb77db12fb0528dac9cb0155bebeff3be
+  data.tar.gz: 4129294c1e8c011521510f0496844b087247d52b
 SHA512:
-  metadata.gz: d052efc4428ce380f7197d3bac6895c9eb9965a5cb9d8becb632240aeeb7b88492cfc5005a751e66ba67e1443e0f9a1f00cc38bc2327c4a9e16ff86fcb818ef7
-  data.tar.gz: 4bee8156a5c67f568f2c8b49e7c88dcf0c905bc74ccf5c16f6ec0f0f550951c76c750e1e7558e8a666bc89f6658e7263e9ef39bfd390814f4a0f20f5c9aa62a1
+  metadata.gz: 76e812ebaef4a6bd9279042bbfda4b02242cece988974506a9be49a097a6fd38696f40f68b0dce344c8354c0dcc4072a7ea21b1a7e247f2a399d601ce8fee4da
+  data.tar.gz: 850bf03967777e5d5101d6c7e8f44a5207a92086301d58f1ad95a99af6e2c6d62c95c7faf48226b1a85b302b9b117b948147fc4487a8cb97e12779003909e14b

data/lib/showoff.rb

@@ -254,11 +254,15 @@ class ShowOff < Sinatra::Application
 
   helpers do
     def css_files
-      Dir.glob("#{settings.pres_dir}/*.css").map { |path| File.basename(path) }
+      base  = Dir.glob("#{settings.pres_dir}/*.css").map { |path| File.basename(path) }
+      extra = Array(settings.showoff_config['styles'])
+      base + extra
     end
 
     def js_files
-      Dir.glob("#{settings.pres_dir}/*.js").map { |path| File.basename(path) }
+      base  = Dir.glob("#{settings.pres_dir}/*.js").map { |path| File.basename(path) }
+      extra = Array(settings.showoff_config['scripts'])
+      base + extra
     end
 
     def preshow_files
@@ -586,7 +590,7 @@ class ShowOff < Sinatra::Application
         result.gsub!(match[0], "<pre class=\"highlight\"><code class=\"#{css}\">#{file}</code></pre>")
       end
 
-      result.gsub!(/\[(fa-.*)\]/, '<i class="fa \1"></i>')
+      result.gsub!(/\[(fa\w?)-(\S*)\]/, '<i class="\1 fa-\2"></i>')
 
       # For fenced code blocks, translate the space separated classes into one
       # colon separated string so Commonmarker doesn't ignore the rest
@@ -1309,9 +1313,14 @@ class ShowOff < Sinatra::Application
       content
     end
 
-    def print(section=nil)
+    def print(section=nil, munged=false)
       @slides = get_slides_html(:static=>true, :toc=>true, :print=>true, :section=>section)
       @favicon = settings.showoff_config['favicon']
+
+      unless munged
+        @baseurl = '../' * section.split('/').count
+      end
+
       erb :onepage
     end
 
@@ -1475,7 +1484,7 @@ class ShowOff < Sinatra::Application
         data = showoff.send(what, opt)
       when 'print'
         opt ||= 'handouts'
-        data = showoff.send(what, opt)
+        data = showoff.send(what, opt, true)
       else
         data = showoff.send(what, true)
       end
@@ -1509,8 +1518,10 @@ class ShowOff < Sinatra::Application
         pres_dir = showoff.settings.pres_dir
 
         # ..., copy all user-defined styles and javascript files
-        Dir.glob("#{pres_dir}/*.{css,js}").each { |path|
-          FileUtils.copy(path, File.join(file_dir, File.basename(path)))
+        showoff.css_files.each { |path|
+          dest = File.join(file_dir, path)
+          FileUtils.mkdir_p(File.dirname(dest))
+          FileUtils.copy(path, dest)
         }
 
         # ... and copy all needed image files
@@ -1526,12 +1537,16 @@ class ShowOff < Sinatra::Application
           end
         end
         # copy images from css too
-        Dir.glob("#{pres_dir}/*.css").each do |css_path|
+        showoff.css_files.each do |css_path|
           File.open(css_path) do |file|
             data = file.read
             data.scan(/url\([\"\']?(?!https?:\/\/)(.*?)[\"\']?\)/).flatten.each do |path|
               path.gsub!(/(\#.*)$/, '') # get rid of the anchor
               path.gsub!(/(\?.*)$/, '') # get rid of the query
+
+              # resolve relative paths in the stylesheet
+              path = "#{File.dirname(css_path)}/#{path}" unless path.start_with? '/'
+
               logger.debug path
               dir = File.dirname(path)
               FileUtils.makedirs(File.join(file_dir, dir))

data/lib/showoff/version.rb

@@ -1,3 +1,3 @@
 # No namespace here since ShowOff is a class and I'd have to inherit from
 # Sinatra::Application (which we don't want to load here)
-SHOWOFF_VERSION = '0.20.0'
+SHOWOFF_VERSION = '0.20.1'

data/public/css/presenter.css

@@ -192,6 +192,7 @@
     }
     #timerSection #pauseTimer {
       float: left;
+      position: absolute;
       display: none;
     }
     #timerSection #stopTimer {

data/public/css/showoff.css

@@ -512,7 +512,7 @@ img#disconnected {
   background-color: #dedede;
 }
 #askedQuestions li:hover:after {
-  font-family: FontAwesome;
+  font-family: "Font Awesome 5 Free";
   font-style: normal;
   font-weight: normal;
   text-decoration: inherit;
@@ -652,7 +652,7 @@ pre.highlight tr:not(:last-child) {
 }
 
 .execute:after {
-  font-family: FontAwesome;
+  font-family: "Font Awesome 5 Free";
   content: "\F144";
   position: absolute;
   right: .5em;
@@ -815,7 +815,7 @@ form .element {
 .slide.answerkey input::before {
   margin-left: -1em;
   vertical-align: top;
-  font-family: FontAwesome;
+  font-family: "Font Awesome 5 Free";
   font-weight: bold;
   text-decoration: none;
 }
@@ -1065,7 +1065,7 @@ form .element {
 
 /* Add the disclosure triangles */
 #stats div.row:before {
-  font-family: FontAwesome;
+  font-family: "Font Awesome 5 Free";
   font-style: normal;
   font-weight: normal;
   font-size: 1.25em;
@@ -1230,7 +1230,7 @@ form .element {
   .callout.exercise:before     { content: "\f41b"; } /* fa-pencil-square */
   .callout.stop:before         { content: "\f05e"; } /* fa-ban */
   .callout.thumbsup:before     { content: "\f164"; } /* fa-thumbs-up */
-  .callout.conversation:before { content: "\f0e5"; } /* fa-comment */
+  .callout.conversation:before { content: "\f075"; } /* fa-comment */
   .callout.glossary:before     { content: "\f02d"; } /* fa-book */
 
   .callout.terminal:before     { content: "\f0c8"; } /* fa-square */
@@ -1265,7 +1265,7 @@ a.term {
   text-decoration: none;
 }
 a.term:after {
-  font-family: FontAwesome;
+  font-family: "Font Awesome 5 Free";;
   font-size: 0.8em;
   vertical-align: super;
   content: "\f27b";

data/public/js/presenter.js

@@ -36,7 +36,7 @@ $(document).ready(function(){
   $("#notes-wrapper .fa-minus").click( function() {
     notesFontSize('decrease');
   });
-  $("#notes-wrapper .fa-dot-circle-o").click( function() {
+  $("#notes-wrapper .fa-circle").click( function() {
     notesFontSize('reset');
   });
   $("#notes-wrapper .fa-plus").click( function() {
@@ -509,7 +509,9 @@ function printSlides(section)
 {
   try {
     var printWindow = window.open('print/'+section);
-    printWindow.window.print();
+    $(printWindow).on('load', function(){
+      printWindow.window.print();
+    });
   }
   catch(e) {
     console.log('Failed to open print window. Popup blocker?');

data/public/js/showoff.js

@@ -1847,14 +1847,14 @@ var removeResults = function() {
   try { slaveWindow.removeResults() } catch (e) {};
 };
 
-var print = function(text) {
+var displayHUD = function(text) {
 	removeResults();
 	var _results = $('<div>').addClass('results').html('<pre>' + String(text).substring(0, 1500) + '</pre>');
 	$('body').append(_results);
 	_results.click(removeResults);
 
 	// if we're a presenter, mirror this on the display window
-  try { slaveWindow.print(text) } catch (e) {};
+  try { slaveWindow.displayHUD(text) } catch (e) {};
 };
 
 // Execute the first visible executable code block
@@ -1910,7 +1910,7 @@ function executeLocalCode(lang, codeDiv) {
   catch(e) {
     result = e.message;
   };
-  if (result != null) print(result);
+  if (result != null) displayHUD(result);
 }
 
 // request the server to execute a code block by path and index
@@ -1921,7 +1921,7 @@ function executeRemoteCode(lang, codeDiv) {
 
   setExecutionSignal(true, codeDiv);
   $.get('execute/'+lang, {path: path, index: index}, function(result) {
-    if (result != null) print(result);
+    if (result != null) displayHUD(result);
     setExecutionSignal(false, codeDiv);
   });
 }

data/views/onepage.erb

@@ -3,6 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+	<% if @baseurl %><base href="<%= @baseurl %>" /> <% end %>
   <title><%= @title %></title>
 
   <% if @favicon %>
@@ -10,8 +11,7 @@
   <% end %>
 
   <% if @inline %>
-
-    <%= inline_css(['font-awesome-4.4.0/css/font-awesome.min.css', 'mermaid-6.0.0.css', "highlight/#{@highlightStyle}.css"], 'public/css') %>
+    <%= inline_css(['font-awesome-5.6.1/css/all.min.css', 'mermaid-6.0.0.css', "highlight/#{@highlightStyle}.css"], 'public/css') %>
     <%= inline_css(['showoff.css', 'onepage.css'], 'public/css') %>
     <%= inline_css(css_files) %>
 
@@ -22,7 +22,7 @@
     <%= inline_js(js_files) %>
 
   <% else %>
-    <% ['font-awesome-4.4.0/css/font-awesome.min.css', 'mermaid-6.0.0.css', "highlight/#{@highlightStyle}.css",
+    <% ['font-awesome-5.6.1/css/all.min.css', 'mermaid-6.0.0.css', "highlight/#{@highlightStyle}.css",
         'showoff.css', 'onepage.css'].each do |css_file| %>
       <link rel="stylesheet" href="css/<%= css_file %>" type="text/css"/>
     <% end %>

data/views/presenter.erb

@@ -130,7 +130,7 @@
           <ul class="section-selector"></ul>
           <div class="controls" id="notes-controls">
             <a class="no-mobile fa fa-minus small" aria-hidden="true" href="#"></a>
-            <a class="no-mobile fa fa-dot-circle-o small" aria-hidden="true" href="#"></a>
+            <a class="no-mobile fa fa-circle small" aria-hidden="true" href="#"></a>
             <a class="no-mobile fa fa-plus small" aria-hidden="true" href="#"></a>
             <span class="spacer"> </span>
             <a id="notesToggle" class="no-mobile fa fa-external-link-square" aria-hidden="true" href="#"></a>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: showoff
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.20.1
 platform: ruby
 authors:
 - Scott Chacon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-18 00:00:00.000000000 Z
+date: 2019-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra