diff --git a/airtime_mvc/application/forms/EditUser.php b/airtime_mvc/application/forms/EditUser.php index 2711bb334..8b8565fce 100644 --- a/airtime_mvc/application/forms/EditUser.php +++ b/airtime_mvc/application/forms/EditUser.php @@ -118,7 +118,7 @@ class Application_Form_EditUser extends Zend_Form $this->addElement($locale); $timezone = new Zend_Form_Element_Select("cu_timezone"); - $timezone->setLabel(_("Timezone:")); + $timezone->setLabel(_("Interface Timezone:")); $timezone->setMultiOptions(Application_Common_Timezone::getTimezones()); $timezone->setValue(Application_Model_Preference::GetUserTimezone($currentUserId)); $timezone->setDecorators(array('ViewHelper')); diff --git a/airtime_mvc/application/forms/GeneralPreferences.php b/airtime_mvc/application/forms/GeneralPreferences.php index 19e3fc064..34b60e704 100644 --- a/airtime_mvc/application/forms/GeneralPreferences.php +++ b/airtime_mvc/application/forms/GeneralPreferences.php @@ -102,7 +102,7 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm /* Form Element for setting the Timezone */ $timezone = new Zend_Form_Element_Select("timezone"); - $timezone->setLabel(_("Default Interface Timezone")); + $timezone->setLabel(_("Station Timezone")); $timezone->setMultiOptions(Application_Common_Timezone::getTimezones()); $timezone->setValue(Application_Model_Preference::GetDefaultTimezone()); $timezone->setDecorators(array('ViewHelper')); diff --git a/airtime_mvc/application/views/scripts/form/add-show-when.phtml b/airtime_mvc/application/views/scripts/form/add-show-when.phtml index f0569ce28..5a5cc1725 100644 --- a/airtime_mvc/application/views/scripts/form/add-show-when.phtml +++ b/airtime_mvc/application/views/scripts/form/add-show-when.phtml @@ -59,6 +59,7 @@
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index 90bbd9b64..4ede9facb 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -13,7 +13,7 @@ html, body { } #login-page { - background: #1f1f1f url(images/login_page_bg.png) no-repeat center 0; + background: #1f1f1f url(images/login_page_bg.png) no-repeat center 0;` margin: 0; padding: 0; height:100%; @@ -125,7 +125,8 @@ select { .airtime_auth_help_icon, .custom_auth_help_icon, .stream_username_help_icon, .playlist_type_help_icon, .master_username_help_icon, .repeat_tracks_help_icon, -.admin_username_help_icon, .stream_type_help_icon, .show_linking_help_icon { +.admin_username_help_icon, .stream_type_help_icon, .show_linking_help_icon, +.show_timezone_help_icon{ cursor: help; position: relative; display:inline-block; zoom:1; diff --git a/airtime_mvc/public/js/airtime/schedule/add-show.js b/airtime_mvc/public/js/airtime/schedule/add-show.js index 8d4fe48d1..582c48566 100644 --- a/airtime_mvc/public/js/airtime/schedule/add-show.js +++ b/airtime_mvc/public/js/airtime/schedule/add-show.js @@ -284,7 +284,29 @@ function setAddShowEvents() { form.find("#add_show_day_check-element").addClass("block-display clearfix"); form.find("#add_show_day_check-element label").addClass("wrapp-label"); form.find("#add_show_day_check-element br").remove(); - + + form.find(".show_timezone_help_icon").qtip({ + content: { + text: $.i18n._("Timezone is set to the station timezone by default. Shows in the calendar will be displayed in your local time defined by the " + + "Interface Timezone in your user settings.") + }, + hide: { + delay: 500, + fixed: true + }, + style: { + border: { + width: 0, + radius: 4 + }, + classes: "ui-tooltip-dark ui-tooltip-rounded" + }, + position: { + my: "left bottom", + at: "right center" + } + }); + form.find(".airtime_auth_help_icon").qtip({ content: { text: $.i18n._("This follows the same security pattern for the shows: only users assigned to the show can connect.")