From 5a7a502d45210d9340232ec2bee36739a1da3083 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Sat, 17 Mar 2012 15:24:19 -0400 Subject: [PATCH] CC-3436: Warn the user that the stream will be interrupted when pypo is restarted -Done --- airtime_mvc/application/controllers/PreferenceController.php | 3 +++ .../application/views/scripts/preference/stream-setting.phtml | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php index d13cd678d..607592217 100644 --- a/airtime_mvc/application/controllers/PreferenceController.php +++ b/airtime_mvc/application/controllers/PreferenceController.php @@ -232,6 +232,9 @@ class PreferenceController extends Zend_Controller_Action $this->view->statusMsg = "
Stream Setting Updated.
"; } } + + $this->view->confirm_pypo_restart_text = "Updating settings will temporarily interrupt any currently playing shows. Click \'OK\' to continue."; + $this->view->num_stream = $num_of_stream; $this->view->enable_stream_conf = Application_Model_Preference::GetEnableStreamConf(); $this->view->form = $form; diff --git a/airtime_mvc/application/views/scripts/preference/stream-setting.phtml b/airtime_mvc/application/views/scripts/preference/stream-setting.phtml index 58332bde8..ed88f61e0 100644 --- a/airtime_mvc/application/views/scripts/preference/stream-setting.phtml +++ b/airtime_mvc/application/views/scripts/preference/stream-setting.phtml @@ -1,7 +1,7 @@

enable_stream_conf == "true"){?>style="float:left">Stream Settings

enable_stream_conf == "true"){?> -
+
@@ -83,4 +83,4 @@
- \ No newline at end of file +