showoff 0.9.10.8 → 0.9.10.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa9913643afd1e04bc645f8855a6c9d30b124022
-  data.tar.gz: 0dd88f99c1ee300cc99787a1f3a9227eff2ec94d
+  metadata.gz: 51005d05cd3c87b9f312400986ef7c2dd1c0e087
+  data.tar.gz: 59838b6f752ebc8b29d7dab7c483833c79edcb2c
 SHA512:
-  metadata.gz: db5c3699b395ca027340a785a5974bf8b427448c4df0cdf1841f30911fe08312f60dbfc6fd64a5e68e1c53c54ed6a1eec0c5a572289d6b690267974a8fd1a6b4
-  data.tar.gz: 85ac7713f88326f337ffdb147480daa753049c33e8c214090afafbab9530d60ca89a0b186581701145937bd865f9a9724847ebba86242a29caa8588e134a4df7
+  metadata.gz: 4e83b17fffc8911bb3665ff2b47bd1bda2734961d626c9a31cd1595d620635e372fe7372b7cf23775ebac047fbb4b41ba0a8d68a60c772adeb5c9ecdd6a5038b
+  data.tar.gz: 7238c58739ebe0dd630a66db1cde2d5907b7b5b4b8a69944c3900280d9e83d57fc69671aa3a093233d489b49bf6fb52cb765ed0d818d768020c628a937c13a77

data/Rakefile

@@ -1,3 +1,5 @@
+task default: :test
+
 desc "Build HTML documentation"
 task :doc do
   system("rdoc --main README.rdoc README.rdoc documentation/*.rdoc")

data/lib/showoff.rb

@@ -288,6 +288,14 @@ class ShowOff < Sinatra::Application
           content += "<div class=\"content #{classes}\" ref=\"#{name}\">\n"
         end
 
+        # reset subsection each time we encounter a new subsection slide. Do this in a regex, because it's much
+        # easier to just get the first of any header than it is after rendering to html.
+        if content_classes.include? 'subsection'
+          @section_title = slide.text.match(/#+ *(.*?)#*$/)[1] rescue settings.showoff_config['name']
+        end
+        # include a header that's hidden by CSS so that pdf renderers like wkhtmltopdf can use it for a section title
+        content += "<h1 class=\"section_title\">#{@section_title}</h1>\n"
+
         # Apply the template to the slide and replace the key to generate the content of the slide
         sl = process_content_for_replacements(template.gsub(/~~~CONTENT~~~/, slide.text))
         sl = Tilt[:markdown].new(nil, nil, engine_options) { sl }.render
@@ -392,7 +400,7 @@ class ShowOff < Sinatra::Application
         toc['id'] = 'toc'
         frag.add_child(toc)
 
-        Nokogiri::HTML(content).css('div.subsection > h1').each do |section|
+        Nokogiri::HTML(content).css('div.subsection > h1:not(.section_title)').each do |section|
           entry = Nokogiri::XML::Node.new('div', frag)
           entry['class'] = 'tocentry'
           toc.add_child(entry)
@@ -711,6 +719,7 @@ class ShowOff < Sinatra::Application
       @slide_count   = 0
       @section_major = 0
       @section_minor = 0
+      @section_title = settings.showoff_config['name']
 
       sections = ShowOffUtils.showoff_sections(settings.pres_dir, @logger)
       files = []

data/lib/showoff/version.rb

@@ -1,4 +1,4 @@
 # 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.9.10.8'
+SHOWOFF_VERSION = '0.9.10.9'
 

data/public/css/presenter.css

@@ -57,6 +57,20 @@ div.zoomed {
     background-color: #003d96;
   }
 
+  #topbar #links a.popdown {
+    background-image: url(popdown.png);
+    background-position: center right;
+    background-repeat: no-repeat;
+    padding-right: 16px;
+  }
+
+  #topbar #links a.popout {
+    background-image: url(popout.png);
+    background-position: top 1px right 1px;
+    background-repeat: no-repeat;
+    padding-right: 18px;
+  }
+
   #topbar #links .mobile {
     display: none;
   }

data/public/css/showoff.css

@@ -1,4 +1,9 @@
 @media screen {
+  /* explicitly size parent elements so the screen blanker works */
+  html, body{
+    height:100%;
+  }
+
   body {
       font-size: 100%;
       font-family: "Gill Sans", Helvetica, Arial, sans-serif;
@@ -185,7 +190,7 @@
 .subsection h1 {
     background: #008;
     color: #fff;
-	padding: .25em;
+    padding: .25em;
 }
 
 .small {
@@ -201,6 +206,15 @@ h1 { font-size: 5em; }
 h2 { font-size: 3em; }
 h3 { font-size: 2em; }
 
+/* make this invisible as possible, while still rendering so that wkhtmltopdf doesn't ignore it */
+.content h1.section_title {
+  color: transparent !important;
+  opacity: 0 !important;
+  font-size: 0 !important;
+  margin: 0 !important;
+  padding: 0 !important;
+}
+
 pre { margin: 1em 40px; padding: .25em; }
 
 #navigation.hidden,

data/views/presenter.erb

@@ -47,12 +47,12 @@
           <a id="report" href="javascript:reportIssue();" title="Report an issue with the current slide.">Report Issue With Slide</a>
         <% end %>
         <span class="spacer"> </span>
-        <a id="stats" href="/stats" target="_showoffchild">Viewing Statistics</a>
-        <a id="downloads" href="/download" target="_showoffchild">Downloads</a>
+        <a id="stats" href="/stats" target="_showoffchild" class="popdown">Viewing Statistics</a>
+        <a id="downloads" href="/download" target="_showoffchild" class="popdown">Downloads</a>
         <span class="spacer"> </span>
-        <a id="slaveWindow" href="javascript:toggleSlave();" title="Enable the slave window.">Slave Window</a>
-        <a id="nextWindow" href="javascript:toggleNext();" title="Enable the next window view.">Next Window</a>
-        <a id="notesWindow" href="javascript:toggleNotes();" title="Enable the popout notes window.">Notes Window</a>
+        <a id="slaveWindow" href="javascript:toggleSlave();" title="Enable the slave window." class="popout">Slave Window</a>
+        <a id="nextWindow" href="javascript:toggleNext();" title="Enable the next window view." class="popout">Next Window</a>
+        <a id="notesWindow" href="javascript:toggleNotes();" title="Enable the popout notes window." class="popout">Notes Window</a>
         <span class="spacer"> </span>
         <a id="generatePDF" href="/pdf" title="Call out to wkhtmltopdf to generate a PDF.">Generate PDF</a>
         <a id="onePage" href="/onepage" title="Load the single page view. Useful for printing.">Single Page</a>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: showoff
 version: !ruby/object:Gem::Version
-  version: 0.9.10.8
+  version: 0.9.10.9
 platform: ruby
 authors:
 - Scott Chacon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-23 00:00:00.000000000 Z
+date: 2015-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -190,9 +190,14 @@ files:
 - public/css/grippy-close.png
 - public/css/grippy.png
 - public/css/menu.png
+- public/css/new_window-a.png
+- public/css/new_window-b.png
+- public/css/new_window-c.png
 - public/css/onepage.css
 - public/css/pace.png
 - public/css/paceMarker.png
+- public/css/popdown.png
+- public/css/popout.png
 - public/css/presenter.css
 - public/css/reset.css
 - public/css/sh_style.css
@@ -301,7 +306,7 @@ files:
 - public/js/sh_main.min.js
 - public/js/showoff.js
 - public/js/showoffcore.js
-homepage: http://github.com/schacon/showoff
+homepage: http://github.com/puppetlabs/showoff
 licenses: []
 metadata: {}
 post_install_message: |2+