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 

Conflicts:
	airtime_mvc/application/services/PodcastService.php
This commit is contained in:
Albert Santoni 2015-11-17 19:35:05 -05:00
parent 47193403ea 6aafe25fd1
commit ddb2a225f8
5 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
airtime_mvc/application/controllers/ApiController.php
View File

@ -23,7 +23,6 @@ class ApiController extends Zend_Controller_Action
"shows", "shows",
"show-tracks", "show-tracks",
"show-schedules", "show-schedules",
"station-logo",
"show-logo", "show-logo",
"stream-m3u" "stream-m3u"
); );

6
airtime_mvc/application/controllers/DashboardController.php
View File

@ -101,11 +101,7 @@ class DashboardController extends Zend_Controller_Action
$this->_helper->layout->setLayout('livestream'); $this->_helper->layout->setLayout('livestream');
$logo = Application_Model_Preference::GetStationLogo(); $logo = Application_Model_Preference::GetStationLogo();
if ($logo === DEFAULT_LOGO_PLACEHOLDER) { $this->view->logo = "data:image/png;base64,".$logo;
$this->view->logo = "/".DEFAULT_LOGO_FILE;
} else {
$this->view->logo = "data:image/png;base64,".$logo;
}
} }
public function helpAction() public function helpAction()

4
airtime_mvc/application/models/Preference.php
View File

@ -576,7 +576,9 @@ class Application_Model_Preference
} else { } else {
// We return the Airtime logo if no logo is set in the database. // We return the Airtime logo if no logo is set in the database.
// airtime_logo.png is stored under the public directory // airtime_logo.png is stored under the public directory
return DEFAULT_LOGO_PLACEHOLDER; $image = @file_get_contents(Application_Common_HTTPHelper::getStationUrl() . DEFAULT_LOGO_FILE);
$image = base64_encode($image);
return $image;
} }
} }

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

@ -375,9 +375,9 @@ class Application_Service_PodcastService
$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)."images/airtime_logo.png"; $imageUrl = Application_Common_HTTPHelper::getStationUrl(false)."api/station-logo";
$image = $channel->addChild("image"); $image = $channel->addChild("image");
$image->addChild("title", "image title"); $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(false));

2
airtime_mvc/application/views/scripts/form/preferences_general.phtml
View File

@ -14,7 +14,7 @@
<div id="Logo-img-container"> <div id="Logo-img-container">
<?php <?php
$logoImg = $this->element->getView()->logoImg; $logoImg = $this->element->getView()->logoImg;
$src = ($logoImg === DEFAULT_LOGO_PLACEHOLDER) ? DEFAULT_LOGO_FILE : "data:image/png;base64,".$logoImg; $src = "data:image/png;base64,".$logoImg;
?> ?>
<img onError="this.onerror = '';this.style.visibility='hidden';$('#logo-remove-btn').hide();$('[id^=stationLogoRemove]').each(function(i,v){v.style.width=v.style.height=v.style.margin=v.style.padding='0px';});" id="logo-img" onload='resizeImg(this, 450, 450);' src="<?php echo $src ?>" /> <img onError="this.onerror = '';this.style.visibility='hidden';$('#logo-remove-btn').hide();$('[id^=stationLogoRemove]').each(function(i,v){v.style.width=v.style.height=v.style.margin=v.style.padding='0px';});" id="logo-img" onload='resizeImg(this, 450, 450);' src="<?php echo $src ?>" />
</div> </div>