From 552ea39ddd9c751b1dc392faf274c346619e73f0 Mon Sep 17 00:00:00 2001
From: Zachary Chai <zachary.chai@blindsidenetworks.com>
Date: Wed, 9 Nov 2016 16:46:24 -0500
Subject: [PATCH] meeting action alerts

---
 app/assets/javascripts/channels/meeting_updates.js  |  3 +++
 app/assets/javascripts/channels/recording_update.js |  4 ++--
 app/views/landing/_rooms_center_panel.html.erb      |  6 +++---
 app/views/landing/rooms.html.erb                    | 12 +++++++++---
 config/locales/en-us.yml                            |  2 ++
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/channels/meeting_updates.js b/app/assets/javascripts/channels/meeting_updates.js
index 86b26a32..db39b476 100644
--- a/app/assets/javascripts/channels/meeting_updates.js
+++ b/app/assets/javascripts/channels/meeting_updates.js
@@ -3,6 +3,7 @@
   var sessionStatusRefresh = function(url) {
     $.get(url + "/session_status_refresh", function(html) {
       $(".center-panel-wrapper").html(html);
+      displayMeetingURL();
     });
   }
 
@@ -20,10 +21,12 @@
               loopJoin();
             } else {
               sessionStatusRefresh($('.meeting-url').val());
+              showAlert($('.meeting-started-alert').html(), 4000);
             }
           }
         } else if (data.action === 'meeting_ended') {
           sessionStatusRefresh($('.meeting-url').val());
+          showAlert($('.meeting-ended-alert').html(), 4000);
         }
       }
     });
diff --git a/app/assets/javascripts/channels/recording_update.js b/app/assets/javascripts/channels/recording_update.js
index 4d3c7730..5650f310 100644
--- a/app/assets/javascripts/channels/recording_update.js
+++ b/app/assets/javascripts/channels/recording_update.js
@@ -15,11 +15,11 @@
           table.row("#"+data.record_id).data(rowData).draw();
 
           var publish = (data.published) ? 'publish' : 'unpublish';
-          showAlert($('.'+publish+'-alert').html(), 4000);
+          showAlert($('.recording-'+publish+'-alert').html(), 4000);
         } else if (data.action === 'delete') {
           row.remove().draw();
 
-          showAlert($('.delete-alert').html(), 4000);
+          showAlert($('.recording-delete-alert').html(), 4000);
         }
       }
     });
diff --git a/app/views/landing/_rooms_center_panel.html.erb b/app/views/landing/_rooms_center_panel.html.erb
index 00efd3de..f805d6b3 100644
--- a/app/views/landing/_rooms_center_panel.html.erb
+++ b/app/views/landing/_rooms_center_panel.html.erb
@@ -1,8 +1,8 @@
 <% content_for :title do %>
   <div class="title">
-    <% if current_user == @user %>
+    <% if admin? && !@meeting_running %>
       <%= t('start_new_session') %>
-    <% elsif current_user && current_user != @user %>
+    <% elsif !admin? %>
       <%= t('join_session_user', name: @user.username) %>
     <% else %>
       <%= t('join_session') %>
@@ -12,7 +12,7 @@
 
 <%= render layout: 'shared/center_panel' do %>
   <div class="center-block col-sm-8">
-    <% if current_user == @user %>
+    <% if admin? %>
       <%= render 'shared/meeting_url', hidden: false %>
     <% else %>
       <%= render 'shared/meeting_url', hidden: true %>
diff --git a/app/views/landing/rooms.html.erb b/app/views/landing/rooms.html.erb
index 3451690b..3cceca19 100644
--- a/app/views/landing/rooms.html.erb
+++ b/app/views/landing/rooms.html.erb
@@ -48,13 +48,19 @@
       <span class="alert-message"></span>
     </div>
   </div>
-  <div class="publish-alert">
+  <div class="recording-publish-alert">
     <%= t('recording_published') %>
   </div>
-  <div class="unpublish-alert">
+  <div class="recording-unpublish-alert">
     <%= t('recording_unpublished') %>
   </div>
-  <div class="delete-alert">
+  <div class="recording-delete-alert">
     <%= t('recording_deleted') %>
   </div>
+  <div class="meeting-ended-alert">
+    <%= t('meeting_ended') %>
+  </div>
+  <div class="meeting-started-alert">
+    <%= t('meeting_started') %>
+  </div>
 </div>
diff --git a/config/locales/en-us.yml b/config/locales/en-us.yml
index 24729388..c4ea2d51 100644
--- a/config/locales/en-us.yml
+++ b/config/locales/en-us.yml
@@ -35,6 +35,8 @@ en-US:
   join_session_user: Join %{name} session
   login: login
   logout: logout
+  meeting_ended: Meeting was ended
+  meeting_started: Meeting was started
   my_room: my room
   no: No
   oauth_signup: Signup for customized sessions