From 4a90de057c6117cac6fde598c5d3edd9d86595fd Mon Sep 17 00:00:00 2001
From: Zachary Chai <zachary.chai@blindsidenetworks.com>
Date: Fri, 3 Feb 2017 14:05:12 -0500
Subject: [PATCH] rewording and consolidating some conditions

---
 app/assets/javascripts/landing.js             |  4 +-
 app/views/landing/_invite_join.html.erb       |  4 +-
 app/views/landing/_previously_joined.html.erb |  2 +-
 .../landing/_rooms_center_panel.html.erb      |  2 +-
 .../_rooms_meetings_center_panel.html.erb     |  2 +-
 app/views/landing/meetings.html.erb           |  2 +-
 app/views/shared/_join_form.html.erb          | 56 ++++++++-----------
 config/locales/en-us.yml                      | 14 ++---
 8 files changed, 36 insertions(+), 50 deletions(-)

diff --git a/app/assets/javascripts/landing.js b/app/assets/javascripts/landing.js
index 8c3eb52b..5c758e0e 100644
--- a/app/assets/javascripts/landing.js
+++ b/app/assets/javascripts/landing.js
@@ -168,7 +168,7 @@
       Meeting.getInstance().setMeetingId(newId);
       $(".page-wrapper.meetings").data('id', newId);
       $('.meeting-url').val(Meeting.getInstance().getURL());
-      $('.join-meeting-title').html(I18n.join_title.replace(/%{id}/, newId));
+      $('.join-meeting-title').text('"'+newId+'"');
       if (newId === '') {
         $('.invite-join-wrapper').addClass('hidden');
       } else {
@@ -190,7 +190,7 @@
       var newId = $(this).val();
       Meeting.getInstance().setMeetingId(newId);
       $('.meeting-url').val(Meeting.getInstance().getURL());
-      $('.join-meeting-title').html(I18n.join_title.replace(/%{id}/, newId));
+      $('.join-meeting-title').text('"'+newId+'"');
       if (newId === '') {
         $('.invite-join-wrapper').addClass('hidden');
       } else {
diff --git a/app/views/landing/_invite_join.html.erb b/app/views/landing/_invite_join.html.erb
index 7f11b5b0..fcdbc247 100644
--- a/app/views/landing/_invite_join.html.erb
+++ b/app/views/landing/_invite_join.html.erb
@@ -1,4 +1,4 @@
-<div class="invite-join-wrapper hidden">
+<div class="row invite-join-wrapper hidden">
   <div class="col-xs-6">
     <%= render 'shared/title', title: t('invite') do %>
       <span><%= t('invite_description') %></span>
@@ -9,7 +9,7 @@
   <div class="col-xs-6">
     <%= render 'shared/title', title: t('join'), title_class: 'join-meeting-title' %>
     <button type="button" class="btn btn-primary center-block meeting-start">
-      <%= t('start_meeting') %>
+      <%= t('start_join') %>
     </button>
   </div>
 </div>
diff --git a/app/views/landing/_previously_joined.html.erb b/app/views/landing/_previously_joined.html.erb
index 3270589b..97cb2ec9 100644
--- a/app/views/landing/_previously_joined.html.erb
+++ b/app/views/landing/_previously_joined.html.erb
@@ -1,6 +1,6 @@
 <div class="previously-joined-wrapper hidden">
   <div class="list-group text-center">
-    <h4><%= t('previously_joined_meetings') %></h4>
+    <h4><%= t('previous_meetings') %></h4>
     <ul class="previously-joined"></ul>
   </div>
 </div>
diff --git a/app/views/landing/_rooms_center_panel.html.erb b/app/views/landing/_rooms_center_panel.html.erb
index 404b59b9..4921e2e1 100644
--- a/app/views/landing/_rooms_center_panel.html.erb
+++ b/app/views/landing/_rooms_center_panel.html.erb
@@ -17,7 +17,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
   <div class="title">
     <h2>
       <% if admin? && !@meeting_running %>
-        <%= t('your_personal_room') %>
+        <%= t('admin_room_title', user: @user.name) %>
       <% else %>
         <%= t('user_person_room', name: @user.name) %>
       <% end %>
diff --git a/app/views/landing/_rooms_meetings_center_panel.html.erb b/app/views/landing/_rooms_meetings_center_panel.html.erb
index c80f0141..36012c49 100644
--- a/app/views/landing/_rooms_meetings_center_panel.html.erb
+++ b/app/views/landing/_rooms_meetings_center_panel.html.erb
@@ -16,7 +16,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 <% content_for :title do %>
   <div class="title">
     <h2>
-      <%= t('join_session_id', id: @meeting_id) %>
+      <%= "\"#{@meeting_id}\"" %>
     </h2>
   </div>
 <% end %>
diff --git a/app/views/landing/meetings.html.erb b/app/views/landing/meetings.html.erb
index 244acfe9..352d728c 100644
--- a/app/views/landing/meetings.html.erb
+++ b/app/views/landing/meetings.html.erb
@@ -15,7 +15,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 
 <% content_for :title do %>
   <div class="title">
-    <h2><%= t('join_session_id', id: @meeting_id) %></h2>
+    <h2><%= "\"#{@meeting_id}\"" %></h2>
   </div>
 <% end %>
 
diff --git a/app/views/shared/_join_form.html.erb b/app/views/shared/_join_form.html.erb
index 13384e5f..0a930e7a 100644
--- a/app/views/shared/_join_form.html.erb
+++ b/app/views/shared/_join_form.html.erb
@@ -23,47 +23,35 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
       <% end %>
 
       <!-- if admin means the user is signed in and owns the room -->
-      <% if admin? %>
-        <% if @meeting_running %>
-          <div class="col-sm-6">
-            <button type="button" class="btn btn-primary meeting-join pull-right">
-              <%= t('join') %>
-            </button>
-          </div>
-          <div class="col-sm-6">
-            <button type="button" class="btn btn-danger meeting-end pull-left">
-              <%= t('end') %>
-            </button>
-          </div>
-        <% else %>
-          <button type="button" class="btn btn-primary center-block meeting-join">
-            <%= t('start_meeting') %>
+      <% if admin? && @meeting_running %>
+        <div class="col-sm-6">
+          <button type="button" class="btn btn-primary meeting-join pull-right">
+            <%= t('join') %>
           </button>
-        <% end %>
+        </div>
+        <div class="col-sm-6">
+          <button type="button" class="btn btn-danger meeting-end pull-left">
+            <%= t('end') %>
+          </button>
+        </div>
       <% else %>
 
-        <!-- on the page of a room/meeting, the user might have to enter a name -->
-        <% if on_room_or_meeting_page? %>
-          <% if current_user %>
+        <!-- if not admin but signed in don't show name field -->
+        <% if current_user %>
+          <button type="button" class="btn btn-primary center-block meeting-join">
+            <%= t('join') %>
+          </button>
+
+        <!-- if not signed in show field to enter name -->
+        <% else %>
+          <%= text_field_tag 'user[name]', '', class: 'form-control meeting-user-name', placeholder: t('enter_name') %>
+          <span class="input-group-btn">
             <button type="button" class="btn btn-primary center-block meeting-join">
               <%= t('join') %>
             </button>
-          <% else %>
-            <%= text_field_tag 'user[name]', '', class: 'form-control meeting-user-name', placeholder: t('enter_name') %>
-            <span class="input-group-btn">
-              <button type="button" class="btn btn-primary center-block meeting-join">
-                <%= t('join') %>
-              </button>
-            </span>
-          <% end %>
-
-        <!-- on the landing page we don't ask for a name, just show the start button -->
-        <% else %>
-          <button type="button" class="btn btn-primary center-block meeting-join">
-            <%= t('start_meeting') %>
-          </button>
+          </span>
         <% end %>
-
+        
       <% end %>
     </div>
   </div>
diff --git a/config/locales/en-us.yml b/config/locales/en-us.yml
index f0da90d6..dc809fb0 100644
--- a/config/locales/en-us.yml
+++ b/config/locales/en-us.yml
@@ -37,13 +37,13 @@
 
 en-US:
   actions: Actions
-  are_you: Are you %{name} ?
+  admin_room_title: Welcome %{user}
+  are_you: Are you %{name}?
   are_you_sure: Are you sure?
   change_recording_visibility: "Change visibility to:"
   client:
     are_you_sure: Are you sure?
     delete_recording: Delete recording
-    join_title: Join "%{id}"
     meeting_ended: Meeting was ended
     meeting_started: Meeting was started
     no_recordings: No Recordings
@@ -64,7 +64,7 @@ en-US:
   copy_error: Use Ctrl-c to copy
   create_your_session: Create your own meeting
   date_recorded: Date
-  duration: Duration (minutes)
+  duration: Length (minutes)
   end: End
   enter_name: Enter your name
   enter_meeting_name: Enter a meeting name to start
@@ -76,10 +76,9 @@ en-US:
   invite: Invite
   invite_description: (share this link below to invite others to this meeting)
   join: Join
-  join_session_id: Join %{id}
   logged_in_description_html: You are logged in as %{link}
   login: login
-  login_description: Want your own recorded meetings?
+  login_description: Want to record a meeting?
   logout: logout
   meeting: Meeting
   meeting_invite:
@@ -100,13 +99,12 @@ en-US:
       subject: "Your recording is ready!"
   past_recordings: Past Recordings
   presentation: Presentation
-  previously_joined_meetings: Previously Joined Meetings
+  previous_meetings: (previous meetings)
   return_to_room: Return to your personal room
   session_url_explanation: The meeting will be taking place using the following URL
   signin_text: Log in with %{provider}
   start: Start
-  start_meeting: Start Meeting
-  your_personal_room: Your Personal Room
+  start_join: Start
   thumbnails: Thumbnails
   url_copy_explanation: Copy this URL to invite others to the meeting
   user_person_room: "%{name} personal room"