diff --git a/web/app/assets/javascripts/react-components/PopupSessionRecording.js.jsx.coffee b/web/app/assets/javascripts/react-components/PopupSessionRecording.js.jsx.coffee index 79c9d8f8d..c4943c3a6 100644 --- a/web/app/assets/javascripts/react-components/PopupSessionRecording.js.jsx.coffee +++ b/web/app/assets/javascripts/react-components/PopupSessionRecording.js.jsx.coffee @@ -122,9 +122,7 @@ mixins.push(Reflux.listenTo(@AppStore,"onAppInit"))
-
- -
+ ` else `Loading...` componentDidMount: () -> diff --git a/web/app/assets/javascripts/react-components/SessionRecordingSettings.js.jsx.coffee b/web/app/assets/javascripts/react-components/SessionRecordingSettings.js.jsx.coffee index ab929ef1c..30d6f2ff2 100644 --- a/web/app/assets/javascripts/react-components/SessionRecordingSettings.js.jsx.coffee +++ b/web/app/assets/javascripts/react-components/SessionRecordingSettings.js.jsx.coffee @@ -45,7 +45,6 @@ mixins.push(Reflux.listenTo(RecordingStore, "onRecordingStateChanged")) audioFormat: rs.audioFormat, audioStoreType: rs.audioStoreType, videoFormat: rs.videoFormat, - audioDelay: rs.audioDelay, includeChat: rs.includeChat, startRequested: false, } @@ -58,7 +57,6 @@ mixins.push(Reflux.listenTo(RecordingStore, "onRecordingStateChanged")) audioFormat: 'mp3', audioStoreType: context.JK.AUDIO_STORE_TYPE_MIX_AND_STEMS['key'], videoFormat: 'mp4', - audioDelay: 100, includeChat: false, startRequested: false } @@ -149,12 +147,12 @@ mixins.push(Reflux.listenTo(RecordingStore, "onRecordingStateChanged")) toggleDisableVideoContrls: (isDisable) -> $root = $(@getDOMNode()) $videoFormat = $root.find("#video-format") - $audioDelay = $root.find("#audio-delay") + #$audioDelay = $root.find("#audio-delay") $videoFormat.attr('disabled', isDisable) - $audioDelay.attr('disabled', isDisable) + #$audioDelay.attr('disabled', isDisable) - setAudioDelay: (e) -> - @setState(audioDelay: e.target.value) + # setAudioDelay: (e) -> + # @setState(audioDelay: e.target.value) setIncludeChat: (e) -> @setState(includeChat: e.target.checked) @@ -242,13 +240,7 @@ mixins.push(Reflux.listenTo(RecordingStore, "onRecordingStateChanged")) -
- -
- -
- ? -
+
@@ -263,7 +255,7 @@ mixins.push(Reflux.listenTo(RecordingStore, "onRecordingStateChanged"))
-
+
CANCEL START RECORDING
@@ -385,8 +377,7 @@ mixins.push(Reflux.listenTo(RecordingStore, "onRecordingStateChanged")) context.JK.helpBubble($root.find(".audio-store-type-mix-and-stems-help"), "audio-store-type-mix-and-stems", {}, {offsetParent:$root.closest('.top-parent'), positions: ['right', 'bottom'], width:450}); context.JK.helpBubble($root.find(".include-chat-help"), "include-chat-in-recording", {}, {offsetParent:$root.closest('.top-parent'), positions: ['right', 'bottom'], width:450}); - - return context.JK.helpBubble($root.find(".audio-delay-help"), "audio-delay-in-recording", {}, {offsetParent:$root.closest('.top-parent'), positions: ['right', 'bottom'], width:450}); + }` # componentDidUpdate: () -> diff --git a/web/app/assets/stylesheets/dialogs/base_dialog.scss b/web/app/assets/stylesheets/dialogs/base_dialog.scss index e17222326..796ed697d 100644 --- a/web/app/assets/stylesheets/dialogs/base_dialog.scss +++ b/web/app/assets/stylesheets/dialogs/base_dialog.scss @@ -110,6 +110,26 @@ color: #aaa; } +.dialog-overlay-md { + width: 550px; + height: auto; + position: fixed; + left: 50%; + top: 20%; + margin-left: -300px; + background-color: #333; + border: 1px solid #ed3618; + z-index: 1000; +} + +.dialog-overlay-md .dialog-inner { + width: 500px; + height: auto; + padding: 25px; + font-size: 15px; + color: #aaa; +} + .dialog-comment-scroller { height: 210px; overflow: auto; diff --git a/web/app/assets/stylesheets/dialogs/sessionRecordingDialog.scss b/web/app/assets/stylesheets/dialogs/sessionRecordingDialog.scss index 123f80093..23a8e8953 100644 --- a/web/app/assets/stylesheets/dialogs/sessionRecordingDialog.scss +++ b/web/app/assets/stylesheets/dialogs/sessionRecordingDialog.scss @@ -79,109 +79,105 @@ } .form-actions{ - align-self:center; - position: absolute; - bottom: 0; - margin-bottom: 2rem; + margin-top: 1rem; + display: flex; } } } - .recording-right{ - flex-grow: 1; - //border: solid 1px indigo; - display: flex; - flex-direction: column; - .vol-gauge-heading{ - font-weight: 400; - margin-bottom: 10px; - } - .vol-gauge{ - display: flex; - //border: solid 1px rgb(205, 232, 26); - flex-direction: row; - .session-track{ - height: 300px; - position: relative; - background-color: #242323; - border-radius: 4px; - display: inline-block; - height: 300px; - margin-right: 14px; - position: relative; - width: 70px; - margin-top: 1px; - margin-left: 2px; + // .recording-right{ + // flex-grow: 1; + // //border: solid 1px indigo; + // display: flex; + // flex-direction: column; + // .vol-gauge-heading{ + // font-weight: 400; + // margin-bottom: 10px; + // } + // .vol-gauge{ + // display: flex; + // //border: solid 1px rgb(205, 232, 26); + // flex-direction: row; + // .session-track{ + // height: 300px; + // position: relative; + // background-color: #242323; + // border-radius: 4px; + // display: inline-block; + // height: 300px; + // margin-right: 14px; + // position: relative; + // width: 70px; + // margin-top: 1px; + // margin-left: 2px; - .track-vu-left{ - position: absolute; - bottom: 8px; - right: 0px; - // position: relative !important; - // bottom: 0 !important; - } - .track-vu-right{ - position: absolute; - bottom: 8px; - right: 0px; - // position: relative !important; - // bottom: 0 !important; - // margin-left: 35px; - } - .track-label { - position: absolute; - width: 55px; - top: 3px; - left: 7px; - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; - font-weight: bold; - } - .track-icon-mute { - float: none; - position: absolute; - top: 246px; - left: 29px; - } - .icheckbox_minimal { - position: absolute; - top: 271px; - left: 12px; - } - label { - font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - position: absolute; - top: 273px; - left: 34px; - } - .track-gain{ - height: 225px; - //position: relative !important; - top: 32px; - left: 23px; - .fader{ - height: 205px; - //position: relative !important; - } - } + // .track-vu-left{ + // position: absolute; + // bottom: 8px; + // right: 0px; + // // position: relative !important; + // // bottom: 0 !important; + // } + // .track-vu-right{ + // position: absolute; + // bottom: 8px; + // right: 0px; + // // position: relative !important; + // // bottom: 0 !important; + // // margin-left: 35px; + // } + // .track-label { + // position: absolute; + // width: 55px; + // top: 3px; + // left: 7px; + // font-family: Arial, Helvetica, sans-serif; + // font-size: 11px; + // font-weight: bold; + // } + // .track-icon-mute { + // float: none; + // position: absolute; + // top: 246px; + // left: 29px; + // } + // .icheckbox_minimal { + // position: absolute; + // top: 271px; + // left: 12px; + // } + // label { + // font-family: Arial, Helvetica, sans-serif; + // font-size: 12px; + // position: absolute; + // top: 273px; + // left: 34px; + // } + // .track-gain{ + // height: 225px; + // //position: relative !important; + // top: 32px; + // left: 23px; + // .fader{ + // height: 205px; + // //position: relative !important; + // } + // } - } - .textual-help{ - max-width: 140px; - //border: solid 1px brown; - p{ - padding-bottom: 15px; - } - } - } - } + // } + // .textual-help{ + // max-width: 140px; + // //border: solid 1px brown; + // p{ + // padding-bottom: 15px; + // } + // } + // } + // } - - } - .form-actions{ - //position: relative; - + .form-actions{ + } } + } \ No newline at end of file diff --git a/web/app/views/dialogs/_sessionRecordingDialog.html.slim b/web/app/views/dialogs/_sessionRecordingDialog.html.slim index 7cd8847fb..813ccdb44 100644 --- a/web/app/views/dialogs/_sessionRecordingDialog.html.slim +++ b/web/app/views/dialogs/_sessionRecordingDialog.html.slim @@ -1,4 +1,4 @@ -.dialog.dialog-overlay-lg.top-parent layout='dialog' layout-id='session-recording' id='session-recording' +.dialog.dialog-overlay-md.top-parent layout='dialog' layout-id='session-recording' id='session-recording' .content-head = image_tag "content/icon_record.png", :width => 18, :height => 18, :class => "content-icon" h1 recording