From 8e8f8aa55b8c11b0afbf4b850076e944a40a5aa8 Mon Sep 17 00:00:00 2001
From: drigato <denise.rigato@sourcefabric.org>
Date: Wed, 10 Jun 2015 12:23:19 -0400
Subject: [PATCH] Radio Page Code Review Changes

Defined a SAAS_PRODUCT_BRANDING_NAME constant.
Defined constants for default station logo.
---
 airtime_mvc/application/configs/constants.php |  5 +++++
 .../layouts/scripts/radio-page.phtml          | 19 -------------------
 airtime_mvc/application/models/Preference.php |  4 ++--
 .../scripts/form/preferences_general.phtml    |  4 ++--
 .../views/scripts/index/index.phtml           |  4 ++--
 5 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/airtime_mvc/application/configs/constants.php b/airtime_mvc/application/configs/constants.php
index bb5184895..e44db1b9e 100644
--- a/airtime_mvc/application/configs/constants.php
+++ b/airtime_mvc/application/configs/constants.php
@@ -3,6 +3,8 @@
 define('PRODUCT_NAME'       , 'Airtime');
 define('PRODUCT_SITE_URL'   , 'http://airtime.sourcefabric.org');
 
+define('SAAS_PRODUCT_BRANDING_NAME', 'Airtime Pro');
+
 define('COMPANY_NAME'       , 'Sourcefabric');
 define('COMPANY_SUFFIX'     , 'z.ú.');
 define('COMPANY_SITE'       , 'Sourcefabric.org');
@@ -20,6 +22,9 @@ define('AIRTIME_COPYRIGHT_DATE' , '2010-2012');
 define('AIRTIME_REST_VERSION'   , '1.1');
 define('AIRTIME_API_VERSION'    , '1.1');
 
+define('DEFAULT_LOGO_PLACEHOLDER', 1);
+define('DEFAULT_LOGO_FILE', 'airtime_logo.png');
+
 // Metadata Keys for files
 define('MDATA_KEY_FILEPATH'    , 'filepath');
 define('MDATA_KEY_DIRECTORY'   , 'directory');
diff --git a/airtime_mvc/application/layouts/scripts/radio-page.phtml b/airtime_mvc/application/layouts/scripts/radio-page.phtml
index f942c10a3..0a863471f 100644
--- a/airtime_mvc/application/layouts/scripts/radio-page.phtml
+++ b/airtime_mvc/application/layouts/scripts/radio-page.phtml
@@ -5,7 +5,6 @@
     <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'>
 
-    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"></script>
     <?php echo $this->headTitle() ?>
     <?php echo $this->headLink() ?>
     <?php echo $this->headScript() ?>
@@ -14,23 +13,5 @@
 
     <?php echo $this->layout()->content ?>
 
-    <!--
-<div class="footer">
-    <?php
-    $company = COMPANY_NAME . " " . COMPANY_SUFFIX;
-    $licenseSiteAnchor = "<a href='" . LICENSE_URL . "'>"
-        . LICENSE_VERSION
-        . "</a>";
-    $companySiteAnchor = "<a href='" . COMPANY_SITE_URL . "'>"
-        . $company
-        . "</a>";
-    echo sprintf(_('%1$s copyright &copy; %2$s All rights reserved.<br />'
-        . 'Maintained and distributed under the %3$s by %4$s'),
-        PRODUCT_NAME, $company,
-        $licenseSiteAnchor,
-        $companySiteAnchor);
-    ?>
-</div>
--->
 </body>
 </html>
diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php
index e82a0dc22..a89015f8c 100644
--- a/airtime_mvc/application/models/Preference.php
+++ b/airtime_mvc/application/models/Preference.php
@@ -502,7 +502,7 @@ class Application_Model_Preference
         if (!empty($description)) {
             return $description;
         } else {
-            return "Powered by Airtime Pro";
+            return sprintf(_("Powered by %s"), SAAS_PRODUCT_BRANDING_NAME);
         }
     }
 
@@ -613,7 +613,7 @@ class Application_Model_Preference
         } else {
             // We return the Airtime logo if no logo is set in the database.
             // airtime_logo.png is stored under the public directory
-            return "airtime_logo.png";
+            return DEFAULT_LOGO_PLACEHOLDER;
         }
     }
     
diff --git a/airtime_mvc/application/views/scripts/form/preferences_general.phtml b/airtime_mvc/application/views/scripts/form/preferences_general.phtml
index e21894d95..de1f1c73f 100644
--- a/airtime_mvc/application/views/scripts/form/preferences_general.phtml
+++ b/airtime_mvc/application/views/scripts/form/preferences_general.phtml
@@ -14,8 +14,8 @@
         <div id="Logo-img-container">
             <?php
             $logoImg = $this->element->getView()->logoImg;
-            if ($logoImg === "airtime_logo.png") {
-                $src = "airtime_logo.png";
+            if ($logoImg === DEFAULT_LOGO_PLACEHOLDER) {
+                $src = DEFAULT_LOGO_FILE;
             } else {
                 $src = "data:image/png;base64,".$logoImg;
             }
diff --git a/airtime_mvc/application/views/scripts/index/index.phtml b/airtime_mvc/application/views/scripts/index/index.phtml
index 84734c0ad..31da5ebfd 100644
--- a/airtime_mvc/application/views/scripts/index/index.phtml
+++ b/airtime_mvc/application/views/scripts/index/index.phtml
@@ -3,8 +3,8 @@
 
     <div class="bck_cover"></div>
 
-    <?php if ($this->stationLogo === "airtime_logo.png") {
-        echo "<a href='#' class='logo'><img src='airtime_logo.png'></a>";
+    <?php if ($this->stationLogo === DEFAULT_LOGO_PLACEHOLDER) {
+        echo "<a href='#' class='logo'><img src='".DEFAULT_LOGO_FILE."'></a>";
     } else {
         echo "<a href='#' class='logo'><img src='data:image/png;base64," . $this->stationLogo . "'></a>";
     } ?>