views/presenter.erb in showoff-0.13.4 vs views/presenter.erb in showoff-0.14.0

- old
+ new

@@ -72,13 +72,33 @@ <img id="paceMarker" src="<%= @asset_path %>/css/paceMarker.png" /> </div> <div id="navigation" class="submenu"></div> </div> <div id="presenter"> - <div id="preview"> - <img id="disconnected" src="<%= @asset_path %>/css/disconnected-large.png" /> - <div id="preso">loading presentation...</div> + <div id="frame"> + <div id="preview"> + <img id="disconnected" src="<%= @asset_path %>/css/disconnected-large.png" /> + <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> + <i class="fa fa-arrow-right tool" data-action="rightArrow" aria-hidden="true"></i> + <i class="fa fa-arrow-left tool" data-action="leftArrow" aria-hidden="true"></i> + <i class="fa fa-bullseye tool" data-action="highlight" aria-hidden="true"></i> + <i class="fa fa-eraser tool" data-action="erase" aria-hidden="true"></i> + <label>Lines</label> + <i class="fa fa-square-o lines color1 active" aria-hidden="true"></i> + <i class="fa fa-square-o lines color2" aria-hidden="true"></i> + <i class="fa fa-square-o lines color3" aria-hidden="true"></i> + <i class="fa fa-square-o lines color4" aria-hidden="true"></i> + <label>Shapes</label> + <i class="fa fa-square shapes color1" aria-hidden="true"></i> + <i class="fa fa-square shapes color2" aria-hidden="true"></i> + <i class="fa fa-square shapes color3 active" aria-hidden="true"></i> + <i class="fa fa-square shapes color4" aria-hidden="true"></i> + </div> </div> <div id="statusbar"> <span id="progress"> Slide: <span id="slideInfo"></span> </span> @@ -87,9 +107,13 @@ <label for="remoteToggle">Enable Remote</label><input type="checkbox" id="remoteToggle" checked /> </span> <span id="enableFollower" title="Send slide change notifications."> <label for="followerToggle">Update Follower</label><input type="checkbox" id="followerToggle" checked /> </span> + <span id="enableAnnotations" title="Enable the annotation system."> + <label for="annotationsToggle">Annotations</label><input type="checkbox" id="annotationsToggle" /> + </span> + </div> </div> </div> <div id="bottom">