From 8719956ba45ad17ad6784a4836ba48257983b00d Mon Sep 17 00:00:00 2001 From: Zachary Chai Date: Fri, 3 Feb 2017 12:09:02 -0500 Subject: [PATCH 1/3] swap visbility and watch columns --- app/assets/javascripts/recordings.coffee | 24 ++++++++++++------------ app/views/landing/rooms.html.erb | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/assets/javascripts/recordings.coffee b/app/assets/javascripts/recordings.coffee index 701394a1..d984c848 100644 --- a/app/assets/javascripts/recordings.coffee +++ b/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 += ''+d.type_i18n+' ' + 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 += ''+d.type_i18n+' ' - return str - return data }, { targets: -1, diff --git a/app/views/landing/rooms.html.erb b/app/views/landing/rooms.html.erb index f24e6217..44dfcc04 100644 --- a/app/views/landing/rooms.html.erb +++ b/app/views/landing/rooms.html.erb @@ -41,8 +41,8 @@ with BigBlueButton; if not, see . <%= t('meeting') %> <%= t('thumbnails') %> <%= t('duration') %> - <%= t('visibility') %> <%= t('watch') %> + <%= t('visibility') %> published <%= t('actions') %> From 4a90de057c6117cac6fde598c5d3edd9d86595fd Mon Sep 17 00:00:00 2001 From: Zachary Chai Date: Fri, 3 Feb 2017 14:05:12 -0500 Subject: [PATCH 2/3] rewording and consolidating some conditions --- app/assets/javascripts/landing.js | 4 +- app/views/landing/_invite_join.html.erb | 4 +- app/views/landing/_previously_joined.html.erb | 2 +- .../landing/_rooms_center_panel.html.erb | 2 +- .../_rooms_meetings_center_panel.html.erb | 2 +- app/views/landing/meetings.html.erb | 2 +- app/views/shared/_join_form.html.erb | 56 ++++++++----------- config/locales/en-us.yml | 14 ++--- 8 files changed, 36 insertions(+), 50 deletions(-) diff --git a/app/assets/javascripts/landing.js b/app/assets/javascripts/landing.js index 8c3eb52b..5c758e0e 100644 --- a/app/assets/javascripts/landing.js +++ b/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 { diff --git a/app/views/landing/_invite_join.html.erb b/app/views/landing/_invite_join.html.erb index 7f11b5b0..fcdbc247 100644 --- a/app/views/landing/_invite_join.html.erb +++ b/app/views/landing/_invite_join.html.erb @@ -1,4 +1,4 @@ - diff --git a/config/locales/en-us.yml b/config/locales/en-us.yml index f0da90d6..dc809fb0 100644 --- a/config/locales/en-us.yml +++ b/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,7 +64,7 @@ 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 @@ -76,10 +76,9 @@ en-US: 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 meeting: Meeting meeting_invite: @@ -100,13 +99,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 - your_personal_room: Your Personal Room + start_join: Start thumbnails: Thumbnails url_copy_explanation: Copy this URL to invite others to the meeting user_person_room: "%{name} personal room" From 8f04967b283cf11d54e8f9797e199cdf818c574b Mon Sep 17 00:00:00 2001 From: Zachary Chai Date: Fri, 3 Feb 2017 14:26:10 -0500 Subject: [PATCH 3/3] select randomized title from pool on root page --- app/views/landing/index.html.erb | 2 +- app/views/landing/rooms.html.erb | 6 ------ config/locales/en-us.yml | 8 ++++++-- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/app/views/landing/index.html.erb b/app/views/landing/index.html.erb index 126a4493..a2fb186f 100644 --- a/app/views/landing/index.html.erb +++ b/app/views/landing/index.html.erb @@ -15,7 +15,7 @@ with BigBlueButton; if not, see . <% content_for :title do %>
-

<%= t('home_title') %>

+

<%= t('landing_titles').values[rand(t('landing_titles').size)] %>

<% end %> diff --git a/app/views/landing/rooms.html.erb b/app/views/landing/rooms.html.erb index 44dfcc04..27624700 100644 --- a/app/views/landing/rooms.html.erb +++ b/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 . --> -<% if current_user %> - <% page_title = t('greet_user', name: current_user.name) %> -<% else %> - <% page_title= t('greet_guest', name: @user.username) %> -<% end %> -
diff --git a/config/locales/en-us.yml b/config/locales/en-us.yml index dc809fb0..8b04258a 100644 --- a/config/locales/en-us.yml +++ b/config/locales/en-us.yml @@ -69,8 +69,6 @@ en-US: 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 @@ -80,6 +78,12 @@ en-US: login: login 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