showoff 0.19.1 → 0.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c80eb56b5142a913acb35ccc32b3fdaed12e0f0
-  data.tar.gz: e1b15daffac40995846c44265d1cb06b7091489f
+  metadata.gz: 3a67c9a02bf519739e7c83abac3251b4c5172dd9
+  data.tar.gz: 379cfad6c8aa48c9b726a8c639674bfb91fb28f8
 SHA512:
-  metadata.gz: 19556afbea4c9beeeba98671732e605752125958ab7d64eadc8bca17d1a57d06d30fa71d67a3058367b86c7bebb9b773aa3000f33aa7dee366a2202f58a4112b
-  data.tar.gz: 7b1954cc0130b69551a670c0b06c2b3b1af445541e073cb5a758b645df2cbdcceb2495807988c77e302628d43ed72177a69da024204d312959ab656028285bdf
+  metadata.gz: d155da95f048d2beb231c1e9f68dfbf8fe6ba7733ad63cfeb103760b9b3bb31e61d9f22f2459b4ed94d82ca14a9f0b1a9f67caca0dcd0926ae965d7e1d58d410
+  data.tar.gz: 5cc8032013b1b8806ce42329de2ff43fce10a183e234edbd623668932f5622e3359734f0e55b953a61e783b3e5df34fb341c613c649c6fe8735a82b11693ac05

data/lib/showoff.rb

@@ -627,8 +627,7 @@ class ShowOff < Sinatra::Application
 
       # Process links
       doc.css('a').each do |link|
-        next unless link.include? 'href'
-        next unless link.include? 'class'
+        next unless link['href']
         next if link['href'].start_with? '#'
         next if link['class'].split.include? 'processed' rescue nil
 
@@ -713,7 +712,14 @@ class ShowOff < Sinatra::Application
       if opts[:toc]
         toc = Nokogiri::HTML::DocumentFragment.parse("<p id=\"toc\"></p>")
 
-        doc.css('div.subsection > h1:not(.section_title)').each do |section|
+        case opts[:toc]
+          when :all
+            titles = doc.css('div.slide:not(.toc) > div.content:not(.cover) > h1:not(.section_title)')
+          else
+            titles = doc.css('div.subsection > h1:not(.section_title)')
+        end
+
+        titles.each do |section|
           href = section.parent.parent['id']
           frag = "<div class=\"tocentry\"><a href=\"##{href}\">#{section.content}</a></div>"
           link = Nokogiri::HTML::DocumentFragment.parse(frag)
@@ -1293,7 +1299,7 @@ class ShowOff < Sinatra::Application
 
     def supplemental(content, static=false)
       # supplemental material is by definition separate from the presentation, so it doesn't make sense to attach notes
-      @slides = get_slides_html(:static=>static, :supplemental=>content, :section=>false)
+      @slides = get_slides_html(:static=>static, :supplemental=>content, :section=>false, :toc=>:all)
       @favicon = settings.showoff_config['favicon']
       @wrapper_classes = ['supplemental']
       erb :onepage

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.19.1'
+SHOWOFF_VERSION = '0.19.2'

data/public/css/highlight/atelier-cave.dark.css

@@ -0,0 +1 @@
+atelier-cave-dark.css

data/public/css/highlight/atelier-cave.light.css

@@ -0,0 +1 @@
+atelier-cave-light.css

data/public/css/highlight/atelier-dune.dark.css

@@ -0,0 +1 @@
+atelier-dune-dark.css

data/public/css/highlight/atelier-dune.light.css

@@ -0,0 +1 @@
+atelier-dune-light.css

data/public/css/highlight/atelier-estuary.dark.css

@@ -0,0 +1 @@
+atelier-estuary-dark.css

data/public/css/highlight/atelier-estuary.light.css

@@ -0,0 +1 @@
+atelier-estuary-light.css

data/public/css/highlight/atelier-forest.dark.css

@@ -0,0 +1 @@
+atelier-forest-dark.css

data/public/css/highlight/atelier-forest.light.css

@@ -0,0 +1 @@
+atelier-forest-light.css

data/public/css/highlight/atelier-heath.dark.css

@@ -0,0 +1 @@
+atelier-heath-dark.css

data/public/css/highlight/atelier-heath.light.css

@@ -0,0 +1 @@
+atelier-heath-light.css

data/public/css/highlight/atelier-lakeside.dark.css

@@ -0,0 +1 @@
+atelier-lakeside-dark.css

data/public/css/highlight/atelier-lakeside.light.css

@@ -0,0 +1 @@
+atelier-lakeside-light.css

data/public/css/highlight/atelier-plateau.dark.css

@@ -0,0 +1 @@
+atelier-plateau-dark.css

data/public/css/highlight/atelier-plateau.light.css

@@ -0,0 +1 @@
+atelier-plateau-light.css

data/public/css/highlight/atelier-savanna.dark.css

@@ -0,0 +1 @@
+atelier-savanna-dark.css

data/public/css/highlight/atelier-savanna.light.css

@@ -0,0 +1 @@
+atelier-savanna-light.css

data/public/css/highlight/atelier-seaside.dark.css

@@ -0,0 +1 @@
+atelier-seaside-dark.css

data/public/css/highlight/atelier-seaside.light.css

@@ -0,0 +1 @@
+atelier-seaside-light.css

data/public/css/highlight/atelier-sulphurpool.dark.css

@@ -0,0 +1 @@
+atelier-sulphurpool-dark.css

data/public/css/highlight/atelier-sulphurpool.light.css

@@ -0,0 +1 @@
+atelier-sulphurpool-light.css

data/public/css/highlight/brown_paper.css

@@ -0,0 +1 @@
+brown-paper.css

data/public/css/highlight/brown_papersq.png

@@ -0,0 +1 @@
+brown-papersq.png

data/public/css/highlight/ir_black.css

@@ -0,0 +1 @@
+ir-black.css

data/public/css/highlight/monokai_sublime.css

@@ -0,0 +1 @@
+monokai-sublime.css

data/public/css/highlight/paraiso.dark.css

@@ -0,0 +1 @@
+paraiso-dark.css

data/public/css/highlight/paraiso.light.css

@@ -0,0 +1 @@
+paraiso-light.css

data/public/css/highlight/school_book.css

@@ -0,0 +1 @@
+school-book.css

data/public/css/highlight/school_book.png

@@ -0,0 +1 @@
+school-book.png

data/public/css/highlight/solarized_dark.css

@@ -0,0 +1 @@
+solarized-dark.css

data/public/css/highlight/solarized_light.css

@@ -0,0 +1 @@
+solarized-light.css

data/public/css/presenter.css

@@ -610,6 +610,7 @@
       top: auto;
       position: relative;
       display: inline;
+      cursor: row-resize;
     }
 
   #notes ol { list-style-type: decimal; }

data/public/css/showoff.css

@@ -783,24 +783,33 @@ form .element {
   text-decoration: line-through;
   font-weight: 100;
   opacity: .7;
+  color: #e74c3c; /* red */
 }
 .slide.answerkey form label.correct,
 .slide.answerkey form option.correct {
   font-weight: 900;
-}
-/* Be careful with order here; these rules depend on cascading order */
-.slide.answerkey input + option,
-.slide.answerkey input + label.incorrect,
-.slide.answerkey input:checked + label.correct,
-.slide.answerkey input:checked + option.correct {
   color: #00AA00; /* green */
 }
-.slide.answerkey input:checked + option,
-.slide.answerkey input:checked + label.incorrect,
-.slide.answerkey input + label.correct,
-.slide.answerkey input + option.correct {
-  color: #e74c3c; /* red */
+
+.slide.answerkey input::before {
+  margin-left: -1em;
+  vertical-align: top;
+  font-family: FontAwesome;
+  font-weight: bold;
+  text-decoration: none;
 }
+  /* Be careful with order here; these rules depend on cascading order */
+  .slide.answerkey input::before,
+  .slide.answerkey input.correct:checked::before {
+    content: "\f14a"; /* square checkmark */
+    color: #00AA00;   /* green */
+  }
+  .slide.answerkey input:checked::before,
+  .slide.answerkey input.correct::before {
+    content: "\f00d"; /* times */
+    color: #e74c3c;   /* red */
+  }
+
 
 
 /*****************

data/public/js/presenter.js

@@ -385,7 +385,7 @@ function toggleNotes() {
   if (mode.notes) {
     try {
       if(windowIsClosed(notesWindow)){
-        notesWindow = blankStyledWindow(I18n.t('notes.label'), 'width=350,height=450', 'notes', true);
+        notesWindow = blankStyledWindow(I18n.t('presenter.notes.label'), 'width=350,height=450', 'notes', true);
         window.setTimeout(function() {
           $(notesWindow.document.documentElement).addClass('floatingNotes');
 

data/public/js/showoff.js

@@ -536,13 +536,13 @@ function setupMenu() {
       content    = $(slide).find(".content");
       slideTitle = content.text().split("\n").filter(Boolean)[0] || ''; // split() gives us an empty array when there's no content.
 
+      // just in case we've got any extra whitespace around.
+      slideTitle = slideTitle.trim();
+
       // if no content (like photo only) fall back to slide name
       if (slideTitle == "") {
         slideTitle = content.attr('ref').split('/').pop();
       }
-
-      // just in case we've got any extra whitespace around.
-      slideTitle = slideTitle.trim();
     }
 
     var navLink = $("<a>")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: showoff
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.19.2
 platform: ruby
 authors:
 - Scott Chacon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-17 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -251,24 +251,23 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
 - README.md
 - Rakefile
-- LICENSE
 - bin/showoff
 - lib/commandline_parser.rb
 - lib/keymap.rb
-- lib/showoff/version.rb
 - lib/showoff.rb
+- lib/showoff/version.rb
 - lib/showoff_utils.rb
-- views/404.erb
-- views/download.erb
-- views/header.erb
-- views/header_mini.erb
-- views/help.erb
-- views/index.erb
-- views/onepage.erb
-- views/presenter.erb
-- views/stats.erb
+- locales/README.md
+- locales/de.yml
+- locales/en.yml
+- locales/es.yml
+- locales/fr.yml
+- locales/ja.yml
+- locales/nl.yml
+- locales/pt.yml
 - public/css/TimeCircles-89ac5ae.css
 - public/css/disconnected-large.png
 - public/css/disconnected.png
@@ -423,14 +422,15 @@ files:
 - public/js/simpleStrings-0.0.1.js
 - public/js/zoomline-0.0.1.js
 - public/unsupported.html
-- locales/README.md
-- locales/de.yml
-- locales/en.yml
-- locales/es.yml
-- locales/fr.yml
-- locales/ja.yml
-- locales/nl.yml
-- locales/pt.yml
+- views/404.erb
+- views/download.erb
+- views/header.erb
+- views/header_mini.erb
+- views/help.erb
+- views/index.erb
+- views/onepage.erb
+- views/presenter.erb
+- views/stats.erb
 homepage: https://puppetlabs.github.io/showoff
 licenses:
 - MIT
@@ -451,7 +451,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: The best damn presentation software a developer could ever love.

data/public/css/highlight/atelier-cave.dark.css

@@ -1,83 +0,0 @@
-/* Base16 Atelier Cave Dark - Theme */
-/* by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/cave) */
-/* Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16) */
-
-/* Atelier-Cave Comment */
-.hljs-comment,
-.hljs-quote {
-  color: #7e7887;
-}
-
-/* Atelier-Cave Red */
-.hljs-variable,
-.hljs-template-variable,
-.hljs-attribute,
-.hljs-regexp,
-.hljs-link,
-.hljs-tag,
-.hljs-name,
-.hljs-selector-id,
-.hljs-selector-class {
-  color: #be4678;
-}
-
-/* Atelier-Cave Orange */
-.hljs-number,
-.hljs-meta,
-.hljs-built_in,
-.hljs-builtin-name,
-.hljs-literal,
-.hljs-type,
-.hljs-params {
-  color: #aa573c;
-}
-
-/* Atelier-Cave Green */
-.hljs-string,
-.hljs-symbol,
-.hljs-bullet {
-  color: #2a9292;
-}
-
-/* Atelier-Cave Blue */
-.hljs-title,
-.hljs-section {
-  color: #576ddb;
-}
-
-/* Atelier-Cave Purple */
-.hljs-keyword,
-.hljs-selector-tag {
-  color: #955ae7;
-}
-
-.hljs-deletion,
-.hljs-addition {
-  color: #19171c;
-  display: inline-block;
-  width: 100%;
-}
-
-.hljs-deletion {
-  background-color: #be4678;
-}
-
-.hljs-addition {
-  background-color: #2a9292;
-}
-
-.hljs {
-  display: block;
-  overflow-x: auto;
-  background: #19171c;
-  color: #8b8792;
-  padding: 0.5em;
-}
-
-.hljs-emphasis {
-  font-style: italic;
-}
-
-.hljs-strong {
-  font-weight: bold;
-}

data/public/css/highlight/atelier-cave.light.css

@@ -1,85 +0,0 @@
-/* Base16 Atelier Cave Light - Theme */
-/* by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/cave) */
-/* Original Base16 color scheme by Chris Kempson (https://github.com/chriskempson/base16) */
-
-/* Atelier-Cave Comment */
-.hljs-comment,
-.hljs-quote {
-  color: #655f6d;
-}
-
-/* Atelier-Cave Red */
-.hljs-variable,
-.hljs-template-variable,
-.hljs-attribute,
-.hljs-tag,
-.hljs-name,
-.hljs-regexp,
-.hljs-link,
-.hljs-name,
-.hljs-name,
-.hljs-selector-id,
-.hljs-selector-class {
-  color: #be4678;
-}
-
-/* Atelier-Cave Orange */
-.hljs-number,
-.hljs-meta,
-.hljs-built_in,
-.hljs-builtin-name,
-.hljs-literal,
-.hljs-type,
-.hljs-params {
-  color: #aa573c;
-}
-
-/* Atelier-Cave Green */
-.hljs-string,
-.hljs-symbol,
-.hljs-bullet {
-  color: #2a9292;
-}
-
-/* Atelier-Cave Blue */
-.hljs-title,
-.hljs-section {
-  color: #576ddb;
-}
-
-/* Atelier-Cave Purple */
-.hljs-keyword,
-.hljs-selector-tag {
-  color: #955ae7;
-}
-
-.hljs-deletion,
-.hljs-addition {
-  color: #19171c;
-  display: inline-block;
-  width: 100%;
-}
-
-.hljs-deletion {
-  background-color: #be4678;
-}
-
-.hljs-addition {
-  background-color: #2a9292;
-}
-
-.hljs {
-  display: block;
-  overflow-x: auto;
-  background: #efecf4;
-  color: #585260;
-  padding: 0.5em;
-}
-
-.hljs-emphasis {
-  font-style: italic;
-}
-
-.hljs-strong {
-  font-weight: bold;
-}