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/models/Preference.php b/airtime_mvc/application/models/Preference.php index 5bb478e7b..a03fd2e1b 100644 --- a/airtime_mvc/application/models/Preference.php +++ b/airtime_mvc/application/models/Preference.php @@ -1,5 +1,6 @@ $enable)); + } } public static function GetNumOfStreams() diff --git a/airtime_mvc/application/models/StreamSetting.php b/airtime_mvc/application/models/StreamSetting.php index 391ae7dbb..52deb535c 100644 --- a/airtime_mvc/application/models/StreamSetting.php +++ b/airtime_mvc/application/models/StreamSetting.php @@ -279,7 +279,7 @@ class Application_Model_StreamSetting $sql = "UPDATE cc_stream_setting SET value=:v WHERE keyname=:keyname"; $map = array(":v" => $v, ":keyname"=>$keyname); - $res = Application_Common_Database::prepareAndExecute($sql, $map, + $res = Application_Common_Database::prepareAndExecute($sql, $map, Application_Common_Database::EXECUTE); } } 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 @@ + +
@@ -17,7 +31,8 @@
- + action('weekly-program','embed', 'default', array('style' => 'premium', 'useiframe' => '1')); ?> +
diff --git a/airtime_mvc/public/.htaccess b/airtime_mvc/public/.htaccess deleted file mode 100644 index 095cf4b86..000000000 --- a/airtime_mvc/public/.htaccess +++ /dev/null @@ -1,26 +0,0 @@ -php_value post_max_size 500M -php_value upload_max_filesize 500M -php_value request_order "GPC" -php_value session.gc_probability 0 -php_value session.auto_start 0 - -RewriteEngine On -RewriteOptions inherit -RewriteCond %{SERVER_NAME} localhost$ -RewriteCond %{REQUEST_FILENAME} -s [OR] -RewriteCond %{REQUEST_FILENAME} -l [OR] -RewriteCond %{REQUEST_FILENAME} -d -RewriteRule ^.*$ - [NC,L] -RewriteCond %{SERVER_NAME} localhost$ -RewriteRule ^.*$ index.php [NC,L] - -AddOutputFilterByType DEFLATE text/plain -AddOutputFilterByType DEFLATE text/html -AddOutputFilterByType DEFLATE text/xml -AddOutputFilterByType DEFLATE text/css -AddOutputFilterByType DEFLATE application/xml -AddOutputFilterByType DEFLATE application/xhtml+xml -AddOutputFilterByType DEFLATE application/rss+xml -AddOutputFilterByType DEFLATE application/javascript -AddOutputFilterByType DEFLATE application/x-javascript -AddOutputFilterByType DEFLATE application/json diff --git a/airtime_mvc/public/css/embed/weekly-schedule-widget.css b/airtime_mvc/public/css/embed/weekly-schedule-widget.css index 1e603f306..2f731c7aa 100644 --- a/airtime_mvc/public/css/embed/weekly-schedule-widget.css +++ b/airtime_mvc/public/css/embed/weekly-schedule-widget.css @@ -9,7 +9,6 @@ body { visibility: hidden; max-width: 750px; /*margin: 0 auto;*/ - margin-bottom: 140px; padding: 10px; position: absolute; /*left: 50%; @@ -68,7 +67,10 @@ body { } .schedule.current .schedule_content { - max-height: 300px; + /*height: 50%; + overflow-y: auto;*/ + max-height: 700px; + 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 000000000..af0b8d2f3 Binary files /dev/null and b/airtime_mvc/public/css/radio-page/img/login-small-white.png differ 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..f23c530f1 100644 --- a/airtime_mvc/public/css/radio-page/radio-page.css +++ b/airtime_mvc/public/css/radio-page/radio-page.css @@ -4,11 +4,18 @@ html { -moz-background-size: cover; -o-background-size: cover; background-size: cover; - overflow-y: hidden; + overflow-y: auto; } + +body { + font-family: 'Roboto', sans-serif; + margin: 0px; +} + + .bck_cover { - position: fixed; + position: absolute; top: 0px; right: 0px; bottom: 0px; @@ -17,11 +24,6 @@ html { z-index: -1; } -body { - font-family: 'Roboto', sans-serif; - margin: 0px; -} - .logo img { margin: 40px 0px 0px 60px; } @@ -31,8 +33,6 @@ body { margin-right: 60px; margin-top: 40px; display:inline-block; - background-color: #000000; - opacity: 0.5; padding: 10px; } @@ -47,7 +47,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; diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index a95b3b85e..35a8ce343 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -2262,7 +2262,7 @@ dd.radio-inline-list, .preferences dd.radio-inline-list, .stream-config dd.radio } .preferences.simple-formblock dd.block-display, .preferences.simple-formblock dd.block-display select, .stream-config.simple-formblock dd.block-display select, - .preferences dd.block-display .input_select, .stream-config dd.block-display .input_select { +.preferences dd.block-display .input_select, .stream-config dd.block-display .input_select { width: 100%; } .preferences dd.block-display .input_text_area, .preferences dd.block-display .input_text diff --git a/airtime_mvc/public/index.php b/airtime_mvc/public/index.php index dac3e5fd4..81a3b1339 100644 --- a/airtime_mvc/public/index.php +++ b/airtime_mvc/public/index.php @@ -54,7 +54,7 @@ if (array_key_exists('config', $_GET)) { showConfigCheckPage(); } -$filename = isset($_SERVER['AIRTIME_CONF']) ? +$filename = isset($_SERVER['AIRTIME_CONF']) ? $_SERVER['AIRTIME_CONF'] : AIRTIME_CONFIG_STOR . AIRTIME_CONFIG; // If a configuration file exists, forward to our boot script diff --git a/installer/apache/airtime-vhost b/installer/apache/airtime-vhost index 890006fb0..fa982a97b 100644 --- a/installer/apache/airtime-vhost +++ b/installer/apache/airtime-vhost @@ -2,11 +2,36 @@ ServerAdmin foo@bar.org DocumentRoot WEB_ROOT php_admin_value upload_tmp_dir /tmp + php_value post_max_size 500M + php_value upload_max_filesize 500M + php_value request_order "GPC" + php_value session.gc_probability 0 + php_value session.auto_start 0 + + AddOutputFilterByType DEFLATE text/plain + AddOutputFilterByType DEFLATE text/html + AddOutputFilterByType DEFLATE text/xml + AddOutputFilterByType DEFLATE text/css + AddOutputFilterByType DEFLATE application/xml + AddOutputFilterByType DEFLATE application/xhtml+xml + AddOutputFilterByType DEFLATE application/rss+xml + AddOutputFilterByType DEFLATE application/javascript + AddOutputFilterByType DEFLATE application/x-javascript + AddOutputFilterByType DEFLATE application/json + - DirectoryIndex index.php - AllowOverride all + + RewriteEngine On + RewriteCond %{REQUEST_FILENAME} -s [OR] + RewriteCond %{REQUEST_FILENAME} -l [OR] + RewriteCond %{REQUEST_FILENAME} -d + RewriteRule ^.*$ - [NC,L] + RewriteRule ^.*$ index.php [NC,L] Order allow,deny Allow from all + + Require all granted +