From 1494dfebf0446b59770e2dc2f6a75be4bd6010cd Mon Sep 17 00:00:00 2001 From: Zachary Chai Date: Thu, 2 Feb 2017 10:08:41 -0500 Subject: [PATCH 1/3] show recordings for anonymous users --- app/assets/javascripts/recordings.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/recordings.coffee b/app/assets/javascripts/recordings.coffee index 25696d27..bb2573c9 100644 --- a/app/assets/javascripts/recordings.coffee +++ b/app/assets/javascripts/recordings.coffee @@ -152,7 +152,7 @@ class @Recordings draw: -> if !@isOwner() - @table.api().columns(4).search('true') + @table.api().columns(5).search('true') @table.api().columns.adjust().draw() # refresh the recordings from the server From 4311c3be8c8d7e379dfc9dc44db3a7a30e4c456c Mon Sep 17 00:00:00 2001 From: Zachary Chai Date: Thu, 2 Feb 2017 10:09:42 -0500 Subject: [PATCH 2/3] change display names for recording visibility states --- app/views/landing/rooms.html.erb | 8 ++++---- config/locales/en-us.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/landing/rooms.html.erb b/app/views/landing/rooms.html.erb index 9cc824eb..ac70ee98 100644 --- a/app/views/landing/rooms.html.erb +++ b/app/views/landing/rooms.html.erb @@ -58,14 +58,14 @@ with BigBlueButton; if not, see .
- -
diff --git a/config/locales/en-us.yml b/config/locales/en-us.yml index b81b4e1b..8f079083 100644 --- a/config/locales/en-us.yml +++ b/config/locales/en-us.yml @@ -100,7 +100,7 @@ en-US: footer_html: "%{greenlight_link} build %{version}, Powered by %{bbb_link}" presentation: Presentation previously_joined_meetings: Previously Joined Meetings - published: Published + published: Everyone 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} @@ -109,7 +109,7 @@ en-US: your_personal_room: Your Personal Room thumbnails: Thumbnails unlisted: Unlisted - unpublished: Unpublished + unpublished: No one url_copy_explanation: Copy this URL to invite others to the meeting video: Video wait_for_mod_msg: Looks like you're the first one here... From 0ba1b2bf41cc2938d62aeb959cf1012fece8a666 Mon Sep 17 00:00:00 2001 From: Zachary Chai Date: Thu, 2 Feb 2017 11:06:28 -0500 Subject: [PATCH 3/3] add visibility column to recordings --- app/assets/javascripts/recordings.coffee | 16 ++++++++++++++++ app/views/landing/rooms.html.erb | 7 ++++--- config/locales/en-us.yml | 7 ++++--- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/recordings.coffee b/app/assets/javascripts/recordings.coffee index bb2573c9..34a54e79 100644 --- a/app/assets/javascripts/recordings.coffee +++ b/app/assets/javascripts/recordings.coffee @@ -37,6 +37,7 @@ 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: "listed", visible: false }, { data: "id", orderable: false } @@ -68,6 +69,21 @@ class @Recordings }, { targets: 4, + render: (data, type, row) -> + visibility = ['unpublished', 'unlisted', 'published'] + if row.published + if row.listed + state = visibility[2] + else + state = visibility[1] + else + state = visibility[0] + if type == 'display' + return I18n[state] + return state + } + { + targets: 5, render: (data, type, row) -> if type == 'display' str = '' diff --git a/app/views/landing/rooms.html.erb b/app/views/landing/rooms.html.erb index ac70ee98..87c7bdba 100644 --- a/app/views/landing/rooms.html.erb +++ b/app/views/landing/rooms.html.erb @@ -39,6 +39,7 @@ with BigBlueButton; if not, see . <%= t('meeting') %> <%= t('thumbnails') %> <%= t('duration') %> + <%= t('visibility') %> <%= t('watch') %> published <%= t('actions') %> @@ -59,13 +60,13 @@ with BigBlueButton; if not, see .
diff --git a/config/locales/en-us.yml b/config/locales/en-us.yml index 8f079083..bf919df0 100644 --- a/config/locales/en-us.yml +++ b/config/locales/en-us.yml @@ -49,12 +49,15 @@ en-US: no_recordings: No Recordings no_recordings_yet: No Recordings (Yet!) publish_recording: Publish recording + published: Everyone recording_created: A recording was created recording_deleted: Recording was deleted recording_published: Recording was published recording_unlisted: Recording was unlisted recording_unpublished: Recording was unpublished unpublish_recording: Hide recording + unlisted: Unlisted + unpublished: No one user_waiting_body: "%{user} is waiting to join your room!" user_waiting_title: A user is waiting copied: Copied @@ -100,7 +103,6 @@ en-US: footer_html: "%{greenlight_link} build %{version}, Powered by %{bbb_link}" presentation: Presentation previously_joined_meetings: Previously Joined Meetings - published: Everyone 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} @@ -108,10 +110,9 @@ en-US: start_meeting: Start Meeting your_personal_room: Your Personal Room thumbnails: Thumbnails - unlisted: Unlisted - unpublished: No one url_copy_explanation: Copy this URL to invite others to the meeting video: Video + visibility: Visibility wait_for_mod_msg: Looks like you're the first one here... wait_for_mod_explanation: You will automatically join when the meeting starts watch: Watch