Merge branch 'master' of github.com:blindsidenetworks/greenlight

app/views/landing/index.html.erb

@@ -45,21 +45,21 @@
       </div>
 
       <div id="landing_page_footer_oauth_append">
+        <% if current_user.nil? %>
         <p>You can have a personal URL (with recordings) by signing in below</p>
+        <ul>
+          <li><%= link_to 'Twitter', '/auth/twitter' %></li>
+          <li><%= link_to 'Google', '/auth/google' %></li>
+        </ul>
+        <% else %>
+          <div>Hello <%= current_user.name %></div>
+          <div><%= link_to 'Personal Room', current_user.room_url %></div>
+          <div><%= link_to 'Logout', '/logout' %></div>
+        <% end %>
       </div>
-        
+
     </div>
-  
+
   </div>
 
 </div>
-
-<% if current_user.nil? %>
-<ul>
-  <li><%= link_to 'Twitter', '/auth/twitter' %></li>
-  <li><%= link_to 'Google', '/auth/google' %></li>
-</ul>
-<% else %>
-<div>Hello <%= current_user.name %></div>
-<%= link_to 'Logout', '/logout' %>
-<% end %>

app/views/landing/room.html.erb

@@ -0,0 +1,19 @@
+<div class="page-wrapper room">
+  <div class="row">
+    <div class="col-sm-2 col-sm-offset-10">
+      <% if admin? %>
+        <span class="user"><%= current_user.name %></span>
+        <%= link_to "Logout", "/logout" %>
+      <% else %>
+        <%= link_to "Login", "/auth/twitter" %>
+      <% end %>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-sm-4 col-sm-offset-4">
+      <div class="room-link">
+        Room Link: <%= link_to "/rooms/#{@room_name}", "/rooms/#{@room_name}" %>
+      </div>
+    </div>
+  </div>
+</div>

app/views/layouts/application.html.erb

@@ -16,10 +16,10 @@
     <!-- Header -->
     <div class='navbar'>
       <div class='container'>
-        <%= image_tag "bbb-logo.png", :alt => "BigBlueButton Demo", :class => "center-block" %>
+        <%= link_to image_tag("bbb-logo.png", :alt => "BigBlueButton Demo", :class => "center-block"), root_path %>
       </div>
     </div>
-    
+
     <%= yield %>
   </body>
 </html>