diff --git a/airtime_mvc/application/controllers/LocaleController.php b/airtime_mvc/application/controllers/LocaleController.php index 1fb58008a..8d7d9080b 100644 --- a/airtime_mvc/application/controllers/LocaleController.php +++ b/airtime_mvc/application/controllers/LocaleController.php @@ -290,7 +290,7 @@ class LocaleController extends Zend_Controller_Action //"Select" => _("Select"), "Select all" => _("Select all"), "Select none" => _("Select none"), - "Remove overbooked tracks" => _("Remove overbooked tracks"), + "Trim overbooked shows" => _("Trim overbooked shows"), "Remove selected scheduled items" => _("Remove selected scheduled items"), "Jump to the current playing track" => _("Jump to the current playing track"), "Cancel current show" => _("Cancel current show"), diff --git a/airtime_mvc/public/css/player-form.css b/airtime_mvc/public/css/player-form.css index db2bc8616..8761396d1 100644 --- a/airtime_mvc/public/css/player-form.css +++ b/airtime_mvc/public/css/player-form.css @@ -14,6 +14,9 @@ } .player-preview { width: 100%; + background-color: #111; + padding-top: 25px; + padding-bottom: 25px; } .player-preview iframe { margin: 0 auto; @@ -31,15 +34,13 @@ padding-bottom: 10px; font-size: 14px; /*font-weight: bold;*/ - color: #333; margin-bottom: 10px; + margin-top: 10px; } .player-title { clear: left; - color: #5b5b5b; float: left; font-size: 13px; - font-weight: bold; width: 40px; padding: 4px 0; text-align: left; @@ -55,7 +56,6 @@ #player_embed_src-element p { margin: 0px; font-size: 13px; - color: #333; } @@ -75,7 +75,7 @@ table#player_compatibility_chart{ #player_compatibility_chart th { - color: #5b5b5b; + color: #1f1f1f; border: 0px; } diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index 886c99298..8fff1c518 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -3395,15 +3395,12 @@ dd .stream-status { margin-bottom: 20px; } -#weekly-schedule-widget label { - font-weight: bold; -} - .schedule_iframe_wrapper { - width: 100%; - float: left; text-align: center; - padding: 10px; + background-color: #111; + padding-top: 25px; + padding-bottom: 25px; + margin-bottom: 25px; } #schedule_iframe { @@ -3442,3 +3439,7 @@ dd .stream-status { #upload_form, #recent_uploads_wrapper { box-sizing: border-box; } + +button.btn-icon-text > i.icon-white { + margin-right: 4px; +} \ No newline at end of file diff --git a/airtime_mvc/public/js/airtime/library/_library.js b/airtime_mvc/public/js/airtime/library/_library.js index 9478e58cd..ed01e9c8d 100644 --- a/airtime_mvc/public/js/airtime/library/_library.js +++ b/airtime_mvc/public/js/airtime/library/_library.js @@ -136,7 +136,7 @@ var AIRTIME = (function(AIRTIME) { "" + "") .append("