diff --git a/airtime_mvc/application/configs/constants.php b/airtime_mvc/application/configs/constants.php
index 4409be287..00c37a063 100644
--- a/airtime_mvc/application/configs/constants.php
+++ b/airtime_mvc/application/configs/constants.php
@@ -24,7 +24,7 @@ define('AIRTIME_API_VERSION' , '1.1');
define('AIRTIME_CODE_VERSION' , '2.5.13');
define('DEFAULT_LOGO_PLACEHOLDER', 1);
-define('DEFAULT_LOGO_FILE', 'airtime_logo.png');
+define('DEFAULT_LOGO_FILE', 'images/airtime_logo.png');
// Metadata Keys for files
define('MDATA_KEY_FILEPATH' , 'filepath');
diff --git a/airtime_mvc/application/controllers/IndexController.php b/airtime_mvc/application/controllers/IndexController.php
index d97264799..56d239e5c 100644
--- a/airtime_mvc/application/controllers/IndexController.php
+++ b/airtime_mvc/application/controllers/IndexController.php
@@ -27,7 +27,6 @@ class IndexController extends Zend_Controller_Action
$this->view->stationUrl = Application_Common_HTTPHelper::getStationUrl();
- $this->view->baseUrl = Application_Common_OsPath::getBaseDir();
}
public function mainAction()
diff --git a/airtime_mvc/application/layouts/scripts/radio-page.phtml b/airtime_mvc/application/layouts/scripts/radio-page.phtml
index 0a863471f..09cc8f52e 100644
--- a/airtime_mvc/application/layouts/scripts/radio-page.phtml
+++ b/airtime_mvc/application/layouts/scripts/radio-page.phtml
@@ -3,7 +3,7 @@
-
+
headTitle() ?>
headLink() ?>
diff --git a/airtime_mvc/application/views/scripts/index/index.phtml b/airtime_mvc/application/views/scripts/index/index.phtml
index 82bca672f..84e991722 100644
--- a/airtime_mvc/application/views/scripts/index/index.phtml
+++ b/airtime_mvc/application/views/scripts/index/index.phtml
@@ -4,7 +4,7 @@
stationLogo === DEFAULT_LOGO_PLACEHOLDER) {
- echo "![](".$this->baseUrl.DEFAULT_LOGO_FILE.")
";
+ echo "![](".DEFAULT_LOGO_FILE.")
";
} else {
echo "![](data:image/png;base64," . $this->stationLogo . ")
";
} ?>
diff --git a/airtime_mvc/public/css/radio-page/img/background.png b/airtime_mvc/public/css/radio-page/img/background.png
index 14b7a1c9b..cd61f82d3 100644
Binary files a/airtime_mvc/public/css/radio-page/img/background.png and b/airtime_mvc/public/css/radio-page/img/background.png differ
diff --git a/airtime_mvc/public/images/airtime_logo.png b/airtime_mvc/public/images/airtime_logo.png
new file mode 100644
index 000000000..a635547b4
Binary files /dev/null and b/airtime_mvc/public/images/airtime_logo.png differ
diff --git a/airtime_mvc/public/index.php b/airtime_mvc/public/index.php
index 02fc19e65..dac3e5fd4 100644
--- a/airtime_mvc/public/index.php
+++ b/airtime_mvc/public/index.php
@@ -54,8 +54,11 @@ if (array_key_exists('config', $_GET)) {
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 (file_exists(AIRTIME_CONFIG_STOR . AIRTIME_CONFIG)) {
+if (file_exists($filename)) {
require_once(APPLICATION_PATH . 'airtime-boot.php');
}
// Otherwise, we'll need to run our configuration setup