diff --git a/app/assets/javascripts/channels/recording_update.js b/app/assets/javascripts/channels/recording_update.js index 23c8a387..f27bf7ea 100644 --- a/app/assets/javascripts/channels/recording_update.js +++ b/app/assets/javascripts/channels/recording_update.js @@ -11,6 +11,14 @@ var rowData = table.row("#"+data.record_id).data(); rowData.published = data.published table.row("#"+data.record_id).data(rowData).draw(); + var publish = (data.published) ? 'publish' : 'unpublish'; + + // show alert success alert + $('.alert-template .alert-message').html($('.'+publish+'-alert').html()); + $('#alerts').html($('.alert-template').html()); + setTimeout(function() { + $('#alerts > .alert').alert('close'); + }, 4000); } }); }; diff --git a/app/assets/javascripts/landing.js b/app/assets/javascripts/landing.js index 42e42055..376a59b7 100644 --- a/app/assets/javascripts/landing.js +++ b/app/assets/javascripts/landing.js @@ -52,6 +52,20 @@ document.execCommand("copy"); meetingURL.blur(); }); + + // enable popovers + var options = { + selector: '.has-popover', + html: true, + trigger: 'focus', + title: function() { + return $(".delete-popover-title").html(); + }, + content: function() { + return $(".delete-popover-body").html(); + } + }; + $('#recordings').popover(options); }; var initIndex = function() { @@ -141,10 +155,12 @@ var roomName = getRoomName(); var published = row.published; var eye = getPublishClass(published); - return ' ' + - ''; + '' + + '' + + ''; } return data; } @@ -154,27 +170,29 @@ $('#recordings').on('click', '.recording-update', function(event) { var btn = $(this); - var room = btn.data('room'); - var id = btn.data('id'); + var row = recordingsTable.api().row($(this).closest('tr')).data(); + var url = $('.meeting-url').val(); + var id = row.id; var published = btn.data('published'); - btn.prop("disabled", true); + btn.prop('disabled', true); $.ajax({ method: 'PATCH', - url: '/rooms/'+room+'/recordings/'+id, + url: url+'/recordings/'+id, data: {published: (!published).toString()} }).done(function(data) { }).fail(function(data) { - btn.prop("disabled", false); + btn.prop('disabled', false); }); }); $('#recordings').on('click', '.recording-delete', function(event) { - var room = $(this).data('room'); - var id = $(this).data('id'); + var row = recordingsTable.api().row($(this).closest('tr')).data(); + var url = $('.meeting-url').val(); + var id = row.id; $.ajax({ method: 'DELETE', - url: '/rooms/'+room+'/recordings/'+id + url: url+'/recordings/'+id }).done(function() { recordingsTable.api().row("#"+id).remove().draw(); }); diff --git a/app/assets/stylesheets/shared.scss b/app/assets/stylesheets/shared.scss index 378788d6..77628fe2 100644 --- a/app/assets/stylesheets/shared.scss +++ b/app/assets/stylesheets/shared.scss @@ -10,7 +10,23 @@ html, body { } .app-background { - background: linear-gradient(0, white 65%, #4DC0A2 35%); + background: #4dc0a2; + background: -moz-linear-gradient(top, #4dc0a2 0%, #4dc0a2 35%, #ffffff 35%, #ffffff 100%); + background: -webkit-gradient(left top, left bottom, color-stop(0%, #4dc0a2), color-stop(35%, #4dc0a2), color-stop(35%, #ffffff), color-stop(100%, #ffffff)); + background: -webkit-linear-gradient(top, #4dc0a2 0%, #4dc0a2 35%, #ffffff 35%, #ffffff 100%); + background: -o-linear-gradient(top, #4dc0a2 0%, #4dc0a2 35%, #ffffff 35%, #ffffff 100%); + background: -ms-linear-gradient(top, #4dc0a2 0%, #4dc0a2 35%, #ffffff 35%, #ffffff 100%); + background: linear-gradient(to bottom, #4dc0a2 0%, #4dc0a2 35%, #ffffff 35%, #ffffff 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#4dc0a2', endColorstr='#ffffff', GradientType=0 ); +} + +#alerts { + position: absolute; + top: 10px; + left: 50%; + margin-left: -250px; + width: 500px; + z-index: 999; } .header { diff --git a/app/views/landing/rooms.html.erb b/app/views/landing/rooms.html.erb index f56f22fd..7be8d4a5 100644 --- a/app/views/landing/rooms.html.erb +++ b/app/views/landing/rooms.html.erb @@ -41,7 +41,7 @@ - + @@ -50,3 +50,31 @@ + + diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 2475e4da..9fda7d81 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -11,9 +11,9 @@ -
<%= t('date_recorded') %><%= t('presentation') %><%= t('thumbnails') %> <%= t('duration') %> <%= t('views') %> <%= t('actions') %>