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

Merge branch 'saas-dev' into soundcloud

Browse source
This commit is contained in:
Duncan Sommerville 2015-06-10 16:25:30 -04:00
commit 8163608666
7 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/configs/constants.php
View file

@ -24,7 +24,7 @@ define('AIRTIME_API_VERSION' , '1.1');
define('AIRTIME_CODE_VERSION' , '2.5.13'); define('AIRTIME_CODE_VERSION' , '2.5.13');
define('DEFAULT_LOGO_PLACEHOLDER', 1); define('DEFAULT_LOGO_PLACEHOLDER', 1);
define('DEFAULT_LOGO_FILE', 'airtime_logo.png'); define('DEFAULT_LOGO_FILE', 'images/airtime_logo.png');
// Metadata Keys for files // Metadata Keys for files
define('MDATA_KEY_FILEPATH' , 'filepath'); define('MDATA_KEY_FILEPATH' , 'filepath');

1
airtime_mvc/application/controllers/IndexController.php
View file

@ -27,7 +27,6 @@ class IndexController extends Zend_Controller_Action
$this->view->stationUrl = Application_Common_HTTPHelper::getStationUrl(); $this->view->stationUrl = Application_Common_HTTPHelper::getStationUrl();
$this->view->baseUrl = Application_Common_OsPath::getBaseDir();
} }
public function mainAction() public function mainAction()

2
airtime_mvc/application/layouts/scripts/radio-page.phtml
View file

@ -3,7 +3,7 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href='http://fonts.googleapis.com/css?family=Roboto:400,100,300,700' rel='stylesheet' type='text/css'> <link href='https://fonts.googleapis.com/css?family=Roboto:400,100,300,700' rel='stylesheet' type='text/css'>
<?php echo $this->headTitle() ?> <?php echo $this->headTitle() ?>
<?php echo $this->headLink() ?> <?php echo $this->headLink() ?>

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

@ -4,7 +4,7 @@
<div class="bck_cover"></div> <div class="bck_cover"></div>
<?php if ($this->stationLogo === DEFAULT_LOGO_PLACEHOLDER) { <?php if ($this->stationLogo === DEFAULT_LOGO_PLACEHOLDER) {
echo "<a href='#' class='logo'><img src='".$this->baseUrl.DEFAULT_LOGO_FILE."'></a>"; echo "<a href='#' class='logo'><img src='".DEFAULT_LOGO_FILE."'></a>";
} else { } else {
echo "<a href='#' class='logo'><img src='data:image/png;base64," . $this->stationLogo . "'></a>"; echo "<a href='#' class='logo'><img src='data:image/png;base64," . $this->stationLogo . "'></a>";
} ?> } ?>

BIN
airtime_mvc/public/css/radio-page/img/background.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.1 MiB

After

Width:  |  Height:  |  Size: 959 KiB

Before After
Before After

BIN
airtime_mvc/public/images/airtime_logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.5 KiB

5
airtime_mvc/public/index.php
View file

@ -54,8 +54,11 @@ if (array_key_exists('config', $_GET)) {
showConfigCheckPage(); showConfigCheckPage();
} }
$filename = isset($_SERVER['AIRTIME_CONF']) ?
$_SERVER['AIRTIME_CONF'] : AIRTIME_CONFIG_STOR . AIRTIME_CONFIG;
// If a configuration file exists, forward to our boot script // If a configuration file exists, forward to our boot script
if (file_exists(AIRTIME_CONFIG_STOR . AIRTIME_CONFIG)) { if (file_exists($filename)) {
require_once(APPLICATION_PATH . 'airtime-boot.php'); require_once(APPLICATION_PATH . 'airtime-boot.php');
} }
// Otherwise, we'll need to run our configuration setup // Otherwise, we'll need to run our configuration setup