diff --git a/airtime_mvc/application/forms/PodcastPreferences.php b/airtime_mvc/application/forms/PodcastPreferences.php index a5706819b..adf86c84e 100644 --- a/airtime_mvc/application/forms/PodcastPreferences.php +++ b/airtime_mvc/application/forms/PodcastPreferences.php @@ -10,8 +10,12 @@ class Application_Form_PodcastPreferences extends Zend_Form_SubForm { _("Public"), _("Private"), )); + $stationPodcastPrivacy->setSeparator(' '); + $stationPodcastPrivacy->addDecorator('HtmlTag', array('tag' => 'dd', + 'id'=>"stationPodcastPrivacy-element", + 'class' => 'radio-inline-list', + )); $stationPodcastPrivacy->setValue($isPrivate); - $stationPodcastPrivacy->setDecorators(array('ViewHelper', 'Label')); $this->addElement($stationPodcastPrivacy); $stationPodcast = PodcastQuery::create()->findOneByDbId(Application_Model_Preference::getStationPodcastId()); @@ -22,7 +26,6 @@ class Application_Form_PodcastPreferences extends Zend_Form_SubForm { ->setRequired(false) ->setLabel(_("Feed URL")) ->setValue($url); - $feedUrl->setDecorators(array('ViewHelper', 'Label')); $this->addElement($feedUrl); } diff --git a/airtime_mvc/application/views/scripts/podcast/station.phtml b/airtime_mvc/application/views/scripts/podcast/station.phtml index a271bf4ed..42a7b46cb 100644 --- a/airtime_mvc/application/views/scripts/podcast/station.phtml +++ b/airtime_mvc/application/views/scripts/podcast/station.phtml @@ -74,7 +74,17 @@

- form->getSubform('preferences_podcast') ?> +
+
+ form->getSubform('preferences_podcast')->getElement("stationPodcastPrivacy")->renderLabel() ?> +
+ form->getSubform('preferences_podcast')->getElement("stationPodcastPrivacy")->renderViewHelper() ?> +
+
+ form->getSubform('preferences_podcast')->getElement("stationPodcastFeedUrl") ?> + +
+

diff --git a/airtime_mvc/public/css/station_podcast.css b/airtime_mvc/public/css/station_podcast.css index d8289fc4c..a8b66924e 100644 --- a/airtime_mvc/public/css/station_podcast.css +++ b/airtime_mvc/public/css/station_podcast.css @@ -41,9 +41,14 @@ text-align: left; } +#podcast-settings #podcast-privacy-options label { + width: 12%; + text-align: left; +} + #podcast-settings label > input { width: auto; - margin: 6px 6px 0 25%; + margin: 6px 6px 0 0%; } label { diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index 2dcb85f6f..c645ce5e2 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -1195,7 +1195,8 @@ input[type="checkbox"] { } #pref_form dt, #pref_form dd, -#pref_form textarea, #clientdetails_form dd { +#pref_form textarea, #clientdetails_form dd, +.podcast-metadata dt, .podcast-metadata dd { display:block; float:none; margin-left:0;