lino.jorzick
/
greenlight
forked from External/greenlight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #102 from zach-chai/recordings 

Recordings
This commit is contained in:
Zachary Chai 2017-02-02 11:18:44 -05:00 committed by GitHub
parent cbafd95d19 0ba1b2bf41
commit 126993dc08
3 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/assets/javascripts/recordings.coffee
View File

@ -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 = ''
@ -152,7 +168,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

11
app/views/landing/rooms.html.erb
View File

@ -39,6 +39,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<th><%= t('meeting') %></th>
<th><%= t('thumbnails') %></th>
<th><%= t('duration') %></th>
<th><%= t('visibility') %></th>
<th><%= t('watch') %></th>
<th>published</th>
<th><%= t('actions') %></th>
@ -58,14 +59,14 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</button>
</div>
<div class="recording-visibility-popover">
<button type="button" class="btn btn-default btn-danger recording-update" data-visibility="unpublished">
<%= t('unpublished') %>
<button type="button" class="btn btn-default btn-success recording-update" data-visibility="published">
<%= t('client.published') %>
</button>
<button type="button" class="btn btn-default btn-warning recording-update" data-visibility="unlisted">
<%= t('unlisted') %>
<%= t('client.unlisted') %>
</button>
<button type="button" class="btn btn-default btn-success recording-update" data-visibility="published">
<%= t('published') %>
<button type="button" class="btn btn-default btn-danger recording-update" data-visibility="unpublished">
<%= t('client.unpublished') %>
</button>
</div>
<div class="alert-template">

7
config/locales/en-us.yml
View File

@ -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: Published
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: Unpublished
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