diff --git a/Vagrantfile b/Vagrantfile index f85987c79..a82b48cd0 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -60,12 +60,6 @@ Vagrant.configure("2") do |config| os.vm.box = "bento/debian-9.2" provision_libretime(os, "debian.sh", installer_args) end - config.vm.define "debian-wheezy" do |os| - STDERR.puts 'WARNING: The "debian-wheezy" option is deprecated. Please migrate to "debian-stretch".' - STDERR.puts - os.vm.box = "bento/debian-7.11" - provision_libretime(os, "debian.sh", installer_args) - end config.vm.define "centos" do |os| os.vm.box = 'centos/7' provision_libretime(os, "centos.sh", installer_args + "--selinux") diff --git a/airtime_mvc/application/forms/AddShowAutoPlaylist.php b/airtime_mvc/application/forms/AddShowAutoPlaylist.php index bb4cead12..c987480b2 100644 --- a/airtime_mvc/application/forms/AddShowAutoPlaylist.php +++ b/airtime_mvc/application/forms/AddShowAutoPlaylist.php @@ -15,7 +15,7 @@ class Application_Form_AddShowAutoPlaylist extends Zend_Form_SubForm // Add autoplaylist checkbox element $this->addElement('checkbox', 'add_show_has_autoplaylist', array( - 'label' => _('Auto Schedule Playlist ?'), + 'label' => _('Add Autoloading Playlist ?'), 'required' => false, 'class' => 'input_text', 'decorators' => array('ViewHelper') @@ -29,7 +29,7 @@ class Application_Form_AddShowAutoPlaylist extends Zend_Form_SubForm $this->addElement($autoPlaylistSelect); // Add autoplaylist checkbox element $this->addElement('checkbox', 'add_show_autoplaylist_repeat', array( - 'label' => _('Repeat AutoPlaylist Until Show is Full ?'), + 'label' => _('Repeat Playlist Until Show is Full ?'), 'required' => false, 'class' => 'input_text', 'decorators' => array('ViewHelper') diff --git a/airtime_mvc/application/forms/SmartBlockCriteria.php b/airtime_mvc/application/forms/SmartBlockCriteria.php index c05bf6cf2..870faf26d 100644 --- a/airtime_mvc/application/forms/SmartBlockCriteria.php +++ b/airtime_mvc/application/forms/SmartBlockCriteria.php @@ -485,15 +485,6 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm $limitValue->setValue(1); } - //getting block content candidate count that meets criteria - $bl = new Application_Model_Block($p_blockId); - if ($p_isValid) { - $files = $bl->getListofFilesMeetCriteria(); - $showPoolCount = true; - } else { - $files = null; - $showPoolCount = false; - } $generate = new Zend_Form_Element_Button('generate_button'); $generate->setAttrib('class', 'sp-button btn'); diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php index 9fe070efc..bf61b21a5 100644 --- a/airtime_mvc/application/models/Block.php +++ b/airtime_mvc/application/models/Block.php @@ -1475,7 +1475,7 @@ SQL; foreach ($out as $crit) { $criteria = $crit->getDbCriteria(); $modifier = $crit->getDbModifier(); - $value = htmlspecialchars($crit->getDbValue()); + $value = $crit->getDbValue(); $extra = $crit->getDbExtra(); if ($criteria == "limit") { diff --git a/airtime_mvc/application/models/airtime/ImportedPodcast.php.bak b/airtime_mvc/application/models/airtime/ImportedPodcast.php.bak deleted file mode 100644 index fa4804f38..000000000 --- a/airtime_mvc/application/models/airtime/ImportedPodcast.php.bak +++ /dev/null @@ -1,251 +0,0 @@ -get_title(); - $podcastArray["description"] = $rss->get_description(); - $podcastArray["link"] = $rss->get_link(); - $podcastArray["language"] = $rss->get_language(); - $podcastArray["copyright"] = $rss->get_copyright(); - $podcastArray["creator"] = $rss->get_author()->get_name(); - $podcastArray["category"] = $rss->get_categories(); - - $itunesChannel = "http://www.itunes.com/dtds/podcast-1.0.dtd"; - - $itunesSubtitle = $rss->get_channel_tags($itunesChannel, 'subtitle'); - $podcastArray["itunes_subtitle"] = isset($itunesSubtitle[0]["data"]) ? $itunesSubtitle[0]["data"] : ""; - - $itunesCategory = $rss->get_channel_tags($itunesChannel, 'category'); - $categoryArray = array(); - foreach ($itunesCategory as $c => $data) { - foreach ($data["attribs"] as $attrib) { - array_push($categoryArray, $attrib["text"]); - } - } - $podcastArray["itunes_category"] = implode(",", $categoryArray); - - $itunesAuthor = $rss->get_channel_tags($itunesChannel, 'author'); - $podcastArray["itunes_author"] = isset($itunesAuthor[0]["data"]) ? $itunesAuthor[0]["data"] : ""; - - $itunesSummary = $rss->get_channel_tags($itunesChannel, 'summary'); - $podcastArray["itunes_summary"] = isset($itunesSummary[0]["data"]) ? $itunesSummary[0]["data"] : ""; - - $itunesKeywords = $rss->get_channel_tags($itunesChannel, 'keywords'); - $podcastArray["itunes_keywords"] = isset($itunesKeywords[0]["data"]) ? $itunesKeywords[0]["data"] : ""; - - $itunesExplicit = $rss->get_channel_tags($itunesChannel, 'explicit'); - $podcastArray["itunes_explicit"] = isset($itunesExplicit[0]["data"]) ? $itunesExplicit[0]["data"] : ""; - - self::validatePodcastMetadata($podcastArray); - - try { - $podcast = new ImportedPodcast(); - $podcast->fromArray($podcastArray, BasePeer::TYPE_FIELDNAME); - $podcast->setDbOwner(self::getOwnerId()); - $podcast->setDbType(IMPORTED_PODCAST); - $podcast->save(); - - return self::_generatePodcastArray($podcast, $rss); - } catch(Exception $e) { - $podcast->delete(); - throw $e; - } - } - - /** - * Fetches a Podcast's rss feed and returns all its episodes with - * the Podcast object - * - * @param $podcastId - * - * @throws PodcastNotFoundException - * @throws InvalidPodcastException - * @return array - Podcast Array with a full list of episodes - */ - public static function getPodcastById($podcastId) - { - $podcast = PodcastQuery::create()->findPk($podcastId); - if (!$podcast) { - throw new PodcastNotFoundException(); - } - - $rss = Application_Service_PodcastService::getPodcastFeed($podcast->getDbUrl()); - if (!$rss) { - throw new InvalidPodcastException(); - } - - return self::_generatePodcastArray($podcast, $rss); - } - - /** - * Given a podcast object and a SimplePie feed object, - * generate a data array to pass back to the front-end - * - * @param Podcast $podcast Podcast model object - * @param SimplePie $rss SimplePie feed object - * - * @return array - */ - private static function _generatePodcastArray($podcast, $rss) { - $podcastArray = $podcast->toArray(BasePeer::TYPE_FIELDNAME); - - $podcastArray["episodes"] = array(); - foreach ($rss->get_items() as $item) { - /** @var SimplePie_Item $item */ - array_push($podcastArray["episodes"], array( - "guid" => $item->get_id(), - "title" => $item->get_title(), - "author" => $item->get_author()->get_name(), - "description" => $item->get_description(), - "pub_date" => $item->get_date("Y-m-d H:i:s"), - "link" => $item->get_link(), - "enclosure" => $item->get_enclosure() - )); - } - - return $podcastArray; - } - - /** - * Updates a Podcast object with the given metadata - * - * @param $podcastId - * @param $data - * @return array - * @throws Exception - * @throws PodcastNotFoundException - */ - public static function updateFromArray($podcastId, $data) - { - $podcast = PodcastQuery::create()->findPk($podcastId); - if (!$podcast) { - throw new PodcastNotFoundException(); - } - - self::removePrivateFields($data); - self::validatePodcastMetadata($data); - - $podcast->fromArray($data, BasePeer::TYPE_FIELDNAME); - $podcast->save(); - - return $podcast->toArray(BasePeer::TYPE_FIELDNAME); - } - - /** - * Deletes a Podcast and its podcast episodes - * - * @param $podcastId - * @throws Exception - * @throws PodcastNotFoundException - */ - public static function deleteById($podcastId) - { - $podcast = PodcastQuery::create()->findPk($podcastId); - if ($podcast) { - $podcast->delete(); - } else { - throw new PodcastNotFoundException(); - } - } - - /** - * Trims the podcast metadata to fit the table's column max size - * - * @param $podcastArray - */ - private static function validatePodcastMetadata(&$podcastArray) - { - $podcastTable = PodcastPeer::getTableMap(); - - foreach ($podcastArray as $key => &$value) { - try { - // Make sure column exists in table - $columnMaxSize = $podcastTable->getColumn($key)->getSize(); - } catch (PropelException $e) { - continue; - } - - if (strlen($value) > $columnMaxSize) { - $value = substr($value, 0, $podcastTable->getColumn($key)->getSize()); - } - } - } - - private static function removePrivateFields(&$data) - { - foreach (self::$privateFields as $key) { - unset($data[$key]); - } - } - - //TODO move this somewhere where it makes sense - private static function getOwnerId() - { - try { - if (Zend_Auth::getInstance()->hasIdentity()) { - $service_user = new Application_Service_UserService(); - return $service_user->getCurrentUser()->getDbId(); - } else { - $defaultOwner = CcSubjsQuery::create() - ->filterByDbType('A') - ->orderByDbId() - ->findOne(); - if (!$defaultOwner) { - // what to do if there is no admin user? - // should we handle this case? - return null; - } - return $defaultOwner->getDbId(); - } - } catch(Exception $e) { - Logging::info($e->getMessage()); - } - } -} diff --git a/airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml b/airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml index 5d5eda5f6..a694866a8 100644 --- a/airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml +++ b/airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml @@ -7,9 +7,11 @@
element->getElement('add_show_has_autoplaylist') ?> +
+

More information"); ?>

- + \ No newline at end of file diff --git a/airtime_mvc/application/views/scripts/schedule/add-show-form.phtml b/airtime_mvc/application/views/scripts/schedule/add-show-form.phtml index 918c3d2bc..7815a59dd 100644 --- a/airtime_mvc/application/views/scripts/schedule/add-show-form.phtml +++ b/airtime_mvc/application/views/scripts/schedule/add-show-form.phtml @@ -25,7 +25,7 @@ repeats; ?> -

+

autoplaylist; ?>
@@ -33,12 +33,6 @@
live; ?>
-

-
- rr; ?> - absoluteRebroadcast; ?> - rebroadcast; ?> -

who; ?> diff --git a/airtime_mvc/locale/ast/LC_MESSAGES/airtime.po b/airtime_mvc/locale/ast/LC_MESSAGES/airtime.po index 3cc41e1dd..f76b852b9 100644 --- a/airtime_mvc/locale/ast/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/ast/LC_MESSAGES/airtime.po @@ -2534,13 +2534,21 @@ msgid "Must wait at least 1 hour to rebroadcast" msgstr "" #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:18 -msgid "Auto Schedule Playlist ?" +msgid "Add Autoloading Playlist ?" msgstr "" +#: airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml:14 +msgid "Autoloading playlists' contents are added to shows one hour before the show airs. More information" +msgstr "" + #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:25 msgid "Select Playlist" msgstr "" +#: airtime_mvc/application/forms/AddShowAutoPlaylist.php:32 +msgid "Repeat Playlist Until Show is Full ?" +msgstr "" + #: airtime_mvc/application/forms/AddShowLiveStream.php:11 #, php-format msgid "Use %s Authentication:" @@ -4934,7 +4942,7 @@ msgid "What" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:14 -msgid "Automatic Playlist" +msgid "Autoloading Playlist" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:18 diff --git a/airtime_mvc/locale/az/LC_MESSAGES/airtime.po b/airtime_mvc/locale/az/LC_MESSAGES/airtime.po index 3ed69001b..952c3f7ae 100644 --- a/airtime_mvc/locale/az/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/az/LC_MESSAGES/airtime.po @@ -2534,13 +2534,21 @@ msgid "Must wait at least 1 hour to rebroadcast" msgstr "" #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:18 -msgid "Auto Schedule Playlist ?" +msgid "Add Autoloading Playlist ?" msgstr "" +#: airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml:14 +msgid "Autoloading playlists' contents are added to shows one hour before the show airs. More information" +msgstr "" + #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:25 msgid "Select Playlist" msgstr "" +#: airtime_mvc/application/forms/AddShowAutoPlaylist.php:32 +msgid "Repeat Playlist Until Show is Full ?" +msgstr "" + #: airtime_mvc/application/forms/AddShowLiveStream.php:11 #, php-format msgid "Use %s Authentication:" @@ -4934,7 +4942,7 @@ msgid "What" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:14 -msgid "Automatic Playlist" +msgid "Autoloading Playlist" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:18 diff --git a/airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po b/airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po index 5a18a1907..ebc588c72 100644 --- a/airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po @@ -2538,13 +2538,21 @@ msgid "Must wait at least 1 hour to rebroadcast" msgstr "Musíte počkat alespoň 1 hodinu před dalším vysíláním" #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:18 -msgid "Auto Schedule Playlist ?" +msgid "Add Autoloading Playlist ?" msgstr "" +#: airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml:14 +msgid "Autoloading playlists' contents are added to shows one hour before the show airs. More information" +msgstr "" + #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:25 msgid "Select Playlist" msgstr "" +#: airtime_mvc/application/forms/AddShowAutoPlaylist.php:32 +msgid "Repeat Playlist Until Show is Full ?" +msgstr "" + #: airtime_mvc/application/forms/AddShowLiveStream.php:11 #, php-format msgid "Use %s Authentication:" @@ -4940,7 +4948,7 @@ msgid "What" msgstr "Co" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:14 -msgid "Automatic Playlist" +msgid "Autoloading Playlist" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:18 diff --git a/airtime_mvc/locale/da_DK/LC_MESSAGES/airtime.po b/airtime_mvc/locale/da_DK/LC_MESSAGES/airtime.po index 0824ba6ce..65c1dc92d 100644 --- a/airtime_mvc/locale/da_DK/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/da_DK/LC_MESSAGES/airtime.po @@ -2534,13 +2534,21 @@ msgid "Must wait at least 1 hour to rebroadcast" msgstr "" #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:18 -msgid "Auto Schedule Playlist ?" +msgid "Add Autoloading Playlist ?" msgstr "" +#: airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml:14 +msgid "Autoloading playlists' contents are added to shows one hour before the show airs. More information" +msgstr "" + #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:25 msgid "Select Playlist" msgstr "" +#: airtime_mvc/application/forms/AddShowAutoPlaylist.php:32 +msgid "Repeat Playlist Until Show is Full ?" +msgstr "" + #: airtime_mvc/application/forms/AddShowLiveStream.php:11 #, php-format msgid "Use %s Authentication:" @@ -4934,7 +4942,7 @@ msgid "What" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:14 -msgid "Automatic Playlist" +msgid "Autoloading Playlist" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:18 diff --git a/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po b/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po index 06e90b569..089555c0c 100644 --- a/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po @@ -2551,13 +2551,21 @@ msgid "Must wait at least 1 hour to rebroadcast" msgstr "Das Wiederholen einer Sendung ist erst nach einer Stunde Wartezeit möglich." #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:18 -msgid "Auto Schedule Playlist ?" +msgid "Add Autoloading Playlist ?" msgstr "" +#: airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml:14 +msgid "Autoloading playlists' contents are added to shows one hour before the show airs. More information" +msgstr "" + #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:25 msgid "Select Playlist" msgstr "" +#: airtime_mvc/application/forms/AddShowAutoPlaylist.php:32 +msgid "Repeat Playlist Until Show is Full ?" +msgstr "" + #: airtime_mvc/application/forms/AddShowLiveStream.php:11 #, php-format msgid "Use %s Authentication:" @@ -4953,7 +4961,7 @@ msgid "What" msgstr "Was" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:14 -msgid "Automatic Playlist" +msgid "Autoloading Playlist" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:18 diff --git a/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po b/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po index 7ce30889c..2d4ba44c0 100644 --- a/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po @@ -2553,13 +2553,21 @@ msgid "Must wait at least 1 hour to rebroadcast" msgstr "Das Wiederholen einer Sendung ist erst nach einer Stunde Wartezeit möglich." #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:18 -msgid "Auto Schedule Playlist ?" +msgid "Add Autoloading Playlist ?" msgstr "" +#: airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml:14 +msgid "Autoloading playlists' contents are added to shows one hour before the show airs. More information" +msgstr "" + #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:25 msgid "Select Playlist" msgstr "" +#: airtime_mvc/application/forms/AddShowAutoPlaylist.php:32 +msgid "Repeat Playlist Until Show is Full ?" +msgstr "" + #: airtime_mvc/application/forms/AddShowLiveStream.php:11 #, php-format msgid "Use %s Authentication:" @@ -4955,7 +4963,7 @@ msgid "What" msgstr "Was" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:14 -msgid "Automatic Playlist" +msgid "Autoloading Playlist" msgstr "Automatische Playlist" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:18 diff --git a/airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po b/airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po index 46b771ed4..7bf24c41f 100644 --- a/airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po @@ -2538,13 +2538,21 @@ msgid "Must wait at least 1 hour to rebroadcast" msgstr "Πρέπει να περιμένετε τουλάχιστον 1 ώρα για την αναμετάδοση" #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:18 -msgid "Auto Schedule Playlist ?" +msgid "Add Autoloading Playlist ?" msgstr "" +#: airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml:14 +msgid "Autoloading playlists' contents are added to shows one hour before the show airs. More information" +msgstr "" + #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:25 msgid "Select Playlist" msgstr "" +#: airtime_mvc/application/forms/AddShowAutoPlaylist.php:32 +msgid "Repeat Playlist Until Show is Full ?" +msgstr "" + #: airtime_mvc/application/forms/AddShowLiveStream.php:11 #, php-format msgid "Use %s Authentication:" @@ -4940,7 +4948,7 @@ msgid "What" msgstr "Τι" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:14 -msgid "Automatic Playlist" +msgid "Autoloading Playlist" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:18 diff --git a/airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po b/airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po index 5bdc0bcbd..329447ab9 100644 --- a/airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po @@ -2538,13 +2538,21 @@ msgid "Must wait at least 1 hour to rebroadcast" msgstr "Must wait at least 1 hour to rebroadcast" #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:18 -msgid "Auto Schedule Playlist ?" +msgid "Add Autoloading Playlist ?" msgstr "" +#: airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml:14 +msgid "Autoloading playlists' contents are added to shows one hour before the show airs. More information" +msgstr "" + #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:25 msgid "Select Playlist" msgstr "" +#: airtime_mvc/application/forms/AddShowAutoPlaylist.php:32 +msgid "Repeat Playlist Until Show is Full ?" +msgstr "" + #: airtime_mvc/application/forms/AddShowLiveStream.php:11 #, php-format msgid "Use %s Authentication:" @@ -4940,7 +4948,7 @@ msgid "What" msgstr "What" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:14 -msgid "Automatic Playlist" +msgid "Autoloading Playlist" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:18 diff --git a/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po b/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po index d8b37ba78..4d83b2e2d 100644 --- a/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po @@ -2539,13 +2539,21 @@ msgid "Must wait at least 1 hour to rebroadcast" msgstr "Must wait at least 1 hour to rebroadcast" #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:18 -msgid "Auto Schedule Playlist ?" +msgid "Add Autoloading Playlist ?" msgstr "" +#: airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml:14 +msgid "Autoloading playlists' contents are added to shows one hour before the show airs. More information" +msgstr "" + #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:25 msgid "Select Playlist" msgstr "" +#: airtime_mvc/application/forms/AddShowAutoPlaylist.php:32 +msgid "Repeat Playlist Until Show is Full ?" +msgstr "" + #: airtime_mvc/application/forms/AddShowLiveStream.php:11 #, php-format msgid "Use %s Authentication:" @@ -4944,7 +4952,7 @@ msgid "What" msgstr "What" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:14 -msgid "Automatic Playlist" +msgid "Autoloading Playlist" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:18 diff --git a/airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po b/airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po index e3e8b1933..8477016d5 100644 --- a/airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po @@ -2538,13 +2538,21 @@ msgid "Must wait at least 1 hour to rebroadcast" msgstr "Must wait at least 1 hour to rebroadcast" #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:18 -msgid "Auto Schedule Playlist ?" +msgid "Add Autoloading Playlist ?" msgstr "" +#: airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml:14 +msgid "Autoloading playlists' contents are added to shows one hour before the show airs. More information" +msgstr "" + #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:25 msgid "Select Playlist" msgstr "" +#: airtime_mvc/application/forms/AddShowAutoPlaylist.php:32 +msgid "Repeat Playlist Until Show is Full ?" +msgstr "" + #: airtime_mvc/application/forms/AddShowLiveStream.php:11 #, php-format msgid "Use %s Authentication:" @@ -4940,7 +4948,7 @@ msgid "What" msgstr "What" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:14 -msgid "Automatic Playlist" +msgid "Autoloading Playlist" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:18 diff --git a/airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.mo index b7826b4af..05dba596f 100644 Binary files a/airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.mo differ diff --git a/airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po b/airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po index eb1740dc8..4a0f091a8 100644 --- a/airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po @@ -2548,13 +2548,21 @@ msgid "Must wait at least 1 hour to rebroadcast" msgstr "Debes esperar al menos 1 hora para reprogramar" #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:18 -msgid "Auto Schedule Playlist ?" -msgstr "¿Auto Programar Lista?" +msgid "Add Autoloading Playlist ?" +msgstr "¿Programar Lista Auto-Cargada?" + +#: airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml:14 +msgid "Autoloading playlists' contents are added to shows one hour before the show airs. More information" +msgstr "Se le agrega los contenidos de las listas auto-cargadas a programas una hora antes de que suenen. Mas información" #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:25 msgid "Select Playlist" msgstr "Seleccionar Lista" +#: airtime_mvc/application/forms/AddShowAutoPlaylist.php:32 +msgid "Repeat Playlist Until Show is Full ?" +msgstr "Repitir lista hasta que termine el programa?" + #: airtime_mvc/application/forms/AddShowLiveStream.php:11 #, php-format msgid "Use %s Authentication:" @@ -4966,8 +4974,8 @@ msgid "What" msgstr "Qué" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:14 -msgid "Automatic Playlist" -msgstr "Lista de reproducción automática" +msgid "Autoloading Playlist" +msgstr "Lista Auto-Cargada" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:18 msgid "When" diff --git a/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po b/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po index 0d991a8ca..f29caed5d 100644 --- a/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po @@ -2538,13 +2538,21 @@ msgid "Must wait at least 1 hour to rebroadcast" msgstr "Vous devez attendre au moins 1 heure pour retransmettre" #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:18 -msgid "Auto Schedule Playlist ?" +msgid "Add Autoloading Playlist ?" msgstr "" +#: airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml:14 +msgid "Autoloading playlists' contents are added to shows one hour before the show airs. More information" +msgstr "" + #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:25 msgid "Select Playlist" msgstr "" +#: airtime_mvc/application/forms/AddShowAutoPlaylist.php:32 +msgid "Repeat Playlist Until Show is Full ?" +msgstr "" + #: airtime_mvc/application/forms/AddShowLiveStream.php:11 #, php-format msgid "Use %s Authentication:" @@ -4940,7 +4948,7 @@ msgid "What" msgstr "Quoi" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:14 -msgid "Automatic Playlist" +msgid "Autoloading Playlist" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:18 diff --git a/airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po b/airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po index 7243ae784..0d89c8418 100644 --- a/airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po @@ -2537,13 +2537,21 @@ msgid "Must wait at least 1 hour to rebroadcast" msgstr "Moraš čekati najmanje 1 sat za re-emitiranje" #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:18 -msgid "Auto Schedule Playlist ?" +msgid "Add Autoloading Playlist ?" msgstr "" +#: airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml:14 +msgid "Autoloading playlists' contents are added to shows one hour before the show airs. More information" +msgstr "" + #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:25 msgid "Select Playlist" msgstr "" +#: airtime_mvc/application/forms/AddShowAutoPlaylist.php:32 +msgid "Repeat Playlist Until Show is Full ?" +msgstr "" + #: airtime_mvc/application/forms/AddShowLiveStream.php:11 #, php-format msgid "Use %s Authentication:" @@ -4939,7 +4947,7 @@ msgid "What" msgstr "Što" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:14 -msgid "Automatic Playlist" +msgid "Autoloading Playlist" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:18 diff --git a/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po b/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po index 5d20ca65d..6f1a6fe02 100644 --- a/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po @@ -2700,13 +2700,21 @@ msgid "Must wait at least 1 hour to rebroadcast" msgstr "Az újraközvetítésre legalább 1 órát kell várni" #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:18 -msgid "Auto Schedule Playlist ?" +msgid "Add Autoloading Playlist ?" msgstr "Lejátszási lista automatikus ütemezése?" +#: airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml:14 +msgid "Autoloading playlists' contents are added to shows one hour before the show airs. More information" +msgstr "" + #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:25 msgid "Select Playlist" msgstr "Lejátszási lista kiválasztása" +#: airtime_mvc/application/forms/AddShowAutoPlaylist.php:32 +msgid "Repeat Playlist Until Show is Full ?" +msgstr "" + #: airtime_mvc/application/forms/AddShowLiveStream.php:11 #, php-format msgid "Use %s Authentication:" @@ -5267,7 +5275,7 @@ msgid "What" msgstr "Mi" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:14 -msgid "Automatic Playlist" +msgid "Autoloading Playlist" msgstr "Automatikus lejátszási lista" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:18 diff --git a/airtime_mvc/locale/hy/LC_MESSAGES/airtime.po b/airtime_mvc/locale/hy/LC_MESSAGES/airtime.po index b9dfbf502..1c246b1a1 100644 --- a/airtime_mvc/locale/hy/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/hy/LC_MESSAGES/airtime.po @@ -2531,13 +2531,21 @@ msgid "Must wait at least 1 hour to rebroadcast" msgstr "" #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:18 -msgid "Auto Schedule Playlist ?" +msgid "Add Autoloading Playlist ?" msgstr "" +#: airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml:14 +msgid "Autoloading playlists' contents are added to shows one hour before the show airs. More information" +msgstr "" + #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:25 msgid "Select Playlist" msgstr "" +#: airtime_mvc/application/forms/AddShowAutoPlaylist.php:32 +msgid "Repeat Playlist Until Show is Full ?" +msgstr "" + #: airtime_mvc/application/forms/AddShowLiveStream.php:11 #, php-format msgid "Use %s Authentication:" @@ -4931,7 +4939,7 @@ msgid "What" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:14 -msgid "Automatic Playlist" +msgid "Autoloading Playlist" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:18 diff --git a/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.po b/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.po index 3842bcdcb..25bbe9f2d 100644 --- a/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.po @@ -2534,13 +2534,21 @@ msgid "Must wait at least 1 hour to rebroadcast" msgstr "" #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:18 -msgid "Auto Schedule Playlist ?" +msgid "Add Autoloading Playlist ?" msgstr "" +#: airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml:14 +msgid "Autoloading playlists' contents are added to shows one hour before the show airs. More information" +msgstr "" + #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:25 msgid "Select Playlist" msgstr "" +#: airtime_mvc/application/forms/AddShowAutoPlaylist.php:32 +msgid "Repeat Playlist Until Show is Full ?" +msgstr "" + #: airtime_mvc/application/forms/AddShowLiveStream.php:11 #, php-format msgid "Use %s Authentication:" @@ -4934,7 +4942,7 @@ msgid "What" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:14 -msgid "Automatic Playlist" +msgid "Autoloading Playlist" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:18 diff --git a/airtime_mvc/locale/id_ID/LC_MESSAGES/airtime.po b/airtime_mvc/locale/id_ID/LC_MESSAGES/airtime.po index d865d0252..1c7de0a44 100644 --- a/airtime_mvc/locale/id_ID/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/id_ID/LC_MESSAGES/airtime.po @@ -2534,13 +2534,21 @@ msgid "Must wait at least 1 hour to rebroadcast" msgstr "" #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:18 -msgid "Auto Schedule Playlist ?" +msgid "Add Autoloading Playlist ?" msgstr "" +#: airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml:14 +msgid "Autoloading playlists' contents are added to shows one hour before the show airs. More information" +msgstr "" + #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:25 msgid "Select Playlist" msgstr "" +#: airtime_mvc/application/forms/AddShowAutoPlaylist.php:32 +msgid "Repeat Playlist Until Show is Full ?" +msgstr "" + #: airtime_mvc/application/forms/AddShowLiveStream.php:11 #, php-format msgid "Use %s Authentication:" @@ -4934,7 +4942,7 @@ msgid "What" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:14 -msgid "Automatic Playlist" +msgid "Autoloading Playlist" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:18 diff --git a/airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.po b/airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.po index 7324b1b19..3982903d0 100644 --- a/airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.po @@ -2539,13 +2539,21 @@ msgid "Must wait at least 1 hour to rebroadcast" msgstr "Aspettare almeno un'ora prima di ritrasmettere" #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:18 -msgid "Auto Schedule Playlist ?" +msgid "Add Autoloading Playlist ?" msgstr "" +#: airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml:14 +msgid "Autoloading playlists' contents are added to shows one hour before the show airs. More information" +msgstr "" + #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:25 msgid "Select Playlist" msgstr "" +#: airtime_mvc/application/forms/AddShowAutoPlaylist.php:32 +msgid "Repeat Playlist Until Show is Full ?" +msgstr "" + #: airtime_mvc/application/forms/AddShowLiveStream.php:11 #, php-format msgid "Use %s Authentication:" @@ -4941,7 +4949,7 @@ msgid "What" msgstr "Cosa" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:14 -msgid "Automatic Playlist" +msgid "Autoloading Playlist" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:18 diff --git a/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po b/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po index 5273a215d..ee02e1e92 100644 --- a/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po @@ -2537,13 +2537,21 @@ msgid "Must wait at least 1 hour to rebroadcast" msgstr "再配信するには、1時間以上待たなければなりません" #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:18 -msgid "Auto Schedule Playlist ?" +msgid "Add Autoloading Playlist ?" msgstr "" +#: airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml:14 +msgid "Autoloading playlists' contents are added to shows one hour before the show airs. More information" +msgstr "" + #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:25 msgid "Select Playlist" msgstr "" +#: airtime_mvc/application/forms/AddShowAutoPlaylist.php:32 +msgid "Repeat Playlist Until Show is Full ?" +msgstr "" + #: airtime_mvc/application/forms/AddShowLiveStream.php:11 #, php-format msgid "Use %s Authentication:" @@ -4939,7 +4947,7 @@ msgid "What" msgstr "番組内容" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:14 -msgid "Automatic Playlist" +msgid "Autoloading Playlist" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:18 diff --git a/airtime_mvc/locale/ja_JP/LC_MESSAGES/airtime.po b/airtime_mvc/locale/ja_JP/LC_MESSAGES/airtime.po index 4acc92078..6d7e963d3 100644 --- a/airtime_mvc/locale/ja_JP/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/ja_JP/LC_MESSAGES/airtime.po @@ -2532,13 +2532,21 @@ msgid "Must wait at least 1 hour to rebroadcast" msgstr "" #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:18 -msgid "Auto Schedule Playlist ?" +msgid "Add Autoloading Playlist ?" msgstr "" +#: airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml:14 +msgid "Autoloading playlists' contents are added to shows one hour before the show airs. More information" +msgstr "" + #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:25 msgid "Select Playlist" msgstr "" +#: airtime_mvc/application/forms/AddShowAutoPlaylist.php:32 +msgid "Repeat Playlist Until Show is Full ?" +msgstr "" + #: airtime_mvc/application/forms/AddShowLiveStream.php:11 #, php-format msgid "Use %s Authentication:" @@ -4932,7 +4940,7 @@ msgid "What" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:14 -msgid "Automatic Playlist" +msgid "Autoloading Playlist" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:18 diff --git a/airtime_mvc/locale/ka/LC_MESSAGES/airtime.po b/airtime_mvc/locale/ka/LC_MESSAGES/airtime.po index bdbeb0f5c..b8de4d740 100644 --- a/airtime_mvc/locale/ka/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/ka/LC_MESSAGES/airtime.po @@ -2534,13 +2534,21 @@ msgid "Must wait at least 1 hour to rebroadcast" msgstr "" #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:18 -msgid "Auto Schedule Playlist ?" +msgid "Add Autoloading Playlist ?" msgstr "" +#: airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml:14 +msgid "Autoloading playlists' contents are added to shows one hour before the show airs. More information" +msgstr "" + #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:25 msgid "Select Playlist" msgstr "" +#: airtime_mvc/application/forms/AddShowAutoPlaylist.php:32 +msgid "Repeat Playlist Until Show is Full ?" +msgstr "" + #: airtime_mvc/application/forms/AddShowLiveStream.php:11 #, php-format msgid "Use %s Authentication:" @@ -4934,7 +4942,7 @@ msgid "What" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:14 -msgid "Automatic Playlist" +msgid "Autoloading Playlist" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:18 diff --git a/airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po b/airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po index f410f5ec3..d033f559d 100644 --- a/airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po @@ -2535,13 +2535,21 @@ msgid "Must wait at least 1 hour to rebroadcast" msgstr "재방송 설정까지 1시간 기간이 필요합니다" #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:18 -msgid "Auto Schedule Playlist ?" +msgid "Add Autoloading Playlist ?" msgstr "" +#: airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml:14 +msgid "Autoloading playlists' contents are added to shows one hour before the show airs. More information" +msgstr "" + #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:25 msgid "Select Playlist" msgstr "" +#: airtime_mvc/application/forms/AddShowAutoPlaylist.php:32 +msgid "Repeat Playlist Until Show is Full ?" +msgstr "" + #: airtime_mvc/application/forms/AddShowLiveStream.php:11 #, php-format msgid "Use %s Authentication:" @@ -4937,7 +4945,7 @@ msgid "What" msgstr "무엇" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:14 -msgid "Automatic Playlist" +msgid "Autoloading Playlist" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:18 diff --git a/airtime_mvc/locale/lt/LC_MESSAGES/airtime.po b/airtime_mvc/locale/lt/LC_MESSAGES/airtime.po index 72edc401a..f50e162b4 100644 --- a/airtime_mvc/locale/lt/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/lt/LC_MESSAGES/airtime.po @@ -2535,13 +2535,21 @@ msgid "Must wait at least 1 hour to rebroadcast" msgstr "" #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:18 -msgid "Auto Schedule Playlist ?" +msgid "Add Autoloading Playlist ?" msgstr "" +#: airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml:14 +msgid "Autoloading playlists' contents are added to shows one hour before the show airs. More information" +msgstr "" + #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:25 msgid "Select Playlist" msgstr "" +#: airtime_mvc/application/forms/AddShowAutoPlaylist.php:32 +msgid "Repeat Playlist Until Show is Full ?" +msgstr "" + #: airtime_mvc/application/forms/AddShowLiveStream.php:11 #, php-format msgid "Use %s Authentication:" @@ -4935,7 +4943,7 @@ msgid "What" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:14 -msgid "Automatic Playlist" +msgid "Autoloading Playlist" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:18 diff --git a/airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po b/airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po index 4e019d0b1..55fb4d204 100644 --- a/airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po @@ -2541,13 +2541,21 @@ msgid "Must wait at least 1 hour to rebroadcast" msgstr "Ten minste 1 uur opnieuw uitzenden moet wachten" #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:18 -msgid "Auto Schedule Playlist ?" +msgid "Add Autoloading Playlist ?" msgstr "" +#: airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml:14 +msgid "Autoloading playlists' contents are added to shows one hour before the show airs. More information" +msgstr "" + #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:25 msgid "Select Playlist" msgstr "" +#: airtime_mvc/application/forms/AddShowAutoPlaylist.php:32 +msgid "Repeat Playlist Until Show is Full ?" +msgstr "" + #: airtime_mvc/application/forms/AddShowLiveStream.php:11 #, php-format msgid "Use %s Authentication:" @@ -4943,7 +4951,7 @@ msgid "What" msgstr "Wat" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:14 -msgid "Automatic Playlist" +msgid "Autoloading Playlist" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:18 diff --git a/airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po b/airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po index 372719152..da8f49d83 100644 --- a/airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po @@ -2538,13 +2538,21 @@ msgid "Must wait at least 1 hour to rebroadcast" msgstr "Należy odczekać przynajmniej 1 godzinę przed ponownym odtworzeniem" #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:18 -msgid "Auto Schedule Playlist ?" +msgid "Add Autoloading Playlist ?" msgstr "" +#: airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml:14 +msgid "Autoloading playlists' contents are added to shows one hour before the show airs. More information" +msgstr "" + #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:25 msgid "Select Playlist" msgstr "" +#: airtime_mvc/application/forms/AddShowAutoPlaylist.php:32 +msgid "Repeat Playlist Until Show is Full ?" +msgstr "" + #: airtime_mvc/application/forms/AddShowLiveStream.php:11 #, php-format msgid "Use %s Authentication:" @@ -4940,7 +4948,7 @@ msgid "What" msgstr "Co" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:14 -msgid "Automatic Playlist" +msgid "Autoloading Playlist" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:18 diff --git a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po index fc7548259..bef98e329 100644 --- a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po @@ -2539,13 +2539,21 @@ msgid "Must wait at least 1 hour to rebroadcast" msgstr "É preciso aguardar uma hora para retransmitir" #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:18 -msgid "Auto Schedule Playlist ?" +msgid "Add Autoloading Playlist ?" msgstr "" +#: airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml:14 +msgid "Autoloading playlists' contents are added to shows one hour before the show airs. More information" +msgstr "" + #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:25 msgid "Select Playlist" msgstr "" +#: airtime_mvc/application/forms/AddShowAutoPlaylist.php:32 +msgid "Repeat Playlist Until Show is Full ?" +msgstr "" + #: airtime_mvc/application/forms/AddShowLiveStream.php:11 #, php-format msgid "Use %s Authentication:" @@ -4941,7 +4949,7 @@ msgid "What" msgstr "O que" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:14 -msgid "Automatic Playlist" +msgid "Autoloading Playlist" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:18 diff --git a/airtime_mvc/locale/ro_RO/LC_MESSAGES/airtime.po b/airtime_mvc/locale/ro_RO/LC_MESSAGES/airtime.po index 9747b18b6..52492e749 100644 --- a/airtime_mvc/locale/ro_RO/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/ro_RO/LC_MESSAGES/airtime.po @@ -2534,13 +2534,21 @@ msgid "Must wait at least 1 hour to rebroadcast" msgstr "" #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:18 -msgid "Auto Schedule Playlist ?" +msgid "Add Autoloading Playlist ?" msgstr "" +#: airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml:14 +msgid "Autoloading playlists' contents are added to shows one hour before the show airs. More information" +msgstr "" + #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:25 msgid "Select Playlist" msgstr "" +#: airtime_mvc/application/forms/AddShowAutoPlaylist.php:32 +msgid "Repeat Playlist Until Show is Full ?" +msgstr "" + #: airtime_mvc/application/forms/AddShowLiveStream.php:11 #, php-format msgid "Use %s Authentication:" @@ -4934,7 +4942,7 @@ msgid "What" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:14 -msgid "Automatic Playlist" +msgid "Autoloading Playlist" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:18 diff --git a/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po b/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po index 62a35c89c..98d34e14a 100644 --- a/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po @@ -2554,13 +2554,21 @@ msgid "Must wait at least 1 hour to rebroadcast" msgstr "1 час нужно подождать до ретрансляции" #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:18 -msgid "Auto Schedule Playlist ?" +msgid "Add Autoloading Playlist ?" msgstr "" +#: airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml:14 +msgid "Autoloading playlists' contents are added to shows one hour before the show airs. More information" +msgstr "" + #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:25 msgid "Select Playlist" msgstr "Выбрать плейлист" +#: airtime_mvc/application/forms/AddShowAutoPlaylist.php:32 +msgid "Repeat Playlist Until Show is Full ?" +msgstr "" + #: airtime_mvc/application/forms/AddShowLiveStream.php:11 #, php-format msgid "Use %s Authentication:" @@ -4982,7 +4990,7 @@ msgid "What" msgstr "Что" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:14 -msgid "Automatic Playlist" +msgid "Autoloading Playlist" msgstr "Автоматический Плейлист" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:18 diff --git a/airtime_mvc/locale/si/LC_MESSAGES/airtime.po b/airtime_mvc/locale/si/LC_MESSAGES/airtime.po index b67d4a665..d5d98b2b2 100644 --- a/airtime_mvc/locale/si/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/si/LC_MESSAGES/airtime.po @@ -2534,13 +2534,21 @@ msgid "Must wait at least 1 hour to rebroadcast" msgstr "" #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:18 -msgid "Auto Schedule Playlist ?" +msgid "Add Autoloading Playlist ?" msgstr "" +#: airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml:14 +msgid "Autoloading playlists' contents are added to shows one hour before the show airs. More information" +msgstr "" + #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:25 msgid "Select Playlist" msgstr "" +#: airtime_mvc/application/forms/AddShowAutoPlaylist.php:32 +msgid "Repeat Playlist Until Show is Full ?" +msgstr "" + #: airtime_mvc/application/forms/AddShowLiveStream.php:11 #, php-format msgid "Use %s Authentication:" @@ -4934,7 +4942,7 @@ msgid "What" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:14 -msgid "Automatic Playlist" +msgid "Autoloading Playlist" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:18 diff --git a/airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po b/airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po index 541f5a6e8..3d217c6f7 100644 --- a/airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po @@ -2537,13 +2537,21 @@ msgid "Must wait at least 1 hour to rebroadcast" msgstr "Мораш да чекаш најмање 1 сат за ре-емитовање" #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:18 -msgid "Auto Schedule Playlist ?" +msgid "Add Autoloading Playlist ?" msgstr "" +#: airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml:14 +msgid "Autoloading playlists' contents are added to shows one hour before the show airs. More information" +msgstr "" + #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:25 msgid "Select Playlist" msgstr "" +#: airtime_mvc/application/forms/AddShowAutoPlaylist.php:32 +msgid "Repeat Playlist Until Show is Full ?" +msgstr "" + #: airtime_mvc/application/forms/AddShowLiveStream.php:11 #, php-format msgid "Use %s Authentication:" @@ -4939,7 +4947,7 @@ msgid "What" msgstr "Шта" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:14 -msgid "Automatic Playlist" +msgid "Autoloading Playlist" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:18 diff --git a/airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po b/airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po index 3f4dcb2e7..cececa3e4 100644 --- a/airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po @@ -2537,13 +2537,21 @@ msgid "Must wait at least 1 hour to rebroadcast" msgstr "Moraš da čekaš najmanje 1 sat za re-emitovanje" #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:18 -msgid "Auto Schedule Playlist ?" +msgid "Add Autoloading Playlist ?" msgstr "" +#: airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml:14 +msgid "Autoloading playlists' contents are added to shows one hour before the show airs. More information" +msgstr "" + #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:25 msgid "Select Playlist" msgstr "" +#: airtime_mvc/application/forms/AddShowAutoPlaylist.php:32 +msgid "Repeat Playlist Until Show is Full ?" +msgstr "" + #: airtime_mvc/application/forms/AddShowLiveStream.php:11 #, php-format msgid "Use %s Authentication:" @@ -4939,7 +4947,7 @@ msgid "What" msgstr "Šta" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:14 -msgid "Automatic Playlist" +msgid "Autoloading Playlist" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:18 diff --git a/airtime_mvc/locale/template/airtime.po b/airtime_mvc/locale/template/airtime.po index a476c9d77..acf00adde 100644 --- a/airtime_mvc/locale/template/airtime.po +++ b/airtime_mvc/locale/template/airtime.po @@ -2534,13 +2534,21 @@ msgid "Must wait at least 1 hour to rebroadcast" msgstr "" #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:18 -msgid "Auto Schedule Playlist ?" +msgid "Add Autoloading Playlist ?" msgstr "" +#: airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml:14 +msgid "Autoloading playlists' contents are added to shows one hour before the show airs. More information" +msgstr "" + #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:25 msgid "Select Playlist" msgstr "" +#: airtime_mvc/application/forms/AddShowAutoPlaylist.php:32 +msgid "Repeat Playlist Until Show is Full ?" +msgstr "" + #: airtime_mvc/application/forms/AddShowLiveStream.php:11 #, php-format msgid "Use %s Authentication:" @@ -4934,7 +4942,7 @@ msgid "What" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:14 -msgid "Automatic Playlist" +msgid "Autoloading Playlist" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:18 diff --git a/airtime_mvc/locale/tr/LC_MESSAGES/airtime.po b/airtime_mvc/locale/tr/LC_MESSAGES/airtime.po index 75aeea172..946f16cb4 100644 --- a/airtime_mvc/locale/tr/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/tr/LC_MESSAGES/airtime.po @@ -2535,13 +2535,21 @@ msgid "Must wait at least 1 hour to rebroadcast" msgstr "Tekrar yayın yapmak için en az bir saat bekleyiniz" #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:18 -msgid "Auto Schedule Playlist ?" +msgid "Add Autoloading Playlist ?" msgstr "" +#: airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml:14 +msgid "Autoloading playlists' contents are added to shows one hour before the show airs. More information" +msgstr "" + #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:25 msgid "Select Playlist" msgstr "" +#: airtime_mvc/application/forms/AddShowAutoPlaylist.php:32 +msgid "Repeat Playlist Until Show is Full ?" +msgstr "" + #: airtime_mvc/application/forms/AddShowLiveStream.php:11 #, php-format msgid "Use %s Authentication:" @@ -4935,7 +4943,7 @@ msgid "What" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:14 -msgid "Automatic Playlist" +msgid "Autoloading Playlist" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:18 diff --git a/airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po b/airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po index dd40ebe43..918c1b86f 100644 --- a/airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po @@ -2537,13 +2537,21 @@ msgid "Must wait at least 1 hour to rebroadcast" msgstr "至少间隔一个小时" #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:18 -msgid "Auto Schedule Playlist ?" +msgid "Add Autoloading Playlist ?" msgstr "" +#: airtime_mvc/application/views/scripts/form/add-show-autoplaylist.phtml:14 +msgid "Autoloading playlists' contents are added to shows one hour before the show airs. More information" +msgstr "" + #: airtime_mvc/application/forms/AddShowAutoPlaylist.php:25 msgid "Select Playlist" msgstr "" +#: airtime_mvc/application/forms/AddShowAutoPlaylist.php:32 +msgid "Repeat Playlist Until Show is Full ?" +msgstr "" + #: airtime_mvc/application/forms/AddShowLiveStream.php:11 #, php-format msgid "Use %s Authentication:" @@ -4939,7 +4947,7 @@ msgid "What" msgstr "名称" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:14 -msgid "Automatic Playlist" +msgid "Autoloading Playlist" msgstr "" #: airtime_mvc/application/views/scripts/schedule/add-show-form.phtml:18 diff --git a/airtime_mvc/public/css/add-show.css b/airtime_mvc/public/css/add-show.css index 772c49007..1928a41ab 100644 --- a/airtime_mvc/public/css/add-show.css +++ b/airtime_mvc/public/css/add-show.css @@ -7,6 +7,11 @@ font-size: 12px; /*width: 25%;*/ width: 310px; + max-height: calc(100vh - 144px); + overflow-y: scroll; +} +.usability_hint:not(.hidden) + .wrapper #schedule-add-show{ + max-height: calc(100vh - 172px); } #schedule-add-show textarea { @@ -85,6 +90,9 @@ label.wrapp-label input[type="checkbox"] { #schedule-add-show fieldset dd input[type="checkbox"] { margin-top: 6px; } +#schedule-show-auto input[type="checkbox"] { + margin-left: 6px; +} #add_show_day_check-element.block-display { margin-bottom: 15px; diff --git a/airtime_mvc/public/css/fullcalendar.css b/airtime_mvc/public/css/fullcalendar.css index e0c991eb5..b6cc9f578 100644 --- a/airtime_mvc/public/css/fullcalendar.css +++ b/airtime_mvc/public/css/fullcalendar.css @@ -314,7 +314,8 @@ a.fc-event { .fc-event-time, .fc-event-title { padding: 0 1px; - } + height: 12px; +} .fc .ui-resizable-handle { /*** TODO: don't use ui-resizable anymore, change class ***/ display: block; diff --git a/airtime_mvc/public/css/images/icon-clock.svg b/airtime_mvc/public/css/images/icon-clock.svg new file mode 100644 index 000000000..dbf371486 --- /dev/null +++ b/airtime_mvc/public/css/images/icon-clock.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index c227fdd43..e895d247a 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -204,14 +204,18 @@ img.logo .airtime_auth_help_icon, .custom_auth_help_icon, .stream_username_help_icon, .playlist_type_help_icon, .repeat_tracks_help_icon, .show_linking_help_icon, .admin_username_help_icon, .stream_type_help_icon, .overflow_tracks_help_icon, -.show_timezone_help_icon{ +.show_timezone_help_icon, .show_autoplaylist_help_icon { cursor: help; position: relative; display:inline-block; zoom:1; width:14px; height:14px; background:url(images/icon_info.png) 0 0 no-repeat; - top:2px; right:7px; left: 3px; + left: 3px; line-height:16px !important; + vertical-align: text-top; +} +.qtip a { + color: white; } /* Clearfix */ @@ -2040,7 +2044,7 @@ span.errors.sp-errors{ margin: 0 0 8px 0; } #schedule-add-show .button-bar.bottom { - margin: 16px 0 0; + margin: 16px 0 8px; } .schedule { text-align:left; @@ -2268,14 +2272,15 @@ span.errors.sp-errors{ height:10px; float:right; margin-left:3px; - margin-top:2px; } .small-icon.linked { background:url(images/icon_link.png) no-repeat 0 0; margin-top: 0px !important; } .small-icon.autoplaylist { - background:url(images/icon_alert_cal_autoplaylist.png) no-repeat 0 0; + background: url(images/icon-clock.svg) black no-repeat center center; + border-radius: 2px; + background-size: contain; } .small-icon.recording { @@ -2888,7 +2893,6 @@ dt.block-display.info-block { text-align:center; letter-spacing:-.3px; text-shadow: rgba(248,248,248,.3) 0 1px 0, rgba(0,0,0,.8) 0 -1px 0; - rgba(51,51,51,.9) } .error-content p { color: #acacac; diff --git a/airtime_mvc/public/js/airtime/schedule/add-show.js b/airtime_mvc/public/js/airtime/schedule/add-show.js index 130c684a8..4d9a8417b 100644 --- a/airtime_mvc/public/js/airtime/schedule/add-show.js +++ b/airtime_mvc/public/js/airtime/schedule/add-show.js @@ -310,17 +310,6 @@ function setAddShowEvents(form) { $(this).blur(); form.find("#add_show_playlist_dropdown").toggle(); form.find("#add_show_autoplaylist_repeat").toggle(); - - var checkBoxSelected = false; - - //must switch rebroadcast displays - if(form.find("#add_show_has_autoplaylist").attr('checked')) { - form.find("#add_show_playlist_dropdown").show(); - form.find("#add_show_autoplaylist_repeat").show(); - } - else { - form.find("#add_show_playlist_downdown").hide(); - } }); form.find("#add_show_repeats").click(function(){ @@ -491,6 +480,27 @@ function setAddShowEvents(form) { at: "right center" } }); + + form.find(".show_autoplaylist_help_icon").qtip({ + content: { + text: $.i18n._("Autoloading playlists' contents are added to shows one hour before the show airs. More information") + }, + 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: { diff --git a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js index 2cc74acbd..ad20162e0 100644 --- a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js +++ b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js @@ -5,10 +5,10 @@ */ function scheduleRefetchEvents(json) { - if(json.show_error == true){ + if (json.show_error == true) { alert($.i18n._("The show instance doesn't exist anymore!")); } - if(json.show_id) { + if (json.show_id) { var dialog_id = parseInt($("#add_show_id").val(), 10); //if you've deleted the show you are currently editing, close the add show dialog. @@ -16,10 +16,10 @@ function scheduleRefetchEvents(json) { $("#add-show-close").click(); } } - $("#schedule_calendar").fullCalendar( 'refetchEvents' ); + $("#schedule_calendar").fullCalendar('refetchEvents'); } -function makeTimeStamp(date){ +function makeTimeStamp(date) { var sy, sm, sd, h, m, s, timestamp; sy = date.getFullYear(); sm = date.getMonth() + 1; @@ -28,19 +28,19 @@ function makeTimeStamp(date){ m = date.getMinutes(); s = date.getSeconds(); - timestamp = sy+"-"+ pad(sm, 2) +"-"+ pad(sd, 2) +" "+ pad(h, 2) +":"+ pad(m, 2) +":"+ pad(s, 2); + timestamp = sy + "-" + pad(sm, 2) + "-" + pad(sd, 2) + " " + pad(h, 2) + ":" + pad(m, 2) + ":" + pad(s, 2); return timestamp; } -function dayClick(date, allDay, jsEvent, view){ +function dayClick(date, allDay, jsEvent, view) { // The show from will be preloaded if the user is admin or program manager. // Hence, if the user if DJ then it won't open anything. - if(userType == "S" || userType == "A" || userType == "P"){ + if (userType == "S" || userType == "A" || userType == "P") { var now, today, selected, chosenDate, chosenTime; now = adjustDateToServerDate(new Date(), serverTimezoneOffset); - if(view.name === "month") { + if (view.name === "month") { today = new Date(now.getFullYear(), now.getMonth(), now.getDate()); selected = new Date(date.getFullYear(), date.getMonth(), date.getDate()); } @@ -49,12 +49,12 @@ function dayClick(date, allDay, jsEvent, view){ selected = new Date(date.getFullYear(), date.getMonth(), date.getDate(), date.getHours(), date.getMinutes()); } - if(selected >= today) { + if (selected >= today) { var addShow = $('.add-button'); //remove the +show button if it exists. - if(addShow.length == 1){ - var span = $(addShow).parent(); + if (addShow.length == 1) { + var span = $(addShow).parent(); $(span).next().remove(); $(span).remove(); @@ -65,10 +65,10 @@ function dayClick(date, allDay, jsEvent, view){ var duration_info = duration_string.split(" "); var duration_h = 0; var duration_m = 0; - if(duration_info[0] != null){ + if (duration_info[0] != null) { duration_h = parseInt(duration_info[0], 10); } - if(duration_info[1] != null){ + if (duration_info[1] != null) { duration_m = parseInt(duration_info[1], 10); } // duration in milisec @@ -77,28 +77,28 @@ function dayClick(date, allDay, jsEvent, view){ var startTime_string; var startTime = 0; // get start time value on the form - if(view.name === "month") { + if (view.name === "month") { startTime_string = $("#add_show_start_time").val(); var startTime_info = startTime_string.split(':'); if (startTime_info.length == 2) { - var start_time_temp = (parseInt(startTime_info[0],10) * 60 * 60 * 1000) + var start_time_temp = (parseInt(startTime_info[0], 10) * 60 * 60 * 1000) + (parseInt(startTime_info[1], 10) * 60 * 1000); if (!isNaN(start_time_temp)) { startTime = start_time_temp; } } - }else{ + } else { // if in day or week view, selected has all the time info as well // so we don't ahve to calculate it explicitly - startTime_string = pad(selected.getHours(),2)+":"+pad(selected.getMinutes(),2) + startTime_string = pad(selected.getHours(), 2) + ":" + pad(selected.getMinutes(), 2) startTime = 0 } // calculate endDateTime var endDateTime = new Date(selected.getTime() + startTime + duration); - chosenDate = selected.getFullYear() + '-' + pad(selected.getMonth()+1,2) + '-' + pad(selected.getDate(),2); - var endDateFormat = endDateTime.getFullYear() + '-' + pad(endDateTime.getMonth()+1,2) + '-' + pad(endDateTime.getDate(),2); + chosenDate = selected.getFullYear() + '-' + pad(selected.getMonth() + 1, 2) + '-' + pad(selected.getDate(), 2); + var endDateFormat = endDateTime.getFullYear() + '-' + pad(endDateTime.getMonth() + 1, 2) + '-' + pad(endDateTime.getDate(), 2); //TODO: This should all be refactored into a proper initialize() function for the show form. @@ -108,8 +108,8 @@ function dayClick(date, allDay, jsEvent, view){ $("#add_show_start_date").val(chosenDate); $("#add_show_end_date_no_repeat").val(endDateFormat); $("#add_show_end_date").val(endDateFormat); - if(view.name !== "month") { - var endTimeString = pad(endDateTime.getHours(),2)+":"+pad(endDateTime.getMinutes(),2); + if (view.name !== "month") { + var endTimeString = pad(endDateTime.getHours(), 2) + ":" + pad(endDateTime.getMinutes(), 2); $("#add_show_start_time").val(startTime_string) $("#add_show_end_time").val(endTimeString) } @@ -123,21 +123,21 @@ function dayClick(date, allDay, jsEvent, view){ } } -function viewDisplay( view ) { +function viewDisplay(view) { view_name = view.name; - - if(view.name === 'agendaDay' || view.name === 'agendaWeek') { + + if (view.name === 'agendaDay' || view.name === 'agendaWeek') { var calendarEl = this; var select = $('') - .val(item.value || "").appendTo($label); - break; - - case 'textarea': - $input = $('') - .val(item.value || "").appendTo($label); - - if (item.height) { - $input.height(item.height); - } - break; - - case 'checkbox': - $input = $('') - .val(item.value || "").prop("checked", !!item.selected).prependTo($label); - break; - - case 'radio': - $input = $('') - .val(item.value || "").prop("checked", !!item.selected).prependTo($label); - break; - - case 'select': - $input = $(' - if (item.type && item.type != 'sub' && item.type != 'html') { - $input - .on('focus', handle.focusInput) - .on('blur', handle.blurInput); - - if (item.events) { - $input.on(item.events); - } - } - - // add icons - if (item.icon) { - $t.addClass("icon icon-" + item.icon); - } - } - - // cache contained elements - item.$input = $input; - item.$label = $label; - - // attach item to menu - $t.appendTo(opt.$menu); - - // Disable text selection - if (!opt.hasTypes) { - if($.browser.msie) { - $t.on('selectstart.disableTextSelect', handle.abortevent); - } else if(!$.browser.mozilla) { - $t.on('mousedown.disableTextSelect', handle.abortevent); - } - } - }); - // attach contextMenu to (to bypass any possible overflow:hidden issues on parents of the trigger element) - if (!opt.$node) { - opt.$menu.css('display', 'none').addClass('context-menu-root'); - } - opt.$menu.appendTo(opt.appendTo || document.body); - }, - update: function(opt, root) { - var $this = this; - if (root === undefined) { - root = opt; - // determine widths of submenus, as CSS won't grow them automatically - // position:absolute > position:absolute; min-width:100; max-width:200; results in width: 100; - // kinda sucks hard... - opt.$menu.find('ul').andSelf().css({position: 'static', display: 'block'}).each(function(){ - var $this = $(this); - $this.width($this.css('position', 'absolute').width()) - .css('position', 'static'); - }).css({position: '', display: ''}); - } - // re-check disabled for each item - opt.$menu.children().each(function(){ - var $item = $(this), - key = $item.data('contextMenuKey'), - item = opt.items[key], - disabled = ($.isFunction(item.disabled) && item.disabled.call($this, key, root)) || item.disabled === true; - - // dis- / enable item - $item[disabled ? 'addClass' : 'removeClass']('disabled'); - - if (item.type) { - // dis- / enable input elements - $item.find('input, select, textarea').prop('disabled', disabled); - - // update input states - switch (item.type) { - case 'text': - case 'textarea': - item.$input.val(item.value || ""); - break; - - case 'checkbox': - case 'radio': - item.$input.val(item.value || "").prop('checked', !!item.selected); - break; - - case 'select': - item.$input.val(item.selected || ""); - break; - } - } - - if (item.$menu) { - // update sub-menu - op.update.call($this, item, root); - } - }); - }, - layer: function(opt, zIndex) { - // add transparent layer for click area - // filter and background for Internet Explorer, Issue #23 - return opt.$layer = $('
') - .css({height: $win.height(), width: $win.width(), display: 'block'}) - .data('contextMenuRoot', opt) - .insertBefore(this) - .on('mousedown', handle.layerClick); - } - }; - -// split accesskey according to http://www.whatwg.org/specs/web-apps/current-work/multipage/editing.html#assigned-access-key -function splitAccesskey(val) { - var t = val.split(/\s+/), - keys = []; - - for (var i=0, k; k = t[i]; i++) { - k = k[0].toUpperCase(); // first character only - // theoretically non-accessible characters should be ignored, but different systems, different keyboard layouts, ... screw it. - // a map to look up already used access keys would be nice - keys.push(k); - } - - return keys; -} - -// handle contextMenu triggers -$.fn.contextMenu = function(operation) { - if (operation === undefined) { - this.first().trigger('contextmenu'); - } else if (operation.x && operation.y) { - this.first().trigger(jQuery.Event("contextmenu", {pageX: operation.x, pageY: operation.y})); - } else if (operation === "hide") { - var $menu = this.data('contextMenu').$menu; - $menu && $menu.trigger('contextmenu:hide'); - } else if (operation) { - this.removeClass('context-menu-disabled'); - } else if (!operation) { - this.addClass('context-menu-disabled'); - } - - return this; -}; - -// manage contextMenu instances -$.contextMenu = function(operation, options) { - if (typeof operation != 'string') { - options = operation; - operation = 'create'; - } - - if (typeof options == 'string') { - options = {selector: options}; - } else if (options === undefined) { - options = {}; - } - - // merge with default options - var o = $.extend(true, {}, defaults, options || {}), - $body = $body = $(document); - - switch (operation) { - case 'create': - // no selector no joy - if (!o.selector) { - throw new Error('No selector specified'); - } - // make sure internal classes are not bound to - if (o.selector.match(/.context-menu-(list|item|input)($|\s)/)) { - throw new Error('Cannot bind to selector "' + o.selector + '" as it contains a reserved className'); - } - if (!o.build && (!o.items || $.isEmptyObject(o.items))) { - throw new Error('No Items sepcified'); - } - counter ++; - o.ns = '.contextMenu' + counter; - namespaces[o.selector] = o.ns; - menus[o.ns] = o; - - if (!initialized) { - // make sure item click is registered first - $body - .on({ - 'contextmenu:hide.contextMenu': handle.hideMenu, - 'prevcommand.contextMenu': handle.prevItem, - 'nextcommand.contextMenu': handle.nextItem, - 'contextmenu.contextMenu': handle.abortevent, - 'mouseenter.contextMenu': handle.menuMouseenter, - 'mouseleave.contextMenu': handle.menuMouseleave - }, '.context-menu-list') - .on('mouseup.contextMenu', '.context-menu-input', handle.inputClick) - .on({ - 'mouseup.contextMenu': handle.itemClick, - 'contextmenu:focus.contextMenu': handle.focusItem, - 'contextmenu:blur.contextMenu': handle.blurItem, - 'contextmenu.contextMenu': handle.abortevent, - 'mouseenter.contextMenu': handle.itemMouseenter, - 'mouseleave.contextMenu': handle.itemMouseleave - }, '.context-menu-item'); - - initialized = true; - } - - // engage native contextmenu event - $body - .on('contextmenu' + o.ns, o.selector, o, handle.contextmenu); - - switch (o.trigger) { - case 'hover': - $body - .on('mouseenter' + o.ns, o.selector, o, handle.mouseenter) - .on('mouseleave' + o.ns, o.selector, o, handle.mouseleave); - break; - - case 'left': - $body.on('click' + o.ns, o.selector, o, handle.click); - break; - /* - default: - // http://www.quirksmode.org/dom/events/contextmenu.html - $body - .on('mousedown' + o.ns, o.selector, o, handle.mousedown) - .on('mouseup' + o.ns, o.selector, o, handle.mouseup); - break; - */ - } - - if (o.trigger != 'hover' && o.ignoreRightClick) { - $body.on('mousedown' + o.ns, o.selector, handle.ignoreRightClick); - } - - // create menu - if (!o.build) { - op.create(o); - } - break; - - case 'destroy': - if (!o.selector) { - $body.off('.contextMenu .contextMenuAutoHide'); - $.each(namespaces, function(key, value) { - $body.off(value); - }); - - namespaces = {}; - menus = {}; - counter = 0; - initialized = false; - - $('.context-menu-list').remove(); - } else if (namespaces[o.selector]) { - try { - if (menus[namespaces[o.selector]].$menu) { - menus[namespaces[o.selector]].$menu.remove(); - } - - delete menus[namespaces[o.selector]]; - } catch(e) { - menus[namespaces[o.selector]] = null; - } - - $body.off(namespaces[o.selector]); - } - break; - - case 'html5': - // if or are not handled by the browser, - // or options was a bool true, - // initialize $.contextMenu for them - if ((!$.support.htmlCommand && !$.support.htmlMenuitem) || (typeof options == "boolean" && options)) { - $('menu[type="context"]').each(function() { - if (this.id) { - $.contextMenu({ - selector: '[contextmenu=' + this.id +']', - items: $.contextMenu.fromMenu(this) - }); - } - }).css('display', 'none'); - } - break; - - default: - throw new Error('Unknown operation "' + operation + '"'); - } - - return this; -}; - -// import values into commands -$.contextMenu.setInputValues = function(opt, data) { - if (data === undefined) { - data = {}; - } - - $.each(opt.inputs, function(key, item) { - switch (item.type) { - case 'text': - case 'textarea': - item.value = data[key] || ""; - break; - - case 'checkbox': - item.selected = data[key] ? true : false; - break; - - case 'radio': - item.selected = (data[item.radio] || "") == item.value ? true : false; - break; - - case 'select': - item.selected = data[key] || ""; - break; - } - }); -}; - -// export values from commands -$.contextMenu.getInputValues = function(opt, data) { - if (data === undefined) { - data = {}; - } - - $.each(opt.inputs, function(key, item) { - switch (item.type) { - case 'text': - case 'textarea': - case 'select': - data[key] = item.$input.val(); - break; - - case 'checkbox': - data[key] = item.$input.prop('checked'); - break; - - case 'radio': - if (item.$input.prop('checked')) { - data[item.radio] = item.value; - } - break; - } - }); - - return data; -}; - -// find