From 5fecb98d0b8a38413106a3c0a29ca9eaaf404126 Mon Sep 17 00:00:00 2001
From: Jesus Federico <jesus@123it.ca>
Date: Thu, 20 Oct 2016 00:13:26 +0000
Subject: [PATCH 1/2] Input for name should be shown only to anonymous users

---
 app/controllers/users_controller.rb   | 2 +-
 app/views/landing/_join_form.html.erb | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 01a1214e..12cc6c63 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -9,7 +9,7 @@ class UsersController < ApplicationController
   # PATCH/PUT /users/1.json
   def update
     if @user.update(user_params)
-      redirect_to controller: 'landing', action: 'room', name: @user.username
+      redirect_to controller: 'landing', action: 'room', id: @user.username
     else
       render :edit
     end
diff --git a/app/views/landing/_join_form.html.erb b/app/views/landing/_join_form.html.erb
index 9c7285d3..f3cf610f 100644
--- a/app/views/landing/_join_form.html.erb
+++ b/app/views/landing/_join_form.html.erb
@@ -18,10 +18,14 @@
   <!-- Join form -->
   <div id="landing_page_join">
     <form id="join_form" class="form-inline">
+      <% if current_user.nil? %>
       <div class="form-group">
         <label for="join_form_name" class="sr-only">Name</label>
-        <input id="join_form_name" type="text" class="form-control input" id="name" placeholder="Your name" required>
+        <input id="join_form_name" type="text" class="form-control input" placeholder="Your name" required>
       </div>
+      <% else %>
+        <input id="join_form_name" type="hidden" value="<%= current_user.name %>">
+      <% end %>
       <button id="join_form_button" type="button" class="btn btn-success" data-url="<%= bbb_join_path(@resource, @meeting_token) %>">Join</button>
     </form>
   </div>

From 31a0dd4100f7f4241c9e476d4cebbbced94a99ea Mon Sep 17 00:00:00 2001
From: jfederico <jesus@123it.ca>
Date: Thu, 20 Oct 2016 09:57:04 -0400
Subject: [PATCH 2/2] Removed text for sharing the meeting/room

---
 app/views/landing/_sharing_text.html.erb | 6 ------
 app/views/landing/meeting.html.erb       | 2 --
 app/views/landing/room.html.erb          | 2 --
 3 files changed, 10 deletions(-)
 delete mode 100644 app/views/landing/_sharing_text.html.erb

diff --git a/app/views/landing/_sharing_text.html.erb b/app/views/landing/_sharing_text.html.erb
deleted file mode 100644
index 32baa585..00000000
--- a/app/views/landing/_sharing_text.html.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<figure class=highlight><pre><figcaption class="text" data-lang="text">
-  <p>Hi Everyone</p>
-  <p>The meeting will be at this URL</p>
-  <p><a id="text_meeting_url" href="<%= resource_url(@resource, @meeting_token) %>"><%= resource_url(@resource, @meeting_token) %></a></p>
-  <p>Please join!</p>
-</figcaption></pre></figure>
diff --git a/app/views/landing/meeting.html.erb b/app/views/landing/meeting.html.erb
index 44aae469..7ae51bf0 100644
--- a/app/views/landing/meeting.html.erb
+++ b/app/views/landing/meeting.html.erb
@@ -20,8 +20,6 @@
   <div class="container">
     <%= render 'landing/join_form' %>
 
-    <%= render 'landing/sharing_text' %>
-
     <%= render 'landing/footer_message' %>
 
     <%= render 'landing/footer_oauth_append' %>
diff --git a/app/views/landing/room.html.erb b/app/views/landing/room.html.erb
index c77170dd..e50c7492 100644
--- a/app/views/landing/room.html.erb
+++ b/app/views/landing/room.html.erb
@@ -17,8 +17,6 @@
   <div class="container">
     <%= render 'landing/join_form' %>
 
-    <%= render 'landing/sharing_text' %>
-
     <%= render 'landing/footer_message' %>
   </div>