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

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

This commit is contained in:
Duncan Sommerville 2015-11-16 12:45:04 -05:00
parent 130c5f570b ae02fa6260
commit 28d378abfa
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
airtime_mvc/application/controllers/IndexController.php
View File

@ -80,6 +80,9 @@ class IndexController extends Zend_Controller_Action
$url = $stationPodcast->getDbUrl(); $url = $stationPodcast->getDbUrl();
$this->view->stationPodcastRssUrl = $url; $this->view->stationPodcastRssUrl = $url;
$stationName = Application_Model_Preference::GetStationName();
$this->view->podcastTitle = sprintf(_("%s Podcast"), !empty($stationName) ? $stationName : $CC_CONFIG["stationId"]);
} }
public function mainAction() public function mainAction()

2
airtime_mvc/application/views/scripts/index/index.phtml
View File

@ -55,7 +55,7 @@
<?php <?php
if ($this->displayRssTab) {?> if ($this->displayRssTab) {?>
<div id="tab-4" class="podcast tab_content"> <div id="tab-4" class="podcast tab_content">
<h2><?php echo _("Radio Podcast") ?><a target="_blank" href="<?php echo $this->stationPodcastRssUrl ?>" class="rss_icon"><span>Subscribe </span><img src="css/radio-page/img/rss.png"></a></h2> <h2><?php echo $this->podcastTitle ?><a target="_blank" href="<?php echo $this->stationPodcastRssUrl ?>" class="rss_icon"><span>Subscribe </span><img src="css/radio-page/img/rss.png"></a></h2>
<div id="jquery_jplayer_1" class="jp-player"> <div id="jquery_jplayer_1" class="jp-player">