diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php index 3224fefbf..49b74c2c0 100644 --- a/airtime_mvc/application/controllers/PreferenceController.php +++ b/airtime_mvc/application/controllers/PreferenceController.php @@ -25,11 +25,11 @@ class PreferenceController extends Zend_Controller_Action $this->view->statusMsg = ""; $form = new Application_Form_Preferences(); - + if ($request->isPost()) { if ($form->isValid($request->getPost())) { $values = $form->getValues(); - + Application_Model_Preference::SetHeadTitle($values["preferences_general"]["stationName"], $this->view); Application_Model_Preference::SetDefaultFade($values["preferences_general"]["stationDefaultFade"]); Application_Model_Preference::SetStreamLabelFormat($values["preferences_general"]["streamFormat"]); @@ -123,7 +123,6 @@ class PreferenceController extends Zend_Controller_Action $this->view->headScript()->appendFile($baseUrl.'/js/airtime/preferences/musicdirs.js','text/javascript'); $watched_dirs_pref = new Application_Form_WatchedDirPreferences(); - $watched_dirs_pref->setWatchedDirs(); $this->view->form = $watched_dirs_pref; } @@ -180,8 +179,6 @@ class PreferenceController extends Zend_Controller_Action RabbitMq::SendMessageToMediaMonitor("change_stor", $data); } - $watched_dirs_form->setWatchedDirs(); - $this->view->subform = $watched_dirs_form->render(); } @@ -200,8 +197,6 @@ class PreferenceController extends Zend_Controller_Action RabbitMq::SendMessageToMediaMonitor("new_watch", $data); } - $watched_dirs_form->setWatchedDirs(); - $this->view->subform = $watched_dirs_form->render(); } @@ -215,6 +210,9 @@ class PreferenceController extends Zend_Controller_Action $data = array(); $data["directory"] = $chosen; RabbitMq::SendMessageToMediaMonitor("remove_watch", $data); + + $watched_dirs_form = new Application_Form_WatchedDirPreferences(); + $this->view->subform = $watched_dirs_form->render(); } } diff --git a/airtime_mvc/application/forms/WatchedDirPreferences.php b/airtime_mvc/application/forms/WatchedDirPreferences.php index 8f074e277..6e443b0bc 100644 --- a/airtime_mvc/application/forms/WatchedDirPreferences.php +++ b/airtime_mvc/application/forms/WatchedDirPreferences.php @@ -47,23 +47,5 @@ class Application_Form_WatchedDirPreferences extends Zend_Form_SubForm } - public function setWatchedDirs() { - - $watched_dirs = MusicDir::getWatchedDirs(); - $i = 1; - foreach($watched_dirs as $dir) { - - $text = new Zend_Form_Element_Text("watched_dir_$i"); - $text->setAttrib('class', 'input_text'); - $text->addFilter('StringTrim'); - $text->setValue($dir->getDirectory()); - $text->setDecorators(array('ViewHelper')); - $this->addElement($text); - - $i = $i + 1; - } - } - - } diff --git a/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml b/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml index b99c598d3..4195bce75 100644 --- a/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml +++ b/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml @@ -1,47 +1,49 @@ -
+
+
-
- -
-
- element->getElement('storageFolder') ?> - - - element->getElement('storageFolder')->hasErrors()) : ?> -
    - element->getElement('storageFolder')->getMessages() as $error): ?> -
    • - -
+
+ +
+
+ element->getElement('storageFolder') ?> + + + element->getElement('storageFolder')->hasErrors()) : ?> +
    + element->getElement('storageFolder')->getMessages() as $error): ?> +
    • + +
+ +
+
Current Storage Folder:getDirectory(); ?>
+ +
+ +
+
+ element->getElement('watchedFolder') ?> + + + element->getElement('watchedFolder')->hasErrors()) : ?> +
    + element->getElement('watchedFolder')->getMessages() as $error): ?> +
    • + +
+ +
+ +
+ 0): ?> + + getDirectory(); ?> + + + You are not watching any music folders. -
-
Current Storage Folder: getDirectory(); ?>
+ -
- -
-
- element->getElement('watchedFolder') ?> - - - element->getElement('watchedFolder')->hasErrors()) : ?> -
    - element->getElement('watchedFolder')->getMessages() as $error): ?> -
    • - -
- -
- -
- - element->getElement("watched_dir_$i"); ?> - -
getValue(); ?>
- - element->getElement("watched_dir_$i"); ?> - -
- -
+
+ diff --git a/airtime_mvc/application/views/scripts/preference/directory-config.phtml b/airtime_mvc/application/views/scripts/preference/directory-config.phtml index d94f0b4a2..eefa513f2 100644 --- a/airtime_mvc/application/views/scripts/preference/directory-config.phtml +++ b/airtime_mvc/application/views/scripts/preference/directory-config.phtml @@ -1,3 +1,4 @@ -
+
+

Manage Music Folders

form; ?>
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index c54fb9c37..037bd5dc3 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -357,6 +357,7 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus, .input_t border: 1px solid #5b5b5b; box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2) inset; font-size: 13px; + text-indent: 3px; margin:0; } .input_select, select { @@ -1386,14 +1387,12 @@ div.success{ #show_content_dialog .datatable { margin-top:8px; } - .simple-formblock.metadata, #side_playlist .simple-formblock.metadata { border:none; width:auto; display:block; padding: 2px; } - #side_playlist .simple-formblock.metadata .input_text, #side_playlist .simple-formblock.metadata .input_text_area { width:95%; } @@ -1594,7 +1593,7 @@ div.success{ .medium-icon.finishedplaying { background:url(images/icon_finishedplaying_m.png) no-repeat 0 0; } -.preferences { +.preferences, .manage-folders { width: 500px; } @@ -1634,6 +1633,10 @@ dd.radio-inline-list, .preferences dd.radio-inline-list { .preferences.simple-formblock dd.block-display { width: 100%; } + +.preferences.simple-formblock dd.block-display select { + width: 100%; +} .preferences dd.block-display .input_select { width: 100%; } @@ -1745,16 +1748,93 @@ label span { .dialogPopup .display_field dt, .dialogPopup .display_field dd { color: #353535; float: left; - font-size: 13px; + font-size: 12px; margin: 0; - min-width: 90px; - padding: 6px 0; + padding: 4px 0; text-align: left; - width:60%; + width:auto; } .dialogPopup .display_field dt { clear: left; font-weight:bold; - width:40%; + width:auto; + min-width:auto; + padding-right:8px; } +#show_what_sending textarea { + background-color:transparent; + border:none; + box-shadow: none; + font-size: 12px; + text-indent: 0; + margin:0; + width:100%; + line-height:180%; +} +#show_what_sending textarea:focus { + border:none; +} +#show_what_sending dl { + height:180px; + overflow:scroll; + overflow-x: hidden; +} + +#watched-folder-section dd.block-display input[type="text"] { + width: 65%; +} + +#watched-folder-section dd.block-display input[type="button"] { + border: 1px solid #5b5b5b; + background-color: #6e6e6e; + background: -moz-linear-gradient(top, #868686 0, #6e6e6e 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #868686), color-stop(100%, #6e6e6e)); + color: #ffffff; + font-family:Arial, Helvetica, sans-serif; + font-size:12px; + height:25px; + margin:0; + display:block; + margin-left:5px; + line-height:12px; + padding:0 10px 1px 10px; +} +#watched-folder-section dd.block-display input[type="button"]:hover { + border: 1px solid #242424; + background-color: #292929; + background: -moz-linear-gradient(top, #3b3b3b 0, #292929 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #3b3b3b), color-stop(100%, #292929)); + color: #ffffff; +} + +#watched-folder-section dd.block-display { + clear:both; + min-height:25px; + +} +#watched-folder-section dd.block-display.selected-item { + clear:both; + background:#9a9a9a; + margin:2px 0 5px 0; + width:84%; + padding:4px 8px 0; + position:relative; + min-height:22px; + border-radius: 4px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + font-size:13px; +} +#watched-folder-section dd.block-display.selected-item .ui-icon { + position:absolute; + top:4px; + right:5px; + cursor:pointer; +} +#watched-folder-section dd.block-display.selected-item .ui-icon:hover { + background-image:url(redmond/images/ui-icons_ff5d1a_256x240.png) +} +#watched-folder-section dd.block-display input { + float:left; +} \ No newline at end of file diff --git a/airtime_mvc/public/js/airtime/preferences/musicdirs.js b/airtime_mvc/public/js/airtime/preferences/musicdirs.js index f4228a26a..18b5a5283 100644 --- a/airtime_mvc/public/js/airtime/preferences/musicdirs.js +++ b/airtime_mvc/public/js/airtime/preferences/musicdirs.js @@ -82,7 +82,9 @@ function setWatchedDirEvents() { {format: "json", dir: folder}, function(json) { - row.remove(); + $("#watched-folder-section").empty(); + $("#watched-folder-section").append(json.subform); + setWatchedDirEvents(); }); }); }