From 88af18a642f93f79efed27ab9e191a18e9ce702f Mon Sep 17 00:00:00 2001
From: Zachary Chai <zachary.chai@blindsidenetworks.com>
Date: Fri, 10 Feb 2017 16:44:51 -0500
Subject: [PATCH 1/2] modify invite join on root page to match room page

---
 app/assets/stylesheets/main/landing.scss | 11 ++--
 app/views/shared/_meeting_url.html.erb   | 77 ++++++++----------------
 2 files changed, 31 insertions(+), 57 deletions(-)

diff --git a/app/assets/stylesheets/main/landing.scss b/app/assets/stylesheets/main/landing.scss
index 79bf61f7..b68180d3 100644
--- a/app/assets/stylesheets/main/landing.scss
+++ b/app/assets/stylesheets/main/landing.scss
@@ -14,6 +14,11 @@
 // You should have received a copy of the GNU Lesser General Public License along
 // with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 
+.meeting-url-button-group {
+  padding-top: 5px;
+  width: 100px;
+}
+
 .previously-joined {
   list-style-type: none;
   margin:auto;
@@ -48,12 +53,6 @@
       }
     }
   }
-
-  .meeting-url-button-group {
-    padding-top: 5px;
-    width: 100px;
-  }
-
 }
 
 .img-thumbnail{
diff --git a/app/views/shared/_meeting_url.html.erb b/app/views/shared/_meeting_url.html.erb
index d2dd0e4c..cf5c7ce2 100644
--- a/app/views/shared/_meeting_url.html.erb
+++ b/app/views/shared/_meeting_url.html.erb
@@ -14,59 +14,34 @@
 %>
 
 <div <%= "hidden" if hidden %> class="meeting-url-wrapper">
-  <div class="<%= 'input-group' unless @user %>">
-    <div class="meeting-url-group">
-      <input type="text" class="form-control meeting-url"/>
-    </div>
+  <div class="meeting-url-group">
+    <input type="text" class="form-control meeting-url"/>
+  </div>
 
-    <% if current_user %>
-      <% body = t('meeting_invite.signed_in.body', user: current_user.name) %>
-      <% subject = t('meeting_invite.signed_in.subject', user: current_user.name) %>
-    <% else %>
-      <% body = t('meeting_invite.not_signed_in.body') %>
-      <% subject = t('meeting_invite.not_signed_in.subject') %>
-    <% end %>
+  <% if current_user %>
+    <% body = t('meeting_invite.signed_in.body', user: current_user.name) %>
+    <% subject = t('meeting_invite.signed_in.subject', user: current_user.name) %>
+  <% else %>
+    <% body = t('meeting_invite.not_signed_in.body') %>
+    <% subject = t('meeting_invite.not_signed_in.subject') %>
+  <% end %>
 
-    <% if @user %>
-      <div class="center-block meeting-url-button-group">
-        <button type="button" class="btn btn-default meeting-url-copy has-tooltip pull-left"
-          title="<%= t('url_copy_explanation') %>"
-          data-copied-hint="<%= t('copied') %>"
-          data-copy-error="<%= t('copy_error') %>"
-          data-copy-hint="<%= t('url_copy_explanation') %>"
-        >
-          <%= icon('clipboard') %>
-        </button>
+  <div class="center-block meeting-url-button-group">
+    <button type="button" class="btn btn-default meeting-url-copy has-tooltip pull-left"
+      title="<%= t('url_copy_explanation') %>"
+      data-copied-hint="<%= t('copied') %>"
+      data-copy-error="<%= t('copy_error') %>"
+      data-copy-hint="<%= t('url_copy_explanation') %>"
+    >
+      <%= icon('clipboard') %>
+    </button>
 
-        <button type="button" class="btn btn-default meeting-invite has-tooltip pull-right"
-          title="<%= t('meeting_invite.explanation') %>"
-          data-invite-body="<%= body %>"
-          data-invite-subject="<%= subject %>"
-        >
-          <%= icon('envelope-o') %>
-        </button>
-      </div>
-    <% else %>
-      <span class="input-group-btn">
-
-        <button type="button" class="btn btn-default meeting-url-copy has-tooltip"
-        title="<%= t('url_copy_explanation') %>"
-        data-copied-hint="<%= t('copied') %>"
-        data-copy-error="<%= t('copy_error') %>"
-        data-copy-hint="<%= t('url_copy_explanation') %>"
-        >
-          <%= icon('clipboard') %>
-      </button>
-
-      <button type="button" class="btn btn-default meeting-invite has-tooltip"
-        title="<%= t('meeting_invite.explanation') %>"
-        data-invite-body="<%= body %>"
-        data-invite-subject="<%= subject %>"
-      >
-        <%= icon('envelope-o') %>
-      </button>
-
-  </span>
-    <% end %>
+    <button type="button" class="btn btn-default meeting-invite has-tooltip pull-right"
+      title="<%= t('meeting_invite.explanation') %>"
+      data-invite-body="<%= body %>"
+      data-invite-subject="<%= subject %>"
+    >
+      <%= icon('envelope-o') %>
+    </button>
   </div>
 </div>

From d6c7bcfade83cbb8e1639ff7b92366a03188365e Mon Sep 17 00:00:00 2001
From: Zachary Chai <zachary.chai@blindsidenetworks.com>
Date: Fri, 10 Feb 2017 16:45:53 -0500
Subject: [PATCH 2/2] pressing enter while focused on meeting-name input
 triggers start event

---
 app/assets/javascripts/landing.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/assets/javascripts/landing.js b/app/assets/javascripts/landing.js
index 0a3408cf..73dd1116 100644
--- a/app/assets/javascripts/landing.js
+++ b/app/assets/javascripts/landing.js
@@ -75,6 +75,13 @@
       }
     });
 
+    $('.center-panel-wrapper').on ('keypress', '.meeting-name', function (event) {
+      if (event.keyCode === 13) {
+        event.preventDefault();
+        $('.meeting-start').click();
+      }
+    });
+
     $('.center-panel-wrapper').on ('click', '.meeting-end', function (event) {
       var jqxhr = Meeting.getInstance().endMeeting();
       var btn = $(this);