From 81dadb7f850eaae39903517038e6d929c27b5fab Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Fri, 14 Sep 2012 17:01:35 -0400 Subject: [PATCH 01/16] Removed annoying logging --- airtime_mvc/application/controllers/WebstreamController.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/airtime_mvc/application/controllers/WebstreamController.php b/airtime_mvc/application/controllers/WebstreamController.php index 9cea83a5e..67176a46b 100644 --- a/airtime_mvc/application/controllers/WebstreamController.php +++ b/airtime_mvc/application/controllers/WebstreamController.php @@ -19,7 +19,6 @@ class WebstreamController extends Zend_Controller_Action if (!$this->isAuthorized(-1)) { // TODO: this header call does not actually print any error message header("Status: 401 Not Authorized"); - Logging::info("Ain't not Authorized"); return; } @@ -112,8 +111,6 @@ class WebstreamController extends Zend_Controller_Action host/dj, that he has the correct permission.*/ $user = Application_Model_User::getCurrentUser(); //only allow when webstream belongs to the DJ - Logging::info("Webstream id:".$webstream->getDbCreatorId()); - Logging::info("User id:".$user->getId()); return $webstream->getDbCreatorId() == $user->getId(); } /*we are creating a new stream. Don't need to check whether the From f2b07e4a8323bcb31af90f0c87c8cc9a4404f6b8 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Fri, 14 Sep 2012 17:02:38 -0400 Subject: [PATCH 02/16] alignment --- .../application/controllers/WebstreamController.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/airtime_mvc/application/controllers/WebstreamController.php b/airtime_mvc/application/controllers/WebstreamController.php index 67176a46b..070063980 100644 --- a/airtime_mvc/application/controllers/WebstreamController.php +++ b/airtime_mvc/application/controllers/WebstreamController.php @@ -129,16 +129,15 @@ class WebstreamController extends Zend_Controller_Action $id = $request->getParam("id"); - $parameters = array(); - $parameters['id'] = trim($request->getParam("id")); - $parameters['length'] = trim($request->getParam("length")); - $parameters['name'] = trim($request->getParam("name")); + $parameters = array(); + $parameters['id'] = trim($request->getParam("id")); + $parameters['length'] = trim($request->getParam("length")); + $parameters['name'] = trim($request->getParam("name")); $parameters['description'] = trim($request->getParam("description")); - $parameters['url'] = trim($request->getParam("url")); + $parameters['url'] = trim($request->getParam("url")); if (!$this->isAuthorized($id)) { header("Status: 401 Not Authorized"); - return; } From 7b1b271a2c5458417d6ff61ded053d3172c02fac Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Fri, 14 Sep 2012 17:09:05 -0400 Subject: [PATCH 03/16] Reformatted sql to use heredocs --- airtime_mvc/application/models/User.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/airtime_mvc/application/models/User.php b/airtime_mvc/application/models/User.php index 9fcf9f62c..d07552472 100644 --- a/airtime_mvc/application/models/User.php +++ b/airtime_mvc/application/models/User.php @@ -335,11 +335,14 @@ class Application_Model_User public static function getUserData($id) { - $sql = "SELECT login, first_name, last_name, type, id, email, cell_phone, skype_contact, jabber_contact" - ." FROM cc_subjs" - ." WHERE id = :id"; - - return Application_Common_Database::prepareAndExecute($sql, array(":id" => $id), 'single'); + $sql = << $id), 'single'); } public static function getCurrentUser() From 092595eb9fba73807224b77b323ce5565973538a Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Fri, 14 Sep 2012 17:10:10 -0400 Subject: [PATCH 04/16] Removed profane logging message --- airtime_mvc/application/controllers/WebstreamController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/airtime_mvc/application/controllers/WebstreamController.php b/airtime_mvc/application/controllers/WebstreamController.php index 070063980..7081fad80 100644 --- a/airtime_mvc/application/controllers/WebstreamController.php +++ b/airtime_mvc/application/controllers/WebstreamController.php @@ -119,7 +119,6 @@ class WebstreamController extends Zend_Controller_Action } else { Logging::info( $user ); } - Logging::info("what the fuck"); return false; } From 2faf299c730177957744423283bf75cff18f977f Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Fri, 14 Sep 2012 17:28:50 -0400 Subject: [PATCH 05/16] Removed code duplication --- .../application/controllers/WebstreamController.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/airtime_mvc/application/controllers/WebstreamController.php b/airtime_mvc/application/controllers/WebstreamController.php index 7081fad80..e9e93fe44 100644 --- a/airtime_mvc/application/controllers/WebstreamController.php +++ b/airtime_mvc/application/controllers/WebstreamController.php @@ -128,12 +128,10 @@ class WebstreamController extends Zend_Controller_Action $id = $request->getParam("id"); - $parameters = array(); - $parameters['id'] = trim($request->getParam("id")); - $parameters['length'] = trim($request->getParam("length")); - $parameters['name'] = trim($request->getParam("name")); - $parameters['description'] = trim($request->getParam("description")); - $parameters['url'] = trim($request->getParam("url")); + $parameters = array(); + foreach (array('id','length','name','description','url') as $p) { + $parameters[$p] = trim($request->getParam($p)); + } if (!$this->isAuthorized($id)) { header("Status: 401 Not Authorized"); From 84deda99c5b64d6e31eb7123e2ca5426c56d7cb0 Mon Sep 17 00:00:00 2001 From: denise Date: Fri, 14 Sep 2012 17:35:14 -0400 Subject: [PATCH 06/16] CC-4440: System -> Streams: Update and Save 'Stream 1/2/3' will make it invisible -fixed --- .../application/views/scripts/form/stream-setting-form.phtml | 2 +- airtime_mvc/public/css/styles.css | 4 ++-- airtime_mvc/public/js/airtime/preferences/preferences.js | 2 +- airtime_mvc/public/js/airtime/preferences/streamsetting.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/airtime_mvc/application/views/scripts/form/stream-setting-form.phtml b/airtime_mvc/application/views/scripts/form/stream-setting-form.phtml index 63e19a400..088fc7aa2 100644 --- a/airtime_mvc/application/views/scripts/form/stream-setting-form.phtml +++ b/airtime_mvc/application/views/scripts/form/stream-setting-form.phtml @@ -1,7 +1,7 @@ stream_number; ?> -

">Stream stream_number?>

+

">Stream stream_number?>

enabled == 0?'style="display: none;':''?> id="-config">
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index 2902390b7..4ec4f72d2 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -1642,8 +1642,8 @@ span.errors.sp-errors{ top:8px; } -.collapsible-header.close .arrow-icon, collapsible-header-disabled.close .arrow-icon { - background-position: 0 -11px; +.collapsible-header.closed .arrow-icon, collapsible-header-disabled.close .arrow-icon { + background-position: 0 -11px !important; } #schedule-add-show .button-bar { diff --git a/airtime_mvc/public/js/airtime/preferences/preferences.js b/airtime_mvc/public/js/airtime/preferences/preferences.js index 98e5d6c2b..17734240e 100644 --- a/airtime_mvc/public/js/airtime/preferences/preferences.js +++ b/airtime_mvc/public/js/airtime/preferences/preferences.js @@ -85,7 +85,7 @@ $(document).ready(function() { $('.collapsible-header').live('click',function() { $(this).next().toggle('fast'); - $(this).toggleClass("close"); + $(this).toggleClass("closed"); return false; }).next().hide(); diff --git a/airtime_mvc/public/js/airtime/preferences/streamsetting.js b/airtime_mvc/public/js/airtime/preferences/streamsetting.js index 8b65350cd..45e91eed0 100644 --- a/airtime_mvc/public/js/airtime/preferences/streamsetting.js +++ b/airtime_mvc/public/js/airtime/preferences/streamsetting.js @@ -238,7 +238,7 @@ $(document).ready(function() { $('.collapsible-header').click(function() { $(this).next().toggle('fast'); - $(this).toggleClass("close"); + $(this).toggleClass("closed"); return false; }) From a75a12a198250be836dac6e5b068a41150b9ead4 Mon Sep 17 00:00:00 2001 From: denise Date: Fri, 14 Sep 2012 18:02:40 -0400 Subject: [PATCH 07/16] -smart block criteria UI change for small screen resolution --- .../views/scripts/form/smart-block-criteria.phtml | 7 ++++--- airtime_mvc/public/css/styles.css | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml b/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml index 163a0bdbd..d6ac417b2 100644 --- a/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml +++ b/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml @@ -1,6 +1,7 @@
-
+
Smart Block Options +
@@ -100,8 +101,8 @@ ?>
- - +
+
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index 4ec4f72d2..ab5156c89 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -2278,6 +2278,10 @@ fieldset.closed, fieldset.display_field.closed { margin-bottom: -6px; margin-left: 1px; } +fieldset.sb-criteria-fieldset{ + min-width:670px; + overflow-x:auto; +} fieldset.closed dl, fieldset.closed textarea, fieldset.closed div, fieldset.closed h2 { display:none; From f809a17c02d245a99eef3f025faec9e98231e844 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Fri, 14 Sep 2012 19:05:30 -0400 Subject: [PATCH 08/16] Formatting --- .../controllers/ShowbuilderController.php | 11 +++--- .../public/js/airtime/library/library.js | 38 +++++++++---------- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/airtime_mvc/application/controllers/ShowbuilderController.php b/airtime_mvc/application/controllers/ShowbuilderController.php index da22096ff..95cf80393 100644 --- a/airtime_mvc/application/controllers/ShowbuilderController.php +++ b/airtime_mvc/application/controllers/ShowbuilderController.php @@ -138,15 +138,16 @@ class ShowbuilderController extends Zend_Controller_Action $disableLib = true; } $this->view->disableLib = $disableLib; - $this->view->showLib = $showLib; + $this->view->showLib = $showLib; //populate date range form for show builder. - $now = time(); + $now = time(); $from = $request->getParam("from", $now); - $to = $request->getParam("to", $now + (24*60*60)); + $to = $request->getParam("to", $now + (24*60*60)); $start = DateTime::createFromFormat("U", $from, new DateTimeZone("UTC")); $start->setTimezone(new DateTimeZone(date_default_timezone_get())); + $end = DateTime::createFromFormat("U", $to, new DateTimeZone("UTC")); $end->setTimezone(new DateTimeZone(date_default_timezone_get())); @@ -154,8 +155,8 @@ class ShowbuilderController extends Zend_Controller_Action $form->populate(array( 'sb_date_start' => $start->format("Y-m-d"), 'sb_time_start' => $start->format("H:i"), - 'sb_date_end' => $end->format("Y-m-d"), - 'sb_time_end' => $end->format("H:i") + 'sb_date_end' => $end->format("Y-m-d"), + 'sb_time_end' => $end->format("H:i") )); $this->view->sb_form = $form; diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index 64e7e3591..bb38adf6d 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -424,27 +424,27 @@ var AIRTIME = (function(AIRTIME) { /* Title */ { "sTitle" : "Title" , "mDataProp" : "track_title" , "sClass" : "library_title" , "sWidth" : "170px" } , /* Creator */ { "sTitle" : "Creator" , "mDataProp" : "artist_name" , "sClass" : "library_creator" , "sWidth" : "160px" } , /* Album */ { "sTitle" : "Album" , "mDataProp" : "album_title" , "sClass" : "library_album" , "sWidth" : "150px" } , - /* Bit Rate */ { "sTitle" : "Bit Rate" , "mDataProp" : "bit_rate" , "bVisible" : false , "sClass" : "library_bitrate" , "sWidth" : "80px" } , - /* BPM */ { "sTitle" : "BPM" , "mDataProp" : "bpm" , "bVisible" : false , "sClass" : "library_bpm" , "sWidth" : "50px" } , - /* Composer */ { "sTitle" : "Composer" , "mDataProp" : "composer" , "bVisible" : false , "sClass" : "library_composer" , "sWidth" : "150px" } , - /* Conductor */ { "sTitle" : "Conductor" , "mDataProp" : "conductor" , "bVisible" : false , "sClass" : "library_conductor" , "sWidth" : "125px" }, - /* Copyright */ { "sTitle" : "Copyright" , "mDataProp" : "copyright" , "bVisible" : false , "sClass" : "library_copyright" , "sWidth" : "125px" } , - /* Encoded */ { "sTitle" : "Encoded By" , "mDataProp" : "encoded_by" , "bVisible" : false , "sClass" : "library_encoded" , "sWidth" : "150px" } , - /* Genre */ { "sTitle" : "Genre" , "mDataProp" : "genre" , "bVisible" : false , "sClass" : "library_genre" , "sWidth" : "100px" } , - /* ISRC Number */ { "sTitle" : "ISRC" , "mDataProp" : "isrc_number" , "bVisible" : false , "sClass" : "library_isrc" , "sWidth" : "150px" } , - /* Label */ { "sTitle" : "Label" , "mDataProp" : "label" , "bVisible" : false , "sClass" : "library_label" , "sWidth" : "125px" } , - /* Language */ { "sTitle" : "Language" , "mDataProp" : "language" , "bVisible" : false , "sClass" : "library_language" , "sWidth" : "125px" } , - /* Last Modified */ { "sTitle" : "Last Modified" , "mDataProp" : "mtime" , "bVisible" : false , "sClass" : "library_modified_time" , "sWidth" : "125px" } , - /* Last Played */ { "sTitle" : "Last Played " , "mDataProp" : "lptime" , "bVisible" : false , "sClass" : "library_modified_time" , "sWidth" : "125px" } , + /* Bit Rate */ { "sTitle" : "Bit Rate" , "mDataProp" : "bit_rate" , "bVisible" : false , "sClass" : "library_bitrate" , "sWidth" : "80px" }, + /* BPM */ { "sTitle" : "BPM" , "mDataProp" : "bpm" , "bVisible" : false , "sClass" : "library_bpm" , "sWidth" : "50px" }, + /* Composer */ { "sTitle" : "Composer" , "mDataProp" : "composer" , "bVisible" : false , "sClass" : "library_composer" , "sWidth" : "150px" }, + /* Conductor */ { "sTitle" : "Conductor" , "mDataProp" : "conductor" , "bVisible" : false , "sClass" : "library_conductor" , "sWidth" : "125px" }, + /* Copyright */ { "sTitle" : "Copyright" , "mDataProp" : "copyright" , "bVisible" : false , "sClass" : "library_copyright" , "sWidth" : "125px" }, + /* Encoded */ { "sTitle" : "Encoded By" , "mDataProp" : "encoded_by" , "bVisible" : false , "sClass" : "library_encoded" , "sWidth" : "150px" }, + /* Genre */ { "sTitle" : "Genre" , "mDataProp" : "genre" , "bVisible" : false , "sClass" : "library_genre" , "sWidth" : "100px" }, + /* ISRC Number */ { "sTitle" : "ISRC" , "mDataProp" : "isrc_number" , "bVisible" : false , "sClass" : "library_isrc" , "sWidth" : "150px" }, + /* Label */ { "sTitle" : "Label" , "mDataProp" : "label" , "bVisible" : false , "sClass" : "library_label" , "sWidth" : "125px" }, + /* Language */ { "sTitle" : "Language" , "mDataProp" : "language" , "bVisible" : false , "sClass" : "library_language" , "sWidth" : "125px" }, + /* Last Modified */ { "sTitle" : "Last Modified" , "mDataProp" : "mtime" , "bVisible" : false , "sClass" : "library_modified_time" , "sWidth" : "125px" }, + /* Last Played */ { "sTitle" : "Last Played " , "mDataProp" : "lptime" , "bVisible" : false , "sClass" : "library_modified_time" , "sWidth" : "125px" }, /* Length */ { "sTitle" : "Length" , "mDataProp" : "length" , "sClass" : "library_length" , "sWidth" : "80px" } , - /* Mime */ { "sTitle" : "Mime" , "mDataProp" : "mime" , "bVisible" : false , "sClass" : "library_mime" , "sWidth" : "80px" } , - /* Mood */ { "sTitle" : "Mood" , "mDataProp" : "mood" , "bVisible" : false , "sClass" : "library_mood" , "sWidth" : "70px" } , - /* Owner */ { "sTitle" : "Owner" , "mDataProp" : "owner_id" , "bVisible" : false , "sClass" : "library_language" , "sWidth" : "125px" } , - /* Replay Gain */ { "sTitle" : "Replay Gain" , "mDataProp" : "replay_gain" , "bVisible" : false , "sClass" : "library_replay_gain" , "sWidth" : "80px" }, - /* Sample Rate */ { "sTitle" : "Sample Rate" , "mDataProp" : "sample_rate" , "bVisible" : false , "sClass" : "library_sr" , "sWidth" : "80px" } , - /* Track Number */ { "sTitle" : "Track Number" , "mDataProp" : "track_number" , "bVisible" : false , "sClass" : "library_track" , "sWidth" : "65px" } , + /* Mime */ { "sTitle" : "Mime" , "mDataProp" : "mime" , "bVisible" : false , "sClass" : "library_mime" , "sWidth" : "80px" }, + /* Mood */ { "sTitle" : "Mood" , "mDataProp" : "mood" , "bVisible" : false , "sClass" : "library_mood" , "sWidth" : "70px" }, + /* Owner */ { "sTitle" : "Owner" , "mDataProp" : "owner_id" , "bVisible" : false , "sClass" : "library_language" , "sWidth" : "125px" }, + /* Replay Gain */ { "sTitle" : "Replay Gain" , "mDataProp" : "replay_gain" , "bVisible" : false , "sClass" : "library_replay_gain" , "sWidth" : "80px" }, + /* Sample Rate */ { "sTitle" : "Sample Rate" , "mDataProp" : "sample_rate" , "bVisible" : false , "sClass" : "library_sr" , "sWidth" : "80px" }, + /* Track Number */ { "sTitle" : "Track Number" , "mDataProp" : "track_number" , "bVisible" : false , "sClass" : "library_track" , "sWidth" : "65px" }, /* Upload Time */ { "sTitle" : "Uploaded" , "mDataProp" : "utime" , "sClass" : "library_upload_time" , "sWidth" : "125px" } , - /* Website */ { "sTitle" : "Website" , "mDataProp" : "info_url" , "bVisible" : false , "sClass" : "library_url" , "sWidth" : "150px" } , + /* Website */ { "sTitle" : "Website" , "mDataProp" : "info_url" , "bVisible" : false , "sClass" : "library_url" , "sWidth" : "150px" }, /* Year */ { "sTitle" : "Year" , "mDataProp" : "year" , "bVisible" : false , "sClass" : "library_year" , "sWidth" : "60px" } ], From 9776da8bf46486fee2931043680550baa18ffd38 Mon Sep 17 00:00:00 2001 From: Vladimir Date: Mon, 17 Sep 2012 14:39:57 +0200 Subject: [PATCH 09/16] Fixed playlist item width --- airtime_mvc/public/css/playlist_builder.css | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/airtime_mvc/public/css/playlist_builder.css b/airtime_mvc/public/css/playlist_builder.css index 4da8dab42..e67e58384 100644 --- a/airtime_mvc/public/css/playlist_builder.css +++ b/airtime_mvc/public/css/playlist_builder.css @@ -21,7 +21,14 @@ .spl_fade_out { clear: left; } - +#spl_sortable > li { + width: 100%; + margin-bottom:-1px; + position:relative; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; +} /*#side_playlist button { float: left; font-size: 12px; @@ -48,12 +55,6 @@ margin-bottom:0; } -/*#side_playlist li { - width: 99.5%; - margin-bottom:-1px; - position:relative; -}*/ - #side_playlist li div.list-item-container, #side_playlist li div.list-item-container.ui-state-active { height:56px; border: none; From d888d1cb1cd422ff9751e920eb77f9ed58a0ac19 Mon Sep 17 00:00:00 2001 From: Vladimir Date: Mon, 17 Sep 2012 15:27:13 +0200 Subject: [PATCH 10/16] CC-4443: Context menu is not displayed correctly --- airtime_mvc/public/css/jquery.contextMenu.css | 303 +++++++++--------- 1 file changed, 154 insertions(+), 149 deletions(-) diff --git a/airtime_mvc/public/css/jquery.contextMenu.css b/airtime_mvc/public/css/jquery.contextMenu.css index dd6ad991f..1119feb8f 100644 --- a/airtime_mvc/public/css/jquery.contextMenu.css +++ b/airtime_mvc/public/css/jquery.contextMenu.css @@ -1,149 +1,154 @@ -/* - * jQuery contextMenu - Plugin for simple contextMenu handling - * - * Version: 1.5.2 - * - * Authors: Rodney Rehm, Addy Osmani (patches for FF) - * Web: http://medialize.github.com/jQuery-contextMenu/ - * - * Licensed under - * MIT License http://www.opensource.org/licenses/mit-license - * GPL v3 http://opensource.org/licenses/GPL-3.0 - * - */ - -.context-menu-list { - margin:0; - padding:0; - - min-width: 120px; - max-width: 250px; - display: inline-block; - position: absolute; - list-style-type: none; - - border: 1px solid #333333; - background: #f0f0f0; - - -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5); - -moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5); - -ms-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5); - -o-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5); - box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5); - - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; -} - -.context-menu-item { - padding: 2px 5px; - background-color: #f0f0f0; - position: relative; - min-height: 18px; - -moz-user-select: -moz-none; -} - -.context-menu-item.icon { - padding: 2px 2px 2px 28px; -} - -.context-menu-separator { - padding-bottom:0; - border-bottom: 1px solid #DDD; - min-height: 2px; -} - -.context-menu-item > label { - -moz-user-select: text; -} - -.context-menu-item.hover { - cursor: pointer; - background-color: #ff5d1a; -} - -.context-menu-item.disabled { - color: #666; -} - -.context-menu-input.hover, -.context-menu-item.disabled.hover { - cursor: default; - background-color: #EEE; -} - -.context-menu-submenu:after { - content: ">"; - color: #666; - position: absolute; - top: 0; - right: 3px; - z-index: 1; -} - -/* icons - #protip: - In case you want to use sprites for icons (which I would suggest you do) have a look at - http://css-tricks.com/13224-pseudo-spriting/ to get an idea of how to implement - .context-menu-item.icon:before {} - */ -.context-menu-item.icon { min-height: 18px; background-repeat: no-repeat; background-position: 4px 2px; } -.context-menu-item.icon-edit { background-image: url(images/icon_edit_cm.png); } -.context-menu-item.icon-cut { background-image: url(images/icon_cut_cm.png); } -.context-menu-item.icon-copy { background-image: url(images/icon_copy_cm.png); } -.context-menu-item.icon-paste { background-image: url(images/icon_paste_cm.png); } -.context-menu-item.icon-delete { background-image: url(images/icon_delete_cm.png); } -.context-menu-item.icon-quit { background-image: url(images/icon_door_cm.png); } -.context-menu-item.icon-soundcloud { background-image: url(images/icon_soundcloud_cm.png); } - -.context-menu-item.icon-download { background-image: url(images/icon_download_cm.png); } -.context-menu-item.icon-overview { background-image: url(images/icon_overview_cm.png); } -.context-menu-item.icon-play { background-image: url(images/icon_play_cm.png); } -.context-menu-item.icon-select-cursor { background-image: url(images/icon_select-cursor_cm.png); } -.context-menu-item.icon-add-playlist { background-image: url(images/icon_add_playlist_cm.png); } -.context-menu-item.icon-add-remove-content { background-image: url(images/icon_add_content_cm.png); } -.context-menu-item.icon-remove-all-content { background-image: url(images/icon_remove_all_content_cm.png); } - -/* vertically align inside labels */ -.context-menu-input > label > * { vertical-align: top; } - -/* position checkboxes and radios as icons */ -.context-menu-input > label > input[type="checkbox"], -.context-menu-input > label > input[type="radio"] { - margin-left: -17px; -} -.context-menu-input > label > span { - margin-left: 5px; -} - -.context-menu-input > label, -.context-menu-input > label > input[type="text"], -.context-menu-input > label > textarea, -.context-menu-input > label > select { - display: block; - width: 100%; - - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - -ms-box-sizing: border-box; - -o-box-sizing: border-box; - box-sizing: border-box; -} - -.context-menu-input > label > textarea { - height: 100px; -} -.context-menu-item > .context-menu-list { - display: none; - /* re-positioned by js */ - right: -5px; - top: 5px; -} - -.context-menu-item.hover > .context-menu-list { - display: block; -} - -.context-menu-accesskey { - text-decoration: underline; -} +/* + * jQuery contextMenu - Plugin for simple contextMenu handling + * + * Version: 1.5.2 + * + * Authors: Rodney Rehm, Addy Osmani (patches for FF) + * Web: http://medialize.github.com/jQuery-contextMenu/ + * + * Licensed under + * MIT License http://www.opensource.org/licenses/mit-license + * GPL v3 http://opensource.org/licenses/GPL-3.0 + * + */ + +.context-menu-list { + margin:0; + padding:0; + + min-width: 120px; + max-width: 250px; + display: inline-block; + position: absolute; + list-style-type: none; + + border: 1px solid #333333; + background: #f0f0f0; + + -webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5); + -ms-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5); + -o-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5); + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5); + + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; +} + +.context-menu-item { + padding: 2px 5px; + background-color: #f0f0f0; + position: relative; + min-height: 18px; + -moz-user-select: -moz-none; + display: block; + width: 100%; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; +} + +.context-menu-item.icon { + padding: 2px 2px 2px 28px; +} + +.context-menu-separator { + padding-bottom:0; + border-bottom: 1px solid #DDD; + min-height: 2px; +} + +.context-menu-item > label { + -moz-user-select: text; +} + +.context-menu-item.hover { + cursor: pointer; + background-color: #ff5d1a; +} + +.context-menu-item.disabled { + color: #666; +} + +.context-menu-input.hover, +.context-menu-item.disabled.hover { + cursor: default; + background-color: #EEE; +} + +.context-menu-submenu:after { + content: ">"; + color: #666; + position: absolute; + top: 0; + right: 3px; + z-index: 1; +} + +/* icons + #protip: + In case you want to use sprites for icons (which I would suggest you do) have a look at + http://css-tricks.com/13224-pseudo-spriting/ to get an idea of how to implement + .context-menu-item.icon:before {} + */ +.context-menu-item.icon { min-height: 18px; background-repeat: no-repeat; background-position: 4px 2px; } +.context-menu-item.icon-edit { background-image: url(images/icon_edit_cm.png); } +.context-menu-item.icon-cut { background-image: url(images/icon_cut_cm.png); } +.context-menu-item.icon-copy { background-image: url(images/icon_copy_cm.png); } +.context-menu-item.icon-paste { background-image: url(images/icon_paste_cm.png); } +.context-menu-item.icon-delete { background-image: url(images/icon_delete_cm.png); } +.context-menu-item.icon-quit { background-image: url(images/icon_door_cm.png); } +.context-menu-item.icon-soundcloud { background-image: url(images/icon_soundcloud_cm.png); } + +.context-menu-item.icon-download { background-image: url(images/icon_download_cm.png); } +.context-menu-item.icon-overview { background-image: url(images/icon_overview_cm.png); } +.context-menu-item.icon-play { background-image: url(images/icon_play_cm.png); } +.context-menu-item.icon-select-cursor { background-image: url(images/icon_select-cursor_cm.png); } +.context-menu-item.icon-add-playlist { background-image: url(images/icon_add_playlist_cm.png); } +.context-menu-item.icon-add-remove-content { background-image: url(images/icon_add_content_cm.png); } +.context-menu-item.icon-remove-all-content { background-image: url(images/icon_remove_all_content_cm.png); } + +/* vertically align inside labels */ +.context-menu-input > label > * { vertical-align: top; } + +/* position checkboxes and radios as icons */ +.context-menu-input > label > input[type="checkbox"], +.context-menu-input > label > input[type="radio"] { + margin-left: -17px; +} +.context-menu-input > label > span { + margin-left: 5px; +} + +.context-menu-input > label, +.context-menu-input > label > input[type="text"], +.context-menu-input > label > textarea, +.context-menu-input > label > select { + display: block; + width: 100%; + + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + -ms-box-sizing: border-box; + -o-box-sizing: border-box; + box-sizing: border-box; +} + +.context-menu-input > label > textarea { + height: 100px; +} +.context-menu-item > .context-menu-list { + display: none; + /* re-positioned by js */ + right: -5px; + top: 5px; +} + +.context-menu-item.hover > .context-menu-list { + display: block; +} + +.context-menu-accesskey { + text-decoration: underline; +} From 465de07ae08f611865a6190ee414e6b624c6f2ae Mon Sep 17 00:00:00 2001 From: Vladimir Date: Mon, 17 Sep 2012 15:32:33 +0200 Subject: [PATCH 11/16] Minor cosmetic change of the liquidsoap status --- airtime_mvc/public/css/styles.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index ab5156c89..3917a35ca 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -1373,7 +1373,11 @@ h2#scheduled_playlist_name span { } .simple-formblock .liquidsoap_status{ - width: 95%; + width: 100%; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + padding: 4px 0 8px; } .simple-formblock dd.block-display { From f6d8e4b9574f4180a126cf99fd7c618ec1e4dcf5 Mon Sep 17 00:00:00 2001 From: Vladimir Date: Mon, 17 Sep 2012 16:17:05 +0200 Subject: [PATCH 12/16] CC-4078: Calendar -> Need better 'now-playing' icon --- airtime_mvc/public/css/images/icon_alert_cal.png | Bin 0 -> 1066 bytes .../public/css/images/icon_alert_cal_alt.png | Bin 0 -> 1072 bytes airtime_mvc/public/css/images/icon_play_cal.png | Bin 0 -> 1065 bytes airtime_mvc/public/css/styles.css | 8 +++----- 4 files changed, 3 insertions(+), 5 deletions(-) create mode 100644 airtime_mvc/public/css/images/icon_alert_cal.png create mode 100644 airtime_mvc/public/css/images/icon_alert_cal_alt.png create mode 100644 airtime_mvc/public/css/images/icon_play_cal.png diff --git a/airtime_mvc/public/css/images/icon_alert_cal.png b/airtime_mvc/public/css/images/icon_alert_cal.png new file mode 100644 index 0000000000000000000000000000000000000000..9b64d6251fb38f9d346514e4d06ea9dcbac27d5d GIT binary patch literal 1066 zcmbVLzi-n(6t+}UpjD-cB7StJPEJQ+pIzIDt-7rfJ2Vn$t29zGbckbL8>_X?*jM6q zp>%?Q0f`C3P!M8*4GF|Rg%F4dftVQi1Aq}0;G8Cfq3VET`+mLed+&Ys-i?L1i$epW z0}R6qm1oUrI?`|8L_huGub*Di;XJYGWD&2BwjCkHaB&lXvTv`VDze?p%kR)6!}Pgc ztxoEdOPYgy&Q5K(#1AQ&VJ4@O(00}k0Zp{(1v>lf#Y+}=uFfvW6<7(2sO8OWMQCwr zuI6m5IjYM}Pl3rqqXa%8Hc0&SAl4F{?eJ=Jo^JCj=$Mc-o!t+rUReM|93dcc6Ille z0#FoAkYq&>E&veD8?I+L+@iH(*slOj&_t9(rC2#$fK8HubbG} z@KHd@rq0q6&h=bPRV@ozhEXt7*`j*pp;0Ilq>`Ca1)&I~9>-x=n1_lgOA`>96lsa7 zB3Q+oD9S=fG89AYVaq{G?7%@izaI75#fnE_wPJ*9f}%9tCXkmim77jsiQ3gw1 z;No_iUe125CW^c($SpuGuIuVF qcRoIoh+vw$wP8(Omb}?^2XRA? z-4sQHfqD=R%0%?&!HGlhF!kU`{{lhW)x!?HbnWyob}%G)FE8Kk_kG{*`@WU(PhQ`C5_9a#1p#B>eTT|digy?(>cu9Ib^B@>uI0XE!;#Sl&{ zPFC&3Ia_g<+-Z8etr7wcVvBBjO+QlGS*FXYl6`#4F?81i&t;jNpk~Z6T|gnEC3Y-j z1D>a4ndL=EmibXy0KC8fa?2@RR3%vz(sb`)h_}$0RV%vD^F_Y0OatRU<+xU>#kR&+ z6xKOjQIwcN5K_b<6?J@UwNrjH(r3_NWQT5mUF6d-qg6u-ILnYocT(^I)7&NYqn=Pi zGOld}9M1yI^Wwa^))B72zhUfY9aTF4kUy;BI;x@+i=e1!c}ymqbNidRXUw z6yr!RT-+M}v`YVo^k2N)ZG7^vJ37!O^AeK5*nG*P$xziwx>jv}tNs4GzD{i<&ul*& z8m`>D{OGN&R{L%JLui7E`hS literal 0 HcmV?d00001 diff --git a/airtime_mvc/public/css/images/icon_play_cal.png b/airtime_mvc/public/css/images/icon_play_cal.png new file mode 100644 index 0000000000000000000000000000000000000000..48069afff3a3542dc552b955da199bdce8aa177e GIT binary patch literal 1065 zcmbVLJ8aWX6g5<;AT&%2g#kTWAwVMj)pla5p|xY1MrzuUrfMXXI`(U0rS@~}SK?Lz z%BM(3Y#k6&DeoBQ`p)!q^G%oF;{#>VReY{q8yU-t+E#Iz4$ao4Jso zC@NbXH>zYjN50Ide)9h?d+!Gs&SSHVXV3y}+YzKR7d0R#`}QKNLfc(k-i0F+)#rM( zI<8kHR0sKto!T&o9}+Z0jf^It?X(~U4Y=q9Mf&H*Pc-n{B0VQnxJp=pO>cZHf-`HA zHD|5mC@wvE1B@gpA@Cu#LEX=4zEh)={8G)jtOoR>4Tu^m1$5y5d;!5oO3vy z2eQoYq9n`wbs%uOz;fi3bG)cZvMS_3_o0cm$X!sYhSl{&RzN@O+6AdmKk$d0m&pk}PtZ!SlQ+ z=#ng0B}1@8lQTr4(8HF47~6pZdwxCQw~HM<7OR#bXk!%B5L)V0z;qK~6gN=_N;49e z^8y#O Date: Mon, 17 Sep 2012 10:27:12 -0400 Subject: [PATCH 13/16] Removed comment --- airtime_mvc/application/controllers/ShowbuilderController.php | 1 + airtime_mvc/public/js/airtime/library/library.js | 1 + 2 files changed, 2 insertions(+) diff --git a/airtime_mvc/application/controllers/ShowbuilderController.php b/airtime_mvc/application/controllers/ShowbuilderController.php index 95cf80393..47d6ed502 100644 --- a/airtime_mvc/application/controllers/ShowbuilderController.php +++ b/airtime_mvc/application/controllers/ShowbuilderController.php @@ -126,6 +126,7 @@ class ShowbuilderController extends Zend_Controller_Action //determine whether to remove/hide/display the library. $showLib = false; if (!$user->isGuest()) { + //if(true) { $disableLib = false; $data = Application_Model_Preference::getNowPlayingScreenSettings(); diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index bb38adf6d..fb25f8f08 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -332,6 +332,7 @@ var AIRTIME = (function(AIRTIME) { }; libraryInit = function() { + return; $libContent = $("#library_content"); From a664e7f74a04bf376c0632ec9cb127b00bc946ef Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Mon, 17 Sep 2012 10:30:55 -0400 Subject: [PATCH 14/16] Removed extra comments --- .../application/controllers/ShowbuilderController.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/airtime_mvc/application/controllers/ShowbuilderController.php b/airtime_mvc/application/controllers/ShowbuilderController.php index 47d6ed502..413afbb70 100644 --- a/airtime_mvc/application/controllers/ShowbuilderController.php +++ b/airtime_mvc/application/controllers/ShowbuilderController.php @@ -126,7 +126,6 @@ class ShowbuilderController extends Zend_Controller_Action //determine whether to remove/hide/display the library. $showLib = false; if (!$user->isGuest()) { - //if(true) { $disableLib = false; $data = Application_Model_Preference::getNowPlayingScreenSettings(); @@ -312,13 +311,9 @@ class ShowbuilderController extends Zend_Controller_Action } catch (OutDatedScheduleException $e) { $this->view->error = $e->getMessage(); Logging::info($e->getMessage()); - Logging::info("{$e->getFile()}"); - Logging::info("{$e->getLine()}"); } catch (Exception $e) { $this->view->error = $e->getMessage(); Logging::info($e->getMessage()); - Logging::info("{$e->getFile()}"); - Logging::info("{$e->getLine()}"); } } @@ -334,13 +329,9 @@ class ShowbuilderController extends Zend_Controller_Action } catch (OutDatedScheduleException $e) { $this->view->error = $e->getMessage(); Logging::info($e->getMessage()); - Logging::info("{$e->getFile()}"); - Logging::info("{$e->getLine()}"); } catch (Exception $e) { $this->view->error = $e->getMessage(); Logging::info($e->getMessage()); - Logging::info("{$e->getFile()}"); - Logging::info("{$e->getLine()}"); } } From 207fe295606e772046591663e52bf72e88269417 Mon Sep 17 00:00:00 2001 From: Vladimir Date: Mon, 17 Sep 2012 16:50:20 +0200 Subject: [PATCH 15/16] CC-4155: Style static/dynamic expansion blocks in playlist contents --- airtime_mvc/public/css/playlist_builder.css | 22 +++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/airtime_mvc/public/css/playlist_builder.css b/airtime_mvc/public/css/playlist_builder.css index e67e58384..4614a3da1 100644 --- a/airtime_mvc/public/css/playlist_builder.css +++ b/airtime_mvc/public/css/playlist_builder.css @@ -481,3 +481,25 @@ li.spl_empty { height: 56px; } +/*---////// SMART BLOCK /////---*/ + +.smart-block-info { + padding: 5px 35px 10px 36px; + width: 100%; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + } + .smart-block-info > li { + display: block; + float: none; + margin-bottom: 4px; + width: 100%; + } + .smart-block-info > li span { + text-align: right; + float: right; + color: #D5D5D5; + font-size: 12px; + } + From 6118cd63d7ce50c1009bd63da4046b679dafb816 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Mon, 17 Sep 2012 10:52:37 -0400 Subject: [PATCH 16/16] cc-4419: Added quick hack for now --- airtime_mvc/public/js/airtime/library/library.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index fb25f8f08..ed3bd13c3 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -49,7 +49,10 @@ var AIRTIME = (function(AIRTIME) { var cItem, selected, $trs; - + + + // TODO : hack, get rid of this crap library + if (!$libTable) { return ; } // Get visible items and check if any chosenItems are visible $trs = $libTable.find("tbody input:checkbox").parents("tr"); $trs.each(function(i){