diff --git a/app/assets/javascripts/landing.js b/app/assets/javascripts/landing.js index 7311db5f..ff41775f 100644 --- a/app/assets/javascripts/landing.js +++ b/app/assets/javascripts/landing.js @@ -170,7 +170,7 @@ var joinedMeetings = localStorage.getItem('joinedMeetings'); if (joinedMeetings && joinedMeetings.length > 0) { joinedMeetings = joinedMeetings.split(','); - $('.center-panel-wrapper .panel-footer').removeClass('hidden'); + $('.center-panel-wrapper .previously-joined-wrapper').removeClass('hidden'); for (var i = joinedMeetings.length - 1; i >= 0; i--) { $('ul.previously-joined').append('
  • '+joinedMeetings[i]+'
  • '); diff --git a/app/assets/stylesheets/shared.scss b/app/assets/stylesheets/shared.scss index 9b4f9e6e..62b47c8f 100644 --- a/app/assets/stylesheets/shared.scss +++ b/app/assets/stylesheets/shared.scss @@ -70,10 +70,10 @@ body[data-controller=landing][data-action=rooms].app-background { } .center-panel { .center-panel-size { - max-width: 900px + max-width: 1200px } .center-panel-content-size { - max-width: 800px; + max-width: 1100px; } .input-spacing { diff --git a/app/views/landing/index.html.erb b/app/views/landing/index.html.erb index f83f4f9c..7cba2273 100644 --- a/app/views/landing/index.html.erb +++ b/app/views/landing/index.html.erb @@ -15,16 +15,7 @@ with BigBlueButton; if not, see . <% content_for :title do %>
    -

    <%= t('create_session') %>

    -
    -<% end %> - -<% content_for :footer do %> - <% end %> @@ -34,8 +25,37 @@ with BigBlueButton; if not, see .
    <%= render layout: 'shared/center_panel' do %>
    - <%= render 'shared/meeting_url', hidden: false %> - <%= render 'shared/join_form' %> + <%= render 'shared/meeting_name_form' %> + +
    + +
    + +
    +
    +
    +
    +

    <%= t('invite') %>

    + <%= t('invite_description') %> +
    +
    + <%= render 'shared/meeting_url', hidden: false %> +
    +
    +
    +
    +

    <%= t('join_session_id', id: '') %>

    +
    +
    + <%= render 'shared/join_form' %> +
    +
    +
    <% end %>
    diff --git a/app/views/shared/_meeting_name_form.html.erb b/app/views/shared/_meeting_name_form.html.erb new file mode 100644 index 00000000..f9189f12 --- /dev/null +++ b/app/views/shared/_meeting_name_form.html.erb @@ -0,0 +1,3 @@ +
    + +
    diff --git a/config/locales/en-us.yml b/config/locales/en-us.yml index 92989d73..7cdea712 100644 --- a/config/locales/en-us.yml +++ b/config/locales/en-us.yml @@ -58,18 +58,21 @@ en-US: user_waiting_title: A user is waiting copied: Copied copy_error: Use Ctrl-c to copy - create_session: Invite others to a meeting create_your_session: Create your own meeting date_recorded: Date duration: Duration (minutes) end: End enter_name: Enter your name + enter_meeting_name: Enter a meeting name 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: Join the current meeting - join_session_id: Join %{id} + join_session_id: Join "%{id}" join_session_user: Join %{name} meeting logged_in_description_html: You are logged in as %{link} login: login