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

Change station podcast RSS links back to https; style fix for menu in some browsers

This commit is contained in:
Duncan Sommerville 2015-11-18 11:10:14 -05:00
parent eae8c7b638
commit 9a8e80f74b
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/models/airtime/PodcastEpisodes.php
View File

@ -35,7 +35,7 @@ class PodcastEpisodes extends BasePodcastEpisodes
$file = CcFilesQuery::create()->findPk($fileId); $file = CcFilesQuery::create()->findPk($fileId);
$ext = FileDataHelper::getAudioMimeTypeArray()[$file->getDbMime()]; $ext = FileDataHelper::getAudioMimeTypeArray()[$file->getDbMime()];
$key = Application_Model_Preference::getStationPodcastDownloadKey(); $key = Application_Model_Preference::getStationPodcastDownloadKey();
return Application_Common_HTTPHelper::getStationUrl(false)."rest/media/$fileId/download/$key.$ext"; return Application_Common_HTTPHelper::getStationUrl()."rest/media/$fileId/download/$key.$ext";
} }
return parent::getDbDownloadUrl(); return parent::getDbDownloadUrl();
} }

2
airtime_mvc/application/services/PodcastEpisodeService.php
View File

@ -193,7 +193,7 @@ class Application_Service_PodcastEpisodeService extends Application_Service_Thir
*/ */
public function publish($fileId) { public function publish($fileId) {
$id = Application_Model_Preference::getStationPodcastId(); $id = Application_Model_Preference::getStationPodcastId();
$url = $guid = Application_Common_HTTPHelper::getStationUrl(false)."rest/media/$fileId/download"; $url = $guid = Application_Common_HTTPHelper::getStationUrl()."rest/media/$fileId/download";
if (!PodcastEpisodesQuery::create() if (!PodcastEpisodesQuery::create()
->filterByDbPodcastId($id) ->filterByDbPodcastId($id)
->findOneByDbFileId($fileId)) { // Don't allow duplicate episodes ->findOneByDbFileId($fileId)) { // Don't allow duplicate episodes

10
airtime_mvc/application/services/PodcastService.php
View File

@ -152,14 +152,14 @@ class Application_Service_PodcastService
public static function createStationPodcast() public static function createStationPodcast()
{ {
$podcast = new Podcast(); $podcast = new Podcast();
$podcast->setDbUrl(Application_Common_HTTPHelper::getStationUrl(false) . "feeds/station-rss"); $podcast->setDbUrl(Application_Common_HTTPHelper::getStationUrl() . "feeds/station-rss");
$title = Application_Model_Preference::GetStationName(); $title = Application_Model_Preference::GetStationName();
$title = empty($title) ? "My Station's Podcast" : $title; $title = empty($title) ? "My Station's Podcast" : $title;
$podcast->setDbTitle($title); $podcast->setDbTitle($title);
$podcast->setDbDescription(Application_Model_Preference::GetStationDescription()); $podcast->setDbDescription(Application_Model_Preference::GetStationDescription());
$podcast->setDbLink(Application_Common_HTTPHelper::getStationUrl(false)); $podcast->setDbLink(Application_Common_HTTPHelper::getStationUrl());
$podcast->setDbLanguage(explode('_', Application_Model_Preference::GetLocale())[0]); $podcast->setDbLanguage(explode('_', Application_Model_Preference::GetLocale())[0]);
$podcast->setDbCreator(Application_Model_Preference::GetStationName()); $podcast->setDbCreator(Application_Model_Preference::GetStationName());
$podcast->setDbOwner(self::getOwnerId()); $podcast->setDbOwner(self::getOwnerId());
@ -371,15 +371,15 @@ class Application_Service_PodcastService
$xml->addAttribute('xmlns:xmlns:atom', "http://www.w3.org/2005/Atom"); $xml->addAttribute('xmlns:xmlns:atom', "http://www.w3.org/2005/Atom");
$atomLink = $channel->addChild("xmlns:atom:link"); $atomLink = $channel->addChild("xmlns:atom:link");
$atomLink->addAttribute("href", Application_Common_HTTPHelper::getStationUrl(false) . "feeds/station-rss"); $atomLink->addAttribute("href", Application_Common_HTTPHelper::getStationUrl() . "feeds/station-rss");
$atomLink->addAttribute("rel", "self"); $atomLink->addAttribute("rel", "self");
$atomLink->addAttribute("type", "application/rss+xml"); $atomLink->addAttribute("type", "application/rss+xml");
$imageUrl = Application_Common_HTTPHelper::getStationUrl(false)."api/station-logo"; $imageUrl = Application_Common_HTTPHelper::getStationUrl()."api/station-logo";
$image = $channel->addChild("image"); $image = $channel->addChild("image");
$image->addChild("title", $podcast->getDbTitle()); $image->addChild("title", $podcast->getDbTitle());
self::addEscapedChild($image, "url", $imageUrl); self::addEscapedChild($image, "url", $imageUrl);
self::addEscapedChild($image, "link", Application_Common_HTTPHelper::getStationUrl(false)); self::addEscapedChild($image, "link", Application_Common_HTTPHelper::getStationUrl());
$xml->addAttribute('xmlns:xmlns:itunes', ITUNES_XML_NAMESPACE_URL); $xml->addAttribute('xmlns:xmlns:itunes', ITUNES_XML_NAMESPACE_URL);
self::addEscapedChild($channel, "xmlns:itunes:author", $podcast->getDbItunesAuthor()); self::addEscapedChild($channel, "xmlns:itunes:author", $podcast->getDbItunesAuthor());

8
airtime_mvc/public/css/styles.css
View File

@ -3590,6 +3590,14 @@ button.btn-icon-text > i.icon-white {
overflow: auto; overflow: auto;
} }
#media_type_nav > div:not(#nav) {
-webkit-flex: 0 1 auto;
-moz-flex: 0 1 auto;
-ms-flex: 0 1 auto;
-o-flex: 0 1 auto;
flex: 0 1 auto;
}
#media_type_nav .icon-white { #media_type_nav .icon-white {
opacity: 0.8; opacity: 0.8;
} }