showoff 0.14.3 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6af0328fa0f7902f4b8b41aab135dc68ecb5b18b
-  data.tar.gz: 69fcaa2c090c7b69e930aeeaae98b6680519dfaa
+  metadata.gz: 93da591c826ee3aca98428a4a9525f86cf3688fa
+  data.tar.gz: 130a86bfccb802aea7d3ba7025ace68b478c5ce1
 SHA512:
-  metadata.gz: cb7757af9a213f5d232674d29e3885791466e961d0eab032d61fb4f68fde5f1ea1647b95e22812d9bd1f6fed97a7ce87b0ba40c7c43ac10d5693e8223e291795
-  data.tar.gz: 4fea23475193b76fc27494aa6f345efbc7a6a4ab54333d201f483ed8dfa44104eb7d91cb07660720f788dd38f94b5f3a2a0162ac032163f9cc5ebae361d2f65c
+  metadata.gz: 5f8d82b171e6a0e7cf7804da4eb7bbfc443882ad48cc02dd8c0faf8d5bb6f2c7e57cf64be03a34d24b47c5522d2d981a1b4f185dc156011bac8efff637455db3
+  data.tar.gz: aa047b17de3c4f8e75ba004b48e72a4217b45ad3098be48c557a1837fc7437ece2665a780d10df1786a68104eba45f572ddb8b1f936cdb785886e975391f757a

data/lib/keymap.rb

@@ -9,7 +9,8 @@ module Keymap
       'down'        => 'NEXT',
       'right'       => 'NEXT',
       'pagedown'    => 'NEXT',
-      'r'           => 'RELOAD',
+      'R'           => 'RELOAD',
+      'r'           => 'REFRESH',
       'c'           => 'CONTENTS',
       't'           => 'CONTENTS',
       'h'           => 'HELP',

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.14.3'
+SHOWOFF_VERSION = '0.15.0'

data/lib/showoff.rb

@@ -1204,8 +1204,10 @@ class ShowOff < Sinatra::Application
 
     if index == 'all'
       doc.css(classes).collect do |code|
-        lang = code.attr('class') =~ /language-(\S*)/ ? $1 : nil
-        [lang, code.text]
+        classes = code.attr('class').split rescue []
+        lang    = classes.shift =~ /language-(\S*)/ ? $1 : nil
+
+        [lang, code.text, classes]
       end
     else
       doc.css(classes)[index.to_i].text rescue 'Invalid code block index'
@@ -1410,6 +1412,7 @@ class ShowOff < Sinatra::Application
               if valid_cookie()
                 name  = control['name']
                 slide = control['slide'].to_i
+                increment = control['increment'].to_i rescue 0
 
                 # check to see if we need to enable a download link
                 if @@downloads.has_key?(slide)
@@ -1419,10 +1422,10 @@ class ShowOff < Sinatra::Application
 
                 # update the current slide pointer
                 @logger.debug "Updated current slide to #{name}"
-                @@current = { :name => name, :number => slide }
+                @@current = { :name => name, :number => slide, :increment => increment }
 
                 # schedule a notification for all clients
-                EM.next_tick { settings.sockets.each{|s| s.send({ 'message' => 'current', 'current' => @@current[:number] }.to_json) } }
+                EM.next_tick { settings.sockets.each{|s| s.send({ 'message' => 'current', 'current' => @@current[:number], 'increment' => @@current[:increment] }.to_json) } }
               end
 
             when 'register'

data/lib/showoff_utils.rb

@@ -122,9 +122,14 @@ class ShowOffUtils
       if filename.downcase.end_with? '.md'
         print '.'
         showoff.get_code_from_slide(filename.sub('.md',''), 'all', false).each_with_index do |block, index|
-          lang, code = block
+          lang, code, classes = block
           validator = validators[lang]
-          if validator
+
+          if classes.include? 'no-validate'
+            print '-'
+            next
+
+          elsif validator
             # write out a tempfile because many validators require files to with
             Tempfile.open('showoff-validation') do |f|
               File.write(f.path, code)
@@ -134,6 +139,7 @@ class ShowOffUtils
               end
             end
           end
+
        end
       end
     end

data/public/css/presenter.css

@@ -27,12 +27,15 @@
   color: #fff;
 }
 
-  #topbar a {
+  #topbar a,
+  #topbar select {
     text-decoration: none;
     color: #fff;
+    background: #222222;
   }
 
-  #topbar a:hover{
+  #topbar a:hover,
+  #topbar select:hover {
     background-color: #555;
   }
 
@@ -72,7 +75,8 @@
     margin: 0 0.5em;
   }
 
-#presenterPopup {
+#presenterPopup,
+#nextWindowConfirmation {
   display: none;
   position: absolute;
   z-index: 2147483647;
@@ -88,10 +92,25 @@
   overflow: auto;
 }
 
-  #presenterPopup a {
+  #presenterPopup a,
+  #nextWindowConfirmation a {
     color: #ffffff;
   }
 
+#nextWindowConfirmation {
+  right: 0.25em;
+  left: auto;
+  width: 14em;
+}
+  #nextWindowConfirmation p {
+    margin: 0.25em;
+  }
+  #nextWindowConfirmation input {
+    float: right;
+    margin: 0.25em;
+  }
+
+
 #center {
   display: -webkit-flex;
   display:         flex;
@@ -206,6 +225,24 @@
       overflow-x: hidden;
       overflow-y: auto;
     }
+    #navigationHover {
+      display: none;
+      position: absolute;
+      overflow: hidden;
+      z-index: 99999;
+      width: 200px;
+      height: 150px;
+      background-color: white;
+      border: 1px solid #4D4F53;
+      margin: 0px;
+      border-radius: 3px;
+      box-shadow: 3px 3px 5px #ccc;
+    }
+      #navigationHover .content {
+        width: 200%;
+        transform: scale(0.5);
+        transform-origin: 0 0;
+      }
 
   #presenter {
     display: -webkit-flex;
@@ -226,16 +263,96 @@
               flex-flow: row;
       -webkit-flex: 10;
               flex: 10;
-      max-height: 95%;  /* dear Firefox; what's the point of flex-box if we still have to do this crap? */
     }
 
+
     #preview {
+      position: relative;
       -webkit-flex: 10;
               flex: 10;
-      overflow: auto;
+      overflow: hidden;
       background: #eee;
       padding: 1em;
     }
+
+    /* thumbnails layout */
+      #preview.thumbs {
+        padding-top: 100px;
+      }
+      #preview .thumb {
+        display: none;
+        position: absolute;
+        top: 0;
+      }
+        #preview .thumb .label {
+        }
+        #nextSlide.thumb .label {
+          text-align: right;
+        }
+
+      #preview .thumb .container {
+        overflow: hidden;
+        height: 150px;
+        width: 200px;
+        top: 0;
+        background-color: white;
+        border-bottom: 2px solid #ccc;
+      }
+        #preview .thumb .content {
+          transform: scale(.5);
+          transform-origin: 0 0;
+          width: 200%;
+        }
+        #prevSlide.thumb {
+          left: 0;
+        }
+          #prevSlide.thumb .container {
+            border-right: 2px solid #ccc;
+          }
+        #nextSlide.thumb {
+          right: 0;
+        }
+          #nextSlide.thumb .container {
+            border-left: 2px solid #ccc;
+          }
+
+        #preview.thumbs #preso {
+          position: absolute;
+          bottom: 1em;
+          margin-left: auto;
+          margin-right: auto;
+          left: 0;
+          right: 0;
+        }
+
+        /* allow us to actually see images! */
+        #navigationHover img,
+        .thumb img {
+          width: 100%;
+          height: 100%;
+        }
+
+    /* beside layout */
+      #preview.beside .thumb {
+        display: none;
+        position: absolute;
+        overflow: hidden;
+        width: 34%;
+        top: 1em;
+      }
+        #preview.beside .thumb .container {
+          width: auto;
+        }
+
+        #nextSlide.beside {
+          right: 1em;
+        }
+        #preview.beside #preso {
+          position: absolute;
+          left: 1em;
+        }
+
+
       #preview input[type=button].display {
         display: inline;
       }
@@ -247,8 +364,12 @@
         font-weight: 900;
       }
 
-      #disconnected {
+      #preview img#disconnected {
         margin: 0.5em 1em;
+        float: none;
+        position: absolute;
+        bottom: 0;
+        left: 0;
       }
 
       #preview .incremental.hidden {
@@ -259,11 +380,29 @@
         color: #404040;
       }
 
+    /* floating layout */
+    body.floating {
+      margin: 0.5em;
+      width: unset !important;
+      max-width: unset !important;
+    }
+      body.floating.next {
+        transform: scale(.5);
+        transform-origin: 0 0;
+        width: 200% !important;
+      }
+      html > body.floating.notes,
+      body.floating.notes {
+        overflow: auto;
+        height: auto;
+      }
+
 
     #preso {
       -webkit-box-shadow:0 0 25px rgba(0,0,0,0.35);
       -moz-box-shadow:0 0 25px rgba(0,0,0,0.35);
       box-shadow:0 0 25px rgba(0,0,0,0.35);
+      position: absolute;
     }
 
     #statusbar {
@@ -545,7 +684,8 @@ a.controls {
   }
   #links .desktop,
   #separator,
-  #stylepicker {
+  #stylepicker,
+  #layoutSelector {
     display: none !important;
   }
   #links {

data/public/css/showoff.css

@@ -52,6 +52,10 @@ pre code {
     overflow: hidden;
   }
 
+    body.busy {
+      cursor: progress;
+    }
+
   body#download {
     overflow: auto;
   }
@@ -67,6 +71,7 @@ pre code {
     background-repeat: no-repeat;
     background-position: center;
     background-size: cover;
+    position: relative;
   }
 
   .slide {
@@ -914,16 +919,18 @@ form .element {
   .callout.question,
   .callout.exercise,
   .callout.stop,
-  .callout.thumbsup {
+  .callout.thumbsup,
+  .callout.conversation {
     padding-left: 3em;
   }
 
-  .callout.info:before     { content: "\f05a"; } /* fa-info-circle */
-  .callout.warning:before  { content: "\f071"; } /* fa-exclamation-triangle */
-  .callout.question:before { content: "\f059"; } /* fa-question-circle */
-  .callout.exercise:before { content: "\f41b"; } /* fa-pencil-square */
-  .callout.stop:before     { content: "\f05e"; } /* fa-ban */
-  .callout.thumbsup:before { content: "\f164"; } /* fa-thumbs-up */
+  .callout.info:before         { content: "\f05a"; } /* fa-info-circle */
+  .callout.warning:before      { content: "\f071"; } /* fa-exclamation-triangle */
+  .callout.question:before     { content: "\f059"; } /* fa-question-circle */
+  .callout.exercise:before     { content: "\f41b"; } /* fa-pencil-square */
+  .callout.stop:before         { content: "\f05e"; } /* fa-ban */
+  .callout.thumbsup:before     { content: "\f164"; } /* fa-thumbs-up */
+  .callout.conversation:before { content: "\f0e5"; } /* fa-comment */
 
 /* callouts used on error pages */
 .error .callout {
@@ -971,8 +978,9 @@ h1.section_title {
     padding: 0;
   }
   body > #preso {
-    width: 976px;
-    zoom: 0.32;
+    transform: scale(.32);
+    transform-origin: 0 0;
+    width: 2928px;
   }
   #preso .slide {
     width: 100%;