diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index d258bd766..afa4baa7a 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -49,6 +49,7 @@ class LibraryController extends Zend_Controller_Action $this->view->headLink()->appendStylesheet($baseUrl.'css/jquery.contextMenu.css?'.$CC_CONFIG['airtime_version']); $this->view->headLink()->appendStylesheet($baseUrl.'css/datatables/css/ColVis.css?'.$CC_CONFIG['airtime_version']); $this->view->headLink()->appendStylesheet($baseUrl.'css/datatables/css/ColReorder.css?'.$CC_CONFIG['airtime_version']); + $this->view->headLink()->appendStylesheet($baseUrl.'css/waveform.css?'.$CC_CONFIG['airtime_version']); $this->view->headScript()->appendFile($baseUrl.'js/airtime/library/spl.js?'.$CC_CONFIG['airtime_version'], 'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/airtime/playlist/smart_blockbuilder.js?'.$CC_CONFIG['airtime_version'], 'text/javascript'); diff --git a/airtime_mvc/application/layouts/scripts/layout.phtml b/airtime_mvc/application/layouts/scripts/layout.phtml index e67e429d6..1a050d3f2 100644 --- a/airtime_mvc/application/layouts/scripts/layout.phtml +++ b/airtime_mvc/application/layouts/scripts/layout.phtml @@ -38,22 +38,22 @@
- Play - Stop + Play + Stop +
-
- - - - - -
-
+
- - + + + + +
+
- + + +
@@ -62,14 +62,14 @@ diff --git a/airtime_mvc/public/css/bootstrap.css b/airtime_mvc/public/css/bootstrap.css index 97fa6b159..efe9abff7 100644 --- a/airtime_mvc/public/css/bootstrap.css +++ b/airtime_mvc/public/css/bootstrap.css @@ -190,13 +190,15 @@ a.badge:hover { } .btn.active, .btn:active { - background-color: #494949; - background-color: #494949 \9; + background-color: #434343; + background-color: #434343 \9; background-image: none; outline: 0; - -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); - -moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); - box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05); + -webkit-box-shadow: inset 0 2px 3px rgba(0,0,0,.25), 0 1px 0 rgba(200,200,200,1); + -moz-box-shadow: inset 0 2px 3px rgba(0,0,0,.25), 0 1px 0 rgba(200,200,200,1); + box-shadow: inset 0 2px 3px rgba(0,0,0,.25), 0 1px 0 rgba(220,220,220,1); + border: 1px solid #131313; + color: #a5a5a5 !important ; } .btn.disabled, .btn[disabled], diff --git a/airtime_mvc/public/css/playlist_builder.css b/airtime_mvc/public/css/playlist_builder.css index 7d828bd31..20da9dafa 100644 --- a/airtime_mvc/public/css/playlist_builder.css +++ b/airtime_mvc/public/css/playlist_builder.css @@ -584,29 +584,4 @@ li.spl_empty { } .expand-block-separate { border-top: 1px solid #5B5B5B; -} - -.channel-wrapper { - position: relative; -} - -.channel { - position: absolute; - margin: 0; - padding: 0; -} - -.state-select { - cursor: text; -} - -.playlist-tracks { - overflow-x: auto; - overflow-y: hidden; -} - -.playlist-fade { - position: absolute; - background-color: rgba(0,0,0,0.1); - z-index: 1000; } \ No newline at end of file diff --git a/airtime_mvc/public/css/waveform.css b/airtime_mvc/public/css/waveform.css new file mode 100644 index 000000000..fd4c9bd57 --- /dev/null +++ b/airtime_mvc/public/css/waveform.css @@ -0,0 +1,74 @@ +.ui-dialog .ui-dialog-content { + padding: 0px; +} +.ui-dialog .ui-dialog-buttonpane { + padding: 0.3em 0.2em 0 0.4em; + margin: 0 -0.4em 0; +} +.btn-small [class^="icon-"] { + margin: 1px 5px 0 -3px; +} +.btn { + margin-right: 3px; +} +.btn-small { + /*line-height: 20px;*/ +} +.playlist-tracks { + margin: 8px 0; +} +.playlist-controls { + margin: 0 0 16px 0; +} + +.channel-wrapper { + position: relative; +} + +.channel { + position: absolute; + margin: 0; + padding: 0; + background: #3e3e3e; +} + +.state-select { + cursor: text; +} + +.playlist-tracks { + overflow-x: auto; + overflow-y: hidden; +} + +.playlist-fade { + position: absolute; + background-color: rgba(0,0,0,0.1); + z-index: 1000; +} +.set-cue { + margin: 12px 0 16px 0; +} +.set-fade { + margin: 0 0 0 30px; +} +.set-cue input[type="text"] { + vertical-align: middle; + padding: 5px 3px 4px 3px; +} +.set-cue input[type="button"] { + min-width: 100px; + margin-top: 0px; + margin-left: 4px; +} +label { + color:#333; + padding: 0 5px 0 6px; + display: inline-block; + min-width: 50px; + text-align: right; +} +label.audio { + font-weight:bold; + vertical-align: middle; +} \ No newline at end of file diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js index 18d10ba0e..403c0d230 100644 --- a/airtime_mvc/public/js/airtime/library/spl.js +++ b/airtime_mvc/public/js/airtime/library/spl.js @@ -1223,8 +1223,8 @@ var AIRTIME = (function(AIRTIME){ width: dim.width - 100, height: dim.height - 100, buttons: [ - {text: "Cancel", click: removeDialog}, - {text: "Save", click: function() { + {text: "Cancel", class: "btn btn-small", click: removeDialog}, + {text: "Save", class: "btn btn-small btn-inverse", click: function() { var json = playlistEditor.getJson(), offset, fadeIn, fadeOut, @@ -1305,19 +1305,19 @@ var AIRTIME = (function(AIRTIME){ $html.remove(); } - $html.find('.editor-cue-in').val(cueIn); - $html.find('.editor-cue-out').val(cueOut); + $html.find('.editor-cue-in').html(cueIn); + $html.find('.editor-cue-out').html(cueOut); $html.on("click", ".set-cue-in", function(e) { var cueIn = $html.find('.audio_start').val(); - $html.find('.editor-cue-in').val(cueIn); + $html.find('.editor-cue-in').html(cueIn); }); $html.on("click", ".set-cue-out", function(e) { var cueOut = $html.find('.audio_end').val(); - $html.find('.editor-cue-out').val(cueOut); + $html.find('.editor-cue-out').html(cueOut); }); $html.dialog({ @@ -1328,10 +1328,10 @@ var AIRTIME = (function(AIRTIME){ width: dim.width - 100, height: dim.height - 100, buttons: [ - {text: "Cancel", click: removeDialog}, - {text: "Save", click: function() { - var cueIn = $html.find('.editor-cue-in').val(), - cueOut = $html.find('.editor-cue-out').val(); + {text: "Cancel", class: "btn btn-small", click: removeDialog}, + {text: "Save", class: "btn btn-small btn-inverse", click: function() { + var cueIn = $html.find('.editor-cue-in').html(), + cueOut = $html.find('.editor-cue-out').html(); playlistEditor.stop(); diff --git a/airtime_mvc/public/js/waveformplaylist/controls.js b/airtime_mvc/public/js/waveformplaylist/controls.js index d83af02f0..1a41aa23e 100644 --- a/airtime_mvc/public/js/waveformplaylist/controls.js +++ b/airtime_mvc/public/js/waveformplaylist/controls.js @@ -556,7 +556,7 @@ AudioControls.prototype.onCursorSelection = function(args) { */ AudioControls.prototype.onAudioUpdate = function(args) { if (this.ctrls["audio_pos"]) { - this.ctrls["audio_pos"].value = this.cueFormatters(this.timeFormat)(args.seconds); + this.ctrls["audio_pos"].innerHTML = this.cueFormatters(this.timeFormat)(args.seconds); } };