Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
drigato 2015-09-21 14:51:55 -04:00
commit 77a53491b0
10 changed files with 82 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

8
airtime_mvc/application/models/airtime/Podcast.php
View file

@ -73,10 +73,6 @@ class Podcast extends BasePodcast
$podcastArray["episodes"] = array();
foreach ($rss->item as $item) {
// Same as above, we need to explicitly cast the SimpleXMLElement 'array' into an actual array
foreach($item as $k => $v) {
$array[$k] = (string)$v;
}
array_push($podcastArray["episodes"], $item);
}
return $podcastArray;
@ -113,10 +109,6 @@ class Podcast extends BasePodcast
$podcastArray["episodes"] = array();
foreach ($rss->item as $item) {
// Same as above, we need to explicitly cast the SimpleXMLElement 'array' into an actual array
foreach($item as $k => $v) {
$array[$k] = (string)$v;
}
array_push($podcastArray["episodes"], $item);
}

58
airtime_mvc/application/views/scripts/podcast/podcast.phtml
View file

@ -1,34 +1,32 @@
<div class="podcast-wrapper" ng-controller="RestController">
<div class="inner_editor_title">
<h2>
<?php echo _("Editing ") ?>"<span ng-bind="podcast.title" class="title_obj_name"></span>"
</h2>
</div>
<div class="inner_editor_wrapper">
<input ng-value="podcast.id" class="obj_id" type="hidden"/>
<label>
<?php echo _("Podcast Name") ?>
<input disabled ng-model="podcast.title" type="text"/>
</label>
<label>
<?php echo _("Podcast URL") ?>
<input disabled ng-model="podcast.url" type="text"/>
</label>
</div>
<div class="inner_editor_title">
<h2>
<?php echo _("Editing ") ?>"<span ng-bind="podcast.title" class="title_obj_name"></span>"
</h2>
</div>
<div class="inner_editor_wrapper">
<input ng-value="podcast.id" class="obj_id" type="hidden"/>
<label>
<?php echo _("Podcast Name") ?>
<input disabled ng-model="podcast.title" type="text"/>
</label>
<label>
<?php echo _("Podcast URL") ?>
<input disabled ng-model="podcast.url" type="text"/>
</label>
</div>
<table class="podcast_episodes datatable" cellpadding="0" cellspacing="0"></table>
<table id="podcast_episodes" class="datatable" cellpadding="0" cellspacing="0"></table>
<div class="btn-toolbar clearfix">
<div class="btn-group pull-right">
<button ng-click="discard()" class="btn" type="button" name="cancel">
<?php echo _("Cancel") ?>
</button>
</div>
<div class='btn-group pull-right'>
<button ng-click="put()" class="btn" title='<?php echo _("Save podcast") ?>' type="button">
<?php echo _("Save") ?>
</button>
</div>
<div class='success' style='display:none'></span></div>
<div class="btn-toolbar clearfix">
<div class="btn-group pull-right">
<button ng-click="discard()" class="btn" type="button" name="cancel">
<?php echo _("Cancel") ?>
</button>
</div>
<div class='btn-group pull-right'>
<button ng-click="put()" class="btn" title='<?php echo _("Save podcast") ?>' type="button">
<?php echo _("Save") ?>
</button>
</div>
<div class='success' style='display:none'></span></div>
</div>