From 7bb4b4a3c830128af40d386b8aa67d454fe4fc82 Mon Sep 17 00:00:00 2001
From: Daniel Weigh <daniel@jamkazam.com>
Date: Sun, 29 Dec 2013 13:14:50 -0500
Subject: [PATCH] VRFS-936 Session header bar missing

---
 web/app/views/clients/_session.html.erb | 190 ++++++++++++------------
 1 file changed, 96 insertions(+), 94 deletions(-)

diff --git a/web/app/views/clients/_session.html.erb b/web/app/views/clients/_session.html.erb
index 4c71c8349..6aca6d92f 100644
--- a/web/app/views/clients/_session.html.erb
+++ b/web/app/views/clients/_session.html.erb
@@ -7,116 +7,118 @@
         <h1>session</h1>
     </div>
 
+    <div class="content-body">
     <!-- session controls -->
-    <div id="session-controls">
-        <a class="button-grey resync left" id="session-resync">
-            <%= image_tag "content/icon_resync.png", {:align => "texttop", :height => 14, :width => 12} %>
-            RESYNC
-        </a>
-        <a class="button-grey left" layout-link="session-settings" id="session-settings-button">
-            <%= image_tag "content/icon_settings_sm.png", {:align => "texttop", :height => 12, :width => 12} %>
-            SETTINGS
-        </a>
-        <a class="button-grey left">
-            <%= image_tag "content/icon_share.png", {:align => "texttop", :height => 12, :width => 12} %> 
-            SHARE
-        </a>
+        <div id="session-controls">
+            <a class="button-grey resync left" id="session-resync">
+                <%= image_tag "content/icon_resync.png", {:align => "texttop", :height => 14, :width => 12} %>
+                RESYNC
+            </a>
+            <a class="button-grey left" layout-link="session-settings" id="session-settings-button">
+                <%= image_tag "content/icon_settings_sm.png", {:align => "texttop", :height => 12, :width => 12} %>
+                SETTINGS
+            </a>
+            <a class="button-grey left">
+                <%= image_tag "content/icon_share.png", {:align => "texttop", :height => 12, :width => 12} %> 
+                SHARE
+            </a>
 
-        <!-- Volume Slider -->
-        <div class="block">
-            <div class="label">VOLUME:</div>
-            <div id="volume" class="fader lohi" mixer-id=""></div>
+            <!-- Volume Slider -->
+            <div class="block">
+                <div class="label">VOLUME:</div>
+                <div id="volume" class="fader lohi" mixer-id=""></div>
+            </div>
+
+            <!-- Mix: Me versus Others -->
+            <div class="block">
+                <div class="label">MIX:</div>
+                <div class="label"><small>others</small></div>
+                <div id="l2m" class="fader flat" mixer-id="__L2M__"></div>
+                <div class="label"><small>me</small></div>
+            </div>
+
+            <!-- Leave Button -->
+            <a class="button-grey right leave" href="#/home" id="session-leave">X&nbsp;&nbsp;LEAVE</a>
         </div>
+        <!-- end session controls -->
 
-        <!-- Mix: Me versus Others -->
-        <div class="block">
-            <div class="label">MIX:</div>
-            <div class="label"><small>others</small></div>
-            <div id="l2m" class="fader flat" mixer-id="__L2M__"></div>
-            <div class="label"><small>me</small></div>
-        </div>
+        <!-- content scrolling area -->
+        <div id="tracks">
+            <div class="content-scroller">
 
-        <!-- Leave Button -->
-        <a class="button-grey right leave" href="#/home" id="session-leave">X&nbsp;&nbsp;LEAVE</a>
-    </div>
-    <!-- end session controls -->
+                <!-- content wrapper -->
+                <div class="content-wrapper">
 
-    <!-- content scrolling area -->
-    <div id="tracks">
-        <div class="content-scroller">
+                    <!-- my tracks -->
+                    <div class="session-mytracks">
+                        <h2>my tracks</h2>
+                        <div id="track-settings" class="session-add" style="display:block;" layout-link="configure-audio">
+                            <%= image_tag "content/icon_settings_lg.png", {:width => 18, :height => 18} %>&nbsp;&nbsp;Settings
+                        </div>
 
-            <!-- content wrapper -->
-            <div class="content-wrapper">
-
-                <!-- my tracks -->
-                <div class="session-mytracks">
-                    <h2>my tracks</h2>
-                    <div id="track-settings" class="session-add" style="display:block;" layout-link="configure-audio">
-                        <%= image_tag "content/icon_settings_lg.png", {:width => 18, :height => 18} %>&nbsp;&nbsp;Settings
-                    </div>
-
-                    <div class="session-tracks-scroller">
-                        <div id="session-mytracks-container"></div>
-                        <div id="voice-chat" class="voicechat" style="display:none;" mixer-id="">
-                            <div class="voicechat-label">CHAT</div>
-                            <div class="voicechat-gain"></div>
-                            <div class="voicechat-mute enabled" control="mute" mixer-id=""></div>
+                        <div class="session-tracks-scroller">
+                            <div id="session-mytracks-container"></div>
+                            <div id="voice-chat" class="voicechat" style="display:none;" mixer-id="">
+                                <div class="voicechat-label">CHAT</div>
+                                <div class="voicechat-gain"></div>
+                                <div class="voicechat-mute enabled" control="mute" mixer-id=""></div>
+                            </div>
                         </div>
                     </div>
-                </div>
 
-                <!-- live tracks -->
-                <div class="session-livetracks">
-                    <h2>live tracks</h2>
-                    <div class="session-add">
-                        <a>
-                            <%= image_tag "content/icon_add.png", {:width => 19, :height => 19, :align => "texttop"} %>&nbsp;&nbsp;Invite Musicians
-                        </a>
+                    <!-- live tracks -->
+                    <div class="session-livetracks">
+                        <h2>live tracks</h2>
+                        <div class="session-add">
+                            <a>
+                                <%= image_tag "content/icon_add.png", {:width => 19, :height => 19, :align => "texttop"} %>&nbsp;&nbsp;Invite Musicians
+                            </a>
+                        </div>
+                        <div class="session-tracks-scroller">
+                            <div id="session-livetracks-container">
+                                <p class="when-empty">
+                                No Live Tracks:<br/>
+                                <a>Invite Other Musicians</a> to<br/>
+                                Add Live Tracks
+                                </p>
+                            </div>
+                            <br clear="all" />
+                            <div class="recording" id="recording-start-stop">
+                                <a>
+                                    <%= image_tag "content/recordbutton-off.png", {:width => 20, :height => 20, :align => "absmiddle"} %>&nbsp;&nbsp;<span id="recording-status">Make a Recording</span>
+                                </a>
+                            </div>
+                        </div>
                     </div>
-                    <div class="session-tracks-scroller">
-                        <div id="session-livetracks-container">
-                            <p class="when-empty">
-                            No Live Tracks:<br/>
-                            <a>Invite Other Musicians</a> to<br/>
-                            Add Live Tracks
+
+                    <!-- recordings -->
+                    <div class="session-recordings">
+                        <h2>recordings</h2>
+                        <div class="session-add">
+                            &nbsp;
+                        </div>
+                        <div>
+                            <p class="when-empty recordings">
+                            No Recordings:<br/><a>Open a Recording</a>
                             </p>
                         </div>
-                        <br clear="all" />
-                        <div class="recording" id="recording-start-stop">
-                            <a>
-                                <%= image_tag "content/recordbutton-off.png", {:width => 20, :height => 20, :align => "absmiddle"} %>&nbsp;&nbsp;<span id="recording-status">Make a Recording</span>
-                            </a>
+
+                        <!-- recording name and close button -->
+                        <!--
+                        <div class="session-recording-name-wrapper">
+                            <div class="session-recording-name left">(No recording loaded)</div>
+                            <div class="session-add right">
+                                <a>
+                                    <%= image_tag "content/icon_close.png", {:width => 18, :height => 20, :align => "texttop"} %>&nbsp;&nbsp;Close
+                                </a>
+                            </div>
+                        </div>
+                        -->
+                        <div class="session-tracks-scroller">
                         </div>
                     </div>
+
                 </div>
-
-                <!-- recordings -->
-                <div class="session-recordings">
-                    <h2>recordings</h2>
-                    <div class="session-add">
-                        &nbsp;
-                    </div>
-                    <div>
-                        <p class="when-empty recordings">
-                        No Recordings:<br/><a>Open a Recording</a>
-                        </p>
-                    </div>
-
-                    <!-- recording name and close button -->
-                    <!--
-                    <div class="session-recording-name-wrapper">
-                        <div class="session-recording-name left">(No recording loaded)</div>
-                        <div class="session-add right">
-                            <a>
-                                <%= image_tag "content/icon_close.png", {:width => 18, :height => 20, :align => "texttop"} %>&nbsp;&nbsp;Close
-                            </a>
-                        </div>
-                    </div>
-                    -->
-                    <div class="session-tracks-scroller">
-                    </div>
-                </div>
-
             </div>
         </div>
     </div>