showoff 0.2.5 → 0.3.1

data/README.rdoc

@@ -241,6 +241,7 @@ added where your cursor was.  Binding this to a keybinding can allow you to add
 [<tt>create</tt>] Create new showoff presentation
 [<tt>help</tt>] Shows list of commands or help for one command
 [<tt>heroku</tt>] Setup your presentation to serve on Heroku
+[<tt>heroku_secure</tt>] Setup your presentation to serve on Heroku with password protection
 [<tt>serve</tt>] Serves the showoff presentation in the current directory
 
 === <tt>add [title]</tt>
@@ -282,16 +283,27 @@ Shows list of commands or help for one command
 
 Setup your presentation to serve on Heroku
 
+=== <tt>heroku_secure heroku_name password</tt>
+
+Setup your presentation to serve on Heroku with password protection using HTTP Authentication
+
 === <tt>serve </tt>
 
 Serves the showoff presentation in the current directory
 
 
-
 ==== Options
 These options are specified *after* the command.
 
 [<tt>-p, --port=arg</tt>] Port on which to run <i>( default: <tt>9090</tt>)</i>
+
+=== ZSH completion
+You can complete commands and options in ZSH, by installing a script:
+
+    mkdir -p $HOME/.zsh/Completion
+    cp script/_showoff $HOME/.zsh/Completion
+    echo 'fpath=(~/.zsh/Completion $fpath)' >> $HOME/.zshrc
+
 = Real World Usage
 
 So far, ShowOff has been used in the following presentations (and many others):
@@ -319,7 +331,13 @@ So far, ShowOff has been used in the following presentations (and many others):
   http://github.com/scottbale/JavaScript-Function-Idioms
 * Open Source Bridge 2010 - Creating a low-cost clustered virtualization environment w/ Ganeti - Lance Albertson
   http://github.com/ramereth/presentation-ganeti
-* RailsConf 2010 - Domain-driven Test-assisted Production Rails Crisis Interventions - Rick Bradley http://railsconf2010.rickbradley.com/ http://github.com/rick/presentation_railsconf_2010
+* RailsConf 2010 - Domain-driven Test-assisted Production Rails Crisis Interventions - Rick Bradley
+  http://railsconf2010.rickbradley.com/ http://github.com/rick/presentation_railsconf_2010
+* WebWorkersCamp - 25 promising projects in 50 minutes - Bruno Michel
+  http://github.com/nono/Presentations/tree/master/20100703_25_promising_projects_in_50_minutes/
+* 11th Libre Software Meeting 2010 - Ruby 1.9, The future of Ruby? - Bruno Michel
+  http://github.com/nono/Presentations/tree/master/20100708_RMLL_Ruby_1.9/
+
 
 If you use it for something, please let me know so I can add it.
 
@@ -328,6 +346,9 @@ If you use it for something, please let me know so I can add it.
 * TextMate Bundle - Showoff.tmdbundle - Dr Nic Williams
   http://github.com/drnic/Showoff.tmbundle
 
+* Emacs major-mode - showoff-mode - Nick Parker
+  http://github.com/developernotes/showoff-mode
+
 = Future Plans
 
 I really want this to evolve into a dynamic presentation software server,
@@ -359,3 +380,6 @@ etc).
 * GLI gem
 * Firefox or Chrome to present
 
+= Contributing
+
+See the CONTRIB.txt file for how to contribute to this project

data/bin/showoff

@@ -25,6 +25,19 @@ command [:create,:init] do |c|
   end
 end
 
+desc 'Same as heroku create, but also adds password protection'
+arg_name 'heroku_name password'
+long_desc 'Creates the .gems file and config.ru file needed to push a showoff pres to heroku with password protection.  it will then run ''heroku create'' for you to register the new project on heroku and add the remote for you.  then all you need to do is commit the new created files and run ''git push heroku'' to deploy.'
+command :heroku_secure do |c|
+  c.action do |global_options,options,args|
+		p args
+    raise "heroku_name is required" if args.empty?
+    raise "password is required" if args.length == 1
+    ShowOffUtils.heroku_secure(args[0], args[1])
+  end
+end
+
+desc 'Serves the showoff presentation in the current directory'
 desc 'Setup your presentation to serve on Heroku'
 arg_name 'heroku_name'
 long_desc 'Creates the .gems file and config.ru file needed to push a showoff pres to heroku.  it will then run ''heroku create'' for you to register the new project on heroku and add the remote for you.  then all you need to do is commit the new created files and run ''git push heroku'' to deploy.'
@@ -80,7 +93,7 @@ command [:add,:new] do |c|
     ShowOffUtils.add_slide(:dir => options[:d],
                            :name => options[:n],
                            :title => title,
-                           :number => !options[:m],
+                           :number => !options[:u],
                            :code => options[:s],
                            :type => options[:t])
   end

data/lib/showoff.rb

@@ -4,7 +4,7 @@ require 'json'
 require 'nokogiri'
 require 'showoff_utils'
 require 'princely'
-require 'ftools'
+require 'fileutils'
 
 begin
   require 'RMagick'
@@ -26,6 +26,7 @@ rescue LoadError
 end
 require 'pp'
 
+
 class ShowOff < Sinatra::Application
 
   attr_reader :cached_image_size
@@ -234,6 +235,7 @@ class ShowOff < Sinatra::Application
 
     def index(static=false)
       if static
+        @title = ShowOffUtils.showoff_title
         @slides = get_slides_html(static)
         @asset_path = "."
       end
@@ -309,7 +311,7 @@ class ShowOff < Sinatra::Application
       else
         out  = "#{path}/#{name}/static"
         # First make a directory
-        File.makedirs("#{out}")
+        FileUtils.makedirs("#{out}")
         # Then write the html
         file = File.new("#{out}/index.html", "w")
         file.puts(data)
@@ -348,7 +350,4 @@ class ShowOff < Sinatra::Application
       end
     end
   end
-
-
-
 end

data/lib/showoff_utils.rb

@@ -28,6 +28,7 @@ class ShowOffUtils
     end
   end
 
+	# Setup presentation to run on Heroku
   def self.heroku(name)
     if !File.exists?(SHOWOFF_JSON_FILE)
       puts "fail. not a showoff directory"
@@ -47,6 +48,42 @@ class ShowOffUtils
       f.puts 'run ShowOff.new'
     end if !File.exists?('config.ru')
 
+    puts "herokuized. run something like this to launch your heroku presentation:
+
+      heroku create #{name}
+      git add .gems config.ru
+      git commit -m 'herokuized'
+      git push heroku master
+    "
+  end
+
+	# Setup the presentation to run on Heroku with password protection
+  def self.heroku_secure(name, password)
+    if !File.exists?(SHOWOFF_JSON_FILE)
+      puts "fail. not a showoff directory"
+      return false
+    end
+    # create .gems file
+    File.open('.gems', 'w+') do |f|
+      f.puts "bluecloth"
+      f.puts "nokogiri"
+      f.puts "showoff"
+      f.puts "gli"
+      f.puts "rack"
+    end if !File.exists?('.gems')
+
+    # create config.ru file
+    File.open('config.ru', 'w+') do |f|
+      f.puts 'require "rack"'
+      f.puts 'require "showoff"'
+			f.puts 'showoff_app = ShowOff.new'
+			f.puts 'protected_showoff = Rack::Auth::Basic.new(showoff_app) do |username, password|'
+			f.puts	"\tpassword == '#{password}'"
+			f.puts 'end'
+			f.puts 'run protected_showoff'
+
+    end if !File.exists?('config.ru')
+
     puts "herokuized. run something like this to launch your heroku presentation:
 
       heroku create #{name}
@@ -128,7 +165,7 @@ class ShowOffUtils
     Dir.mkdir dir
 
     showoff_json = JSON.parse(File.read(SHOWOFF_JSON_FILE))
-    showoff_json << { "section" => dir }
+    showoff_json["section"] = dir
     File.open(SHOWOFF_JSON_FILE,'w') do |file|
       file.puts JSON.generate(showoff_json)
     end

data/public/css/sh_style.css

@@ -1,66 +1,66 @@
-pre.sh_sourceCode {
-  background-color: white;
-  color: black;
-  font-style: normal;
-  font-weight: normal;
-}
-
-pre.sh_sourceCode .sh_keyword { color: blue; font-weight: bold; }           /* language keywords */
-pre.sh_sourceCode .sh_type { color: darkgreen; }                            /* basic types */
-pre.sh_sourceCode .sh_usertype { color: teal; }                             /* user defined types */
-pre.sh_sourceCode .sh_string { color: red; font-family: monospace; }        /* strings and chars */
-pre.sh_sourceCode .sh_regexp { color: orange; font-family: monospace; }     /* regular expressions */
-pre.sh_sourceCode .sh_specialchar { color: pink; font-family: monospace; }  /* e.g., \n, \t, \\ */
-pre.sh_sourceCode .sh_comment { color: brown; font-style: italic; }         /* comments */
-pre.sh_sourceCode .sh_number { color: purple; }                             /* literal numbers */
-pre.sh_sourceCode .sh_preproc { color: darkblue; font-weight: bold; }       /* e.g., #include, import */
-pre.sh_sourceCode .sh_symbol { color: darkred; }                            /* */
-pre.sh_sourceCode .sh_function { color: black; font-weight: bold; }         /* function calls and declarations */
-pre.sh_sourceCode .sh_cbracket { color: red; }                              /* block brackets (e.g., {, }) */
-pre.sh_sourceCode .sh_todo { font-weight: bold; background-color: cyan; }   /* TODO and FIXME */
-
-/* Predefined variables and functions (for instance glsl) */
-pre.sh_sourceCode .sh_predef_var { color: darkblue; }
-pre.sh_sourceCode .sh_predef_func { color: darkblue; font-weight: bold; }
-
-/* for OOP */
-pre.sh_sourceCode .sh_classname { color: teal; }
-
-/* line numbers (not yet implemented) */
-pre.sh_sourceCode .sh_linenum { color: black; font-family: monospace; }
-
-/* Internet related */
-pre.sh_sourceCode .sh_url { color: blue; text-decoration: underline; font-family: monospace; }
-
-/* for ChangeLog and Log files */
-pre.sh_sourceCode .sh_date { color: blue; font-weight: bold; }
-pre.sh_sourceCode .sh_time, pre.sh_sourceCode .sh_file { color: darkblue; font-weight: bold; }
-pre.sh_sourceCode .sh_ip, pre.sh_sourceCode .sh_name { color: darkgreen; }
-
-/* for Prolog, Perl... */
-pre.sh_sourceCode .sh_variable { color: darkgreen; }
-
-/* for LaTeX */
-pre.sh_sourceCode .sh_italics { color: darkgreen; font-style: italic; }
-pre.sh_sourceCode .sh_bold { color: darkgreen; font-weight: bold; }
-pre.sh_sourceCode .sh_underline { color: darkgreen; text-decoration: underline; }
-pre.sh_sourceCode .sh_fixed { color: green; font-family: monospace; }
-pre.sh_sourceCode .sh_argument { color: darkgreen; }
-pre.sh_sourceCode .sh_optionalargument { color: purple; }
-pre.sh_sourceCode .sh_math { color: orange; }
-pre.sh_sourceCode .sh_bibtex { color: blue; }
-
-/* for diffs */
-pre.sh_sourceCode .sh_oldfile { color: orange; }
-pre.sh_sourceCode .sh_newfile { color: darkgreen; }
-pre.sh_sourceCode .sh_difflines { color: blue; }
-
-/* for css */
-pre.sh_sourceCode .sh_selector { color: purple; }
-pre.sh_sourceCode .sh_property { color: blue; }
-pre.sh_sourceCode .sh_value { color: darkgreen; font-style: italic; }
-
-/* other */
-pre.sh_sourceCode .sh_section { color: black; font-weight: bold; }
-pre.sh_sourceCode .sh_paren { color: red; }
-pre.sh_sourceCode .sh_attribute { color: darkgreen; }
+pre.sh_sourceCode {
+  background-color: white;
+  color: black;
+  font-style: normal;
+  font-weight: normal;
+}
+
+pre.sh_sourceCode .sh_keyword { color: blue; font-weight: bold; }           /* language keywords */
+pre.sh_sourceCode .sh_type { color: darkgreen; }                            /* basic types */
+pre.sh_sourceCode .sh_usertype { color: teal; }                             /* user defined types */
+pre.sh_sourceCode .sh_string { color: red; font-family: monospace; }        /* strings and chars */
+pre.sh_sourceCode .sh_regexp { color: orange; font-family: monospace; }     /* regular expressions */
+pre.sh_sourceCode .sh_specialchar { color: pink; font-family: monospace; }  /* e.g., \n, \t, \\ */
+pre.sh_sourceCode .sh_comment { color: brown; font-style: italic; }         /* comments */
+pre.sh_sourceCode .sh_number { color: purple; }                             /* literal numbers */
+pre.sh_sourceCode .sh_preproc { color: darkblue; font-weight: bold; }       /* e.g., #include, import */
+pre.sh_sourceCode .sh_symbol { color: darkred; }                            /* */
+pre.sh_sourceCode .sh_function { color: black; font-weight: bold; }         /* function calls and declarations */
+pre.sh_sourceCode .sh_cbracket { color: red; }                              /* block brackets (e.g., {, }) */
+pre.sh_sourceCode .sh_todo { font-weight: bold; background-color: cyan; }   /* TODO and FIXME */
+
+/* Predefined variables and functions (for instance glsl) */
+pre.sh_sourceCode .sh_predef_var { color: darkblue; }
+pre.sh_sourceCode .sh_predef_func { color: darkblue; font-weight: bold; }
+
+/* for OOP */
+pre.sh_sourceCode .sh_classname { color: teal; }
+
+/* line numbers (not yet implemented) */
+pre.sh_sourceCode .sh_linenum { color: black; font-family: monospace; }
+
+/* Internet related */
+pre.sh_sourceCode .sh_url { color: blue; text-decoration: underline; font-family: monospace; }
+
+/* for ChangeLog and Log files */
+pre.sh_sourceCode .sh_date { color: blue; font-weight: bold; }
+pre.sh_sourceCode .sh_time, pre.sh_sourceCode .sh_file { color: darkblue; font-weight: bold; }
+pre.sh_sourceCode .sh_ip, pre.sh_sourceCode .sh_name { color: darkgreen; }
+
+/* for Prolog, Perl... */
+pre.sh_sourceCode .sh_variable { color: darkgreen; }
+
+/* for LaTeX */
+pre.sh_sourceCode .sh_italics { color: darkgreen; font-style: italic; }
+pre.sh_sourceCode .sh_bold { color: darkgreen; font-weight: bold; }
+pre.sh_sourceCode .sh_underline { color: darkgreen; text-decoration: underline; }
+pre.sh_sourceCode .sh_fixed { color: green; font-family: monospace; }
+pre.sh_sourceCode .sh_argument { color: darkgreen; }
+pre.sh_sourceCode .sh_optionalargument { color: purple; }
+pre.sh_sourceCode .sh_math { color: orange; }
+pre.sh_sourceCode .sh_bibtex { color: blue; }
+
+/* for diffs */
+pre.sh_sourceCode .sh_oldfile { color: orange; }
+pre.sh_sourceCode .sh_newfile { color: darkgreen; }
+pre.sh_sourceCode .sh_difflines { color: blue; }
+
+/* for css */
+pre.sh_sourceCode .sh_selector { color: purple; }
+pre.sh_sourceCode .sh_property { color: blue; }
+pre.sh_sourceCode .sh_value { color: darkgreen; font-style: italic; }
+
+/* other */
+pre.sh_sourceCode .sh_section { color: black; font-weight: bold; }
+pre.sh_sourceCode .sh_paren { color: red; }
+pre.sh_sourceCode .sh_attribute { color: darkgreen; }

data/public/js/jTypeWriter.js

@@ -1,26 +1,26 @@
-// jTypeWriter, JQuery plugin
-// v 1.1 
-// Licensed under GPL licenses.
-// Copyright (C) 2008 Nikos "DuMmWiaM" Kontis, info@dummwiam.com
-// http://www.DuMmWiaM.com/jTypeWriter
-// ----------------------------------------------------------------------------
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-// ----------------------------------------------------------------------------
-
+// jTypeWriter, JQuery plugin
+// v 1.1 
+// Licensed under GPL licenses.
+// Copyright (C) 2008 Nikos "DuMmWiaM" Kontis, info@dummwiam.com
+// http://www.DuMmWiaM.com/jTypeWriter
+// ----------------------------------------------------------------------------
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+// ----------------------------------------------------------------------------
+
 eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('(7($){$.u.v=7(b){5 c,8,w,r,x,A;5 d=$.W({},$.u.v.H,b);5 e=d.I*J;5 f=d.K.X();5 g=d.L;5 h=d.M;5 j=d.9;5 k=d.N;5 l=d.O;5 m=(f=="Y")?" ":".";5 n=P Q();5 o=0;y(i=0;i<q.p;i++){4(j){$(q[i]).9(j)}4(f=="s")n.R({3:$(q[i]),6:$(q[i]).9()});t n.R({3:$(q[i]),6:$(q[i]).9().Z(m)});4(!g)o=n[i].6.p>o?n[i].6.p:o;t o+=n[i].6.p;$(q[i]).9("")}B();7 B(){c=e/o;8=0;w=r=0;x=(!g)?C(S,c):C(T,c)};7 S(){8++;y(i=0;i<n.p;i++){5 a=n[i];4(a.6.p>=8){4(f=="s"){a.3.9(a.6.U(0,8))}t{a.3.z(a.6[8-1]);4(8<o){a.3.z(m)}}}}4(8>=o){D()}};7 T(){$3=n[w];4(f=="s"){$3.3.9($3.6.U(0,++r))}t{$3.3.z($3.6[r++]);4(r<$3.6.p)$3.3.z(m)}4(r>=$3.6.p){w++;r=0}8++;4(8>=o){D()}};7 D(){E(x);4(f!="s"){}4(k){4(l)A=C(V,l*J);t F()}h()};7 F(){y(i=0;i<n.p;i++){n[i].3.9("")}B()};7 V(){F();E(A)};7 G(){E(x);y(i=0;i<n.p;i++){n[i].3.9(n[i].6)}};q.G=G;10 q};$.u.v.H={I:2,K:"s",L:11,M:7(){},9:"",N:12,O:0};$.u.v.13={14:P Q()}})(15);',62,68,'|||obj|if|var|initialText|function|nIntervalCounter|text||||||||||||||||length|this|nSequentialCounterInternal|letter|else|fn|jTypeWriter|nSequentialCounter|nInterval|for|append|nLoopInterval|init|setInterval|circleEnd|clearInterval|newLoop|endEffect|defaults|duration|1000|type|sequential|onComplete|loop|loopDelay|new|Array|push|typerSimultaneous|typerSequential|substr|loopInterval|extend|toLowerCase|word|split|return|true|false|variables|aObjects|jQuery'.split('|'),0,{}))

data/public/js/sh_lang/sh_cucumber.min.js

@@ -0,0 +1,2 @@
+if(!this.sh_languages){this.sh_languages={};}
+sh_languages['cucumber']=[[[/#/g,'sh_comment',1],[/@/g,'sh_comment',1],[/Scenario:/g,'sh_keyword',1],[/Feature:/g,'sh_keyword',1],[/In order to/g,'sh_variable',1],[/As a/g,'sh_variable',1],[/I want to/g,'sh_variable',1],[/I wish to/g,'sh_variable',1],[/I can/g,'sh_variable',1],[/So that/g,'sh_variable',1],[/\b(?:Given|When|Then|And|But)\b/g,'sh_keyword',-1]],[[/$/g,null,-2]]];

data/public/js/showoff.js

@@ -21,350 +21,353 @@ var loadSlidesBool
 var loadSlidesPrefix
 
 function setupPreso(load_slides, prefix) {
-  if (preso_started)
-  {
-     alert("already started")
-     return
-  }
-  preso_started = true
+	if (preso_started)
+	{
+		alert("already started")
+		return
+	}
+	preso_started = true
 
-  loadSlidesBool = load_slides
-  loadSlidesPrefix = prefix
-  loadSlides(loadSlidesBool, loadSlidesPrefix)
+	loadSlidesBool = load_slides
+	loadSlidesPrefix = prefix
+	loadSlides(loadSlidesBool, loadSlidesPrefix)
 
-  doDebugStuff()
+	doDebugStuff()
 
-  // bind event handlers
-  document.onkeydown = keyDown
-  document.onkeyup = keyUp
-  /* window.onresize  = resized; */
-  /* window.onscroll = scrolled; */
-  /* window.onunload = unloaded; */
+	// bind event handlers
+	document.onkeydown = keyDown
+	document.onkeyup = keyUp
+	/* window.onresize	= resized; */
+	/* window.onscroll = scrolled; */
+	/* window.onunload = unloaded; */
 }
 
 function loadSlides(load_slides, prefix) {
-  //load slides offscreen, wait for images and then initialize
-  if (load_slides) {
-  	$("#slides").load("/slides", false, function(){
-    	$("#slides img").batchImageLoad({
+	//load slides offscreen, wait for images and then initialize
+	if (load_slides) {
+		$("#slides").load("/slides", false, function(){
+			$("#slides img").batchImageLoad({
 			loadingCompleteCallback: initializePresentation(prefix)
 		})
-  	})
-  } else {
+		})
+	} else {
 	$("#slides img").batchImageLoad({
 		loadingCompleteCallback: initializePresentation(prefix)
 	})
-  }
+	}
 }
 
 function initializePresentation(prefix) {
-  //center slides offscreen
-  centerSlides($('#slides > .slide'))
+	// unhide for height to work in static mode
+  $("#slides").show();
 
-  //copy into presentation area
-  $("#preso").empty()
-  $('#slides > .slide').appendTo($("#preso"))
+	//center slides offscreen
+	centerSlides($('#slides > .slide'))
 
-  //populate vars
-  slides = $('#preso > .slide')
-  slideTotal = slides.size()
+	//copy into presentation area
+	$("#preso").empty()
+	$('#slides > .slide').appendTo($("#preso"))
+
+	//populate vars
+	slides = $('#preso > .slide')
+	slideTotal = slides.size()
 
-  //setup manual jquery cycle
-  $('#preso').cycle({
-    timeout: 0
-  })
+	//setup manual jquery cycle
+	$('#preso').cycle({
+		timeout: 0
+	})
 
-  setupMenu()
-  if (slidesLoaded) {
-    showSlide()
-  } else {
-    showFirstSlide();
-    slidesLoaded = true
-  }
-  setupSlideParamsCheck();
-  sh_highlightDocument(prefix+'/js/sh_lang/', '.min.js')
+	setupMenu()
+	if (slidesLoaded) {
+		showSlide()
+	} else {
+		showFirstSlide();
+		slidesLoaded = true
+	}
+	setupSlideParamsCheck();
+	sh_highlightDocument(prefix+'/js/sh_lang/', '.min.js')
 }
 
 function centerSlides(slides) {
-  slides.each(function(s, slide) {
-    centerSlide(slide)
-  })
+	slides.each(function(s, slide) {
+		centerSlide(slide)
+	})
 }
 
 function centerSlide(slide) {
-  var slide_content = $(slide).children(".content").first()
-  var height = slide_content.height()
-  var mar_top = (0.5 * parseFloat($(slide).height())) - (0.5 * parseFloat(height))
-  if (mar_top < 0) {
-    mar_top = 0
-  }
-  slide_content.css('margin-top', mar_top)
+	var slide_content = $(slide).children(".content").first()
+	var height = slide_content.height()
+	var mar_top = (0.5 * parseFloat($(slide).height())) - (0.5 * parseFloat(height))
+	if (mar_top < 0) {
+		mar_top = 0
+	}
+	slide_content.css('margin-top', mar_top)
 }
 
 function setupMenu() {
-  $('#navmenu').hide();
+	$('#navmenu').hide();
 
-  var currSlide = 0
-  var menu = new ListMenu()
+	var currSlide = 0
+	var menu = new ListMenu()
 
-  slides.each(function(s, elem) {
-    content = $(elem).children(".content")
-    shortTxt = $(content).text().substr(0, 20)
-    path = $(content).attr('ref').split('/')
-    currSlide += 1
-    menu.addItem(path, shortTxt, currSlide)
-  })
+	slides.each(function(s, elem) {
+		content = $(elem).children(".content")
+		shortTxt = $(content).text().substr(0, 20)
+		path = $(content).attr('ref').split('/')
+		currSlide += 1
+		menu.addItem(path, shortTxt, currSlide)
+	})
 
-  $('#navigation').html(menu.getList())
-  $('#navmenu').menu({
-    content: $('#navigation').html(),
-    flyOut: true
-  });
+	$('#navigation').html(menu.getList())
+	$('#navmenu').menu({
+		content: $('#navigation').html(),
+		flyOut: true
+	});
 }
 
 function checkSlideParameter() {
-  if (slideParam = currentSlideFromParams()) {
-    slidenum = slideParam;
-  }
+	if (slideParam = currentSlideFromParams()) {
+		slidenum = slideParam;
+	}
 }
 
 function currentSlideFromParams() {
-  var result;
-  if (result = window.location.hash.match(/#([0-9]+)/)) {
-    return result[result.length - 1] - 1;
-  }
+	var result;
+	if (result = window.location.hash.match(/#([0-9]+)/)) {
+		return result[result.length - 1] - 1;
+	}
 }
 
 function setupSlideParamsCheck() {
-  var check = function() {
-    var currentSlide = currentSlideFromParams();
-    if (slidenum != currentSlide) {
-      slidenum = currentSlide;
-      showSlide();
-    }
-    setTimeout(check, 100);
-  }
-  setTimeout(check, 100);
+	var check = function() {
+		var currentSlide = currentSlideFromParams();
+		if (slidenum != currentSlide) {
+			slidenum = currentSlide;
+			showSlide();
+		}
+		setTimeout(check, 100);
+	}
+	setTimeout(check, 100);
 }
 
 function gotoSlide(slideNum) {
-  slidenum = parseInt(slideNum)
-  if (!isNaN(slidenum)) {
-    showSlide()
-  }
+	slidenum = parseInt(slideNum)
+	if (!isNaN(slidenum)) {
+		showSlide()
+	}
 }
 
 function showFirstSlide() {
-  slidenum = 0
-  checkSlideParameter();
-  showSlide()
+	slidenum = 0
+	checkSlideParameter();
+	showSlide()
 }
 
 function showSlide(back_step) {
 
-  if(slidenum < 0) {
-    slidenum = 0
-    return
-  }
+	if(slidenum < 0) {
+		slidenum = 0
+		return
+	}
 
-  if(slidenum > (slideTotal - 1)) {
-    slidenum = slideTotal - 1
-    return
-  }
+	if(slidenum > (slideTotal - 1)) {
+		slidenum = slideTotal - 1
+		return
+	}
 
-  currentSlide = slides.eq(slidenum)
+	currentSlide = slides.eq(slidenum)
 
-  var transition = currentSlide.attr('data-transition')
-  var fullPage = currentSlide.find(".content").is('.full-page');
+	var transition = currentSlide.attr('data-transition')
+	var fullPage = currentSlide.find(".content").is('.full-page');
 
-  if (back_step || fullPage) {
-    transition = 'none'
-  }
+	if (back_step || fullPage) {
+		transition = 'none'
+	}
 
-  $('#preso').cycle(slidenum, transition)
+	$('#preso').cycle(slidenum, transition)
 
-  if (fullPage) {
-    $('#preso').css({'width' : '100%', 'overflow' : 'visible'});
-    currentSlide.css({'width' : '100%', 'text-align' : 'center', 'overflow' : 'visible'});
-  } else {
-    $('#preso').css({'width' : '1020px', 'overflow' : 'hidden'});
-  }
+	if (fullPage) {
+		$('#preso').css({'width' : '100%', 'overflow' : 'visible'});
+		currentSlide.css({'width' : '100%', 'text-align' : 'center', 'overflow' : 'visible'});
+	} else {
+		$('#preso').css({'width' : '1020px', 'overflow' : 'hidden'});
+	}
 
-  percent = getSlidePercent()
-  $("#slideInfo").text((slidenum + 1) + '/' + slideTotal + '  - ' + percent + '%')
+	percent = getSlidePercent()
+	$("#slideInfo").text((slidenum + 1) + '/' + slideTotal + '	- ' + percent + '%')
 
-  if(!back_step) {
-    // determine if there are incremental bullets to show
-    // unless we are moving backward
-    determineIncremental()
-  } else {
-    incrCurr = 0
-    incrSteps = 0
-  }
-  location.hash = slidenum + 1;
-  $('body').addSwipeEvents().
-    bind('swipeleft',  swipeLeft).
-    bind('swiperight', swipeRight)
-  removeResults()
+	if(!back_step) {
+		// determine if there are incremental bullets to show
+		// unless we are moving backward
+		determineIncremental()
+	} else {
+		incrCurr = 0
+		incrSteps = 0
+	}
+	location.hash = slidenum + 1;
+	$('body').addSwipeEvents().
+		bind('swipeleft',	swipeLeft).
+		bind('swiperight', swipeRight)
+	removeResults()
 
-  $(currentSlide).find(".content").trigger("showoff:show");
+	$(currentSlide).find(".content").trigger("showoff:show");
 
-  return getCurrentNotes()
+	return getCurrentNotes()
 }
 
 function getSlideProgress()
 {
-  return (slidenum + 1) + '/' + slideTotal
+	return (slidenum + 1) + '/' + slideTotal
 }
 
 function getCurrentNotes()
 {
-  return currentSlide.find("p.notes").text()
+	return currentSlide.find("p.notes").text()
 }
 
 function getSlidePercent()
 {
-  return Math.ceil(((slidenum + 1) / slideTotal) * 100)
+	return Math.ceil(((slidenum + 1) / slideTotal) * 100)
 }
 
 function determineIncremental()
 {
-  incrCurr = 0
-  incrCode = false
-  incrElem = currentSlide.find(".incremental > ul > li")
-  incrSteps = incrElem.size()
-  if(incrSteps == 0) {
-    // also look for commandline
-    incrElem = currentSlide.find(".incremental > pre > code > code")
-    incrSteps = incrElem.size()
-    incrCode = true
-  }
-  incrElem.each(function(s, elem) {
-    $(elem).hide()
-  })
+	incrCurr = 0
+	incrCode = false
+	incrElem = currentSlide.find(".incremental > ul > li")
+	incrSteps = incrElem.size()
+	if(incrSteps == 0) {
+		// also look for commandline
+		incrElem = currentSlide.find(".incremental > pre > code > code")
+		incrSteps = incrElem.size()
+		incrCode = true
+	}
+	incrElem.each(function(s, elem) {
+		$(elem).hide()
+	})
 }
 
 function prevStep()
 {
 
-  var event = jQuery.Event("showoff:prev");
-  $(currentSlide).find(".content").trigger(event);
-  if (event.isDefaultPrevented()) {
-      return;
-  }
+	var event = jQuery.Event("showoff:prev");
+	$(currentSlide).find(".content").trigger(event);
+	if (event.isDefaultPrevented()) {
+			return;
+	}
 
-  slidenum--
-  return showSlide(true) // We show the slide fully loaded
+	slidenum--
+	return showSlide(true) // We show the slide fully loaded
 }
 
 function nextStep()
 {
-  var event = jQuery.Event("showoff:next");
-  $(currentSlide).find(".content").trigger(event);
-  if (event.isDefaultPrevented()) {
-      return;
-  }
-
-  if (incrCurr >= incrSteps) {
-    slidenum++
-    return showSlide()
-  } else {
-    elem = incrElem.eq(incrCurr)
-    if (incrCode && elem.hasClass('command')) {
-      incrElem.eq(incrCurr).show().jTypeWriter({duration:1.0})
-    } else {
-      incrElem.eq(incrCurr).show()
-    }
-    incrCurr++
-  }
+	var event = jQuery.Event("showoff:next");
+	$(currentSlide).find(".content").trigger(event);
+	if (event.isDefaultPrevented()) {
+			return;
+	}
+
+	if (incrCurr >= incrSteps) {
+		slidenum++
+		return showSlide()
+	} else {
+		elem = incrElem.eq(incrCurr)
+		if (incrCode && elem.hasClass('command')) {
+			incrElem.eq(incrCurr).show().jTypeWriter({duration:1.0})
+		} else {
+			incrElem.eq(incrCurr).show()
+		}
+		incrCurr++
+	}
 }
 
 function doDebugStuff()
 {
-  if (debugMode) {
-    $('#debugInfo').show()
-    debug('debug mode on')
-  } else {
-    $('#debugInfo').hide()
-  }
+	if (debugMode) {
+		$('#debugInfo').show()
+		debug('debug mode on')
+	} else {
+		$('#debugInfo').hide()
+	}
 }
 
 function debug(data)
 {
-  $('#debugInfo').text(data)
+	$('#debugInfo').text(data)
 }
 
 //  See e.g. http://www.quirksmode.org/js/keys.html for keycodes
 function keyDown(event)
 {
-    var key = event.keyCode;
-
-    if (event.ctrlKey || event.altKey || event.metaKey)
-       return true;
-
-    debug('keyDown: ' + key)
-
-    if (key >= 48 && key <= 57) // 0 - 9
-    {
-      gotoSlidenum = gotoSlidenum * 10 + (key - 48);
-      return true;
-    }
-
-    if (key == 13){
-        if (gotoSlidenum > 0) {
-            debug('go to ' + gotoSlidenum);
-            slidenum = gotoSlidenum - 1;
-            showSlide(true);
-            gotoSlidenum = 0;
-        } else {
-            debug('executeCode');
-            executeCode.call($('.sh_javaScript code:visible'));
-        }
-
-    }
-
-
-    if (key == 16) // shift key
-    {
-      shiftKeyActive = true;
-    }
-    if (key == 32) // space bar
-    {
-      if (shiftKeyActive) { prevStep() }
-      else                { nextStep() }
-    }
-    else if (key == 68) // 'd' for debug
-    {
-      debugMode = !debugMode
-      doDebugStuff()
-    }
-    else if (key == 37 || key == 33 || key == 38) // Left arrow, page up, or up arrow
-    {
-      prevStep()
-    }
-    else if (key == 39 || key == 34 || key == 40) // Right arrow, page down, or down arrow
-    {
-      nextStep()
-    }
-    else if (key == 82) // R for reload
-    {
-      if (confirm('really reload slides?')) {
-        loadSlides(loadSlidesBool, loadSlidesPrefix)
-        showSlide()
-      }
-    }
-    else if (key == 84 || key == 67)  // T or C for table of contents
-    {
-      $('#navmenu').toggle().trigger('click')
-    }
-    else if (key == 90) // z for help
-    {
-      $('#help').toggle()
-    }
-    else if (key == 66 || key == 70) // f for footer (also "b" which is what kensington remote "stop" button sends
-    {
-      toggleFooter()
-    }
+	var key = event.keyCode;
+
+	if (event.ctrlKey || event.altKey || event.metaKey)
+		return true;
+
+	debug('keyDown: ' + key)
+
+	if (key >= 48 && key <= 57) // 0 - 9
+	{
+		gotoSlidenum = gotoSlidenum * 10 + (key - 48);
+		return true;
+	}
+
+	if (key == 13){
+		if (gotoSlidenum > 0) {
+			debug('go to ' + gotoSlidenum);
+			slidenum = gotoSlidenum - 1;
+			showSlide(true);
+			gotoSlidenum = 0;
+		} else {
+			debug('executeCode');
+			executeCode.call($('.sh_javaScript code:visible'));
+		}
+
+	}
+
+
+	if (key == 16) // shift key
+	{
+		shiftKeyActive = true;
+	}
+	if (key == 32) // space bar
+	{
+		if (shiftKeyActive) { prevStep() }
+		else				{ nextStep() }
+	}
+	else if (key == 68) // 'd' for debug
+	{
+		debugMode = !debugMode
+		doDebugStuff()
+	}
+	else if (key == 37 || key == 33 || key == 38) // Left arrow, page up, or up arrow
+	{
+		prevStep()
+	}
+	else if (key == 39 || key == 34 || key == 40) // Right arrow, page down, or down arrow
+	{
+		nextStep()
+	}
+	else if (key == 82) // R for reload
+	{
+		if (confirm('really reload slides?')) {
+			loadSlides(loadSlidesBool, loadSlidesPrefix)
+			showSlide()
+		}
+	}
+	else if (key == 84 || key == 67)  // T or C for table of contents
+	{
+		$('#navmenu').toggle().trigger('click')
+	}
+	else if (key == 90) // z for help
+	{
+		$('#help').toggle()
+	}
+	else if (key == 66 || key == 70) // f for footer (also "b" which is what kensington remote "stop" button sends
+	{
+		toggleFooter()
+	}
 	else if (key == 27) // esc
 	{
 		removeResults();
@@ -373,95 +376,95 @@ function keyDown(event)
 	{
 		runPreShow();
 	}
-    return true
+	return true
 }
 
 function toggleFooter()
 {
-  $('#footer').toggle()
+	$('#footer').toggle()
 }
 
 function keyUp(event) {
-  var key = event.keyCode;
-  debug('keyUp: ' + key);
-  if (key == 16) // shift key
-  {
-    shiftKeyActive = false;
-  }
+	var key = event.keyCode;
+	debug('keyUp: ' + key);
+	if (key == 16) // shift key
+	{
+		shiftKeyActive = false;
+	}
 }
 
 
 function swipeLeft() {
-  nextStep()
+	nextStep()
 }
 
 function swipeRight() {
-  prevStep()
+	prevStep()
 }
 
 function ListMenu(s)
 {
-  this.slide = s
-  this.typeName = 'ListMenu'
-  this.itemLength = 0;
-  this.items = new Array();
-  this.addItem = function (key, text, slide) {
-    if (key.length > 1) {
-      thisKey = key.shift()
-      if (!this.items[thisKey]) {
-        this.items[thisKey] = new ListMenu(slide)
-      }
-      this.items[thisKey].addItem(key, text, slide)
-    } else {
-      thisKey = key.shift()
-      this.items[thisKey] = new ListMenuItem(text, slide)
-    }
-  }
-  this.getList = function() {
-    var newMenu = $("<ul>")
-    for(var i in this.items) {
-      var item = this.items[i]
-      var domItem = $("<li>")
-      if (item.typeName == 'ListMenu') {
-        choice = $("<a rel=\"" + (item.slide - 1) + "\" href=\"#\">" + i + "</a>")
-        domItem.append(choice)
-        domItem.append(item.getList())
-      }
-      if (item.typeName == 'ListMenuItem') {
-        choice = $("<a rel=\"" + (item.slide - 1) + "\" href=\"#\">" + item.slide + '. ' + item.textName + "</a>")
-        domItem.append(choice)
-      }
-      newMenu.append(domItem)
-    }
-    return newMenu
-  }
+	this.slide = s
+	this.typeName = 'ListMenu'
+	this.itemLength = 0;
+	this.items = new Array();
+	this.addItem = function (key, text, slide) {
+		if (key.length > 1) {
+			thisKey = key.shift()
+			if (!this.items[thisKey]) {
+				this.items[thisKey] = new ListMenu(slide)
+			}
+			this.items[thisKey].addItem(key, text, slide)
+		} else {
+			thisKey = key.shift()
+			this.items[thisKey] = new ListMenuItem(text, slide)
+		}
+	}
+	this.getList = function() {
+		var newMenu = $("<ul>")
+		for(var i in this.items) {
+			var item = this.items[i]
+			var domItem = $("<li>")
+			if (item.typeName == 'ListMenu') {
+				choice = $("<a rel=\"" + (item.slide - 1) + "\" href=\"#\">" + i + "</a>")
+				domItem.append(choice)
+				domItem.append(item.getList())
+			}
+			if (item.typeName == 'ListMenuItem') {
+				choice = $("<a rel=\"" + (item.slide - 1) + "\" href=\"#\">" + item.slide + '. ' + item.textName + "</a>")
+				domItem.append(choice)
+			}
+			newMenu.append(domItem)
+		}
+		return newMenu
+	}
 }
 
 function ListMenuItem(t, s)
 {
-  this.typeName = "ListMenuItem"
-  this.slide = s
-  this.textName = t
+	this.typeName = "ListMenuItem"
+	this.slide = s
+	this.textName = t
 }
 
 var removeResults = function() {
-  $('.results').remove();
+	$('.results').remove();
 };
 
 var print = function(text) {
-  removeResults();
-  var _results = $('<div>').addClass('results').html($.print(text, {max_string:500}));
-  $('body').append(_results);
-  _results.click(removeResults);
+	removeResults();
+	var _results = $('<div>').addClass('results').html($.print(text, {max_string:500}));
+	$('body').append(_results);
+	_results.click(removeResults);
 };
 
 function executeCode () {
-    result = null;
-    var codeDiv = $(this);
-    codeDiv.addClass("executing");
-    eval(codeDiv.text());
-    setTimeout(function() { codeDiv.removeClass("executing");}, 250 );
-    if (result != null) print(result);
+	result = null;
+	var codeDiv = $(this);
+	codeDiv.addClass("executing");
+	eval(codeDiv.text());
+	setTimeout(function() { codeDiv.removeClass("executing");}, 250 );
+	if (result != null) print(result);
 }
 $('.sh_javaScript code').live("click", executeCode);
 
@@ -481,8 +484,8 @@ var preshow_imagesTotal = 0;
 var preshow_des;
 
 function runPreShow() {
-	if(preshow_running) { 
-		stopPreShow() 
+	if(preshow_running) {
+		stopPreShow()
 	} else {
 		var minutes = prompt("Minutes from now to start")
 		preshow_secondsLeft = parseFloat(minutes) * 60
@@ -496,7 +499,7 @@ function runPreShow() {
 						preshow_des = data
 					})
 				} else {
-					$('#preshow').append('<img ref="' + n + '" src="/file/_preshow/' + n + '"/>')				
+					$('#preshow').append('<img ref="' + n + '" src="/file/_preshow/' + n + '"/>')
 				}
 			})
 			startPreShow()
@@ -505,30 +508,30 @@ function runPreShow() {
 }
 
 function startPreShow() {
-  if (!preshow_running) {
-    preshow_running = true
-    preshow_seconds = 0
-    preshow_images = $('#preshow > img')
-    preshow_imagesTotal = preshow_images.size()
-    nextPreShowImage()
-
-    if(!preshow_timerRunning) {
-      setInterval(function() {
-        preshow_timerRunning = true
-        if (!preshow_running) { return }
-        preshow_seconds++
-        preshow_secondsLeft--
+	if (!preshow_running) {
+		preshow_running = true
+		preshow_seconds = 0
+		preshow_images = $('#preshow > img')
+		preshow_imagesTotal = preshow_images.size()
+		nextPreShowImage()
+
+		if(!preshow_timerRunning) {
+			setInterval(function() {
+				preshow_timerRunning = true
+				if (!preshow_running) { return }
+				preshow_seconds++
+				preshow_secondsLeft--
 		if (preshow_secondsLeft < 0) {
 			stopPreShow()
 		}
-        if (preshow_seconds == preshow_secondsPer) {
-          preshow_seconds = 0
-          nextPreShowImage()
-        }
+				if (preshow_seconds == preshow_secondsPer) {
+					preshow_seconds = 0
+					nextPreShowImage()
+				}
 		addPreShowTips()
-      }, 1000)
-    }
-  }
+			}, 1000)
+		}
+	}
 }
 
 function addPreShowTips() {
@@ -554,11 +557,11 @@ function secondsToTime(sec) {
 
 function stopPreShow() {
 	preshow_running = false
-	
+
 	$('#preshow').remove()
 	$('#tips').remove()
 	$('#preshow_timer').remove()
-	
+
 	toggleFooter()
 	loadSlides(loadSlidesBool, loadSlidesPrefix);
 }