diff --git a/app/assets/javascripts/landing.js b/app/assets/javascripts/landing.js index eb38db9d..736f097d 100644 --- a/app/assets/javascripts/landing.js +++ b/app/assets/javascripts/landing.js @@ -134,19 +134,6 @@ } }); - $('.center-panel-wrapper').on('keyup', '.meeting-name', function (event, msg) { - var newId = $(this).val(); - 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)); - if (newId === '') { - $('.invite-join-wrapper').addClass('hidden'); - } else { - $('.invite-join-wrapper').removeClass('hidden'); - } - }); - // enable tooltips var options = { selector: '.has-tooltip', @@ -172,6 +159,19 @@ var initIndex = function() { + $('.center-panel-wrapper').on('keyup', '.meeting-name', function (event, msg) { + var newId = $(this).val(); + 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)); + if (newId === '') { + $('.invite-join-wrapper').addClass('hidden'); + } else { + $('.invite-join-wrapper').removeClass('hidden'); + } + }); + $('ul.previously-joined').empty(); var joinedMeetings = localStorage.getItem('joinedMeetings'); if (joinedMeetings && joinedMeetings.length > 0) { diff --git a/app/views/landing/_rooms_center_panel.html.erb b/app/views/landing/_rooms_center_panel.html.erb index 47fa3252..5321a4f4 100644 --- a/app/views/landing/_rooms_center_panel.html.erb +++ b/app/views/landing/_rooms_center_panel.html.erb @@ -30,10 +30,23 @@ with BigBlueButton; if not, see . <%= render layout: 'shared/center_panel' do %>
<% if admin? %> - <%= render 'shared/meeting_url', hidden: false %> + <%= render 'shared/meeting_name_form' %> +
+
+ <%= render 'shared/title', title: t('invite') do %> + <%= t('invite_description') %> + <% end %> + <%= render 'shared/meeting_url', hidden: false %> +
+
+
+ <%= render 'shared/title', title: t('join'), title_class: 'join-meeting-title' %> + <%= render 'shared/join_form' %> +
+
<% else %> <%= render 'shared/meeting_url', hidden: true %> + <%= render 'shared/join_form' %> <% end %> - <%= render 'shared/join_form' %>
<% end %>