diff --git a/app/assets/javascripts/channels/meeting_updates.js b/app/assets/javascripts/channels/meeting_updates.js
index f455fcc0..86b26a32 100644
--- a/app/assets/javascripts/channels/meeting_updates.js
+++ b/app/assets/javascripts/channels/meeting_updates.js
@@ -2,7 +2,7 @@
var sessionStatusRefresh = function(url) {
$.get(url + "/session_status_refresh", function(html) {
- $(".join-form-wrapper").html(html);
+ $(".center-panel-wrapper").html(html);
});
}
diff --git a/app/assets/javascripts/landing.js b/app/assets/javascripts/landing.js
index 5b778a7e..a3e27d8e 100644
--- a/app/assets/javascripts/landing.js
+++ b/app/assets/javascripts/landing.js
@@ -15,7 +15,7 @@
var init = function() {
- $('.center-panel').on ('click', '.meeting-join', function (event) {
+ $('.center-panel-wrapper').on ('click', '.meeting-join', function (event) {
var url = $('.meeting-url').val();
var name = $('.meeting-user-name').val();
Meeting.getInstance().setURL(url);
@@ -34,7 +34,7 @@
});
});
- $('.center-panel').on ('click', '.meeting-end', function (event) {
+ $('.center-panel-wrapper').on ('click', '.meeting-end', function (event) {
var jqxhr = Meeting.getInstance().endMeeting();
var btn = $(this);
btn.prop("disabled", true);
@@ -46,7 +46,7 @@
});
});
- $('.center-panel').on ('click', '.meeting-url-copy', function (event) {
+ $('.center-panel-wrapper').on ('click', '.meeting-url-copy', function (event) {
meetingURL = $('.meeting-url');
meetingURL.select();
document.execCommand("copy");
@@ -94,12 +94,7 @@
};
var initRooms = function() {
- meetingURL = $('.meeting-url');
- var link = window.location.protocol +
- '//' +
- window.location.hostname +
- meetingURL.data('path');
- meetingURL.val(link);
+ displayMeetingURL();
// initialize recordings datatable
recordingsTable = $('#recordings').dataTable({
diff --git a/app/assets/javascripts/shared.js b/app/assets/javascripts/shared.js
index 28aa8511..3140b55f 100644
--- a/app/assets/javascripts/shared.js
+++ b/app/assets/javascripts/shared.js
@@ -91,3 +91,12 @@ var showAlert = function(html, timeout_delay) {
}, timeout_delay);
}
}
+
+var displayMeetingURL = function() {
+ meetingURL = $('.meeting-url');
+ var link = window.location.protocol +
+ '//' +
+ window.location.hostname +
+ meetingURL.data('path');
+ meetingURL.val(link);
+}
diff --git a/app/views/landing/_rooms_center_panel.html.erb b/app/views/landing/_rooms_center_panel.html.erb
new file mode 100644
index 00000000..00efd3de
--- /dev/null
+++ b/app/views/landing/_rooms_center_panel.html.erb
@@ -0,0 +1,24 @@
+<% content_for :title do %>
+
+ <% if current_user == @user %>
+ <%= t('start_new_session') %>
+ <% elsif current_user && current_user != @user %>
+ <%= t('join_session_user', name: @user.username) %>
+ <% else %>
+ <%= t('join_session') %>
+ <% end %>
+
+<% end %>
+
+<%= render layout: 'shared/center_panel' do %>
+
+ <% if current_user == @user %>
+ <%= render 'shared/meeting_url', hidden: false %>
+ <% else %>
+ <%= render 'shared/meeting_url', hidden: true %>
+ <% end %>
+
+ <%= render 'shared/join_form' %>
+
+
+<% end %>
diff --git a/app/views/landing/meetings.html.erb b/app/views/landing/meetings.html.erb
index 311c1595..c2033119 100644
--- a/app/views/landing/meetings.html.erb
+++ b/app/views/landing/meetings.html.erb
@@ -18,7 +18,7 @@
<% end %>
-
+
<%= render 'shared/title', title: t('start_new_session') %>
diff --git a/app/views/landing/rooms.html.erb b/app/views/landing/rooms.html.erb
index a6ba4f12..3451690b 100644
--- a/app/views/landing/rooms.html.erb
+++ b/app/views/landing/rooms.html.erb
@@ -4,36 +4,13 @@
<% page_title= t('greet_guest', name: @user.username) %>
<% end %>
-<% content_for :title do %>
-
- <% if current_user == @user %>
- <%= t('start_new_session') %>
- <% elsif current_user && current_user != @user %>
- <%= t('join_session_user', name: @user.username) %>
- <% else %>
- <%= t('join_session_guest') %>
- <% end %>
-
-<% end %>
-
<%= render 'shared/title', title: page_title %>
- <%= render layout: 'shared/center_panel' do %>
-
- <% if current_user == @user %>
- <%= render 'shared/meeting_url', hidden: false %>
- <% else %>
- <%= render 'shared/meeting_url', hidden: true %>
- <% end %>
-
- <%= render 'shared/join_form' %>
-
-
- <% end %>
+ <%= render 'rooms_center_panel' %>
diff --git a/app/views/landing/session_status_refresh.html.erb b/app/views/landing/session_status_refresh.html.erb
index b732306d..a6afa2fc 100644
--- a/app/views/landing/session_status_refresh.html.erb
+++ b/app/views/landing/session_status_refresh.html.erb
@@ -1 +1 @@
-<%= render 'shared/join_form' %>
+<%= render 'rooms_center_panel' %>
diff --git a/app/views/shared/_center_panel.html.erb b/app/views/shared/_center_panel.html.erb
index cde84a49..5a143ae0 100644
--- a/app/views/shared/_center_panel.html.erb
+++ b/app/views/shared/_center_panel.html.erb
@@ -7,6 +7,7 @@
<%= yield :title %>
<%= yield %>
+
<%= yield :footer %>
diff --git a/config/locales/en-us.yml b/config/locales/en-us.yml
index f657133a..24729388 100644
--- a/config/locales/en-us.yml
+++ b/config/locales/en-us.yml
@@ -31,7 +31,7 @@ en-US:
greet_guest: Welcome to %{name} Meeting Space
hi_all: Hi Everyone
join: Join
- join_session_guest: Join the current session
+ join_session: Join the current session
join_session_user: Join %{name} session
login: login
logout: logout