showoff 0.9.8.1 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fca9e8bcaae915b49026c82cc34298fd4413505c
-  data.tar.gz: 8aef14fae196f0aeadefbe9831419a57c3352021
+  metadata.gz: 43fa218d1a12936c933c64b8819f1f6c65812b71
+  data.tar.gz: b6a65b1480ca48095b43930af822a951daf0a9d6
 SHA512:
-  metadata.gz: 17c1bca3813b395bbc4e5d3e281a73cea6ebba13637e77b90a026fa65be83759e226ab514b9b45be0b2d1a31550dbc35a4bb89515b2674e69a22e4cf9e87b441
-  data.tar.gz: edcf51738ef555ddcb356a69a39069ab68deae628ab785eed81114e229c3570f1f552bd03119d270b8e9c9ea72f49b88dd37f21db65d91d07c107a242191f115
+  metadata.gz: 071852ca2bc0e2a8c1ebc36b73fab308c7b23f89905b25a5fca3a41010bda34f613312c3f1d60969d7772b64dce0d143cd4dc8c21191dc502fb86e9ca69733ff
+  data.tar.gz: ee1903e661ee16456371ac02717b59d6c8a0bb3524cf03abe696fab532c26dac9c31d2403d37bb7315246921ba3adb49e13eba6cf91b118d7f7c336226df08fe

data/README.rdoc

@@ -1,6 +1,6 @@
-= ShowOff Presentation Software
+= Showoff Presentation Software
 
-ShowOff is a Sinatra web app that reads simple configuration files for a
+Showoff is a Sinatra web app that reads simple configuration files for a
 presentation.  It is sort of like a Keynote web app engine - think S5 +
 Slidedown.  I am using it to do all my talks in 2010, because I have a deep
 hatred in my heart for Keynote and yet it is by far the best in the field.
@@ -50,7 +50,7 @@ Please see the documentation in <tt>./documentation</tt> for further information
 
 = Real World Usage
 
-So far, ShowOff has been used in the following presentations (and many others):
+So far, Showoff has been used in the following presentations (and many others):
 
 * LinuxConf.au 2010 - Wrangling Git - Scott Chacon
   http://github.com/schacon/showoff-wrangling-git

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.9.8.1'
+SHOWOFF_VERSION = '0.9.9'

data/lib/showoff.rb

@@ -37,6 +37,7 @@ class ShowOff < Sinatra::Application
   set :statsdir, "stats"
   set :viewstats, "viewstats.json"
   set :feedback, "feedback.json"
+  set :forms, "forms.json"
 
   set :server, 'thin'
   set :sockets, []
@@ -61,6 +62,13 @@ class ShowOff < Sinatra::Application
     @@counter = Hash.new
   end
 
+  # keeps track of form responses. In memory to avoid concurrence issues.
+  begin
+    @@forms = JSON.parse(File.read("#{settings.statsdir}/#{settings.forms}"))
+  rescue
+    @@forms = Hash.new
+  end
+
   @@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
@@ -282,6 +290,7 @@ class ShowOff < Sinatra::Application
         # 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
+        sl = build_forms(sl, content_classes)
         sl = update_p_classes(sl)
         sl = process_content_for_section_tags(sl)
         sl = update_special_content(sl, @slide_count, name) # TODO: deprecated
@@ -314,6 +323,9 @@ class ShowOff < Sinatra::Application
       # scan for pagebreak tags. Should really only be used for handout notes or supplemental materials
       result.gsub!("~~~PAGEBREAK~~~", '<div class="break">continued...</div>')
 
+      # replace with form rendering placeholder
+      result.gsub!(/~~~FORM:([^~]*)~~~/, '<div class="form wrapper" title="\1"></div>')
+
       # Now check for any kind of options
       content.scan(/(~~~CONFIG:(.*?)~~~)/).each do |match|
         result.gsub!(match[0], settings.showoff_config[match[1]]) if settings.showoff_config.key?(match[1])
@@ -382,6 +394,163 @@ class ShowOff < Sinatra::Application
       markdown.gsub(/<p>\.(.*?) /, '<p class="\1">')
     end
 
+    # replace custom markup with html forms
+    def build_forms(content, classes=[])
+      classes.select { |cl| cl =~ /^form=(\w+)$/ }
+      # only process slides marked as forms
+      return content unless $1
+
+      begin
+        tools =  '<div class="tools">'
+        tools << '<input type="button" class="display" value="Display Results">'
+        tools << '<input type="submit" value="Save" disabled="disabled">'
+        tools << '</div>'
+        form  = "<form id='#{$1}' action='/form/#{$1}' method='POST'>#{content}#{tools}</form>"
+        doc = Nokogiri::HTML::DocumentFragment.parse(form)
+        doc.css('p').each do |p|
+          if p.text =~ /^(\w*) ?(?:->)? ?([^\*]*)? ?(\*?)= ?(.*)?$/
+            id       = $1
+            name     = $2.empty? ? $1 : $2
+            required = ! $3.empty?
+            rhs      = $4
+
+            p.replace form_element(id, name, required, rhs, p.text)
+          end
+        end
+        doc.to_html
+      rescue Exception => e
+        @logger.warn "Form parsing failed: #{e.message}"
+        @logger.debug "Backtrace:\n\t#{e.backtrace.join("\n\t")}"
+        content
+      end
+    end
+
+    def form_element(id, name, required, rhs, text)
+      required = required ? 'required' : ''
+      str =  "<div class='form element #{required}' id='#{id}'>"
+      str << "<label for='#{id}'>#{name}</label>"
+      case rhs
+      when /^\[\s+(\d*)\]$$/             # value = [    5]                                    (textarea)
+        str << form_element_textarea(id, name, $1)
+      when /^___+(?:\[(\d+)\])?$/        # value = ___[50]                                    (text)
+        str << form_element_text(id, name, $1)
+      when /^\(x?\)/                     # value = (x) option one () opt2 () opt3 -> option 3 (radio)
+        str << form_element_radio(id, name, rhs.scan(/\((x?)\)\s*([^()]+)\s*/))
+      when /^\[x?\]/                     # value = [x] option one [] opt2 [] opt3 -> option 3 (checkboxes)
+        str << form_element_checkboxes(id, name, rhs.scan(/\[(x?)\] ?([^\[\]]+)/))
+      when /^{(.*)}$/                    # value = {BOS, SFO, (NYC)}                          (select shorthand)
+        str << form_element_select(id, name, rhs.scan(/\(?\w+\)?/))
+      when /^{$/                         # value = {                                          (select)
+        str << form_element_select_multiline(id, name, text)
+      when ''                            # value =                                            (radio/checkbox list)
+        str << form_element_multiline(id, name, text)
+      else
+        @logger.warn "Unmatched form element: #{rhs}"
+      end
+      str << '</div>'
+    end
+
+    def form_element_text(id, name, length)
+      "<input type='text' id='#{id}' name='#{id}' size='#{length}' />"
+    end
+
+    def form_element_textarea(id, name, rows)
+      rows = 3 if rows.empty?
+      "<textarea id='#{id}' name='#{id}' rows='#{rows}'></textarea>"
+    end
+
+    def form_element_radio(id, name, items)
+      form_element_check_or_radio_set('radio', id, name, items)
+    end
+
+    def form_element_checkboxes(id, name, items)
+      form_element_check_or_radio_set('checkbox', id, name, items)
+    end
+
+    def form_element_select(id, name, items)
+      str =  "<select id='#{id}' name='#{name}'>"
+      str << '<option value="">----</option>'
+
+      items.each do |item|
+        if item =~ /\((\w+)\)/
+          item     = $1
+          selected = 'selected'
+        else
+          selected = ''
+        end
+        str << "<option value='#{item}' #{selected}>#{item}</option>"
+      end
+      str << '</select>'
+    end
+
+    def form_element_select_multiline(id, name, text)
+      str =  "<select id='#{id}' name='#{id}'>"
+      str << '<option value="">----</option>'
+
+      text.split("\n")[1..-1].each do |item|
+        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}'>#{$2}</option>"
+        when /^   +\((.+)[^,],?$/                # (Boston)
+          str << "<option value='#{$1}' selected>#{$1}</option>"
+        when /^   +([^\(].+[^\),]),?$/           # Boston
+          str << "<option value='#{$1}'>#{$1}</option>"
+        end
+      end
+      str << '</select>'
+    end
+
+    def form_element_multiline(id, name, text)
+      str = '<ul>'
+
+      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
+        end
+
+        str << '<li>'
+        str << form_element_check_or_radio(type, id, value, label, checked)
+        str << '</li>'
+      end
+      str << '</ul>'
+    end
+
+    def form_element_check_or_radio_set(type, id, name, items)
+      str = ''
+      items.each do |item|
+        checked = item[0].empty? ? '': "checked='checked'"
+
+        if item[1] =~ /^(\w*) -> (.*)$/
+          value = $1
+          label = $2
+        else
+          value = label = item[1]
+        end
+
+        str << form_element_check_or_radio(type, id, value, label, checked)
+      end
+      str
+    end
+
+    def form_element_check_or_radio(type, id, value, label, checked)
+      # yes, value and id are conflated, because this is the id of the parent widget
+
+      id  = "#{id}[]" if type == 'checkbox'
+      str =  "<input type='#{type}' name='#{id}' id='#{value}' value='#{value}' #{checked} />"
+      str << "<label for='#{value}'>#{label}</label>"
+    end
+
     # TODO: deprecated
     def update_special_content(content, seq, name)
       doc = Nokogiri::HTML::DocumentFragment.parse(content)
@@ -471,7 +640,7 @@ class ShowOff < Sinatra::Application
     end
 
     def update_commandline_code(slide)
-      html = Nokogiri::XML.parse(slide)
+      html = Nokogiri::HTML.parse(slide)
       parser = CommandlineParser.new
 
       html.css('pre').each do |pre|
@@ -845,6 +1014,39 @@ class ShowOff < Sinatra::Application
     (request.cookies['presenter'] == @@cookie)
   end
 
+  post '/form/:id' do |id|
+    @logger.warn("Saving form answers from ip:#{request.ip} for id:##{id}")
+
+    form = params.reject { |k,v| ['splat', 'captures', 'id'].include? k }
+
+    # make sure we've got a bucket for this form, then save our answers
+    @@forms[id] ||= {}
+    @@forms[id][request.ip] = form
+
+    form.to_json
+  end
+
+  # Return a list of the totals for each alternative for each question of a form
+  get '/form/:id' do |id|
+    return nil unless @@forms.has_key? id
+
+    @@forms[id].each_with_object({}) do |(ip,form), sum|
+      form.each do |key, val|
+        sum[key]      ||= {}
+
+        if val.class == Array
+          val.each do |item|
+            sum[key][item] ||= 0
+            sum[key][item]  += 1
+          end
+        else
+          sum[key][val] ||= 0
+          sum[key][val]  += 1
+        end
+      end
+    end.to_json
+  end
+
   get '/eval_ruby' do
     return eval_ruby(params[:code]) if ENV['SHOWOFF_EVAL_RUBY']
 
@@ -1010,12 +1212,24 @@ class ShowOff < Sinatra::Application
 
   at_exit do
     if defined?(@@counter)
-      filename = "#{settings.statsdir}/#{settings.viewstats}"
-      if settings.verbose then
-        File.write(filename, JSON.pretty_generate(@@counter))
-      else
-        File.write(filename, @@counter.to_json)
+      File.open("#{settings.statsdir}/#{settings.viewstats}", 'w') do |f|
+        if settings.verbose then
+          f.write(JSON.pretty_generate(@@counter))
+        else
+          f.write(@@counter.to_json)
+        end
+      end
+    end
+
+    if defined?(@@forms)
+      File.open("#{settings.statsdir}/#{settings.forms}", 'w') do |f|
+        if settings.verbose then
+          f.write(JSON.pretty_generate(@@forms))
+        else
+          f.write(@@forms.to_json)
+        end
       end
     end
+
   end
 end

data/public/css/presenter.css

@@ -157,6 +157,13 @@ div.zoomed {
     background: #eee;
   }
 
+#preview .content form div.tools input[type=button].display {
+  display: inline;
+}
+#preview .content form div.tools input[type=submit] {
+  display: none;
+}
+
 img#disconnected {
   margin: 0.5em 1em;
 }

data/public/css/showoff.css

@@ -61,16 +61,19 @@
 }
 
 /* plain (non-bullet) text */
-.content > p {
-	font-size: 2em;
+.content > p,
+.content > form > p {
+    font-size: 2em;
     margin: 1em;
-	text-align: center;
+    text-align: center;
 }
 
-.content > pre {
+.content > pre,
+.content > form > pre {
     font-size: 300%;
 }
-.content > blockquote {
+.content > blockquote,
+.content > form > blockquote {
     font-size: 250%;
     margin: 2em;
 }
@@ -92,9 +95,9 @@
 /* numbered lists are numbered */
 .content ol {
     margin-left: 40px;
-	font-size: 3em;
-	text-align: left;
-	padding-left: 40px;
+    font-size: 3em;
+    text-align: left;
+    padding-left: 40px;
 }
 .content ol > li {
     list-style: decimal;
@@ -103,15 +106,15 @@
 
 
 /* ironically, normal lists have bullets and 'bullets' lists don't */
-.content > ul {
+.content > ul,
+.content > form > ul {
     list-style: disc;
+    font-size: 3em;
+    text-align: left;
+    padding-left: 40px;
 }
-.content > ul {
-	font-size: 3em;
-	text-align: left;
-	padding-left: 40px;
-}
-.content > ul > li {
+.content > ul > li,
+.content > form > ul > li {
     padding: .5em;
     margin-left: 40px;
 }
@@ -308,7 +311,7 @@ img#disconnected {
   text-align: center;
 }
 
-#feedbackSidebar div.row.tools button#editSlide {
+#feedbackSidebar div.row > button {
   width: 90%%;
   margin: auto 5%;
 }
@@ -448,6 +451,81 @@ a.fg-button { float:left; }
   content: leader(".") target-counter(attr(href), page);
 }
 
+/**********************************
+ ***       form widgets         ***
+ **********************************/
+.content div.form.element {
+    text-align: left;
+    padding-left: 40px;
+}
+.content div.form.element label {
+  margin-right: 0.5em;
+}
+.content div.form.element select {
+  font-size: 2em;
+}
+.content div.form.element textarea {
+  display: block;
+  width: 85%;
+}
+.content div.form.element ul {
+  list-style: disc;
+}
+.content div.form.element ul > li {
+  margin-left: 40px;
+}
+/* TODO: not sure why the preview window honks things up */
+#preview .content div.form.element select {
+  font-size: 0.8em;
+}
+.content div.form.element.warning {
+  background-color: #ff7373;
+}
+.content form div.tools {
+  font-size: 2em;
+}
+.content form div.tools * {
+  float: right;
+}
+.content form div.tools input[type=submit],
+.content form div.tools input[type=button] {
+  margin: 1em;
+}
+.content form div.tools input[type=submit].dirty {
+  color: red;
+}
+.content form div.tools input[type=button].display {
+  display: none;
+}
+
+div.rendered.form {
+  border: 1px solid #ccc;
+  border-radius: 0.5em;
+  margin: 1em;
+  padding: 0.25em;
+}
+div.rendered.form label {
+  display: block;
+  font-weight: bold;
+  border-bottom: 1px solid #999;
+}
+div.rendered.form .item {
+  display: block;
+  width: 0;
+/*   overflow: hidden; */
+  height: 1.25em;
+  white-space: nowrap;
+}
+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.barstyle4 { background-color: #f75d5d; }
+
+#notes .form.wrapper {
+  display: none;
+}
+
 /**********************************
  ***   supplemental materials   ***
  **********************************/

data/public/js/presenter.js

@@ -357,11 +357,20 @@ function postSlide()
 		  var notes = getCurrentNotes()
 		}
 */
-    var notes = getCurrentNotes()
-		$('#notes').html(notes.html())
+    // clear out any existing rendered forms
+    try { clearInterval(renderFormInterval) } catch(e) {}
+    $('#notes div.form').empty();
+
+    var notes = getCurrentNotes();
+		$('#notes').html(notes.html());
+
+		var fileName = currentSlide.children().first().attr('ref');
+		$('#slideFile').text(fileName);
+
+    $("#notes div.form.wrapper").each(function(e) {
+      renderFormInterval = renderFormWatcher($(this));
+    });
 
-		var fileName = currentSlide.children().first().attr('ref')
-		$('#slideFile').text(fileName)
 	}
 }
 

data/public/js/showoff.js

@@ -40,7 +40,7 @@ function setupPreso(load_slides, prefix) {
 
 	// Load slides fetches images
 	loadSlidesBool = load_slides
-	loadSlidesPrefix = prefix
+	loadSlidesPrefix = prefix || '/'
 	loadSlides(loadSlidesBool, loadSlidesPrefix)
 
 	doDebugStuff()
@@ -155,6 +155,36 @@ function initializePresentation(prefix) {
 	} catch(e) {
 	    sh_highlightDocument();
 	}
+
+  $(".content form").submit(function(e) {
+    e.preventDefault();
+    submitForm($(this));
+  });
+
+  // suspend hotkey handling
+  $(".content form :input").focus( function() {
+    document.onkeydown = null;
+    document.onkeyup   = null;
+  });
+  $(".content form :input").blur( function() {
+    document.onkeydown = keyDown;
+    document.onkeyup   = keyUp;
+  });
+
+  $(".content form :input").change(function(e) {
+    enableForm($(this));
+  });
+
+  $(".content form div.tools input.display").click(function(e) {
+    try {
+      // If we're a presenter, try to bust open the slave display
+      slaveWindow.renderForm($(this).closest('form').attr('id'));
+    }
+    catch (e) {
+      renderForm($(this).closest('form'));
+    }
+  });
+
 	$("#preso").trigger("showoff:loaded");
 }
 
@@ -203,13 +233,15 @@ function checkSlideParameter() {
 
 function currentSlideFromName(name) {
   var count = 0;
-	slides.each(function(s, slide) {
-	  if (name == $(slide).find(".content").attr("ref") ) {
-	    found = count;
-	    return false;
-	  }
-	  count++;
-	});
+  if(name.length > 0 ) {
+  	slides.each(function(s, slide) {
+  	  if (name == $(slide).find(".content").attr("ref") ) {
+  	    found = count;
+  	    return false;
+  	  }
+  	  count++;
+  	});
+	}
 	return count;
 }
 
@@ -381,6 +413,168 @@ function clearIf(elem, val) {
   if(elem.val() == val ) { elem.val(''); }
 }
 
+
+// form handling
+function submitForm(form) {
+  if(validateForm(form)) {
+    var dataString = form.serialize();
+    var formAction = form.attr("action");
+
+    $.post(formAction, dataString, function( data ) {
+      var submit = form.find("input[type=submit]")
+      submit.attr("disabled", "disabled");
+      submit.removeClass("dirty");
+    });
+  }
+}
+
+function validateForm(form) {
+  var success = true;
+
+  form.children('div.form.element.required').each(function() {
+    var count  = $(this).find(':input:checked').length;
+    var value  = $.trim($(this).children('input:text, textarea, select').first().val());
+
+    // if we have no checked inputs or content, then flag it
+    if(count || (value && value)) {
+      $(this).closest('div.form.element').removeClass('warning');
+    }
+    else {
+      $(this).closest('div.form.element').addClass('warning');
+      success = false;
+    }
+
+  });
+
+  return success;
+}
+
+function enableForm(element) {
+  var submit = element.closest('form').find(':submit')
+  submit.removeAttr("disabled");
+  submit.addClass("dirty")
+}
+
+function renderFormWatcher(element) {
+  var form = element.attr('title');
+  var action = $('.content form#'+form).attr('action');
+
+  element.empty();
+  element.attr('action', action); // yes, we're putting an action on a div. Sue me.
+  $('.content form#'+form+' div.form.element').each(function() {
+    $(this).clone().appendTo(element);
+  });
+
+  renderForm(element);
+  // short pause to let the form be rebuilt. Prevents screen flashing.
+  setTimeout(function() { element.show(); }, 100);
+  return setInterval(function() { renderForm(element); }, 3000);
+}
+
+function renderForm(form) {
+  if(typeof(form) == 'string') {
+    form = $('form#'+form);
+  }
+  var action = form.attr("action");
+  $.getJSON(action, function( data ) {
+    //console.log(data);
+    form.children('div.form.element').each(function() {
+      var key = $(this).attr('id');
+      var sum = 0;
+
+      $(this).find('ul > li > *').each(function() {
+        $(this).parent().parent().before(this);
+      });
+      $(this).children('ul').each(function() {
+        $(this).remove();
+      });
+
+      // replace all input widgets with spans for the bar chart
+      var max   = 5;
+      var style = 0;
+      $(this).children(':input').each(function() {
+        switch( $(this).attr('type') ) {
+          case 'text':
+          case 'button':
+          case 'submit':
+          case 'textarea':
+            // we don't render these
+            $(this).parent().remove();
+            break;
+
+          case 'radio':
+          case 'checkbox':
+            // Just render these directly and migrate the label to inside the span
+            var name  = $(this).attr('id');
+            var label = $(this).next('label');
+            var text  = label.text();
+
+            if(text.match(/^-+$/)) {
+              $(this).remove();
+            }
+            else{
+              $(this).replaceWith('<div class="item barstyle'+style+'" id="'+name+'">'+text+'</div>');
+            }
+            label.remove();
+            break;
+
+          default:
+            // select doesn't have a type attribute... yay html
+            // poke inside to get options, then render each as a span and replace the select
+            parent = $(this).parent();
+
+            $(this).children('option').each(function() {
+              var value = $(this).val();
+              var text  = $(this).text();
+
+              if(! text.match(/^-+$/)) {
+                parent.append('<div class="item barstyle'+style+'" id="'+value+'">'+text+'</div>');
+
+                // loop style counter
+                style++; style %= max;
+              }
+            });
+            $(this).remove();
+            break;
+        }
+
+        // loop style counter
+        style++; style %= max;
+      });
+
+      // only start counting and sizing bars if we actually have usable data
+      if(data) {
+        // double loop so we can handle re-renderings of the form
+        $(this).find('.item').each(function() {
+          var name  = $(this).attr('id');
+          var count = data[key][name];
+
+          if(count) { sum += count; }
+        });
+
+
+        $(this).find('.item').each(function() {
+          var name     = $(this).attr('id');
+          var oldCount = $(this).attr('data-count');
+          var oldSum   = $(this).attr('data-sum');
+          var count    = data[key][name] || 0;
+
+          if(count != oldCount || sum != oldSum) {
+            var percent = (sum) ? ((count/sum)*100)+'%' : '0%';
+
+            $(this).attr('data-count', count);
+            $(this).attr('data-sum', sum);
+            $(this).animate({width: percent});
+          }
+        });
+      }
+
+      $(this).addClass('rendered');
+    });
+
+  });
+}
+
 function connectControlChannel() {
   ws           = new WebSocket('ws://' + location.host + '/control');
   ws.onopen    = function()  { connected();          };

data/views/index.erb

@@ -16,7 +16,7 @@
 <% if @feedback then %>
 <div id="feedbackWrapper">
     <div id="feedbackSidebar">
-        <img id="feedbackActivity" src="css/spinner.gif" />
+        <img id="feedbackActivity" src="<%= @asset_path %>/css/spinner.gif" />
         <h3>Live Interaction</h3>
         <div class="row">
           <h4>The presenter should...</h4>
@@ -41,12 +41,19 @@
           <textarea id="feedback"></textarea>
           <button id="sendFeedback">Send Feedback</button>
         </div>
-        <% if @edit then %>
+
         <div class="row tools">
+          <button id="fileDownloads" onclick="window.open('/download');">File Downloads</button>
+          <% if @edit then %>
           <button id="editSlide">Edit Current Slide</button>
+          <% end %>
+          <hr />
+        </div>
+
+        <div id="disclaimer">
+          <p>Press <code>?</code> for help.</p>
+          <p>All features are anonymous</p>
         </div>
-        <% end %>
-        <div id="disclaimer">All features are anonymous</div>
     </div>
     <div id="feedbackHandle"></div>
 </div>
@@ -57,6 +64,7 @@
     <tr><td class="key">z, ?</td><td>toggle help (this)</td></tr>
     <tr><td class="key">space, &rarr;</td><td>next slide</td></tr>
     <tr><td class="key">shift-space, &larr;</td><td>previous slide</td></tr>
+    <tr><td class="key">b</td><td>blank screen</td></tr>
     <tr><td class="key">d</td><td>toggle debug mode</td></tr>
     <tr><td class="key">## &lt;ret&gt;</td><td>go to slide #</td></tr>
     <tr><td class="key">c, t</td><td>table of contents (vi)</td></tr>
@@ -82,7 +90,7 @@
   <span id="debugInfo"></span>
   <span id="notesInfo"></span>
   <span id="slideFilename"></span>
-  <img id="disconnected" src="/css/disconnected.png" />
+  <img id="disconnected" src="<%= @asset_path %>/css/disconnected.png" />
 </div>
 
 <div id="slides" class="offscreen" <%= 'style="display:none;"' if @slides %>>

data/views/presenter.erb

@@ -19,6 +19,7 @@
     <tr><td class="key">z, ?</td><td>toggle help (this)</td></tr>
     <tr><td class="key">space, &rarr;</td><td>next slide</td></tr>
     <tr><td class="key">shift-space, &larr;</td><td>previous slide</td></tr>
+    <tr><td class="key">b</td><td>blank screen</td></tr>
     <tr><td class="key">d</td><td>toggle debug mode</td></tr>
     <tr><td class="key">## &lt;ret&gt;</td><td>go to slide #</td></tr>
     <tr><td class="key">c, t</td><td>table of contents (vi)</td></tr>
@@ -68,14 +69,14 @@
       <div id="feedbackPace">
         <span id="paceSlow">Speed Up!</span>
         <span id="paceFast">Slow Down!</span>
-        <img id="paceMarker" src="css/paceMarker.png" />
+        <img id="paceMarker" src="<%= @asset_path %>/css/paceMarker.png" />
       </div>
       <div id="slidemenu">
         <div id="navigation" class="menu"></div>
       </div>
     </div>
     <div id="preview" class="grid_8">
-      <img id="disconnected" src="/css/disconnected-large.png" />
+      <img id="disconnected" src="<%= @asset_path %>/css/disconnected-large.png" />
       <div id="preso" class="zoomed">loading presentation...</div>
     </div>
     <div id="statusbar">

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: showoff
 version: !ruby/object:Gem::Version
-  version: 0.9.8.1
+  version: 0.9.9
 platform: ruby
 authors:
 - Scott Chacon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra-websocket
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -95,21 +95,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thin
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: sinatra-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -123,19 +123,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: mg
   requirement: !ruby/object:Gem::Requirement