showoff 0.4.1 → 0.4.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/lib/showoff.rb CHANGED
@@ -31,7 +31,7 @@ require 'pp'
31
31
 
32
32
  class ShowOff < Sinatra::Application
33
33
 
34
- Version = VERSION = '0.4.1'
34
+ Version = VERSION = '0.4.2'
35
35
 
36
36
  attr_reader :cached_image_size
37
37
 
@@ -5,6 +5,7 @@
5
5
  padding: 0;
6
6
  width: 1020px;
7
7
  height: 740px;
8
+ max-height: 740px !important;
8
9
  margin-left:auto;
9
10
  margin-right:auto;
10
11
  overflow:hidden;
@@ -56,4 +57,4 @@
56
57
  border: 1px solid #333;
57
58
  page-break-after: always
58
59
  }
59
- }
60
+ }
@@ -29,7 +29,6 @@
29
29
  font-size:14px;
30
30
  position:relative;
31
31
  top:-24px;
32
- z-index: 16;
33
32
  margin:0 auto;
34
33
  -webkit-border-top-left-radius: 3px;
35
34
  -webkit-border-top-right-radius: 3px;
@@ -37,6 +36,7 @@
37
36
  -moz-border-radius-topright: 3px;
38
37
  border-top-left-radius: 3px;
39
38
  border-top-right-radius: 3px;
39
+ z-index: 2147483647; /* max, see http://www.puidokas.com/max-z-index/ */
40
40
  }
41
41
  }
42
42
 
@@ -166,6 +166,7 @@ pre { margin-left: 40px; font-size: 2.8em; }
166
166
  .buttonNav { display: none }
167
167
  .offscreen { position:absolute; top:0; left:-9999px; overflow:hidden; }
168
168
  #debugInfo { margin-left: 30px; }
169
+ #notesInfo { margin-left: 30px; display: none }
169
170
  #preshow { display: none; }
170
171
 
171
172
  #help {
@@ -173,7 +174,7 @@ pre { margin-left: 40px; font-size: 2.8em; }
173
174
  position: absolute;
174
175
  right: 80px;
175
176
  display: none;
176
- z-index: 2147483647; //max, see http://www.puidokas.com/max-z-index/
177
+ z-index: 2147483647; /* max, see http://www.puidokas.com/max-z-index/ */
177
178
  }
178
179
  #help table tr td.key {
179
180
  text-align: right;
@@ -183,7 +184,7 @@ pre { margin-left: 40px; font-size: 2.8em; }
183
184
  }
184
185
 
185
186
  .fg-menu-container {
186
- z-index: 2147483647; //max, see http://www.puidokas.com/max-z-index/
187
+ z-index: 2147483647; /* max, see http://www.puidokas.com/max-z-index/ */
187
188
  }
188
189
 
189
190
  .fg-button { clear:left; margin:0 4px 40px 20px; padding: .4em 1em; text-decoration:none !important; cursor:pointer; position: relative; text-align: center; zoom: 1; }
@@ -194,7 +195,13 @@ a.fg-button { float:left; }
194
195
 
195
196
  .fg-button.ui-state-loading .ui-icon { background: url(spinner_bar.gif) no-repeat 0 0; }
196
197
 
197
- #navmenu { position: absolute; top: 10px; left: 10px; width: 50px; z-index: 16; }
198
+ #navmenu {
199
+ position: absolute;
200
+ top: 10px;
201
+ left: 10px;
202
+ width: 50px;
203
+ z-index: 2147483647; /* max, see http://www.puidokas.com/max-z-index/ */
204
+ }
198
205
 
199
206
  .code .c { color: #999988; font-style: italic } /* Comment */
200
207
  .code .err { color: #a61717; background-color: #e3d2d2 } /* Error */
@@ -267,7 +274,7 @@ a.fg-button { float:left; }
267
274
  padding:15px;
268
275
  margin:0px;
269
276
  font-family: monospace;
270
- z-index: 2147483647; //max, see http://www.puidokas.com/max-z-index/
277
+ z-index: 2147483647; /* max, see http://www.puidokas.com/max-z-index/ */
271
278
  }
272
279
 
273
280
  .executing {
@@ -284,7 +291,7 @@ a.fg-button { float:left; }
284
291
  position: fixed;
285
292
  padding:25px;
286
293
  margin:0px;
287
- z-index: 2147483647; //max, see http://www.puidokas.com/max-z-index/
294
+ z-index: 2147483647; /* max, see http://www.puidokas.com/max-z-index/ */
288
295
  }
289
296
 
290
297
  #tips {
data/public/js/showoff.js CHANGED
@@ -221,7 +221,9 @@ function getSlideProgress()
221
221
 
222
222
  function getCurrentNotes()
223
223
  {
224
- return currentSlide.find("p.notes").text()
224
+ var notes = currentSlide.find("p.notes").text()
225
+ $('#notesInfo').text(notes)
226
+ return notes
225
227
  }
226
228
 
227
229
  function getSlidePercent()
@@ -291,6 +293,18 @@ function doDebugStuff()
291
293
  }
292
294
  }
293
295
 
296
+ var notesMode = false
297
+ function toggleNotes()
298
+ {
299
+ notesMode = !notesMode
300
+ if (notesMode) {
301
+ $('#notesInfo').show()
302
+ debug('notes mode on')
303
+ } else {
304
+ $('#notesInfo').hide()
305
+ }
306
+ }
307
+
294
308
  function debug(data)
295
309
  {
296
310
  $('#debugInfo').text(data)
@@ -367,6 +381,10 @@ function keyDown(event)
367
381
  {
368
382
  toggleFooter()
369
383
  }
384
+ else if (key == 78) // 'n' for notes
385
+ {
386
+ toggleNotes()
387
+ }
370
388
  else if (key == 27) // esc
371
389
  {
372
390
  removeResults();
data/views/index.erb CHANGED
@@ -70,6 +70,7 @@
70
70
  <div id="footer">
71
71
  <span id="slideInfo"></span>
72
72
  <span id="debugInfo"></span>
73
+ <span id="notesInfo"></span>
73
74
  </div>
74
75
 
75
76
  <div id="slides" class="offscreen" <%= 'style="display:none;"' if @slides %>>
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: showoff
3
3
  version: !ruby/object:Gem::Version
4
- hash: 13
4
+ hash: 11
5
5
  prerelease: false
6
6
  segments:
7
7
  - 0
8
8
  - 4
9
- - 1
10
- version: 0.4.1
9
+ - 2
10
+ version: 0.4.2
11
11
  platform: ruby
12
12
  authors:
13
13
  - Scott Chacon