From 3529e97a08834062ceafc47c7c1ff7008892bdbd Mon Sep 17 00:00:00 2001
From: Zachary Chai <zachary.chai@blindsidenetworks.com>
Date: Mon, 24 Oct 2016 10:56:57 -0400
Subject: [PATCH] header layout

---
 app/assets/stylesheets/application.css |  2 +-
 app/assets/stylesheets/shared.scss     | 57 ++++++++++++++++++++++++++
 app/views/layouts/application.html.erb | 37 +++++++++++++++--
 3 files changed, 91 insertions(+), 5 deletions(-)
 create mode 100644 app/assets/stylesheets/shared.scss

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index a15c8c86..6f2b6eff 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -10,8 +10,8 @@
  * files in this directory. Styles in this file should be added after the last require_* statement.
  * It is generally better to create a new file per style scope.
  *
- *= require_tree .
  *= require jquery-ui
  *= require dataTables/jquery.dataTables
+ *= require_tree .
  *= require_self
  */
diff --git a/app/assets/stylesheets/shared.scss b/app/assets/stylesheets/shared.scss
new file mode 100644
index 00000000..afa20028
--- /dev/null
+++ b/app/assets/stylesheets/shared.scss
@@ -0,0 +1,57 @@
+@import "bootstrap-sprockets";
+@import "bootstrap";
+@import "bootstrap-social";
+@import "font-awesome";
+
+
+html, body {
+  width: 100%;
+  height: 100%;
+}
+
+.header {
+  margin: 20px 40px;
+
+  .logo {
+    max-width: 150px;
+    max-height: 50px;
+  }
+}
+
+.footer {
+  margin: 20px;
+}
+
+.page-header {
+  margin-top: 60px;
+  border: 0;
+}
+
+.vertical-center {
+  display: inline-block;
+  vertical-align: middle;
+  float: none;
+}
+
+.content-box {
+  .center-block {
+    float: none;
+  }
+
+  .input-spacing {
+    margin-top: 15px;
+  }
+
+  .panel-footer {
+    padding: 35px;
+    background-color: white;
+  }
+
+  .panel-body {
+    padding-bottom: 40px;
+  }
+
+  .title-wrapper {
+    margin-bottom: 30px;
+  }
+}
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 167c983b..e85c3218 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -14,12 +14,41 @@
     </div>
 
     <!-- Header -->
-    <div class='navbar'>
-      <div class='container'>
-        <%= link_to image_tag("bbb-logo.png", :alt => "BigBlueButton Demo", :class => "center-block"), root_path %>
-      </div>
+    <div class='header'>
+      <span class="logo-wrapper pull-left">
+        <%= link_to image_tag("bbb-logo.png", :alt => "BigBlueButton Demo", :class => "logo"), root_path %>
+      </span>
+      <span class="signup pull-right">
+        <% if current_user %>
+          <%= current_user.name %> |
+          <% if current_user.username %>
+            <%= link_to 'my room', current_user.room_url %> |
+          <% else %>
+            <%= link_to 'my room', edit_user_path(current_user) %> |
+          <% end %>
+          <%= link_to 'logout', user_logout_url %>
+        <% elsif @user %>
+          Are you <%= @user.username %> ? |
+          <%= link_to 'login', "/auth/#{@user.provider}" %>
+        <% else %>
+          Signup for customized sessions
+          <%= link_to('/auth/twitter', :class => "btn icon btn-lg btn-social-icon btn-twitter") do %>
+            <span class="fa fa-twitter"></span>
+          <% end %>
+          <%= link_to('/auth/google', :class => "btn icon btn-lg btn-social-icon btn-google") do %>
+            <span class="fa fa-google"></span>
+          <% end %>
+        <% end %>
+      </span>
     </div>
+    <!-- End of Header -->
 
     <%= yield %>
+
+    <!-- Footer -->
+    <div class='footer text-center'>
+      Powered by BigBlueButton
+    </div>
+    <!-- End of Footer -->
   </body>
 </html>