Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing

This commit is contained in:
drigato 2015-11-16 12:36:11 -05:00
commit ae02fa6260
6 changed files with 28 additions and 6 deletions

View File

@ -6,6 +6,14 @@ class Application_Form_StationPodcast extends Zend_Form {
// Station Podcast form
$podcastPreferences = new Application_Form_PodcastPreferences();
$this->addSubForm($podcastPreferences, 'preferences_podcast');
$csrf_namespace = new Zend_Session_Namespace('csrf_namespace');
$csrf_element = new Zend_Form_Element_Hidden('csrf');
$csrf_element->setValue($csrf_namespace->authtoken)
->setRequired('true')
->removeDecorator('HtmlTag')
->removeDecorator('Label');
$this->addElement($csrf_element);
}
}

View File

@ -1,3 +1,5 @@
<div class="angular_wrapper" ng-controller="Podcast">
<div class="inner_editor_title">
<h2>
@ -13,7 +15,9 @@
</div>
<div>
<label for="podcast_url"><?php echo _("Podcast URL: ") ?></label>
<span class="podcast-metadata-field">{{podcast.url}}</span>
<a href="{{podcast.url}}" target="_blank">
<span class="podcast-metadata-field">{{podcast.url}}</span>
</a>
</div>
<label for="podcast_auto_ingest"><?php echo _("Automatically download latest episodes?") ?></label>

View File

@ -10,6 +10,7 @@
</a>
</div>
<form class="podcast-metadata">
<?php echo $this->form->getElement('csrf') ?>
<input ng-value="podcast.id" class="obj_id" type="hidden"/>
<h3 class="collapsible-header"><span class="arrow-icon"></span><?php echo _("General Fields") ?></h3>

View File

@ -505,7 +505,6 @@ li.ui-state-default {
}
.inner_editor_wrapper {
max-height: 60%;
overflow-x: hidden;
width: 100%;
flex: 1 0 auto;
@ -515,6 +514,10 @@ li.ui-state-default {
box-sizing: border-box;
}
.angular_wrapper > .inner_editor_wrapper {
max-height: none;
}
.inner_editor_title h2 {
margin: 10px 0 0 10px;
width: 70%;

View File

@ -4033,7 +4033,8 @@ li .ui-state-hover {
}
.podcast-metadata input[type="checkbox"] {
margin: 8px 60% 0 0;
float: left;
margin: 8px 0 0;
}
.podcast-metadata label,
@ -4056,6 +4057,11 @@ li .ui-state-hover {
.podcast-metadata-field {
display: inline-block;
width: 60%;
min-width: 60%;
max-width: 60%;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
margin: 4px 0;
line-height: 24px;
}
@ -4192,7 +4198,7 @@ li .ui-state-hover {
}
#podcast_url_dialog table tr td {
padding: 0px;
padding: 0;
}
#podcast_url_dialog .errors {

View File

@ -41,7 +41,7 @@ var AIRTIME = (function (AIRTIME) {
$http.put(endpoint + $scope.podcast.id, {csrf_token: $scope.csrf, podcast: $scope.podcast})
.success(function () {
AIRTIME.library.podcastDataTable.fnDraw();
tab || tab.close();
!tab || tab.close();
});
};
@ -49,7 +49,7 @@ var AIRTIME = (function (AIRTIME) {
* Close the tab and discard any changes made to the podcast data.
*/
$scope.discard = function () {
tab || tab.close();
!tab || tab.close();
$scope.podcast = {};
};