showoff 0.10.2 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcf39224213729d49b49c882caac09ee531ad443
-  data.tar.gz: 61ad24fcd9c449045ef49bb9b926483bf67c1b2c
+  metadata.gz: b168170069c1f28da7c3fe26bff21344cf8ad6bd
+  data.tar.gz: b42c67ff2736fbeda95819f6c3d61b4a1ea2980b
 SHA512:
-  metadata.gz: 67824aa75b98a4397a7829faa7fe8926a32c4cbe6dcfed121812076e3951b9871dab6ae13c5ec8f661d9c248fe02bb501c0be9d8ce87385b3342d282ba0501ee
-  data.tar.gz: 0f39a3db0cc58ed01d20fad3316ea303562e93ab6f917b30bdd29f0e1781524aa13270f9e935daaa7cd9f1d38aa41ce561edbb72401c3056bb052b2f8c201d58
+  metadata.gz: 7056bb877d7f2066f713d31e6e32c58bb6661c52c650f89aa45dc415ef5e96dbf4ff9273746b8373c8c552e9e5290229c60c6fbcefb500da5bd7c13a662b9ba2
+  data.tar.gz: ae64ba89fa60b8a14f64f2cc5392fedf0e26dfc60aa2eaea74c4496d5a52f63fa4f43d5f06a83d42bd43a4abe79ecdf35ad2daaa025f372b2ab5ea0b95628746

data/bin/showoff

@@ -117,25 +117,37 @@ default_value "."
 command :serve do |c|
 
   c.desc 'Show verbose messaging'
-  c.switch :verbose
+  c.switch [:v, :verbose]
 
   c.desc 'Enable code review'
-  c.switch :review
+  c.switch [:r, :review]
 
   c.desc 'Enable remote code execution'
-  c.switch [:x,:executecode]
+  c.switch [:x, :executecode]
+
+  c.desc 'Disable content caching'
+  c.switch :nocache
 
   c.desc 'Port on which to run'
   c.default_value "9090"
-  c.flag [:p,:port]
+  c.flag [:p, :port]
 
   c.desc 'Host or ip to run on'
   c.default_value "0.0.0.0"
-  c.flag [:h,:host]
+  c.flag [:h, :host]
+
+  c.desc 'Run via HTTPS'
+  c.switch [:s, :ssl]
+
+  c.desc 'Path to SSL certificate. Showoff will generate one automatically if unset.'
+  c.flag :ssl_certificate
+
+  c.desc 'Path to SSL private key. Showoff will generate one automatically if unset.'
+  c.flag :ssl_private_key
 
   c.desc 'JSON file used to describe presentation'
   c.default_value "showoff.json"
-  c.flag [:f, :pres_file]
+  c.flag [:f, :file, :pres_file]
 
   c.action do |global_options,options,args|
 
@@ -145,8 +157,15 @@ command :serve do |c|
       raise "This presentation requires Showoff version #{config['version']} or greater."
     end
 
-    host = options[:h] == '0.0.0.0' ? 'localhost' : options[:h]
-    url  = "http://#{host}:#{options[:p].to_i}"
+    options[:host]            ||= config['host']
+    options[:port]            ||= config['port']
+    options[:ssl]             ||= config['ssl']
+    options[:ssl_certificate] ||= config['ssl_certificate']
+    options[:ssl_private_key] ||= config['ssl_private_key']
+
+    protocol = options[:ssl] ? 'https' : 'http'
+    host     = options[:host] == '0.0.0.0' ? 'localhost' : options[:host]
+    url      = "#{protocol}://#{host}:#{options[:p].to_i}"
     puts "
 -------------------------
 
@@ -160,14 +179,28 @@ To run it from presenter view, go to: [ #{url}/presenter ]
 
 "
 
-    ShowOff.run!  :host      => options[:h],
-                  :port      => options[:p].to_i,
-                  :pres_file => options[:f],
+    ShowOff.run!( :host      => options[:host],
+                  :port      => options[:port].to_i,
+                  :pres_file => options[:file],
                   :pres_dir  => args[0],
                   :verbose   => options[:verbose],
                   :review    => options[:review],
-                  :execute   => options[:x],
-                  :bind      => options[:h]
+                  :execute   => options[:executecode],
+                  :nocache   => options[:nocache],
+                  :bind      => options[:host],
+    ) do |server|
+      if options[:ssl]
+        ssl_options = {
+          :cert_chain_file  => options[:ssl_certificate],
+          :private_key_file => options[:ssl_private_key],
+          :verify_peer      => false,
+        }
+
+        server.ssl = true
+        server.ssl_options = ssl_options
+      end
+    end
+
   end
 end
 

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.10.2'
+SHOWOFF_VERSION = '0.11.0'

data/lib/showoff.rb

@@ -13,7 +13,7 @@ require "#{here}/commandline_parser"
 require "#{here}/keymap"
 
 begin
-  require 'RMagick'
+  require 'rmagick'
 rescue LoadError
   # nop
 end
@@ -121,8 +121,13 @@ class ShowOff < Sinatra::Application
     # Page view time accumulator. Tracks how often slides are viewed by the audience
     begin
       @@counter = JSON.parse(File.read("#{settings.statsdir}/#{settings.viewstats}"))
+
+      # port old format stats
+      unless @@counter.has_key? 'user_agents'
+        @@counter = { 'user_agents' => {}, 'pageviews' => @@counter }
+      end
     rescue
-      @@counter = Hash.new
+      @@counter = { 'user_agents' => {}, 'pageviews' => {} }
     end
 
     # keeps track of form responses. In memory to avoid concurrence issues.
@@ -135,6 +140,7 @@ class ShowOff < Sinatra::Application
     @@downloads = Hash.new # Track downloadable files
     @@cookie    = nil      # presenter cookie. Identifies the presenter for control messages
     @@current   = Hash.new # The current slide that the presenter is viewing
+    @@cache     = nil      # Cache slide content for subsequent hits
 
     # flush stats to disk periodically
     Thread.new do
@@ -458,9 +464,9 @@ class ShowOff < Sinatra::Application
         end
       end
 
-      # Now add a target so we open all links from notes in a new window
+      # Now add a target so we open all external links from notes in a new window
       doc.css('a').each do |link|
-        link.set_attribute('target', '_blank')
+        link.set_attribute('target', '_blank') unless link['href'].start_with? '#'
       end
 
       doc.to_html
@@ -513,7 +519,7 @@ class ShowOff < Sinatra::Application
         form  = "<form id='#{title}' action='/form/#{title}' method='POST'>#{content}#{tools}</form>"
         doc = Nokogiri::HTML::DocumentFragment.parse(form)
         doc.css('p').each do |p|
-          if p.text =~ /^(\w*) ?(?:->)? ?([^\*]*)? ?(\*?)= ?(.*)?$/
+          if p.text =~ /^(\w*) ?(?:->)? ?(.*)? (\*?)= ?(.*)?$/
             code     = $1
             id       = "#{title}_#{code}"
             name     = $2.empty? ? code : $2
@@ -536,19 +542,19 @@ class ShowOff < Sinatra::Application
       str =  "<div class='form element #{required}' id='#{id}' data-name='#{code}'>"
       str << "<label for='#{id}'>#{name}</label>"
       case rhs
-      when /^\[\s+(\d*)\]$$/             # value = [    5]                                    (textarea)
+      when /^\[\s+(\d*)\]$$/             # value = [    5]                                     (textarea)
         str << form_element_textarea(id, code, $1)
-      when /^___+(?:\[(\d+)\])?$/        # value = ___[50]                                    (text)
+      when /^___+(?:\[(\d+)\])?$/        # value = ___[50]                                     (text)
         str << form_element_text(id, code, $1)
-      when /^\(x?\)/                     # value = (x) option one () opt2 () opt3 -> option 3 (radio)
-        str << form_element_radio(id, code, rhs.scan(/\((x?)\)\s*([^()]+)\s*/))
-      when /^\[x?\]/                     # value = [x] option one [] opt2 [] opt3 -> option 3 (checkboxes)
-        str << form_element_checkboxes(id, code, rhs.scan(/\[(x?)\] ?([^\[\]]+)/))
-      when /^\{(.*)\}$/                  # value = {BOS, SFO, (NYC)}                          (select shorthand)
-        str << form_element_select(id, code, rhs.scan(/\(?\w+\)?/))
-      when /^\{$/                        # value = {                                          (select)
+      when /^\(.?\)/                     # value = (x) option one (=) opt2 () opt3 -> option 3 (radio)
+        str << form_element_radio(id, code, rhs.scan(/\((.?)\)\s*([^()]+)\s*/))
+      when /^\[.?\]/                     # value = [x] option one [=] opt2 [] opt3 -> option 3 (checkboxes)
+        str << form_element_checkboxes(id, code, rhs.scan(/\[(.?)\] ?([^\[\]]+)/))
+      when /^\{(.*)\}$/                  # value = {BOS, [SFO], (NYC)}                         (select shorthand)
+        str << form_element_select(id, code, rhs.scan(/[(\[]?\w+[)\]]?/))
+      when /^\{$/                        # value = {                                           (select)
         str << form_element_select_multiline(id, code, text)
-      when ''                            # value =                                            (radio/checkbox list)
+      when ''                            # value =                                             (radio/checkbox list)
         str << form_element_multiline(id, code, text)
       else
         @logger.warn "Unmatched form element: #{rhs}"
@@ -597,9 +603,13 @@ class ShowOff < Sinatra::Application
         case item
         when /^   +\((\w+) -> (.+)\),?$/         # (NYC -> New York City)
           str << "<option value='#{$1}' selected>#{$2}</option>"
+        when /^   +\[(\w+) -> (.+)\],?$/         # [NYC -> New York City]
+          str << "<option value='#{$1}' class='correct'>#{$2}</option>"
         when /^   +(\w+) -> (.+),?$/             # NYC -> New, York City
           str << "<option value='#{$1}'>#{$2}</option>"
-        when /^   +\((.+)[^,],?$/                # (Boston)
+        when /^   +\((.+)\)$/                    # (Boston)
+          str << "<option value='#{$1}' selected>#{$1}</option>"
+        when /^   +\[(.+)\]$/                    # [Boston]
           str << "<option value='#{$1}' selected>#{$1}</option>"
         when /^   +([^\(].+[^\),]),?$/           # Boston
           str << "<option value='#{$1}'>#{$1}</option>"
@@ -613,20 +623,20 @@ class ShowOff < Sinatra::Application
 
       text.split("\n")[1..-1].each do |item|
         case item
-        when /\((x?)\)\s*(\w+)\s*(?:->\s*(.*)?)?/
-          checked = $1.empty? ? '': "checked='checked'"
-          type  = 'radio'
-          value = $2
-          label = $3 || $2
-        when /\[(x?)\]\s*(\w+)\s*(?:->\s*(.*)?)?/
-          checked = $1.empty? ? '': "checked='checked'"
-          type  = 'checkbox'
-          value = $2
-          label = $3 || $2
+        when /\((.?)\)\s*(\w+)\s*(?:->\s*(.*)?)?/
+          modifier = $1
+          type     = 'radio'
+          value    = $2
+          label    = $3 || $2
+        when /\[(.?)\]\s*(\w+)\s*(?:->\s*(.*)?)?/
+          modifier = $1
+          type     = 'checkbox'
+          value    = $2
+          label    = $3 || $2
         end
 
         str << '<li>'
-        str << form_element_check_or_radio(type, id, code, value, label, checked)
+        str << form_element_check_or_radio(type, id, code, value, label, modifier)
         str << '</li>'
       end
       str << '</ul>'
@@ -635,7 +645,7 @@ class ShowOff < Sinatra::Application
     def form_element_check_or_radio_set(type, id, code, items)
       str = ''
       items.each do |item|
-        checked = item[0].empty? ? '': "checked='checked'"
+        modifier = item[0]
 
         if item[1] =~ /^(\w*) -> (.*)$/
           value = $1
@@ -644,17 +654,31 @@ class ShowOff < Sinatra::Application
           value = label = item[1]
         end
 
-        str << form_element_check_or_radio(type, id, code, value, label, checked)
+        str << form_element_check_or_radio(type, id, code, value, label, modifier)
       end
       str
     end
 
-    def form_element_check_or_radio(type, id, code, value, label, checked)
+    def form_element_check_or_radio(type, id, code, value, label, modifier)
       # yes, value and id are conflated, because this is the id of the parent widget
+      checked = form_checked?(modifier)
+      classes = form_classes(modifier)
 
       name = (type == 'checkbox') ? "#{code}[]" : code
-      str  =  "<input type='#{type}' name='#{name}' id='#{id}_#{value}' value='#{value}' #{checked} />"
-      str << "<label for='#{id}_#{value}'>#{label}</label>"
+      str  =  "<input type='#{type}' name='#{name}' id='#{id}_#{value}' value='#{value}' class='#{classes}' #{checked} />"
+      str << "<label for='#{id}_#{value}' class='#{classes}'>#{label}</label>"
+    end
+
+    def form_classes(modifier)
+      modifier.downcase!
+      classes = []
+      classes << 'correct' if modifier.include?('=')
+
+      classes.join
+    end
+
+    def form_checked?(modifier)
+      modifier.downcase.include?('x') ? "checked='checked'" : ''
     end
 
     # TODO: deprecated
@@ -931,7 +955,13 @@ class ShowOff < Sinatra::Application
     end
 
     def slides(static=false)
-      get_slides_html(:static=>static)
+      # if we have a cache and we're not asking to invalidate it
+      return @@cache if (@@cache and params['cache'] != 'clear')
+      content = get_slides_html(:static=>static)
+
+      # allow command line cache disabling
+      @@cache = content unless settings.nocache
+      content
     end
 
     def onepage(static=false)
@@ -970,12 +1000,12 @@ class ShowOff < Sinatra::Application
 
     def stats()
       if request.env['REMOTE_HOST'] == 'localhost'
-        # the presenter should have full stats
-        @counter = @@counter
+        # the presenter should have full stats in the erb
+        @counter = @@counter['pageviews']
       end
 
       @all = Hash.new
-      @@counter.each do |slide, stats|
+      @@counter['pageviews'].each do |slide, stats|
         @all[slide] = 0
         stats.map do |host, visits|
           visits.each { |entry| @all[slide] += entry['elapsed'].to_f }
@@ -1158,16 +1188,21 @@ class ShowOff < Sinatra::Application
 
     @@forms[id].each_with_object({}) do |(ip,form), sum|
       form.each do |key, val|
-        sum[key]      ||= {}
+        # initialize the object with an empty response if needed
+        sum[key] ||= { 'count' => 0, 'responses' => {} }
+
+        # increment the number of unique responses we've seen
+        sum[key]['count'] += 1
 
+        responses = sum[key]['responses']
         if val.class == Array
           val.each do |item|
-            sum[key][item] ||= 0
-            sum[key][item]  += 1
+            responses[item] ||= 0
+            responses[item]  += 1
           end
         else
-          sum[key][val] ||= 0
-          sum[key][val]  += 1
+          responses[val] ||= 0
+          responses[val]  += 1
         end
       end
     end.to_json
@@ -1294,14 +1329,18 @@ class ShowOff < Sinatra::Application
               slide  = control['slide']
               time   = control['time'].to_f
 
-              @logger.debug "Logged #{time} on slide #{slide} for #{remote}"
+              # record the UA of the client if we haven't seen it before
+              @@counter['user_agents'][remote] ||= request.user_agent
 
+              views = @@counter['pageviews']
               # a bucket for this slide
-              @@counter[slide] ||= Hash.new
+              views[slide] ||= Hash.new
               # a bucket of slideviews for this address
-              @@counter[slide][remote] ||= Array.new
+              views[slide][remote] ||= Array.new
               # and add this slide viewing to the bucket
-              @@counter[slide][remote] << { 'elapsed' => time, 'timestamp' => Time.now.to_i, 'presenter' => @@current[:name] }
+              views[slide][remote] << { 'elapsed' => time, 'timestamp' => Time.now.to_i, 'presenter' => @@current[:name] }
+
+              @logger.debug "Logged #{time} on slide #{slide} for #{remote}"
 
             when 'position'
               ws.send( { 'current' => @@current[:number] }.to_json ) unless @@cookie.nil?

data/public/css/presenter.css

@@ -175,6 +175,12 @@ div.zoomed {
       background-color: #fff;
       font-family: helvetica;
     }
+
+    .menu ul {
+      list-style: none;
+      padding: 0;
+    }
+
     .menu ul li {
       padding: 5px;
     }
@@ -234,6 +240,11 @@ div.zoomed {
         display: none;
       }
 
+      #preview .content form label.correct {
+        font-weight: 900;
+        border-bottom: 4px solid black;
+      }
+
       img#disconnected {
         margin: 0.5em 1em;
       }
@@ -349,6 +360,19 @@ div.zoomed {
     list-style-type: disc;
   }
 
+  #notes div.rendered.form span.count {
+    display: inline;
+    position: absolute;
+    top: 3px;
+    right: 4px;
+    z-index: 10;
+    font-size: 2.5em;
+    background-color: #ddd;
+    border: 1px solid #333;
+    border-radius: 0 0.15em 0 0;
+    box-shadow: 2px 2px 2px #888;
+  }
+
   #bottom #notes div.personal {
     float: right;
     border-left: 4px solid #999;

data/public/css/showoff.css

@@ -641,6 +641,11 @@ div.rendered.form {
   border-radius: 0.5em;
   margin: 1em;
   padding: 0.25em;
+  min-height: 3em;
+}
+div.rendered.form.element {
+  position: relative; /* for absolutely positioning children */
+  padding-left: 0.5em;
 }
 div.rendered.form label {
   display: block;
@@ -653,11 +658,23 @@ div.rendered.form .item {
 /*   overflow: hidden; */
   height: 1.25em;
   white-space: nowrap;
+  opacity: 0.5;
+  border-radius: 0 0.5em 0.5em 0;
+  margin: 2px 0;
+}
+div.rendered.form .item.correct {
+  font-weight: 900;
+  border-left: 4px solid black;
+  opacity: 1.0;
 }
+div.rendered.form span.count {
+  display: none;
+}
+
 div.rendered.form .item.barstyle0 { background-color: #bb73bb; }
 div.rendered.form .item.barstyle1 { background-color: #59b859; }
 div.rendered.form .item.barstyle2 { background-color: #e3742f; }
-div.rendered.form .item.barstyle3 { background-color: #4848e8; }
+div.rendered.form .item.barstyle3 { background-color: #48a2ee; }
 div.rendered.form .item.barstyle4 { background-color: #f75d5d; }
 
 #notes .form.wrapper {

data/public/js/showoff.js

@@ -102,10 +102,14 @@ function setupPreso(load_slides, prefix) {
 */
 }
 
-function loadSlides(load_slides, prefix) {
+function loadSlides(load_slides, prefix, reload) {
+  var url = loadSlidesPrefix + "slides";
+  if (reload) {
+    url += "?cache=clear";
+  }
 	//load slides offscreen, wait for images and then initialize
 	if (load_slides) {
-		$("#slides").load(loadSlidesPrefix + "slides", false, function(){
+		$("#slides").load(url, false, function(){
 			$("#slides img").batchImageLoad({
 			loadingCompleteCallback: initializePresentation(prefix)
 		})
@@ -118,7 +122,7 @@ function loadSlides(load_slides, prefix) {
 }
 
 function loadKeyDictionaries () {
-  $.getJSON('/js/keyDictionary.json', function(data) {
+  $.getJSON('js/keyDictionary.json', function(data) {
     keycode_dictionary = data['keycodeDictionary'];
     keycode_shifted_keys = data['shiftedKeyDictionary'];
   });
@@ -504,7 +508,11 @@ function renderForm(form) {
     //console.log(data);
     form.children('div.form.element').each(function() {
       var key = $(this).attr('data-name');
-      var sum = 0;
+
+      // add a counter label if we haven't already
+      if( $(this).has('span.count').length == 0 ) {
+        $(this).prepend('<span class="count"></span>');
+      }
 
       $(this).find('ul > li > *').each(function() {
         $(this).parent().parent().before(this);
@@ -529,15 +537,16 @@ function renderForm(form) {
           case 'radio':
           case 'checkbox':
             // Just render these directly and migrate the label to inside the span
-            var value = $(this).attr('value');
-            var label = $(this).next('label');
-            var text  = label.text();
+            var value   = $(this).attr('value');
+            var label   = $(this).next('label');
+            var classes = $(this).attr('class');
+            var text    = label.text();
 
             if(text.match(/^-+$/)) {
               $(this).remove();
             }
             else{
-              $(this).replaceWith('<div class="item barstyle'+style+'" data-value="'+value+'">'+text+'</div>');
+              $(this).replaceWith('<div class="item barstyle'+style+' '+classes+'" data-value="'+value+'">'+text+'</div>');
             }
             label.remove();
             break;
@@ -548,11 +557,12 @@ function renderForm(form) {
             parent = $(this).parent();
 
             $(this).children('option').each(function() {
-              var value = $(this).val();
-              var text  = $(this).text();
+              var value   = $(this).val();
+              var text    = $(this).text();
+              var classes = $(this).attr('class');
 
               if(! text.match(/^-+$/)) {
-                parent.append('<div class="item barstyle'+style+'" data-value="'+value+'">'+text+'</div>');
+                parent.append('<div class="item barstyle'+style+' '+classes+'" data-value="'+value+'">'+text+'</div>');
 
                 // loop style counter
                 style++; style %= max;
@@ -568,37 +578,46 @@ function renderForm(form) {
 
       // only start counting and sizing bars if we actually have usable data
       if(data) {
+        // number of unique responses
+        var total = 0;
         // double loop so we can handle re-renderings of the form
         $(this).find('.item').each(function() {
           var name = $(this).attr('data-value');
 
           if(key in data) {
-            var count = data[key][name];
-            if(count) { sum += count; }
+            var count = data[key]['responses'][name];
+
+            total = data[key]['count'];
           }
         });
 
+        // insert the total into the counter label
+        $(this).find('span.count').each(function() {
+          $(this).text(total);
+        });
 
+        var oldTotal = $(this).attr('data-total');
         $(this).find('.item').each(function() {
           var name     = $(this).attr('data-value');
           var oldCount = $(this).attr('data-count');
-          var oldSum   = $(this).attr('data-sum');
 
           if(key in data) {
-            var count = data[key][name] || 0;
+            var count = data[key]['responses'][name] || 0;
           }
           else {
             var count = 0;
           }
 
-          if(count != oldCount || sum != oldSum) {
-            var percent = (sum) ? ((count/sum)*100)+'%' : '0%';
+          if(count != oldCount || total != oldTotal) {
+            var percent = (total) ? ((count/total)*100)+'%' : '0%';
 
             $(this).attr('data-count', count);
-            $(this).attr('data-sum', sum);
             $(this).animate({width: percent});
           }
         });
+
+        // record the old total value so we only animate when it changes
+        $(this).attr('data-total', total);
       }
 
       $(this).addClass('rendered');
@@ -608,7 +627,8 @@ function renderForm(form) {
 }
 
 function connectControlChannel() {
-  ws           = new WebSocket('ws://' + location.host + '/control');
+  protocol     = (location.protocol === 'https:') ? 'wss://' : 'ws://';
+  ws           = new WebSocket(protocol + location.host + '/control');
   ws.onopen    = function()  { connected();          };
   ws.onclose   = function()  { disconnected();       }
   ws.onmessage = function(m) { parseMessage(m.data); };
@@ -911,7 +931,7 @@ function toggleDebug () {
 
 function reloadSlides () {
   if (confirm('Are you sure you want to reload the slides?')) {
-    loadSlides(loadSlidesBool, loadSlidesPrefix);
+    loadSlides(loadSlidesBool, loadSlidesPrefix, true);
     showSlide();
   }
 }

data/views/header.erb

@@ -3,8 +3,6 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0"/>
 
-  <link rel="stylesheet" href="<%= @asset_path %>/css/reset.css" type="text/css"/>
-
   <% if @favicon %>
   <link rel="icon" href="<%= @favicon %>"/>
   <% end %>

data/views/header_mini.erb

@@ -7,7 +7,6 @@
     <link rel="icon" href="<%= @favicon %>"/>
   <% end %>
 
-  <link rel="stylesheet" href="<%= @asset_path %>/css/reset.css" type="text/css"/>
   <link rel="stylesheet" href="<%= @asset_path %>/css/showoff.css" type="text/css"/>
 
   <link type="text/css" href="<%= @asset_path %>/css/fg.menu.css" media="screen" rel="stylesheet" />

data/views/onepage.erb

@@ -11,11 +11,11 @@
 
   <% if @inline %>
 
-    <%= inline_css(['reset.css', 'showoff.css', 'theme/ui.all.css', 'sh_style.css', 'onepage.css', "highlight/#{@highlightStyle}.css"], 'public/css') %>
+    <%= inline_css(['showoff.css', 'theme/ui.all.css', 'onepage.css', "highlight/#{@highlightStyle}.css"], 'public/css') %>
     <%= inline_css(css_files) %>
 
     <!--[if lte IE 8]>
-      <%= inline_css('ie8.css') %>
+      <%= inline_css(['ie8.css'], 'public/css') %>
     <![endif]-->
 
     <%= inline_js(['jquery-2.1.4.min.js', 'jquery-print.js', 'showoff.js', 'onepage.js', 'highlight.pack.js'], 'public/js') %>
@@ -23,7 +23,7 @@
     <%= inline_js(js_files) %>
 
   <% else %>
-    <% ['reset.css', 'showoff.css', 'theme/ui.all.css', 'onepage.css', "highlight/#{@highlightStyle}.css"].each do |css_file| %>
+    <% ['showoff.css', 'theme/ui.all.css', 'onepage.css', "highlight/#{@highlightStyle}.css"].each do |css_file| %>
       <link rel="stylesheet" href="<%= @asset_path %>/css/<%= css_file %>" type="text/css"/>
     <% end %>
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: showoff
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.0
 platform: ruby
 authors:
 - Scott Chacon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-16 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -268,7 +268,6 @@ files:
 - public/css/popdown.png
 - public/css/popout.png
 - public/css/presenter.css
-- public/css/reset.css
 - public/css/run_code-dim.png
 - public/css/run_code.png
 - public/css/showoff.css

data/public/css/reset.css

@@ -1,53 +0,0 @@
-/* http://meyerweb.com/eric/tools/css/reset/ */
-/* v1.0 | 20080212 */
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, font, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	outline: 0;
-	font-size: 100%;
-	vertical-align: baseline;
-	background: transparent;
-}
-body {
-	line-height: 1;
-}
-ol, ul {
-	list-style: none;
-}
-blockquote, q {
-	quotes: none;
-}
-blockquote:before, blockquote:after,
-q:before, q:after {
-	content: '';
-	content: none;
-}
-
-/* remember to define focus styles! */
-:focus {
-	outline: 0;
-}
-
-/* remember to highlight inserts somehow! */
-ins {
-	text-decoration: none;
-}
-del {
-	text-decoration: line-through;
-}
-
-/* tables still need 'cellspacing="0"' in the markup */
-table {
-	border-collapse: collapse;
-	border-spacing: 0;
-}