From ded0f9b056404773d71c188e11588efccf39864d Mon Sep 17 00:00:00 2001
From: Zachary Chai <zachary.chai@blindsidenetworks.com>
Date: Thu, 24 Nov 2016 11:30:12 -0500
Subject: [PATCH] meetings page changes

---
 app/views/landing/index.html.erb    |  2 +-
 app/views/landing/meetings.html.erb | 23 +++++++----------------
 config/locales/en-us.yml            |  2 ++
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/app/views/landing/index.html.erb b/app/views/landing/index.html.erb
index 37cfdf13..f6e19d38 100644
--- a/app/views/landing/index.html.erb
+++ b/app/views/landing/index.html.erb
@@ -17,7 +17,7 @@
   <% end %>
 <% end %>
 
-<div class="page-wrapper meetings" data-id="<%= @meeting_id %>">
+<div class="page-wrapper meetings">
   <div class="container-fluid">
 
     <div class="center-panel-wrapper">
diff --git a/app/views/landing/meetings.html.erb b/app/views/landing/meetings.html.erb
index 6763a45c..14785810 100644
--- a/app/views/landing/meetings.html.erb
+++ b/app/views/landing/meetings.html.erb
@@ -1,26 +1,17 @@
 <% content_for :title do %>
   <div class="title">
-    <%= t('hi_all') %>
+    <h2><%= t('join_session_id', id: @meeting_id) %></h2>
   </div>
-  <small>
-    <%= t('session_url_explanation') %>
-  </small>
-<% end %>
-
-<% if !@meeting_id %>
-  <% content_for :footer do %>
-    <div class="panel-footer">
-      <div class="text-center">
-        <%= t('refresh_html') %>
-      </div>
-    </div>
-  <% end %>
 <% end %>
 
 <% content_for :footer do %>
   <div class="panel-footer">
     <div class="text-center">
-      <%= link_to t('create_your_session'), root_path %>
+      <% if current_user %>
+        <%= link_to t('return_to_room'), current_user.room_url %>
+      <% else %>
+        <%= link_to t('create_your_session'), root_path %>
+      <% end %>
     </div>
   </div>
 <% end %>
@@ -31,7 +22,7 @@
     <div class="center-panel-wrapper">
       <%= render layout: 'shared/center_panel' do %>
         <div class="center-block center-panel-conent-size col-xs-12">
-          <%= render 'shared/meeting_url', hidden: false %>
+          <%= render 'shared/meeting_url', hidden: true %>
           <%= render 'shared/join_form' %>
         </div>
       <% end %>
diff --git a/config/locales/en-us.yml b/config/locales/en-us.yml
index 38c106bb..465f63b5 100644
--- a/config/locales/en-us.yml
+++ b/config/locales/en-us.yml
@@ -45,6 +45,7 @@ en-US:
   hi_all: Hi Everyone
   join: Join
   join_session: Join the current session
+  join_session_id: Join %{id}
   join_session_user: Join %{name} session
   login: login
   logout: logout
@@ -55,6 +56,7 @@ en-US:
   powered_bigbluebutton: Powered by BigBlueButton
   presentation: Presentation
   refresh_html: <a href="#" class="generate-link">Click refresh</a> to generate a new meeting URL
+  return_to_room: Return to your personal room
   session_url_explanation: The session will be taking place using the following URL
   start: Start
   start_new_session: Start a new session