From dde5a75a456f6dc245d0c788f5e83a65d1a41c4f Mon Sep 17 00:00:00 2001 From: Steven Miers Date: Sun, 2 Nov 2014 23:07:11 -0600 Subject: [PATCH] VRFS-1849 : Add checkboxes for upload_to_youtube and save_to_computer. --- .../dialog/recordingFinishedDialog.js | 15 ++++++++++++-- .../dialogs/recordingFinishedDialog.css.scss | 20 +++++++++++++------ .../dialogs/_recordingFinishedDialog.html.erb | 10 ++++++++++ 3 files changed, 37 insertions(+), 8 deletions(-) diff --git a/web/app/assets/javascripts/dialog/recordingFinishedDialog.js b/web/app/assets/javascripts/dialog/recordingFinishedDialog.js index 5863d54e8..f0d24a27d 100644 --- a/web/app/assets/javascripts/dialog/recordingFinishedDialog.js +++ b/web/app/assets/javascripts/dialog/recordingFinishedDialog.js @@ -122,13 +122,17 @@ var description = $('#recording-finished-dialog form textarea[name=description]').val(); var genre = $('#recording-finished-dialog form select[name=genre]').val(); var is_public = $('#recording-finished-dialog form input[name=is_public]').is(':checked') + var save_video = $('#recording-finished-dialog form input[name=save_video]').is(':checked') + var upload_to_youtube = $('#recording-finished-dialog form input[name=upload_to_youtube]').is(':checked') rest.claimRecording({ id: recording.id, name: name, description: description, genre: genre, - is_public: is_public + is_public: is_public, + save_video: save_video, + upload_to_youtube: upload_to_youtube }) .done(function () { $dialog.data('result', {keep:true}); @@ -151,6 +155,12 @@ var $is_public_errors = context.JK.format_errors('is_public', errors); if ($is_public_errors) $('#recording-finished-dialog form input[name=is_public]').closest('div.field').addClass('error').end().after($is_public_errors); + var $save_video_errors = context.JK.format_errors('save_video', errors); + if ($save_video_errors) $('#recording-finished-dialog form input[name=save_video]').closest('div.field').addClass('error').end().after($save_video_errors); + + var $upload_to_youtube_errors = context.JK.format_errors('upload_to_youtube', errors); + if ($upload_to_youtube_errors) $('#recording-finished-dialog form input[name=upload_to_youtube]').closest('div.field').addClass('error').end().after($upload_to_youtube_errors); + var recording_error = context.JK.get_first_error('recording_id', errors); if (recording_error) context.JK.showErrorDialog(app, "Unable to claim recording.", recording_error); @@ -223,8 +233,9 @@ function initializeButtons() { var isPublic = $('#recording-finished-dialog input[name="is_public"]'); - context.JK.checkbox(isPublic); + context.JK.checkbox($('#recording-finished-dialog input[name="save_video"]')); + context.JK.checkbox($('#recording-finished-dialog input[name="upload_to_youtube"]')); } function initialize() { diff --git a/web/app/assets/stylesheets/dialogs/recordingFinishedDialog.css.scss b/web/app/assets/stylesheets/dialogs/recordingFinishedDialog.css.scss index a738fa57b..00dcb0dd7 100644 --- a/web/app/assets/stylesheets/dialogs/recordingFinishedDialog.css.scss +++ b/web/app/assets/stylesheets/dialogs/recordingFinishedDialog.css.scss @@ -1,8 +1,9 @@ #recording-finished-dialog { width:1000px; height:auto; - div[purpose=description], div[purpose=is_public] { + div[purpose=description] { margin-top:20px; + margin-bottom: 10px; } label[for=is_public], label[for=playback-mode-preview-all], label[for=playback-mode-preview-me] { @@ -23,11 +24,18 @@ margin-top:20px; } - div[purpose=is_public] .icheckbox_minimal { - display:inline-block; - position:relative; - top:3px; - margin-right:3px; + div[purpose=is_public], div[purpose=upload_to_youtube], div[purpose=save_video] { + .icheckbox_minimal { + display:inline-block; + position:relative; + top:1px; + margin-bottom:4px; + margin-right:2px; + } + label { + display: inline-block + } + clear: left; } } diff --git a/web/app/views/dialogs/_recordingFinishedDialog.html.erb b/web/app/views/dialogs/_recordingFinishedDialog.html.erb index 989e7243f..2fdeb4c95 100644 --- a/web/app/views/dialogs/_recordingFinishedDialog.html.erb +++ b/web/app/views/dialogs/_recordingFinishedDialog.html.erb @@ -30,9 +30,19 @@ + +
+ +
+ +
+ +
+
+