Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix the timezone/language picker and fix the What's New dialog popping up for new users

Browse source
This commit is contained in:
Albert Santoni 2015-09-29 09:19:33 -04:00
parent 6658fca10b
commit f1c5a8b244
4 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
airtime_mvc/application/controllers/ShowbuilderController.php
View file

@ -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'); $this->view->headScript()->appendFile($baseUrl.'js/airtime/showbuilder/main_builder.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
// MEDIA BUILDER // 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/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->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']); $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 = DateTime::createFromFormat("U", $to, $utcTimezone);
$end->setTimezone($displayTimeZone); $end->setTimezone($displayTimeZone);
$this->checkAndShowSetupPopup($request);
$form = new Application_Form_ShowBuilder(); $form = new Application_Form_ShowBuilder();
$form->populate(array( $form->populate(array(
'sb_date_start' => $start->format("Y-m-d"), 'sb_date_start' => $start->format("Y-m-d"),

6
airtime_mvc/application/layouts/scripts/layout.phtml
View file

@ -176,8 +176,10 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
if (!Application_Model_Preference::getWhatsNewDialogViewed()) { if (!Application_Model_Preference::getWhatsNewDialogViewed()) {
?> ?>
<div id="whatsnew"> <div id="whatsnew">
<div id="whatsnew_video"> <div>
<iframe width="560" height="315" src="<?php echo UI_REVAMP_EMBED_URL ?>" frameborder="0" allowfullscreen></iframe> <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> <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 <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> added a few new ones! Check out the video above or read on to find out more."); ?></p>

1
airtime_mvc/application/views/scripts/showbuilder/index.phtml
View file

@ -33,3 +33,4 @@
</div> </div>
<?php echo $this->dialog ?> <?php echo $this->dialog ?>
<?php echo $this->lang_tz_popup_form; ?>

4
airtime_mvc/build/sql/defaultdata.sql
View file

@ -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 ANALYZE cc_pref; -- this validates the new partial index
--end added in 2.5.14 --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');