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

Merge branch 'saas-dev-publishing' into saas-dev-publishing-episode-view

Browse source 
Conflicts:
	airtime_mvc/public/js/airtime/library/podcast.js
This commit is contained in:
Duncan Sommerville 2015-11-04 15:18:50 -05:00
commit 6cb28e0911
6 changed files with 37 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/views/scripts/podcast/station_podcast.phtml
View file

@ -1,7 +1,7 @@
<div class="angular_wrapper" ng-controller="StationPodcast">
<div class="inner_editor_title">
<h2>
<?php echo _("Editing ") ?>"<span ng-bind="podcast.title" class="title_obj_name"></span>"
<span class="title_obj_name"><?php echo _("My Station Podcast") ?></span>
</h2>
<a href="{{podcast.url}}" target="_blank">
<button class="btn"><?php echo _("View Feed") ?></button>