Merge pull request #110 from zach-chai/more_rewording

More rewording

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 {

app/assets/javascripts/recordings.coffee

@@ -37,8 +37,8 @@ class @Recordings
         { data: "name", visible: $(".page-wrapper.rooms").data('main-room') },
         { data: "previews", orderable: false },
         { data: "duration", orderable: false },
-        { data: "published" },
         { data: "playbacks", orderable: false },
+        { data: "published" },
         { data: "listed", visible: false },
         { data: "id", orderable: false }
       ],
@@ -69,6 +69,17 @@ class @Recordings
         },
         {
           targets: 4,
+          render: (data, type, row) ->
+            if type == 'display'
+              str = ''
+              if row.published
+                for d in data
+                  str += '<a href="'+d.url+'" target="_blank">'+d.type_i18n+'</a> '
+              return str
+            return data
+        },
+        {
+          targets: 5,
           render: (data, type, row) ->
             visibility = ['unpublished', 'unlisted', 'published']
             if row.published
@@ -81,17 +92,6 @@ class @Recordings
             if type == 'display'
               return I18n[state]
             return state
-        }
-        {
-          targets: 5,
-          render: (data, type, row) ->
-            if type == 'display'
-              str = ''
-              if row.published
-                for d in data
-                  str += '<a href="'+d.url+'" target="_blank">'+d.type_i18n+'</a> '
-              return str
-            return data
         },
         {
           targets: -1,

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>

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>

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 %>

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 %>

app/views/landing/index.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('home_title') %></h2>
+    <h2><%= t('landing_titles').values[rand(t('landing_titles').size)] %></h2>
   </div>
 <% end %>
 

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 %>
 

app/views/landing/rooms.html.erb

@@ -13,12 +13,6 @@ You should have received a copy of the GNU Lesser General Public License along
 with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 -->
 
-<% if current_user %>
-  <% page_title = t('greet_user', name: current_user.name) %>
-<% else %>
-  <% page_title= t('greet_guest', name: @user.username) %>
-<% end %>
-
 <div class="page-wrapper rooms" data-main-room="<%= @main_room %>" data-id="<%= @meeting_id %>" data-admin-id="<%= @user.encrypted_id %>">
   <div class="container-fluid">
 
@@ -41,8 +35,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
           <th><%= t('meeting') %></th>
           <th><%= t('thumbnails') %></th>
           <th><%= t('duration') %></th>
-          <th><%= t('visibility') %></th>
           <th><%= t('watch') %></th>
+          <th><%= t('visibility') %></th>
           <th>published</th>
           <th><%= t('actions') %></th>
         </thead>

app/views/shared/_join_form.html.erb

@@ -23,8 +23,7 @@ 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 admin? && @meeting_running %>
-        <% if @meeting_running %>
         <div class="col-sm-6">
           <button type="button" class="btn btn-primary meeting-join pull-right">
             <%= t('join') %>
@@ -36,18 +35,14 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
           </button>
         </div>
       <% else %>
-          <button type="button" class="btn btn-primary center-block meeting-join">
-            <%= t('start_meeting') %>
-          </button>
-        <% end %>
-      <% else %>
 
-        <!-- on the page of a room/meeting, the user might have to enter a name -->
+        <!-- if not admin but signed in don't show name field -->
-        <% if on_room_or_meeting_page? %>
         <% 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">
@@ -57,13 +52,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
           </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>
-        <% end %>
-
       <% end %>
     </div>
   </div>

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,23 +64,26 @@ 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
   footer_html: Powered by %{bbb_link}
-  greet_user: Welcome, %{name}
-  greet_guest: Welcome to %{name} Meeting Space
   hi_all: Hi Everyone
   home_title: Welcome to BigBlueButton
   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
+  landing_titles:
+    start_meeting: Start your own meeting
+    get_work_down: Let's get some work done
+    connect: Connect in real-time with others
+    collaborate: Collaborate with friends
+    teach: Teach students online
   meeting: Meeting
   meeting_invite:
     explanation: Send an email with an invitation to this meeting
@@ -100,13 +103,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
+  start_join: Start
-  your_personal_room: Your Personal Room
   thumbnails: Thumbnails
   url_copy_explanation: Copy this URL to invite others to the meeting
   user_person_room: "%{name} personal room"