From f1c5a8b2446ae135e258e2a42a467b4a200119aa Mon Sep 17 00:00:00 2001
From: Albert Santoni <albert.santoni@sourcefabric.org>
Date: Tue, 29 Sep 2015 09:19:33 -0400
Subject: [PATCH] Fix the timezone/language picker and fix the What's New
 dialog popping up for new users

---
 .../application/controllers/ShowbuilderController.php       | 3 +++
 airtime_mvc/application/layouts/scripts/layout.phtml        | 6 ++++--
 .../application/views/scripts/showbuilder/index.phtml       | 1 +
 airtime_mvc/build/sql/defaultdata.sql                       | 4 ++++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/application/controllers/ShowbuilderController.php b/airtime_mvc/application/controllers/ShowbuilderController.php
index df3d01294..02db188e7 100644
--- a/airtime_mvc/application/controllers/ShowbuilderController.php
+++ b/airtime_mvc/application/controllers/ShowbuilderController.php
@@ -60,6 +60,7 @@ class ShowbuilderController extends Zend_Controller_Action
         $this->view->headScript()->appendFile($baseUrl.'js/airtime/showbuilder/main_builder.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
 
         // MEDIA BUILDER
+        $this->view->headScript()->appendFile($baseUrl.'js/js-timezone-detect/jstz-1.0.4.min.js','text/javascript');
         $this->view->headScript()->appendFile($baseUrl.'js/airtime/library/spl.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
         $this->view->headScript()->appendFile($baseUrl.'js/airtime/playlist/smart_blockbuilder.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
         $this->view->headLink()->appendStylesheet($baseUrl.'css/playlist_builder.css?'.$CC_CONFIG['airtime_version']);
@@ -87,6 +88,8 @@ class ShowbuilderController extends Zend_Controller_Action
         $end = DateTime::createFromFormat("U", $to, $utcTimezone);
         $end->setTimezone($displayTimeZone);
 
+        $this->checkAndShowSetupPopup($request);
+
         $form = new Application_Form_ShowBuilder();
         $form->populate(array(
                             'sb_date_start' => $start->format("Y-m-d"),
diff --git a/airtime_mvc/application/layouts/scripts/layout.phtml b/airtime_mvc/application/layouts/scripts/layout.phtml
index 17d9da5c0..bc9b14951 100644
--- a/airtime_mvc/application/layouts/scripts/layout.phtml
+++ b/airtime_mvc/application/layouts/scripts/layout.phtml
@@ -176,8 +176,10 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
     if (!Application_Model_Preference::getWhatsNewDialogViewed()) {
         ?>
         <div id="whatsnew">
-            <div id="whatsnew_video">
-                <iframe width="560" height="315" src="<?php echo UI_REVAMP_EMBED_URL ?>" frameborder="0" allowfullscreen></iframe>
+            <div>
+                <div id="whatsnew_video">
+                    <iframe width="560" height="315" src="<?php echo UI_REVAMP_EMBED_URL ?>" frameborder="0" allowfullscreen></iframe>
+                </div>
                 <h2><?php echo _("Airtime Pro has a new look!"); ?></h2>
                 <p><?php echo _("Your favorite features are now even easier to use - and we've even
                     added a few new ones! Check out the video above or read on to find out more."); ?></p>
diff --git a/airtime_mvc/application/views/scripts/showbuilder/index.phtml b/airtime_mvc/application/views/scripts/showbuilder/index.phtml
index b3f90508b..dedcf2937 100644
--- a/airtime_mvc/application/views/scripts/showbuilder/index.phtml
+++ b/airtime_mvc/application/views/scripts/showbuilder/index.phtml
@@ -33,3 +33,4 @@
 </div>
 
 <?php echo $this->dialog ?>
+<?php echo $this->lang_tz_popup_form; ?>
diff --git a/airtime_mvc/build/sql/defaultdata.sql b/airtime_mvc/build/sql/defaultdata.sql
index 85736f336..1f0db0e05 100644
--- a/airtime_mvc/build/sql/defaultdata.sql
+++ b/airtime_mvc/build/sql/defaultdata.sql
@@ -387,3 +387,7 @@ CREATE UNIQUE INDEX cc_pref_key_idx ON cc_pref (keystr) WHERE subjid IS NULL;
 ANALYZE cc_pref; -- this validates the new partial index
 
 --end added in 2.5.14
+
+INSERT INTO cc_pref (keystr, valstr, subjid) VALUES ('whats_new_dialog_viewed', 'true', '0');
+INSERT INTO cc_pref (keystr, valstr, subjid) VALUES ('whats_new_dialog_viewed', 'true', '1');
+INSERT INTO cc_pref (keystr, valstr, subjid) VALUES ('whats_new_dialog_viewed', 'true', '2');
\ No newline at end of file