presenter.erb in showoff-0.15.0

- old
+ new

@@ -1,21 +1,21 @@
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
   <%= erb :header %>
-  <link rel="stylesheet" href="<%= @asset_path %>/css/presenter.css" type="text/css"/>
-  <link href="<%= @asset_path %>/css/TimeCircles.css" rel="stylesheet">
-  <script type="text/javascript" src="<%= @asset_path %>/js/TimeCircles.js"></script>
-  <script type="text/javascript" src="<%= @asset_path %>/js/presenter.js"></script>
+  <link rel="stylesheet" href="<%= @asset_path %>/css/presenter.css?v=<%= SHOWOFF_VERSION %>" type="text/css"/>
+  <link href="<%= @asset_path %>/css/TimeCircles-89ac5ae.css" rel="stylesheet">
+  <script type="text/javascript" src="<%= @asset_path %>/js/TimeCircles-89ac5ae.js"></script>
+  <script type="text/javascript" src="<%= @asset_path %>/js/presenter.js?v=<%= SHOWOFF_VERSION %>"></script>
   <script type="text/javascript">
     editUrl  = "<%= @edit %>";
     issueUrl = "<%= @issues %>";
   </script>
 </head>
 
-<body>
+<body class="presenter">
 <%= erb :help %>
 
 <div id="main">
   <div id="topbar">
     <span id="slideSource">
@@ -38,23 +38,32 @@
           <a id="statslink" href="">Viewing Statistics <i class="fa fa-chevron-down"></i></a>
           <a id="downloadslink" href="">Downloads <i class="fa fa-chevron-down"></i></a>
         </span>
         <span>
           <a id="slaveWindow" href="javascript:toggleSlave();" title="Enable the display window.">Display Window <i class="fa fa-clone"></i></a>
-          <a id="nextWindow" href="javascript:toggleNext();" title="Enable the next window view.">Next Window <i class="fa fa-clone"></i></a>
           <a id="notesWindow" href="javascript:toggleNotes();" title="Enable the popout notes window.">Notes Window <i class="fa fa-clone"></i></a>
         </span>
         <span>
           <a id="printSlides" href="javascript:printSlides();" title="Print slides using a new window.">Print Slides <i class="fa fa-print"></i></a>
           <a id="onePage" href="/" title="Switch to Display Window.">Switch Views <i class="fa fa-exchange fa-rotate-90"></i></a>
         </span>
       </span>
+      <select id="layoutSelector" autocomplete="off">
+        <option value="default" selected>Default Layout</option>
+        <option value="thumbs"   title="Display thumbnail previews of the next and previous slides.">Thumbnails</option>
+        <option value="floating" title="Open the next slide as a floating window.">Floating</option>
+        <option value="beside"   title="Display the next slide as a large preview in the main presenter view.">Side-by-Side</option>
+      </select>
       <span class="mobile">
         <a id="update" href="">Update</a>
       </span>
     </span>
   </div>
+  <div id="nextWindowConfirmation">
+    <p>Browser security requires confirmation before opening a new window.</p>
+    <p><a href="javascript:chooseLayout('default');">cancel</a><input type="button" onClick="javascript:openNext();" value="Open Window" /></p>
+  </div>
 
   <div id="center">
     <div id="sidebar">
       <div id="timerSection">
         <input type="button" id="pauseTimer" value="Pause" />
@@ -70,15 +79,18 @@
         <span id="paceSlow">Speed Up!</span>
         <span id="paceFast">Slow Down!</span>
         <img id="paceMarker" src="<%= @asset_path %>/css/paceMarker.png" />
       </div>
       <div id="navigation" class="submenu"></div>
+      <div id="navigationHover"></div>
     </div>
     <div id="presenter">
       <div id="frame">
         <div id="preview">
           <img id="disconnected" src="<%= @asset_path %>/css/disconnected-large.png" />
+          <div id="prevSlide" class="thumb"><div class="container"></div><h3 class="label">Previous</h3></div>
+          <div id="nextSlide" class="thumb"><div class="container"></div><h3 class="label">Next</h3></div>
           <div id="preso">loading presentation...</div>
         </div>
         <div id="annotationToolbar">
           <label>Tools</label>
             <i class="fa fa-pencil tool default active" data-action="draw" aria-hidden="true"></i>
@@ -110,10 +122,9 @@
           <label for="followerToggle">Update Follower</label><input type="checkbox" id="followerToggle" autocomplete="off" checked />
         </span>
         <span id="enableAnnotations" title="Enable the annotation system.">
           <label for="annotationsToggle">Annotations</label><input type="checkbox" id="annotationsToggle" autocomplete="off" />
         </span>
-
       </div>
     </div>
   </div>
 
   <div id="bottom">