From ad5121f2ca7eaa05997aff987816bba9854b74f9 Mon Sep 17 00:00:00 2001
From: drigato <denise.rigato@sourcefabric.org>
Date: Mon, 15 Jun 2015 14:42:37 -0400
Subject: [PATCH] Radio Page improvements

---
 .../application/controllers/EmbedController.php   |   8 +++++++-
 .../application/views/scripts/embed/player.phtml  |   1 +
 .../views/scripts/embed/weekly-program.phtml      |   1 +
 .../application/views/scripts/index/index.phtml   |   3 ++-
 .../public/css/embed/weekly-schedule-widget.css   |   3 ++-
 .../css/radio-page/img/login-small-white.png      | Bin 0 -> 463 bytes
 .../public/css/radio-page/premium_player.css      |   4 ++--
 airtime_mvc/public/css/radio-page/radio-page.css  |   4 +---
 8 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 airtime_mvc/public/css/radio-page/img/login-small-white.png

diff --git a/airtime_mvc/application/controllers/EmbedController.php b/airtime_mvc/application/controllers/EmbedController.php
index c160ad9e2..7e5500b75 100644
--- a/airtime_mvc/application/controllers/EmbedController.php
+++ b/airtime_mvc/application/controllers/EmbedController.php
@@ -78,12 +78,18 @@ class EmbedController extends Zend_Controller_Action
 
     public function weeklyProgramAction()
     {
-        $this->view->layout()->disableLayout();
 
         $CC_CONFIG = Config::getConfig();
 
         $request = $this->getRequest();
 
+        $useIframe = $request->getParam('useiframe');
+        if (!isset($useIframe)) {
+            $this->view->layout()->disableLayout();
+        } elseif ($useIframe == "1") {
+            $this->_helper->layout->setLayout('bare');
+        }
+
         $widgetStyle = $request->getParam('style');
         if ($widgetStyle == "premium") {
             $this->view->widgetStyle = "premium";
diff --git a/airtime_mvc/application/views/scripts/embed/player.phtml b/airtime_mvc/application/views/scripts/embed/player.phtml
index 80bc71fde..78baec3c8 100644
--- a/airtime_mvc/application/views/scripts/embed/player.phtml
+++ b/airtime_mvc/application/views/scripts/embed/player.phtml
@@ -5,6 +5,7 @@
     <link rel="stylesheet" href="<?php echo $this->css?>" type="text/css">
     <script src="<?php echo $this->mrp_js?>" type="text/javascript"></script>
     <script src="<?php echo $this->jquery?>" type="text/javascript"></script>
+    <link href='https://fonts.googleapis.com/css?family=Roboto:400,100,300,700' rel='stylesheet' type='text/css'>
     <script type="text/javascript">
 
         var MAX_MOBILE_SCREEN_WIDTH = 760;
diff --git a/airtime_mvc/application/views/scripts/embed/weekly-program.phtml b/airtime_mvc/application/views/scripts/embed/weekly-program.phtml
index 8eb1118b7..6d36f2242 100644
--- a/airtime_mvc/application/views/scripts/embed/weekly-program.phtml
+++ b/airtime_mvc/application/views/scripts/embed/weekly-program.phtml
@@ -6,6 +6,7 @@
     <script src="<?php echo $this->jquery ?>" type="text/javascript"></script>
     <script src="<?php echo $this->jquery_custom ?>" type="text/javascript"></script>
     <script src="<?php echo $this->widget_js ?>" type="text/javascript"></script>
+    <link href='https://fonts.googleapis.com/css?family=Roboto:400,100,300,700' rel='stylesheet' type='text/css'>
     <script type="text/javascript">
         $(document).ready(function() {
             $('.tabs li').click(function(){
diff --git a/airtime_mvc/application/views/scripts/index/index.phtml b/airtime_mvc/application/views/scripts/index/index.phtml
index 8d8b22b6f..f070338bd 100644
--- a/airtime_mvc/application/views/scripts/index/index.phtml
+++ b/airtime_mvc/application/views/scripts/index/index.phtml
@@ -17,7 +17,8 @@
     </div>
 
     <div id="tab-1" class="schedule tab_content current">
-        <iframe id="schedule_iframe" height="400px" scrolling="no" frameborder="0" src=<?php echo $this->stationUrl."embed/weekly-program?style=premium"?>></iframe>
+        <?php echo $this->action('weekly-program','embed', 'default', array('style' => 'premium', 'useiframe' => '1')); ?>
+        <!--<iframe id="schedule_iframe" height="300px" scrolling="no" frameborder="0" src=<?php /*echo $this->stationUrl."embed/weekly-program?style=premium"*/?>></iframe>-->
     </div>
 
     
diff --git a/airtime_mvc/public/css/embed/weekly-schedule-widget.css b/airtime_mvc/public/css/embed/weekly-schedule-widget.css
index 1e603f306..1610a0647 100644
--- a/airtime_mvc/public/css/embed/weekly-schedule-widget.css
+++ b/airtime_mvc/public/css/embed/weekly-schedule-widget.css
@@ -68,7 +68,8 @@ body {
 }
 
 .schedule.current .schedule_content {
-    max-height: 300px;
+    height: 70%;
+    overflow-y: auto;
 }
 
 .schedule_item {
diff --git a/airtime_mvc/public/css/radio-page/img/login-small-white.png b/airtime_mvc/public/css/radio-page/img/login-small-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..af0b8d2f390fbc08244172712ba7ef7acb224e23
GIT binary patch
literal 463
zcmV;=0WkiFP)<h;3K|Lk000e1NJLTq000>P001%w1^@s6se*8p00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3hMv>3hM!aiw#-;000McNliru-v$p3IV{dyE&l)j0bEH$
zK~z}7?Upf4!$1&4-$savbR2+4)HJ^VN~8#hGA%U+prndv(&hlEIRv67)ij~U+yN>}
zXlOPl5>D(*oQO#Nm9<{`?cbdp{XmH%Wx$XIWM-kW<lSKd|97@6NiN9&I_y9#WRD?|
zy1Q`l8ZRl5wg&kEhLUoimjXG6D;ofV74yD<)A)P>yi0mCvrH0ZRt*8pfZN2a9!k0}
zv+G(;fEn;q;p7H5UKp$GBqUVV6gUSyfGac0t9n;e7cSFLTzwD7lMlY8F3s#Su5LRe
zJO{MBtA%V<!jeY7Lj!3gEQNSc6b%HTu+oXmW{quC2!Z_$cOKQ=lNM5|TDrR^$v1b;
z0Q!@0QVFL(rt!Pn-FqpJ5C`gnyFZaAgpl<oV_xp=OChnXg!w?`>*=|Ula0dNDktk6
z{Mu*o@2abtI6ocIw)z&*48+|>zM&S=$}%TK0|tJ>-49coQU-NNO3DBL002ovPDHLk
FV1m7QzU2S_

literal 0
HcmV?d00001

diff --git a/airtime_mvc/public/css/radio-page/premium_player.css b/airtime_mvc/public/css/radio-page/premium_player.css
index dca2da386..81583d31e 100644
--- a/airtime_mvc/public/css/radio-page/premium_player.css
+++ b/airtime_mvc/public/css/radio-page/premium_player.css
@@ -44,14 +44,14 @@ body {
 .bottom_bar p.now_playing {
     color: #222222;
     font-size: 26px;
-    font-weight: normal;
+    font-weight: 300;
     float: left;
     margin: 28px 0px;
 }
 
 .bottom_bar p.now_playing span {
     display: block;
-    font-weight: lighter;
+    font-weight: 100;
 }
 
 .bottom_bar .button {
diff --git a/airtime_mvc/public/css/radio-page/radio-page.css b/airtime_mvc/public/css/radio-page/radio-page.css
index 635c9bc3c..7c484d523 100644
--- a/airtime_mvc/public/css/radio-page/radio-page.css
+++ b/airtime_mvc/public/css/radio-page/radio-page.css
@@ -31,8 +31,6 @@ body {
     margin-right: 60px;
     margin-top: 40px;
     display:inline-block;
-    background-color: #000000;
-    opacity: 0.5;
     padding: 10px;
 }
 
@@ -47,7 +45,7 @@ body {
 }
 
 span.login-img {
-    background: url('img/login-small.png') no-repeat center -25px;
+    background: url('img/login-small-white.png') no-repeat center -25px;
     display: inline-block;
     vertical-align: middle;
     width: 25px;