showoff 0.9.11.1 → 0.10.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (148) hide show
  1. checksums.yaml +4 -4
  2. data/bin/showoff +4 -0
  3. data/lib/keymap.rb +30 -0
  4. data/lib/showoff/version.rb +1 -1
  5. data/lib/showoff.rb +91 -29
  6. data/public/css/highlight/agate.css +137 -0
  7. data/public/css/highlight/androidstudio.css +53 -0
  8. data/public/css/highlight/arta.css +138 -0
  9. data/public/css/highlight/ascetic.css +52 -0
  10. data/public/css/highlight/atelier-cave.dark.css +113 -0
  11. data/public/css/highlight/atelier-cave.light.css +113 -0
  12. data/public/css/highlight/atelier-dune.dark.css +94 -0
  13. data/public/css/highlight/atelier-dune.light.css +94 -0
  14. data/public/css/highlight/atelier-estuary.dark.css +113 -0
  15. data/public/css/highlight/atelier-estuary.light.css +113 -0
  16. data/public/css/highlight/atelier-forest.dark.css +94 -0
  17. data/public/css/highlight/atelier-forest.light.css +94 -0
  18. data/public/css/highlight/atelier-heath.dark.css +94 -0
  19. data/public/css/highlight/atelier-heath.light.css +94 -0
  20. data/public/css/highlight/atelier-lakeside.dark.css +94 -0
  21. data/public/css/highlight/atelier-lakeside.light.css +94 -0
  22. data/public/css/highlight/atelier-plateau.dark.css +113 -0
  23. data/public/css/highlight/atelier-plateau.light.css +113 -0
  24. data/public/css/highlight/atelier-savanna.dark.css +113 -0
  25. data/public/css/highlight/atelier-savanna.light.css +113 -0
  26. data/public/css/highlight/atelier-seaside.dark.css +94 -0
  27. data/public/css/highlight/atelier-seaside.light.css +94 -0
  28. data/public/css/highlight/atelier-sulphurpool.dark.css +94 -0
  29. data/public/css/highlight/atelier-sulphurpool.light.css +94 -0
  30. data/public/css/highlight/brown_paper.css +103 -0
  31. data/public/css/highlight/brown_papersq.png +0 -0
  32. data/public/css/highlight/codepen-embed.css +97 -0
  33. data/public/css/highlight/color-brewer.css +165 -0
  34. data/public/css/highlight/dark.css +103 -0
  35. data/public/css/highlight/darkula.css +152 -0
  36. data/public/css/highlight/default.css +155 -0
  37. data/public/css/highlight/docco.css +134 -0
  38. data/public/css/highlight/far.css +110 -0
  39. data/public/css/highlight/foundation.css +135 -0
  40. data/public/css/highlight/github-gist.css +211 -0
  41. data/public/css/highlight/github.css +123 -0
  42. data/public/css/highlight/googlecode.css +144 -0
  43. data/public/css/highlight/hybrid.css +164 -0
  44. data/public/css/highlight/idea.css +122 -0
  45. data/public/css/highlight/ir_black.css +106 -0
  46. data/public/css/highlight/kimbie.dark.css +97 -0
  47. data/public/css/highlight/kimbie.light.css +97 -0
  48. data/public/css/highlight/magula.css +120 -0
  49. data/public/css/highlight/mono-blue.css +68 -0
  50. data/public/css/highlight/monokai.css +126 -0
  51. data/public/css/highlight/monokai_sublime.css +154 -0
  52. data/public/css/highlight/obsidian.css +152 -0
  53. data/public/css/highlight/paraiso.dark.css +96 -0
  54. data/public/css/highlight/paraiso.light.css +96 -0
  55. data/public/css/highlight/pojoaque.css +106 -0
  56. data/public/css/highlight/pojoaque.jpg +0 -0
  57. data/public/css/highlight/railscasts.css +184 -0
  58. data/public/css/highlight/rainbow.css +107 -0
  59. data/public/css/highlight/school_book.css +111 -0
  60. data/public/css/highlight/school_book.png +0 -0
  61. data/public/css/highlight/solarized_dark.css +107 -0
  62. data/public/css/highlight/solarized_light.css +107 -0
  63. data/public/css/highlight/sunburst.css +161 -0
  64. data/public/css/highlight/tomorrow-night-blue.css +96 -0
  65. data/public/css/highlight/tomorrow-night-bright.css +95 -0
  66. data/public/css/highlight/tomorrow-night-eighties.css +95 -0
  67. data/public/css/highlight/tomorrow-night.css +96 -0
  68. data/public/css/highlight/tomorrow.css +93 -0
  69. data/public/css/highlight/vs.css +92 -0
  70. data/public/css/highlight/xcode.css +154 -0
  71. data/public/css/highlight/zenburn.css +118 -0
  72. data/public/css/ie8.css +4 -0
  73. data/public/css/presenter.css +5 -17
  74. data/public/css/run_code-dim.png +0 -0
  75. data/public/css/run_code.png +0 -0
  76. data/public/css/showoff.css +154 -127
  77. data/public/js/highlight.pack.js +10816 -0
  78. data/public/js/keyDictionary.json +139 -0
  79. data/public/js/presenter.js +111 -144
  80. data/public/js/showoff.js +333 -387
  81. data/views/header.erb +15 -17
  82. data/views/header_mini.erb +4 -0
  83. data/views/help.erb +79 -0
  84. data/views/index.erb +3 -22
  85. data/views/onepage.erb +27 -14
  86. data/views/presenter.erb +3 -17
  87. data/views/stats.erb +4 -4
  88. metadata +75 -62
  89. data/public/css/sh_style.css +0 -81
  90. data/public/css/tipsy.css +0 -26
  91. data/public/js/core.js +0 -79
  92. data/public/js/jquery.tipsy.js +0 -260
  93. data/public/js/onepage.js +0 -4
  94. data/public/js/sh_lang/sh_bison.min.js +0 -1
  95. data/public/js/sh_lang/sh_c.min.js +0 -1
  96. data/public/js/sh_lang/sh_caml.min.js +0 -1
  97. data/public/js/sh_lang/sh_changelog.min.js +0 -1
  98. data/public/js/sh_lang/sh_coffeescript.min.js +0 -1
  99. data/public/js/sh_lang/sh_cpp.min.js +0 -1
  100. data/public/js/sh_lang/sh_csharp.min.js +0 -1
  101. data/public/js/sh_lang/sh_css.min.js +0 -1
  102. data/public/js/sh_lang/sh_cucumber.min.js +0 -2
  103. data/public/js/sh_lang/sh_desktop.min.js +0 -1
  104. data/public/js/sh_lang/sh_diff.min.js +0 -1
  105. data/public/js/sh_lang/sh_docker.js +0 -137
  106. data/public/js/sh_lang/sh_docker.min.js +0 -1
  107. data/public/js/sh_lang/sh_erlang.min.js +0 -1
  108. data/public/js/sh_lang/sh_flex.min.js +0 -1
  109. data/public/js/sh_lang/sh_gherkin.js +0 -112
  110. data/public/js/sh_lang/sh_gherkin.min.js +0 -1
  111. data/public/js/sh_lang/sh_glsl.min.js +0 -1
  112. data/public/js/sh_lang/sh_haxe.min.js +0 -1
  113. data/public/js/sh_lang/sh_html.min.js +0 -1
  114. data/public/js/sh_lang/sh_ini.js +0 -87
  115. data/public/js/sh_lang/sh_ini.min.js +0 -87
  116. data/public/js/sh_lang/sh_java.min.js +0 -1
  117. data/public/js/sh_lang/sh_javascript.min.js +0 -1
  118. data/public/js/sh_lang/sh_javascript_dom.min.js +0 -1
  119. data/public/js/sh_lang/sh_latex.min.js +0 -1
  120. data/public/js/sh_lang/sh_ldap.min.js +0 -1
  121. data/public/js/sh_lang/sh_log.min.js +0 -1
  122. data/public/js/sh_lang/sh_lsm.min.js +0 -1
  123. data/public/js/sh_lang/sh_m4.min.js +0 -1
  124. data/public/js/sh_lang/sh_makefile.min.js +0 -1
  125. data/public/js/sh_lang/sh_oracle.min.js +0 -1
  126. data/public/js/sh_lang/sh_pascal.min.js +0 -1
  127. data/public/js/sh_lang/sh_perl.min.js +0 -1
  128. data/public/js/sh_lang/sh_php.min.js +0 -1
  129. data/public/js/sh_lang/sh_prolog.min.js +0 -1
  130. data/public/js/sh_lang/sh_properties.min.js +0 -1
  131. data/public/js/sh_lang/sh_puppet.js +0 -182
  132. data/public/js/sh_lang/sh_puppet.min.js +0 -182
  133. data/public/js/sh_lang/sh_puppet_output.js +0 -22
  134. data/public/js/sh_lang/sh_puppet_output.min.js +0 -22
  135. data/public/js/sh_lang/sh_python.min.js +0 -1
  136. data/public/js/sh_lang/sh_ruby.min.js +0 -1
  137. data/public/js/sh_lang/sh_scala.min.js +0 -1
  138. data/public/js/sh_lang/sh_sh.min.js +0 -1
  139. data/public/js/sh_lang/sh_shell.min.js +0 -1
  140. data/public/js/sh_lang/sh_slang.min.js +0 -1
  141. data/public/js/sh_lang/sh_sml.min.js +0 -1
  142. data/public/js/sh_lang/sh_spec.min.js +0 -1
  143. data/public/js/sh_lang/sh_sql.min.js +0 -1
  144. data/public/js/sh_lang/sh_tcl.min.js +0 -1
  145. data/public/js/sh_lang/sh_xml.min.js +0 -1
  146. data/public/js/sh_lang/sh_xorg.min.js +0 -1
  147. data/public/js/sh_main.min.js +0 -4
  148. data/public/js/showoffcore.js +0 -13
data/views/header.erb CHANGED
@@ -9,34 +9,30 @@
9
9
  <link rel="icon" href="<%= @favicon %>"/>
10
10
  <% end %>
11
11
 
12
- <link type="text/css" href="<%= @asset_path %>/css/fg.menu.css" media="screen" rel="stylesheet" />
13
- <link type="text/css" href="<%= @asset_path %>/css/theme/ui.all.css" media="screen" rel="stylesheet" />
14
- <link type="text/css" href="<%= @asset_path %>/css/sh_style.css" rel="stylesheet" />
15
- <link type="text/css" href="<%= @asset_path %>/css/tipsy.css" rel="stylesheet" />
12
+ <link rel="stylesheet" type="text/css" href="<%= @asset_path %>/css/fg.menu.css" media="screen" />
13
+ <link rel="stylesheet" type="text/css" href="<%= @asset_path %>/css/theme/ui.all.css" media="screen" />
14
+ <link rel="stylesheet" type="text/css" href="<%= @asset_path %>/css/highlight/<%= @highlightStyle %>.css" />
16
15
 
17
- <link rel="stylesheet" href="<%= @asset_path %>/css/showoff.css" type="text/css"/>
16
+ <link rel="stylesheet" type="text/css" href="<%= @asset_path %>/css/showoff.css" />
17
+
18
+ <!--[if lte IE 8]>
19
+ <link rel="stylesheet" type="text/css" href="<%= @asset_path %>/css/ie8.css" />
20
+ <![endif]-->
18
21
 
19
22
  <script type="text/javascript" src="<%= @asset_path %>/js/jquery-2.1.4.min.js"></script>
23
+
20
24
  <script type="text/javascript" src="<%= @asset_path %>/js/jquery.cycle.all.js"></script>
21
- <script type="text/javascript" src="<%= @asset_path %>/js/jquery-print.js"></script>
25
+ <script type="text/javascript" src="<%= @asset_path %>/js/jquery-print.js"></script>
22
26
  <script type="text/javascript" src="<%= @asset_path %>/js/jquery.batchImageLoad.js"></script>
23
27
  <script type="text/javascript" src="<%= @asset_path %>/js/jquery.parsequery.min.js"></script>
24
28
  <script type="text/javascript" src="<%= @asset_path %>/js/jquery.doubletap-0.1.js"></script>
25
- <script type="text/javascript" src="<%= @asset_path %>/js/jquery.tipsy.js"></script>
26
-
27
29
  <script type="text/javascript" src="<%= @asset_path %>/js/fg.menu.js"></script>
28
- <script type="text/javascript" src="<%= @asset_path %>/js/showoff.js"></script>
29
30
  <script type="text/javascript" src="<%= @asset_path %>/js/jTypeWriter.js"> </script>
30
- <script type="text/javascript" src="<%= @asset_path %>/js/sh_main.min.js"></script>
31
- <script type="text/javascript" src="<%= @asset_path %>/js/core.js"></script>
32
- <script type="text/javascript" src="<%= @asset_path %>/js/showoffcore.js"></script>
31
+ <script type="text/javascript" src="<%= @asset_path %>/js/highlight.pack.js"></script>
32
+
33
33
  <script type="text/javascript" src="<%= @asset_path %>/js/coffee-script.js"></script>
34
34
 
35
- <% if @languages %>
36
- <% @languages.each do |l| %>
37
- <script type="text/javascript" src="<%= @asset_path %>/js/<%= l %>"></script>
38
- <% end %>
39
- <% end %>
35
+ <script type="text/javascript" src="<%= @asset_path %>/js/showoff.js"></script>
40
36
 
41
37
  <% css_files.each do |css_file| %>
42
38
  <% alternate = ShowOffUtils.default_style?(css_file) ? '' : 'alternate ' %>
@@ -53,4 +49,6 @@
53
49
  });
54
50
 
55
51
  editUrl = "<%= @edit %>";
52
+
53
+ keymap = <%= JSON.pretty_generate @keymap %>;
56
54
  </script>
@@ -13,6 +13,10 @@
13
13
  <link type="text/css" href="<%= @asset_path %>/css/fg.menu.css" media="screen" rel="stylesheet" />
14
14
  <link type="text/css" href="<%= @asset_path %>/css/theme/ui.all.css" media="screen" rel="stylesheet" />
15
15
 
16
+ <!--[if lte IE 8]>
17
+ <link rel="stylesheet" type="text/css" href="<%= @asset_path %>/css/ie8.css" />
18
+ <![endif]-->
19
+
16
20
  <script type="text/javascript" src="<%= @asset_path %>/js/jquery-2.1.4.min.js"></script>
17
21
 
18
22
  <script type="text/javascript" src="<%= @asset_path %>/js/showoff.js"></script>
data/views/help.erb ADDED
@@ -0,0 +1,79 @@
1
+ <div id="help">
2
+ <h1>Showoff Hotkeys</h1>
3
+ <div>
4
+ <span class="description">Move to the next slide.</span>
5
+ <span class="action">NEXT</span>
6
+ <span class="hotkeys"><%= mapped_keys('NEXT') %></span>
7
+ </div>
8
+ <div>
9
+ <span class="description">Move to the previous slide.</span>
10
+ <span class="action">PREV</span>
11
+ <span class="hotkeys"><%= mapped_keys('PREV') %></span>
12
+ </div>
13
+ <div>
14
+ <span class="description">Show the table of contents menu.</span>
15
+ <span class="action">CONTENTS</span>
16
+ <span class="hotkeys"><%= mapped_keys('CONTENTS') %></span>
17
+ </div>
18
+ <div>
19
+ <span class="description">Toggle follow mode.</span>
20
+ <span class="action">FOLLOW</span>
21
+ <span class="hotkeys"><%= mapped_keys('FOLLOW') %></span>
22
+ </div>
23
+ <div>
24
+ <span class="description">Show this help dialog.</span>
25
+ <span class="action">HELP</span>
26
+ <span class="hotkeys"><%= mapped_keys('HELP') %></span>
27
+ </div>
28
+
29
+ <hr />
30
+
31
+ <div>
32
+ <span class="description">Reload all slides.</span>
33
+ <span class="action">RELOAD</span>
34
+ <span class="hotkeys"><%= mapped_keys('RELOAD') %></span>
35
+ </div>
36
+ <div>
37
+ <span class="description">Blank the screen.</span>
38
+ <span class="action">BLANK</span>
39
+ <span class="hotkeys"><%= mapped_keys('BLANK') %></span>
40
+ </div>
41
+ <div>
42
+ <span class="description">Toggle the display footer.</span>
43
+ <span class="action">FOOTER</span>
44
+ <span class="hotkeys"><%= mapped_keys('FOOTER') %></span>
45
+ </div>
46
+ <div>
47
+ <span class="description">Toggle notes display.</span>
48
+ <span class="action">NOTES</span>
49
+ <span class="hotkeys"><%= mapped_keys('NOTES') %></span>
50
+ </div>
51
+ <div>
52
+ <span class="description">Clear code execution results.</span>
53
+ <span class="action">CLEAR</span>
54
+ <span class="hotkeys"><%= mapped_keys('CLEAR') %></span>
55
+ </div>
56
+ <div>
57
+ <span class="description">Pause the presentation.</span>
58
+ <span class="action">PAUSE</span>
59
+ <span class="hotkeys"><%= mapped_keys('PAUSE') %></span>
60
+ </div>
61
+ <div>
62
+ <span class="description">Display slideshow of <tt>preshow</tt> images on a timer.</span>
63
+ <span class="action">PRESHOW</span>
64
+ <span class="hotkeys"><%= mapped_keys('PRESHOW') %></span>
65
+ </div>
66
+ <div>
67
+ <span class="description">Execute the first visible code block.</span>
68
+ <span class="action">EXECUTE</span>
69
+ <span class="hotkeys"><%= mapped_keys('EXECUTE') %></span>
70
+ </div>
71
+
72
+ <hr />
73
+
74
+ <div>
75
+ <span class="description">Show debugging information.</span>
76
+ <span class="action">DEBUG</span>
77
+ <span class="hotkeys"><%= mapped_keys('DEBUG') %></span>
78
+ </div>
79
+ </div>
data/views/index.erb CHANGED
@@ -9,8 +9,6 @@
9
9
 
10
10
  <a tabindex="0" href="#search-engines" class="fg-button fg-button-icon-right ui-widget ui-state-default ui-corner-all" id="navmenu"><span class="ui-icon ui-icon-triangle-1-s"></span>slides</a>
11
11
  <div id="navigation" class="hidden"></div>
12
- <a tabindex="1" href="#search-engines" class="fg-button fg-button-icon-right ui-widget ui-state-default ui-corner-all" id="stylemenu"><span class="ui-icon ui-icon-triangle-1-s"></span>styles</a>
13
- <div id="stylepicker" class="hidden"></div>
14
12
 
15
13
  <% if @feedback then %>
16
14
  <div id="feedbackWrapper">
@@ -23,7 +21,7 @@
23
21
  <span class="buttonWrapper faster"><button id="paceFaster">Speed Up</button></span>
24
22
  </div>
25
23
  <div class="row">
26
- <textarea id="question"></textarea>
24
+ <textarea id="question" placeholder="Ask a question..."></textarea>
27
25
  <button id="askQuestion">Ask a Question</button>
28
26
  </div>
29
27
  <hr />
@@ -37,7 +35,7 @@
37
35
  <input type="radio" name="rating" value="4"></input>
38
36
  <input type="radio" name="rating" value="5"></input>
39
37
  Awesome
40
- <textarea id="feedback"></textarea>
38
+ <textarea id="feedback" placeholder="Why...?"></textarea>
41
39
  <button id="sendFeedback">Send Feedback</button>
42
40
  </div>
43
41
 
@@ -58,24 +56,7 @@
58
56
  </div>
59
57
  <% end %>
60
58
 
61
- <div id="help">
62
- <table>
63
- <tr><td class="key">z, ?</td><td>toggle help (this)</td></tr>
64
- <tr><td class="key">space, &rarr;</td><td>next slide</td></tr>
65
- <tr><td class="key">shift-space, &larr;</td><td>previous slide</td></tr>
66
- <tr><td class="key">b</td><td>blank screen</td></tr>
67
- <tr><td class="key">d</td><td>toggle debug mode</td></tr>
68
- <tr><td class="key">## &lt;ret&gt;</td><td>go to slide #</td></tr>
69
- <tr><td class="key">c, t</td><td>table of contents (vi)</td></tr>
70
- <tr><td class="key">f</td><td>toggle footer</td></tr>
71
- <tr><td class="key">g</td><td>toggle follow</td></tr>
72
- <tr><td class="key">r</td><td>reload slides</td></tr>
73
- <tr><td class="key">n</td><td>toggle notes</td></tr>
74
- <tr><td class="key">p</td><td>run preshow</td></tr>
75
- <tr><td class="key">P</td><td>toggle pause</td></tr>
76
- <tr><td class="key">s</td><td>choose style</td></tr>
77
- </table>
78
- </div>
59
+ <%= erb :help %>
79
60
 
80
61
  <div class="buttonNav">
81
62
  <input type="submit" onClick="prevStep();" value="prev"/>
data/views/onepage.erb CHANGED
@@ -11,27 +11,27 @@
11
11
 
12
12
  <% if @inline %>
13
13
 
14
- <%= inline_css(['reset.css', 'showoff.css', 'theme/ui.all.css', 'sh_style.css', 'onepage.css'], 'public/css') %>
14
+ <%= inline_css(['reset.css', 'showoff.css', 'theme/ui.all.css', 'sh_style.css', 'onepage.css', "highlight/#{@highlightStyle}.css"], 'public/css') %>
15
15
  <%= inline_css(css_files) %>
16
16
 
17
- <%= inline_js(['jquery-2.1.4.min.js', 'jquery-print.js', 'showoff.js', 'onepage.js', 'sh_main.min.js', 'core.js', 'showoffcore.js'], 'public/js') %>
17
+ <!--[if lte IE 8]>
18
+ <%= inline_css('ie8.css') %>
19
+ <![endif]-->
20
+
21
+ <%= inline_js(['jquery-2.1.4.min.js', 'jquery-print.js', 'showoff.js', 'onepage.js', 'highlight.pack.js'], 'public/js') %>
18
22
  <%= inline_js(@languages, 'public/js') if @languages %>
19
23
  <%= inline_js(js_files) %>
20
- <script type="text/javascript">
21
- $(document).ready(function() {
22
- setupOnePage()
23
- });
24
- </script>
25
24
 
26
25
  <% else %>
27
- <% ['reset.css', 'showoff.css', 'theme/ui.all.css', 'sh_style.css', 'onepage.css'].each do |css_file| %>
26
+ <% ['reset.css', 'showoff.css', 'theme/ui.all.css', 'onepage.css', "highlight/#{@highlightStyle}.css"].each do |css_file| %>
28
27
  <link rel="stylesheet" href="<%= @asset_path %>/css/<%= css_file %>" type="text/css"/>
29
28
  <% end %>
29
+
30
30
  <% css_files.each do |css_file| %>
31
31
  <link rel="stylesheet" href="<%= @asset_path %>/file/<%= css_file %>" type="text/css"/>
32
32
  <% end %>
33
33
 
34
- <% ['jquery-2.1.4.min.js', 'jquery-print.js', 'showoff.js', 'onepage.js', 'sh_main.min.js', 'core.js', 'showoffcore.js'].each do |js_file| %>
34
+ <% ['jquery-2.1.4.min.js', 'jquery-print.js', 'showoff.js', 'onepage.js', 'highlight.pack.js'].each do |js_file| %>
35
35
  <script type="text/javascript" src="<%= @asset_path %>/js/<%= js_file %>"></script>
36
36
  <% end %>
37
37
  <% js_files.each do |js_file| %>
@@ -42,13 +42,26 @@
42
42
  <script type="text/javascript" src="<%= @asset_path %>/js<%= l %>"></script>
43
43
  <% end %>
44
44
  <% end %>
45
- <script type="text/javascript">
46
- $(document).ready(function() {
47
- setupOnePage()
48
- });
49
- </script>
50
45
 
46
+ <!--[if lte IE 8]>
47
+ <link rel="stylesheet" type="text/css" href="<%= @asset_path %>/css/ie8.css" />
48
+ <![endif]-->
51
49
  <% end %>
50
+
51
+ <script type="text/javascript">
52
+ $(document).ready(function() {
53
+ $('pre.highlight code').each(function(i, block) {
54
+ try {
55
+ hljs.highlightBlock(block);
56
+ } catch(e) {
57
+ console.log('Syntax highlighting failed on ' + $(this).closest('div.slide').attr('id'));
58
+ console.log('Syntax highlighting failed for ' + $(this).attr('class'));
59
+ console.log(e);
60
+ }
61
+ });
62
+ });
63
+ </script>
64
+
52
65
  </head>
53
66
 
54
67
  <body>
data/views/presenter.erb CHANGED
@@ -12,21 +12,7 @@
12
12
  </head>
13
13
 
14
14
  <body>
15
-
16
- <div id="help">
17
- <table>
18
- <tr><td class="key">z, ?</td><td>toggle help (this)</td></tr>
19
- <tr><td class="key">space, &rarr;</td><td>next slide</td></tr>
20
- <tr><td class="key">shift-space, &larr;</td><td>previous slide</td></tr>
21
- <tr><td class="key">b</td><td>blank screen</td></tr>
22
- <tr><td class="key">d</td><td>toggle debug mode</td></tr>
23
- <tr><td class="key">## &lt;ret&gt;</td><td>go to slide #</td></tr>
24
- <tr><td class="key">c, t</td><td>table of contents (vi)</td></tr>
25
- <tr><td class="key">r</td><td>reload slides</td></tr>
26
- <tr><td class="key">p</td><td>run preshow</td></tr>
27
- <tr><td class="key">s</td><td>choose style</td></tr>
28
- </table>
29
- </div>
15
+ <%= erb :help %>
30
16
 
31
17
  <div id="main">
32
18
  <div id="topbar">
@@ -47,8 +33,8 @@
47
33
  <a id="report" href="javascript:reportIssue();" title="Report an issue with the current slide.">Report Issue With Slide</a>
48
34
  <% end %>
49
35
  <span class="spacer"> </span>
50
- <a id="stats" href="/stats" target="_showoffchild" class="popdown">Viewing Statistics</a>
51
- <a id="downloads" href="/download" target="_showoffchild" class="popdown">Downloads</a>
36
+ <a id="statslink" href="" class="popdown">Viewing Statistics</a>
37
+ <a id="downloadslink" href="" class="popdown">Downloads</a>
52
38
  <span class="spacer"> </span>
53
39
  <a id="slaveWindow" href="javascript:toggleSlave();" title="Enable the display window." class="popout">Display Window</a>
54
40
  <a id="nextWindow" href="javascript:toggleNext();" title="Enable the next window view." class="popout">Next Window</a>
data/views/stats.erb CHANGED
@@ -21,7 +21,7 @@
21
21
  <% timestr = (max > 3599) ? '%H:%M:%S' : '%M:%S' %>
22
22
  <% @least.each do |slide, time| %>
23
23
  <div class="row">
24
- <span class="label">Slide <%= slide %>:</span>
24
+ <span class="label"><%= slide %></span>
25
25
  <div class="bar" style="width: <%= (time/max)*100 %>%;"> </div>
26
26
  <div class="time"><%= Time.at(time).gmtime.strftime(timestr) %></div>
27
27
  </div>
@@ -36,8 +36,8 @@
36
36
  <% timestr = (max > 3599) ? '%H:%M:%S' : '%M:%S' %>
37
37
  <% @most.each do |slide, time| %>
38
38
  <div class="row">
39
- <span class="label">Slide <%= slide %>:</span>
40
- <div class="bar" style="width: <%= (time/max)*100 %>%;"> :</div>
39
+ <span class="label"><%= slide %></span>
40
+ <div class="bar" style="width: <%= (time/max)*100 %>%;"> </div>
41
41
  <div class="time"><%= Time.at(time).gmtime.strftime(timestr) %></div>
42
42
  </div>
43
43
  <% end %>
@@ -49,7 +49,7 @@
49
49
  <%# We reuse the max value calculated from the above step. %>
50
50
  <% @all.sort.map do |slide, time| %>
51
51
  <div class="row">
52
- <span class="label">Slide <%= slide %>:</span>
52
+ <span class="label"><%= slide %></span>
53
53
  <div class="bar" style="width: <%= (time/max)*100 %>%;"> </div>
54
54
  <div class="time"><%= Time.at(time).gmtime.strftime(timestr) %></div>
55
55
  <% if @counter %>
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: showoff
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.11.1
4
+ version: 0.10.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Scott Chacon
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-05-27 00:00:00.000000000 Z
11
+ date: 2015-07-01 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: sinatra
@@ -171,6 +171,7 @@ files:
171
171
  - LICENSE
172
172
  - bin/showoff
173
173
  - lib/commandline_parser.rb
174
+ - lib/keymap.rb
174
175
  - lib/showoff/version.rb
175
176
  - lib/showoff.rb
176
177
  - lib/showoff_utils.rb
@@ -178,6 +179,7 @@ files:
178
179
  - views/download.erb
179
180
  - views/header.erb
180
181
  - views/header_mini.erb
182
+ - views/help.erb
181
183
  - views/index.erb
182
184
  - views/onepage.erb
183
185
  - views/presenter.erb
@@ -189,6 +191,73 @@ files:
189
191
  - public/css/fg.menu.css
190
192
  - public/css/grippy-close.png
191
193
  - public/css/grippy.png
194
+ - public/css/highlight/agate.css
195
+ - public/css/highlight/androidstudio.css
196
+ - public/css/highlight/arta.css
197
+ - public/css/highlight/ascetic.css
198
+ - public/css/highlight/atelier-cave.dark.css
199
+ - public/css/highlight/atelier-cave.light.css
200
+ - public/css/highlight/atelier-dune.dark.css
201
+ - public/css/highlight/atelier-dune.light.css
202
+ - public/css/highlight/atelier-estuary.dark.css
203
+ - public/css/highlight/atelier-estuary.light.css
204
+ - public/css/highlight/atelier-forest.dark.css
205
+ - public/css/highlight/atelier-forest.light.css
206
+ - public/css/highlight/atelier-heath.dark.css
207
+ - public/css/highlight/atelier-heath.light.css
208
+ - public/css/highlight/atelier-lakeside.dark.css
209
+ - public/css/highlight/atelier-lakeside.light.css
210
+ - public/css/highlight/atelier-plateau.dark.css
211
+ - public/css/highlight/atelier-plateau.light.css
212
+ - public/css/highlight/atelier-savanna.dark.css
213
+ - public/css/highlight/atelier-savanna.light.css
214
+ - public/css/highlight/atelier-seaside.dark.css
215
+ - public/css/highlight/atelier-seaside.light.css
216
+ - public/css/highlight/atelier-sulphurpool.dark.css
217
+ - public/css/highlight/atelier-sulphurpool.light.css
218
+ - public/css/highlight/brown_paper.css
219
+ - public/css/highlight/brown_papersq.png
220
+ - public/css/highlight/codepen-embed.css
221
+ - public/css/highlight/color-brewer.css
222
+ - public/css/highlight/dark.css
223
+ - public/css/highlight/darkula.css
224
+ - public/css/highlight/default.css
225
+ - public/css/highlight/docco.css
226
+ - public/css/highlight/far.css
227
+ - public/css/highlight/foundation.css
228
+ - public/css/highlight/github-gist.css
229
+ - public/css/highlight/github.css
230
+ - public/css/highlight/googlecode.css
231
+ - public/css/highlight/hybrid.css
232
+ - public/css/highlight/idea.css
233
+ - public/css/highlight/ir_black.css
234
+ - public/css/highlight/kimbie.dark.css
235
+ - public/css/highlight/kimbie.light.css
236
+ - public/css/highlight/magula.css
237
+ - public/css/highlight/mono-blue.css
238
+ - public/css/highlight/monokai.css
239
+ - public/css/highlight/monokai_sublime.css
240
+ - public/css/highlight/obsidian.css
241
+ - public/css/highlight/paraiso.dark.css
242
+ - public/css/highlight/paraiso.light.css
243
+ - public/css/highlight/pojoaque.css
244
+ - public/css/highlight/pojoaque.jpg
245
+ - public/css/highlight/railscasts.css
246
+ - public/css/highlight/rainbow.css
247
+ - public/css/highlight/school_book.css
248
+ - public/css/highlight/school_book.png
249
+ - public/css/highlight/solarized_dark.css
250
+ - public/css/highlight/solarized_light.css
251
+ - public/css/highlight/sunburst.css
252
+ - public/css/highlight/tomorrow-night-blue.css
253
+ - public/css/highlight/tomorrow-night-bright.css
254
+ - public/css/highlight/tomorrow-night-eighties.css
255
+ - public/css/highlight/tomorrow-night.css
256
+ - public/css/highlight/tomorrow.css
257
+ - public/css/highlight/vs.css
258
+ - public/css/highlight/xcode.css
259
+ - public/css/highlight/zenburn.css
260
+ - public/css/ie8.css
192
261
  - public/css/menu.png
193
262
  - public/css/new_window-a.png
194
263
  - public/css/new_window-b.png
@@ -200,7 +269,8 @@ files:
200
269
  - public/css/popout.png
201
270
  - public/css/presenter.css
202
271
  - public/css/reset.css
203
- - public/css/sh_style.css
272
+ - public/css/run_code-dim.png
273
+ - public/css/run_code.png
204
274
  - public/css/showoff.css
205
275
  - public/css/slow.png
206
276
  - public/css/spinner.gif
@@ -231,11 +301,10 @@ files:
231
301
  - public/css/theme/ui.slider.css
232
302
  - public/css/theme/ui.tabs.css
233
303
  - public/css/theme/ui.theme.css
234
- - public/css/tipsy.css
235
304
  - public/favicon.ico
236
305
  - public/js/coffee-script.js
237
- - public/js/core.js
238
306
  - public/js/fg.menu.js
307
+ - public/js/highlight.pack.js
239
308
  - public/js/jTypeWriter.js
240
309
  - public/js/jquery-2.1.4.min.js
241
310
  - public/js/jquery-print.js
@@ -243,65 +312,9 @@ files:
243
312
  - public/js/jquery.cycle.all.js
244
313
  - public/js/jquery.doubletap-0.1.js
245
314
  - public/js/jquery.parsequery.min.js
246
- - public/js/jquery.tipsy.js
247
- - public/js/onepage.js
315
+ - public/js/keyDictionary.json
248
316
  - public/js/presenter.js
249
- - public/js/sh_lang/sh_bison.min.js
250
- - public/js/sh_lang/sh_c.min.js
251
- - public/js/sh_lang/sh_caml.min.js
252
- - public/js/sh_lang/sh_changelog.min.js
253
- - public/js/sh_lang/sh_coffeescript.min.js
254
- - public/js/sh_lang/sh_cpp.min.js
255
- - public/js/sh_lang/sh_csharp.min.js
256
- - public/js/sh_lang/sh_css.min.js
257
- - public/js/sh_lang/sh_cucumber.min.js
258
- - public/js/sh_lang/sh_desktop.min.js
259
- - public/js/sh_lang/sh_diff.min.js
260
- - public/js/sh_lang/sh_docker.js
261
- - public/js/sh_lang/sh_docker.min.js
262
- - public/js/sh_lang/sh_erlang.min.js
263
- - public/js/sh_lang/sh_flex.min.js
264
- - public/js/sh_lang/sh_gherkin.js
265
- - public/js/sh_lang/sh_gherkin.min.js
266
- - public/js/sh_lang/sh_glsl.min.js
267
- - public/js/sh_lang/sh_haxe.min.js
268
- - public/js/sh_lang/sh_html.min.js
269
- - public/js/sh_lang/sh_ini.js
270
- - public/js/sh_lang/sh_ini.min.js
271
- - public/js/sh_lang/sh_java.min.js
272
- - public/js/sh_lang/sh_javascript.min.js
273
- - public/js/sh_lang/sh_javascript_dom.min.js
274
- - public/js/sh_lang/sh_latex.min.js
275
- - public/js/sh_lang/sh_ldap.min.js
276
- - public/js/sh_lang/sh_log.min.js
277
- - public/js/sh_lang/sh_lsm.min.js
278
- - public/js/sh_lang/sh_m4.min.js
279
- - public/js/sh_lang/sh_makefile.min.js
280
- - public/js/sh_lang/sh_oracle.min.js
281
- - public/js/sh_lang/sh_pascal.min.js
282
- - public/js/sh_lang/sh_perl.min.js
283
- - public/js/sh_lang/sh_php.min.js
284
- - public/js/sh_lang/sh_prolog.min.js
285
- - public/js/sh_lang/sh_properties.min.js
286
- - public/js/sh_lang/sh_puppet.js
287
- - public/js/sh_lang/sh_puppet.min.js
288
- - public/js/sh_lang/sh_puppet_output.js
289
- - public/js/sh_lang/sh_puppet_output.min.js
290
- - public/js/sh_lang/sh_python.min.js
291
- - public/js/sh_lang/sh_ruby.min.js
292
- - public/js/sh_lang/sh_scala.min.js
293
- - public/js/sh_lang/sh_sh.min.js
294
- - public/js/sh_lang/sh_shell.min.js
295
- - public/js/sh_lang/sh_slang.min.js
296
- - public/js/sh_lang/sh_sml.min.js
297
- - public/js/sh_lang/sh_spec.min.js
298
- - public/js/sh_lang/sh_sql.min.js
299
- - public/js/sh_lang/sh_tcl.min.js
300
- - public/js/sh_lang/sh_xml.min.js
301
- - public/js/sh_lang/sh_xorg.min.js
302
- - public/js/sh_main.min.js
303
317
  - public/js/showoff.js
304
- - public/js/showoffcore.js
305
318
  homepage: http://github.com/puppetlabs/showoff
306
319
  licenses: []
307
320
  metadata: {}
@@ -1,81 +0,0 @@
1
- pre.sh_sourceCode {
2
- background-color: white;
3
- color: black;
4
- font-style: normal;
5
- font-weight: normal;
6
- }
7
-
8
- pre.sh_sourceCode .sh_keyword { color: blue; font-weight: bold; } /* language keywords */
9
- pre.sh_sourceCode .sh_type { color: darkgreen; } /* basic types */
10
- pre.sh_sourceCode .sh_usertype { color: teal; } /* user defined types */
11
- pre.sh_sourceCode .sh_string { color: red; font-family: monospace; } /* strings and chars */
12
- pre.sh_sourceCode .sh_regexp { color: orange; font-family: monospace; } /* regular expressions */
13
- pre.sh_sourceCode .sh_specialchar { color: pink; font-family: monospace; } /* e.g., \n, \t, \\ */
14
- pre.sh_sourceCode .sh_comment { color: brown; font-style: italic; } /* comments */
15
- pre.sh_sourceCode .sh_number { color: purple; } /* literal numbers */
16
- pre.sh_sourceCode .sh_preproc { color: darkblue; font-weight: bold; } /* e.g., #include, import */
17
- pre.sh_sourceCode .sh_symbol { color: darkred; } /* */
18
- pre.sh_sourceCode .sh_function { color: black; font-weight: bold; } /* function calls and declarations */
19
- pre.sh_sourceCode .sh_cbracket { color: red; } /* block brackets (e.g., {, }) */
20
- pre.sh_sourceCode .sh_todo { font-weight: bold; background-color: cyan; } /* TODO and FIXME */
21
-
22
- /* Predefined variables and functions (for instance glsl) */
23
- pre.sh_sourceCode .sh_predef_var { color: darkblue; }
24
- pre.sh_sourceCode .sh_predef_func { color: darkblue; font-weight: bold; }
25
-
26
- /* for OOP */
27
- pre.sh_sourceCode .sh_classname { color: teal; }
28
-
29
- /* line numbers (not yet implemented) */
30
- pre.sh_sourceCode .sh_linenum { color: black; font-family: monospace; }
31
-
32
- /* Internet related */
33
- pre.sh_sourceCode .sh_url { color: blue; text-decoration: underline; font-family: monospace; }
34
-
35
- /* for ChangeLog and Log files */
36
- pre.sh_sourceCode .sh_date { color: blue; font-weight: bold; }
37
- pre.sh_sourceCode .sh_time, pre.sh_sourceCode .sh_file { color: darkblue; font-weight: bold; }
38
- pre.sh_sourceCode .sh_ip, pre.sh_sourceCode .sh_name { color: darkgreen; }
39
-
40
- /* for Prolog, Perl... */
41
- pre.sh_sourceCode .sh_variable { color: darkgreen; }
42
-
43
- /* for LaTeX */
44
- pre.sh_sourceCode .sh_italics { color: darkgreen; font-style: italic; }
45
- pre.sh_sourceCode .sh_bold { color: darkgreen; font-weight: bold; }
46
- pre.sh_sourceCode .sh_underline { color: darkgreen; text-decoration: underline; }
47
- pre.sh_sourceCode .sh_fixed { color: green; font-family: monospace; }
48
- pre.sh_sourceCode .sh_argument { color: darkgreen; }
49
- pre.sh_sourceCode .sh_optionalargument { color: purple; }
50
- pre.sh_sourceCode .sh_math { color: orange; }
51
- pre.sh_sourceCode .sh_bibtex { color: blue; }
52
-
53
- /* for diffs */
54
- pre.sh_sourceCode .sh_oldfile { color: orange; }
55
- pre.sh_sourceCode .sh_newfile { color: darkgreen; }
56
- pre.sh_sourceCode .sh_difflines { color: blue; }
57
-
58
- /* for css */
59
- pre.sh_sourceCode .sh_selector { color: purple; }
60
- pre.sh_sourceCode .sh_property { color: blue; }
61
- pre.sh_sourceCode .sh_value { color: darkgreen; font-style: italic; }
62
-
63
- /* other */
64
- pre.sh_sourceCode .sh_section { color: black; font-weight: bold; }
65
- pre.sh_sourceCode .sh_paren { color: red; }
66
- pre.sh_sourceCode .sh_attribute { color: darkgreen; }
67
-
68
- /* for Puppet */
69
- pre.sh_sourceCode .sh_puppet_uri { color: blue; }
70
- pre.sh_sourceCode .sh_ensure { color: magenta; }
71
- pre.sh_sourceCode .sh_hashrocket { color: brown; }
72
- pre.sh_sourceCode .sh_param { color: purple; font-weight: bold; }
73
- pre.sh_sourceCode .sh_reference { color: orange; }
74
-
75
- /* for Puppet Output */
76
- pre.sh_sourceCode.sh_puppet_output { background-color: black; color: white; }
77
- pre.sh_sourceCode .sh_info { color: green; }
78
- pre.sh_sourceCode .sh_notice { color: cyan; }
79
- pre.sh_sourceCode .sh_warning { color: red; }
80
-
81
-
data/public/css/tipsy.css DELETED
@@ -1,26 +0,0 @@
1
- .tipsy { font-size: 10px; position: absolute; padding: 5px; z-index: 100000; }
2
- .tipsy-inner { background-color: #000; color: #FFF; padding: 5px 8px 4px 8px; text-align: center; }
3
-
4
- /* Rounded corners */
5
- .tipsy-inner { border-radius: 3px; -moz-border-radius: 3px; -webkit-border-radius: 3px; }
6
-
7
- /* Uncomment for shadow */
8
- /*.tipsy-inner { box-shadow: 0 0 5px #000000; -webkit-box-shadow: 0 0 5px #000000; -moz-box-shadow: 0 0 5px #000000; }*/
9
-
10
- .tipsy-arrow { position: absolute; width: 0; height: 0; line-height: 0; border: 5px dashed #000; }
11
-
12
- /* Rules to colour arrows */
13
- .tipsy-arrow-n { border-bottom-color: #000; }
14
- .tipsy-arrow-s { border-top-color: #000; }
15
- .tipsy-arrow-e { border-left-color: #000; }
16
- .tipsy-arrow-w { border-right-color: #000; }
17
-
18
- .tipsy-n .tipsy-arrow { top: 0px; left: 50%; margin-left: -5px; border-bottom-style: solid; border-top: none; border-left-color: transparent; border-right-color: transparent; }
19
- .tipsy-nw .tipsy-arrow { top: 0; left: 10px; border-bottom-style: solid; border-top: none; border-left-color: transparent; border-right-color: transparent;}
20
- .tipsy-ne .tipsy-arrow { top: 0; right: 10px; border-bottom-style: solid; border-top: none; border-left-color: transparent; border-right-color: transparent;}
21
- .tipsy-s .tipsy-arrow { bottom: 0; left: 50%; margin-left: -5px; border-top-style: solid; border-bottom: none; border-left-color: transparent; border-right-color: transparent; }
22
- .tipsy-sw .tipsy-arrow { bottom: 0; left: 10px; border-top-style: solid; border-bottom: none; border-left-color: transparent; border-right-color: transparent; }
23
- .tipsy-se .tipsy-arrow { bottom: 0; right: 10px; border-top-style: solid; border-bottom: none; border-left-color: transparent; border-right-color: transparent; }
24
- .tipsy-e .tipsy-arrow { right: 0; top: 50%; margin-top: -5px; border-left-style: solid; border-right: none; border-top-color: transparent; border-bottom-color: transparent; }
25
- .tipsy-w .tipsy-arrow { left: 0; top: 50%; margin-top: -5px; border-right-style: solid; border-left: none; border-top-color: transparent; border-bottom-color: transparent; }
26
-