diff --git a/CREDITS b/CREDITS index a78be4701..83b80fcc6 100644 --- a/CREDITS +++ b/CREDITS @@ -2,6 +2,36 @@ CREDITS ======= +Version 2.4.0 +------------- +Martin Konecny (martin.konecny@sourcefabric.org) + Role: Developer Team Lead + +Denise Rigato (denise.rigato@sourcefabric.org) + Role: Software Developer + +Naomi Aro (naomi.aro@sourcefabric.org) + Role: Software Developer + +Cliff Wang (cliff.wang@sourcefabric.org) + Role: QA + +Daniel James (daniel.james@sourcefabric.org) + Role: Documentor & QA + +Localizations: + +Albert (French) +Helmut Müller, Christoph Rombach, Micz Flor, Silvio Mende (German) +Claudia Cruz (Spanish) +Katerina Michailidis (Greek) +Erich Pöttinger (Austrian) +Luba Sirina (Russian) +Luciano De Fazio (Brazilian Portuguese) +Sebastian Matuszewski (Polish) +Staff Pingu (Italian) +Magyar Zsolt (Hungarian) + Version 2.3.0/2.3.1 ------------- Martin Konecny (martin.konecny@sourcefabric.org) diff --git a/airtime_mvc/application/configs/conf.php b/airtime_mvc/application/configs/conf.php index 937b91c75..13b4a06bd 100644 --- a/airtime_mvc/application/configs/conf.php +++ b/airtime_mvc/application/configs/conf.php @@ -26,6 +26,7 @@ class Config { $CC_CONFIG['webServerUser'] = $values['general']['web_server_user']; $CC_CONFIG['rabbitmq'] = $values['rabbitmq']; + $CC_CONFIG['baseDir'] = $values['general']['base_dir']; $CC_CONFIG['baseUrl'] = $values['general']['base_url']; $CC_CONFIG['basePort'] = $values['general']['base_port']; $CC_CONFIG['phpDir'] = $values['general']['airtime_dir']; diff --git a/airtime_mvc/application/forms/SmartBlockCriteria.php b/airtime_mvc/application/forms/SmartBlockCriteria.php index d981fdb49..cd588a215 100644 --- a/airtime_mvc/application/forms/SmartBlockCriteria.php +++ b/airtime_mvc/application/forms/SmartBlockCriteria.php @@ -510,7 +510,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm } } elseif ($column->getType() == PropelColumnTypes::TIMESTAMP) { if (!preg_match("/(\d{4})-(\d{2})-(\d{2})/", $d['sp_criteria_value'])) { - $element->addError(_("The value should be in timestamp format(eg. 0000-00-00 or 00-00-00 00:00:00)")); + $element->addError(_("The value should be in timestamp format (e.g. 0000-00-00 or 0000-00-00 00:00:00)")); $isValid = false; } else { $result = Application_Common_DateHelper::checkDateTimeRangeForSQL($d['sp_criteria_value']); @@ -523,7 +523,7 @@ class Application_Form_SmartBlockCriteria extends Zend_Form_SubForm if (isset($d['sp_criteria_extra'])) { if (!preg_match("/(\d{4})-(\d{2})-(\d{2})/", $d['sp_criteria_extra'])) { - $element->addError(_("The value should be in timestamp format(eg. 0000-00-00 or 00-00-00 00:00:00)")); + $element->addError(_("The value should be in timestamp format (e.g. 0000-00-00 or 0000-00-00 00:00:00)")); $isValid = false; } else { $result = Application_Common_DateHelper::checkDateTimeRangeForSQL($d['sp_criteria_extra']); diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index 9169efaee..74e0a7a05 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -501,44 +501,25 @@ SQL; } /** - * Get the URL to access this file using the server name/address that - * this PHP script was invoked through. + * Get the URL to access this file */ public function getFileUrl() { - $serverName = $_SERVER['SERVER_NAME']; - $serverPort = $_SERVER['SERVER_PORT']; - - return $this->constructGetFileUrl($serverName, $serverPort); - } - - /** - * Get the URL to access this file using the server name/address that - * is specified in the airtime.conf config file. If either of these is - * not specified, then use values provided by the $_SERVER global variable. - */ - public function getFileUrlUsingConfigAddress() - { - $CC_CONFIG = Config::getConfig(); - - if (isset($CC_CONFIG['baseUrl'])) { - $serverName = $CC_CONFIG['baseUrl']; - } else { - $serverName = $_SERVER['SERVER_NAME']; - } - - if (isset($CC_CONFIG['basePort'])) { - $serverPort = $CC_CONFIG['basePort']; - } else { - $serverPort = $_SERVER['SERVER_PORT']; - } - - return $this->constructGetFileUrl($serverName, $serverPort); - } - - private function constructGetFileUrl($p_serverName, $p_serverPort) - { - return "http://$p_serverName:$p_serverPort/api/get-media/file/".$this->getId().".".$this->getFileExtension(); + $CC_CONFIG = Config::getConfig(); + + $protocol = empty($_SERVER['HTTPS']) ? "http" : "https"; + + $serverName = $_SERVER['SERVER_NAME']; + $serverPort = $_SERVER['SERVER_PORT']; + $subDir = $CC_CONFIG['baseDir']; + + if ($subDir[0] === "/") { + $subDir = substr($subDir, 1, strlen($subDir) - 1); + } + + $baseUrl = "{$protocol}://{$serverName}:{$serverPort}/{$subDir}"; + + return $this->getRelativeFileUrl($baseUrl); } /** @@ -547,6 +528,8 @@ SQL; */ public function getRelativeFileUrl($baseUrl) { + Logging::debug("Zend base url: $baseUrl"); + return $baseUrl."api/get-media/file/".$this->getId().".".$this->getFileExtension(); } diff --git a/airtime_mvc/application/views/scripts/library/library.phtml b/airtime_mvc/application/views/scripts/library/library.phtml index 6a57e0c6f..8edf9efa2 100644 --- a/airtime_mvc/application/views/scripts/library/library.phtml +++ b/airtime_mvc/application/views/scripts/library/library.phtml @@ -1,9 +1,16 @@ - +
- + + + +
+
diff --git a/airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.mo index 22d40ca33..0df19471f 100644 Binary files a/airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.mo differ diff --git a/airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po b/airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po index 009da7098..43c19a492 100644 --- a/airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Airtime 2.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-05-21 09:20-0400\n" -"PO-Revision-Date: 2013-05-17 14:43-0500\n" -"Last-Translator: Denise Rigato \n" +"PO-Revision-Date: 2013-05-22 10:43+0100\n" +"Last-Translator: Daniel James \n" "Language-Team: Sourcefabric \n" "Language: cs_CZ\n" "MIME-Version: 1.0\n" @@ -1547,8 +1547,8 @@ msgstr "'Délka' by měla být ve formátu '00:00:00'" #: airtime_mvc/application/forms/SmartBlockCriteria.php:513 #: airtime_mvc/application/forms/SmartBlockCriteria.php:526 -msgid "The value should be in timestamp format(eg. 0000-00-00 or 00-00-00 00:00:00)" -msgstr "Hodnota by měla být v časový formát(např. 0000-00-00 nebo 00-00-00 00:00:00)" +msgid "The value should be in timestamp format (e.g. 0000-00-00 or 0000-00-00 00:00:00)" +msgstr "Hodnota by měla být v časový formát (např. 0000-00-00 nebo 0000-00-00 00:00:00)" #: airtime_mvc/application/forms/SmartBlockCriteria.php:540 msgid "The value has to be numeric" @@ -2200,7 +2200,7 @@ msgstr "Tato cesta není v současné době dostupná." #: airtime_mvc/application/controllers/LocaleController.php:170 #, php-format -msgid "Some steam types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." +msgid "Some stream types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." msgstr "" #: airtime_mvc/application/controllers/LocaleController.php:171 diff --git a/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.mo index e8a37cbd6..1b38ed906 100644 Binary files a/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.mo differ diff --git a/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po b/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po index 6ac4baac6..8e6aa7f66 100644 --- a/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Airtime 2.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-05-21 09:20-0400\n" -"PO-Revision-Date: 2013-05-17 14:44-0500\n" -"Last-Translator: Denise Rigato \n" +"PO-Revision-Date: 2013-05-22 10:44+0100\n" +"Last-Translator: Daniel James \n" "Language-Team: Austrian Localization \n" "Language: \n" "MIME-Version: 1.0\n" @@ -1545,8 +1545,8 @@ msgstr "Die 'Dauer' muß im Format '00:00:00' eingegeben werden" #: airtime_mvc/application/forms/SmartBlockCriteria.php:513 #: airtime_mvc/application/forms/SmartBlockCriteria.php:526 -msgid "The value should be in timestamp format(eg. 0000-00-00 or 00-00-00 00:00:00)" -msgstr "Der Wert muß im Timestamp-Format eingegeben werden (zB. 0000-00-00 oder 00-00-00 00:00:00)" +msgid "The value should be in timestamp format (e.g. 0000-00-00 or 0000-00-00 00:00:00)" +msgstr "Der Wert muß im Timestamp-Format eingegeben werden (zB. 0000-00-00 oder 0000-00-00 00:00:00)" #: airtime_mvc/application/forms/SmartBlockCriteria.php:540 msgid "The value has to be numeric" @@ -2206,7 +2206,7 @@ msgstr "Dieser Pfad ist derzeit nicht erreichbar." #: airtime_mvc/application/controllers/LocaleController.php:170 #, php-format -msgid "Some steam types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." +msgid "Some stream types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." msgstr "" #: airtime_mvc/application/controllers/LocaleController.php:171 diff --git a/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.mo index 939ac2a85..cc826753d 100644 Binary files a/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.mo differ diff --git a/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po b/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po index b9ea22684..56af0502d 100644 --- a/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Airtime 2.4\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-05-21 09:20-0400\n" -"PO-Revision-Date: 2013-05-17 14:44-0500\n" -"Last-Translator: Denise Rigato \n" +"PO-Revision-Date: 2013-05-22 10:45+0100\n" +"Last-Translator: Daniel James \n" "Language-Team: German Localization \n" "Language: \n" "MIME-Version: 1.0\n" @@ -1553,8 +1553,8 @@ msgstr "'Länge' sollte im 00:00:00-Format sein" #: airtime_mvc/application/forms/SmartBlockCriteria.php:513 #: airtime_mvc/application/forms/SmartBlockCriteria.php:526 -msgid "The value should be in timestamp format(eg. 0000-00-00 or 00-00-00 00:00:00)" -msgstr "Der Wert sollte in Zeitstempel-Format vorliegen (z.B. 0000-00-00 oder 00-00-00 00:00:00)" +msgid "The value should be in timestamp format (e.g. 0000-00-00 or 0000-00-00 00:00:00)" +msgstr "Der Wert sollte in Zeitstempel-Format vorliegen (z.B. 0000-00-00 oder 0000-00-00 00:00:00)" #: airtime_mvc/application/forms/SmartBlockCriteria.php:540 msgid "The value has to be numeric" @@ -2211,7 +2211,7 @@ msgstr "Zu diesem Pfad besteht momentan kein Zugang." # Translated without GUI review! #: airtime_mvc/application/controllers/LocaleController.php:170 #, php-format -msgid "Some steam types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." +msgid "Some stream types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." msgstr "Einige Stream Formate erfordern weitre Einstellungen. Einzelheiten über das Aktivieren von %sAAC+ Unterstüzung%s oder %sOpus Unterstüzung%s werden bereitgestellt." #: airtime_mvc/application/controllers/LocaleController.php:171 diff --git a/airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.mo index 493317139..9a7b497a8 100644 Binary files a/airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.mo differ diff --git a/airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po b/airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po index eaac52f2a..9ea6b8de2 100644 --- a/airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Airtime 2.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-05-21 09:20-0400\n" -"PO-Revision-Date: 2013-05-17 14:44-0500\n" -"Last-Translator: Denise Rigato \n" +"PO-Revision-Date: 2013-05-22 10:46+0100\n" +"Last-Translator: Daniel James \n" "Language-Team: Greek Localization \n" "Language: el_GR\n" "MIME-Version: 1.0\n" @@ -1547,8 +1547,8 @@ msgstr "Το «Μήκος» θα πρέπει να είναι σε υπό μορ #: airtime_mvc/application/forms/SmartBlockCriteria.php:513 #: airtime_mvc/application/forms/SmartBlockCriteria.php:526 -msgid "The value should be in timestamp format(eg. 0000-00-00 or 00-00-00 00:00:00)" -msgstr "Η τιμή θα πρέπει να είναι υπο μορφής ώρας (π.χ. 0000-00-00 ή 00-00-00 00:00:00)" +msgid "The value should be in timestamp format (e.g. 0000-00-00 or 0000-00-00 00:00:00)" +msgstr "Η τιμή θα πρέπει να είναι υπο μορφής ώρας (π.χ. 0000-00-00 ή 0000-00-00 00:00:00)" #: airtime_mvc/application/forms/SmartBlockCriteria.php:540 msgid "The value has to be numeric" @@ -2200,7 +2200,7 @@ msgstr "Αυτή η διαδρομή δεν είναι προς το παρόν #: airtime_mvc/application/controllers/LocaleController.php:170 #, php-format -msgid "Some steam types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." +msgid "Some stream types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." msgstr "" #: airtime_mvc/application/controllers/LocaleController.php:171 diff --git a/airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.mo index 53d1b6267..201b012ee 100644 Binary files a/airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.mo differ diff --git a/airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po b/airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po index 621d42235..2f8df0011 100644 --- a/airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Airtime 2.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-05-21 09:20-0400\n" -"PO-Revision-Date: 2013-05-17 14:44-0500\n" -"Last-Translator: Denise Rigato \n" +"PO-Revision-Date: 2013-05-22 10:47+0100\n" +"Last-Translator: Daniel James \n" "Language-Team: Canadian Localization \n" "Language: en_CA\n" "MIME-Version: 1.0\n" @@ -69,7 +69,7 @@ msgstr "Edit Show" #: airtime_mvc/application/services/CalendarService.php:133 msgid "Edit This Instance" -msgstr "" +msgstr "Edit This Instance" #: airtime_mvc/application/services/CalendarService.php:151 #: airtime_mvc/application/services/CalendarService.php:166 @@ -93,7 +93,7 @@ msgstr "Delete This Instance and All Following" #: airtime_mvc/application/services/CalendarService.php:210 msgid "Permission denied" -msgstr "" +msgstr "Permission denied" #: airtime_mvc/application/services/CalendarService.php:214 #: airtime_mvc/application/models/ShowInstance.php:245 @@ -228,12 +228,12 @@ msgstr "Logout" #: airtime_mvc/application/layouts/scripts/layout.phtml:41 #: airtime_mvc/application/layouts/scripts/layout.phtml:66 msgid "Play" -msgstr "" +msgstr "Play" #: airtime_mvc/application/layouts/scripts/layout.phtml:42 #: airtime_mvc/application/layouts/scripts/layout.phtml:67 msgid "Stop" -msgstr "" +msgstr "Stop" #: airtime_mvc/application/layouts/scripts/layout.phtml:46 #: airtime_mvc/application/models/Block.php:1330 @@ -244,7 +244,7 @@ msgstr "Cue In" #: airtime_mvc/application/layouts/scripts/layout.phtml:48 msgid "Set Cue In" -msgstr "" +msgstr "Set Cue In" #: airtime_mvc/application/layouts/scripts/layout.phtml:53 #: airtime_mvc/application/models/Block.php:1331 @@ -255,11 +255,11 @@ msgstr "Cue Out" #: airtime_mvc/application/layouts/scripts/layout.phtml:55 msgid "Set Cue Out" -msgstr "" +msgstr "Set Cue Out" #: airtime_mvc/application/layouts/scripts/layout.phtml:70 msgid "Cursor" -msgstr "" +msgstr "Cursor" #: airtime_mvc/application/layouts/scripts/layout.phtml:71 #: airtime_mvc/application/controllers/LocaleController.php:281 @@ -444,7 +444,7 @@ msgstr "Airtime Password Reset" #: airtime_mvc/application/models/Scheduler.php:72 msgid "Cannot move items out of linked shows" -msgstr "" +msgstr "Cannot move items out of linked shows" #: airtime_mvc/application/models/Scheduler.php:115 msgid "The schedule you're viewing is out of date! (sched mismatch)" @@ -481,7 +481,7 @@ msgstr "The show %s has been previously updated!" #: airtime_mvc/application/models/Scheduler.php:174 msgid "Content in linked shows must be scheduled before or after any one is broadcasted" -msgstr "" +msgstr "Content in linked shows must be scheduled before or after any one is broadcasted" #: airtime_mvc/application/models/Scheduler.php:197 #: airtime_mvc/application/models/Scheduler.php:283 @@ -1125,7 +1125,7 @@ msgstr "Mount cannot be empty with Icecast server." #: airtime_mvc/application/forms/AddShowRepeats.php:10 msgid "Link:" -msgstr "" +msgstr "Link:" #: airtime_mvc/application/forms/AddShowRepeats.php:16 msgid "Repeat Type:" @@ -1184,15 +1184,15 @@ msgstr "Sat" #: airtime_mvc/application/forms/AddShowRepeats.php:45 msgid "Repeat By:" -msgstr "" +msgstr "Repeat By:" #: airtime_mvc/application/forms/AddShowRepeats.php:48 msgid "day of the month" -msgstr "" +msgstr "day of the month" #: airtime_mvc/application/forms/AddShowRepeats.php:48 msgid "day of the week" -msgstr "" +msgstr "day of the week" #: airtime_mvc/application/forms/AddShowRepeats.php:67 msgid "No End?" @@ -1546,8 +1546,8 @@ msgstr "'Length' should be in '00:00:00' format" #: airtime_mvc/application/forms/SmartBlockCriteria.php:513 #: airtime_mvc/application/forms/SmartBlockCriteria.php:526 -msgid "The value should be in timestamp format(eg. 0000-00-00 or 00-00-00 00:00:00)" -msgstr "The value should be in timestamp format(eg. 0000-00-00 or 00-00-00 00:00:00)" +msgid "The value should be in timestamp format (e.g. 0000-00-00 or 0000-00-00 00:00:00)" +msgstr "The value should be in timestamp format (e.g. 0000-00-00 or 0000-00-00 00:00:00)" #: airtime_mvc/application/forms/SmartBlockCriteria.php:540 msgid "The value has to be numeric" @@ -1604,7 +1604,7 @@ msgstr "Password field cannot be empty." #: airtime_mvc/application/forms/GeneralPreferences.php:33 msgid "Default Crossfade Duration (s):" -msgstr "" +msgstr "Default Crossfade Duration (s):" #: airtime_mvc/application/forms/GeneralPreferences.php:40 #: airtime_mvc/application/forms/GeneralPreferences.php:59 @@ -1614,11 +1614,11 @@ msgstr "enter a time in seconds 0{.0}" #: airtime_mvc/application/forms/GeneralPreferences.php:52 msgid "Default Fade In (s):" -msgstr "" +msgstr "Default Fade In (s):" #: airtime_mvc/application/forms/GeneralPreferences.php:71 msgid "Default Fade Out (s):" -msgstr "" +msgstr "Default Fade Out (s):" #: airtime_mvc/application/forms/GeneralPreferences.php:89 #, php-format @@ -1975,11 +1975,11 @@ msgstr "Are you sure you want to delete the selected item(s)?" #: airtime_mvc/application/controllers/LocaleController.php:64 msgid "Scheduled" -msgstr "" +msgstr "Scheduled" #: airtime_mvc/application/controllers/LocaleController.php:65 msgid "Playlist / Block" -msgstr "" +msgstr "Playlist / Block" #: airtime_mvc/application/controllers/LocaleController.php:69 msgid "Bit Rate" @@ -2070,7 +2070,7 @@ msgstr "You are currently uploading files. %sGoing to another screen will cancel #: airtime_mvc/application/controllers/LocaleController.php:113 msgid "Open Media Builder" -msgstr "" +msgstr "Open Media Builder" #: airtime_mvc/application/controllers/LocaleController.php:114 msgid "please put in a time '00:00:00 (.0)'" @@ -2199,8 +2199,8 @@ msgstr "This path is currently not accessible." #: airtime_mvc/application/controllers/LocaleController.php:170 #, php-format -msgid "Some steam types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." -msgstr "" +msgid "Some stream types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." +msgstr "Some stream types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." #: airtime_mvc/application/controllers/LocaleController.php:171 msgid "Connected to the streaming server" @@ -2270,7 +2270,7 @@ msgstr "The show instance doesn't exist anymore!" #: airtime_mvc/application/controllers/LocaleController.php:195 msgid "Warning: Shows cannot be re-linked" -msgstr "" +msgstr "Warning: Shows cannot be re-linked" #: airtime_mvc/application/controllers/LocaleController.php:199 msgid "Show" @@ -2494,15 +2494,15 @@ msgstr "Moving %s Items" #: airtime_mvc/application/controllers/LocaleController.php:294 msgid "Fade Editor" -msgstr "" +msgstr "Fade Editor" #: airtime_mvc/application/controllers/LocaleController.php:295 msgid "Cue Editor" -msgstr "" +msgstr "Cue Editor" #: airtime_mvc/application/controllers/LocaleController.php:296 msgid "Waveform features are available in a browser supporting the Web Audio API" -msgstr "" +msgstr "Waveform features are available in a browser supporting the Web Audio API" #: airtime_mvc/application/controllers/LocaleController.php:299 msgid "Select all" @@ -3096,7 +3096,7 @@ msgstr "Empty playlist" #: airtime_mvc/application/views/scripts/playlist/set-fade.phtml:3 #: airtime_mvc/application/views/scripts/playlist/set-cue.phtml:3 msgid "Show Waveform" -msgstr "" +msgstr "Show Waveform" #: airtime_mvc/application/views/scripts/playlist/set-fade.phtml:6 #: airtime_mvc/application/views/scripts/playlist/playlist.phtml:70 @@ -3143,12 +3143,12 @@ msgstr "New Webstream" #: airtime_mvc/application/views/scripts/playlist/playlist.phtml:21 msgid "Empty playlist content" -msgstr "" +msgstr "Empty playlist content" #: airtime_mvc/application/views/scripts/playlist/playlist.phtml:21 #: airtime_mvc/application/views/scripts/playlist/smart-block.phtml:21 msgid "Clear" -msgstr "" +msgstr "Clear" #: airtime_mvc/application/views/scripts/playlist/playlist.phtml:24 msgid "Shuffle playlist" @@ -3175,7 +3175,7 @@ msgstr "No open playlist" #: airtime_mvc/application/views/scripts/playlist/smart-block.phtml:21 msgid "Empty smart block content" -msgstr "" +msgstr "Empty smart block content" #: airtime_mvc/application/views/scripts/playlist/smart-block.phtml:90 msgid "No open smart block" diff --git a/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.mo index 591176071..69a7a7fe9 100644 Binary files a/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.mo differ diff --git a/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po b/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po index 251aa63b4..5d5f4df24 100644 --- a/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Airtime 2.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-05-21 09:20-0400\n" -"PO-Revision-Date: 2013-05-17 14:44-0500\n" -"Last-Translator: Denise Rigato \n" +"PO-Revision-Date: 2013-05-22 10:48+0100\n" +"Last-Translator: Daniel James \n" "Language-Team: British Localization \n" "Language: en_GB\n" "MIME-Version: 1.0\n" @@ -69,7 +69,7 @@ msgstr "Edit Show" #: airtime_mvc/application/services/CalendarService.php:133 msgid "Edit This Instance" -msgstr "" +msgstr "Edit This Instance" #: airtime_mvc/application/services/CalendarService.php:151 #: airtime_mvc/application/services/CalendarService.php:166 @@ -93,7 +93,7 @@ msgstr "Delete This Instance and All Following" #: airtime_mvc/application/services/CalendarService.php:210 msgid "Permission denied" -msgstr "" +msgstr "Permission denied" #: airtime_mvc/application/services/CalendarService.php:214 #: airtime_mvc/application/models/ShowInstance.php:245 @@ -228,12 +228,12 @@ msgstr "Logout" #: airtime_mvc/application/layouts/scripts/layout.phtml:41 #: airtime_mvc/application/layouts/scripts/layout.phtml:66 msgid "Play" -msgstr "" +msgstr "Play" #: airtime_mvc/application/layouts/scripts/layout.phtml:42 #: airtime_mvc/application/layouts/scripts/layout.phtml:67 msgid "Stop" -msgstr "" +msgstr "Stop" #: airtime_mvc/application/layouts/scripts/layout.phtml:46 #: airtime_mvc/application/models/Block.php:1330 @@ -244,7 +244,7 @@ msgstr "Cue In" #: airtime_mvc/application/layouts/scripts/layout.phtml:48 msgid "Set Cue In" -msgstr "" +msgstr "Set Cue In" #: airtime_mvc/application/layouts/scripts/layout.phtml:53 #: airtime_mvc/application/models/Block.php:1331 @@ -255,11 +255,11 @@ msgstr "Cue Out" #: airtime_mvc/application/layouts/scripts/layout.phtml:55 msgid "Set Cue Out" -msgstr "" +msgstr "Set Cue Out" #: airtime_mvc/application/layouts/scripts/layout.phtml:70 msgid "Cursor" -msgstr "" +msgstr "Cursor" #: airtime_mvc/application/layouts/scripts/layout.phtml:71 #: airtime_mvc/application/controllers/LocaleController.php:281 @@ -444,7 +444,7 @@ msgstr "Airtime Password Reset" #: airtime_mvc/application/models/Scheduler.php:72 msgid "Cannot move items out of linked shows" -msgstr "" +msgstr "Cannot move items out of linked shows" #: airtime_mvc/application/models/Scheduler.php:115 msgid "The schedule you're viewing is out of date! (sched mismatch)" @@ -481,7 +481,7 @@ msgstr "The show %s has been previously updated!" #: airtime_mvc/application/models/Scheduler.php:174 msgid "Content in linked shows must be scheduled before or after any one is broadcasted" -msgstr "" +msgstr "Content in linked shows must be scheduled before or after any one is broadcasted" #: airtime_mvc/application/models/Scheduler.php:197 #: airtime_mvc/application/models/Scheduler.php:283 @@ -1125,7 +1125,7 @@ msgstr "Mount cannot be empty with Icecast server." #: airtime_mvc/application/forms/AddShowRepeats.php:10 msgid "Link:" -msgstr "" +msgstr "Link:" #: airtime_mvc/application/forms/AddShowRepeats.php:16 msgid "Repeat Type:" @@ -1184,15 +1184,15 @@ msgstr "Sat" #: airtime_mvc/application/forms/AddShowRepeats.php:45 msgid "Repeat By:" -msgstr "" +msgstr "Repeat By:" #: airtime_mvc/application/forms/AddShowRepeats.php:48 msgid "day of the month" -msgstr "" +msgstr "day of the month" #: airtime_mvc/application/forms/AddShowRepeats.php:48 msgid "day of the week" -msgstr "" +msgstr "day of the week" #: airtime_mvc/application/forms/AddShowRepeats.php:67 msgid "No End?" @@ -1546,8 +1546,8 @@ msgstr "'Length' should be in '00:00:00' format" #: airtime_mvc/application/forms/SmartBlockCriteria.php:513 #: airtime_mvc/application/forms/SmartBlockCriteria.php:526 -msgid "The value should be in timestamp format(eg. 0000-00-00 or 00-00-00 00:00:00)" -msgstr "The value should be in timestamp format(eg. 0000-00-00 or 00-00-00 00:00:00)" +msgid "The value should be in timestamp format (e.g. 0000-00-00 or 0000-00-00 00:00:00)" +msgstr "The value should be in timestamp format (e.g. 0000-00-00 or 0000-00-00 00:00:00)" #: airtime_mvc/application/forms/SmartBlockCriteria.php:540 msgid "The value has to be numeric" @@ -1604,7 +1604,7 @@ msgstr "Password field cannot be empty." #: airtime_mvc/application/forms/GeneralPreferences.php:33 msgid "Default Crossfade Duration (s):" -msgstr "" +msgstr "Default Crossfade Duration (s):" #: airtime_mvc/application/forms/GeneralPreferences.php:40 #: airtime_mvc/application/forms/GeneralPreferences.php:59 @@ -1614,11 +1614,11 @@ msgstr "enter a time in seconds 0{.0}" #: airtime_mvc/application/forms/GeneralPreferences.php:52 msgid "Default Fade In (s):" -msgstr "" +msgstr "Default Fade In (s):" #: airtime_mvc/application/forms/GeneralPreferences.php:71 msgid "Default Fade Out (s):" -msgstr "" +msgstr "Default Fade Out (s):" #: airtime_mvc/application/forms/GeneralPreferences.php:89 #, php-format @@ -1975,11 +1975,11 @@ msgstr "Are you sure you want to delete the selected item(s)?" #: airtime_mvc/application/controllers/LocaleController.php:64 msgid "Scheduled" -msgstr "" +msgstr "Scheduled" #: airtime_mvc/application/controllers/LocaleController.php:65 msgid "Playlist / Block" -msgstr "" +msgstr "Playlist / Block" #: airtime_mvc/application/controllers/LocaleController.php:69 msgid "Bit Rate" @@ -2070,7 +2070,7 @@ msgstr "You are currently uploading files. %sGoing to another screen will cancel #: airtime_mvc/application/controllers/LocaleController.php:113 msgid "Open Media Builder" -msgstr "" +msgstr "Open Media Builder" #: airtime_mvc/application/controllers/LocaleController.php:114 msgid "please put in a time '00:00:00 (.0)'" @@ -2199,8 +2199,8 @@ msgstr "This path is currently not accessible." #: airtime_mvc/application/controllers/LocaleController.php:170 #, php-format -msgid "Some steam types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." -msgstr "" +msgid "Some stream types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." +msgstr "Some stream types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." #: airtime_mvc/application/controllers/LocaleController.php:171 msgid "Connected to the streaming server" @@ -2270,7 +2270,7 @@ msgstr "The show instance doesn't exist anymore!" #: airtime_mvc/application/controllers/LocaleController.php:195 msgid "Warning: Shows cannot be re-linked" -msgstr "" +msgstr "Warning: Shows cannot be re-linked" #: airtime_mvc/application/controllers/LocaleController.php:199 msgid "Show" @@ -2494,15 +2494,15 @@ msgstr "Moving %s Items" #: airtime_mvc/application/controllers/LocaleController.php:294 msgid "Fade Editor" -msgstr "" +msgstr "Fade Editor" #: airtime_mvc/application/controllers/LocaleController.php:295 msgid "Cue Editor" -msgstr "" +msgstr "Cue Editor" #: airtime_mvc/application/controllers/LocaleController.php:296 msgid "Waveform features are available in a browser supporting the Web Audio API" -msgstr "" +msgstr "Waveform features are available in a browser supporting the Web Audio API" #: airtime_mvc/application/controllers/LocaleController.php:299 msgid "Select all" @@ -3096,7 +3096,7 @@ msgstr "Empty playlist" #: airtime_mvc/application/views/scripts/playlist/set-fade.phtml:3 #: airtime_mvc/application/views/scripts/playlist/set-cue.phtml:3 msgid "Show Waveform" -msgstr "" +msgstr "Show Waveform" #: airtime_mvc/application/views/scripts/playlist/set-fade.phtml:6 #: airtime_mvc/application/views/scripts/playlist/playlist.phtml:70 @@ -3143,12 +3143,12 @@ msgstr "New Webstream" #: airtime_mvc/application/views/scripts/playlist/playlist.phtml:21 msgid "Empty playlist content" -msgstr "" +msgstr "Empty playlist content" #: airtime_mvc/application/views/scripts/playlist/playlist.phtml:21 #: airtime_mvc/application/views/scripts/playlist/smart-block.phtml:21 msgid "Clear" -msgstr "" +msgstr "Clear" #: airtime_mvc/application/views/scripts/playlist/playlist.phtml:24 msgid "Shuffle playlist" @@ -3175,7 +3175,7 @@ msgstr "No open playlist" #: airtime_mvc/application/views/scripts/playlist/smart-block.phtml:21 msgid "Empty smart block content" -msgstr "" +msgstr "Empty smart block content" #: airtime_mvc/application/views/scripts/playlist/smart-block.phtml:90 msgid "No open smart block" diff --git a/airtime_mvc/locale/en_US/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/en_US/LC_MESSAGES/airtime.mo index c0804a7c6..a49c66f48 100644 Binary files a/airtime_mvc/locale/en_US/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/en_US/LC_MESSAGES/airtime.mo differ diff --git a/airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po b/airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po index 106c4aafe..4c86c961a 100644 --- a/airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Airtime 2.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-05-21 09:20-0400\n" -"PO-Revision-Date: 2013-05-17 14:44-0500\n" -"Last-Translator: Denise Rigato \n" +"PO-Revision-Date: 2013-05-22 10:49+0100\n" +"Last-Translator: Daniel James \n" "Language-Team: United States Localization \n" "Language: en_US\n" "MIME-Version: 1.0\n" @@ -69,7 +69,7 @@ msgstr "Edit Show" #: airtime_mvc/application/services/CalendarService.php:133 msgid "Edit This Instance" -msgstr "" +msgstr "Edit This Instance" #: airtime_mvc/application/services/CalendarService.php:151 #: airtime_mvc/application/services/CalendarService.php:166 @@ -93,7 +93,7 @@ msgstr "Delete This Instance and All Following" #: airtime_mvc/application/services/CalendarService.php:210 msgid "Permission denied" -msgstr "" +msgstr "Permission denied" #: airtime_mvc/application/services/CalendarService.php:214 #: airtime_mvc/application/models/ShowInstance.php:245 @@ -228,12 +228,12 @@ msgstr "Logout" #: airtime_mvc/application/layouts/scripts/layout.phtml:41 #: airtime_mvc/application/layouts/scripts/layout.phtml:66 msgid "Play" -msgstr "" +msgstr "Play" #: airtime_mvc/application/layouts/scripts/layout.phtml:42 #: airtime_mvc/application/layouts/scripts/layout.phtml:67 msgid "Stop" -msgstr "" +msgstr "Stop" #: airtime_mvc/application/layouts/scripts/layout.phtml:46 #: airtime_mvc/application/models/Block.php:1330 @@ -244,7 +244,7 @@ msgstr "Cue In" #: airtime_mvc/application/layouts/scripts/layout.phtml:48 msgid "Set Cue In" -msgstr "" +msgstr "Set Cue In" #: airtime_mvc/application/layouts/scripts/layout.phtml:53 #: airtime_mvc/application/models/Block.php:1331 @@ -255,11 +255,11 @@ msgstr "Cue Out" #: airtime_mvc/application/layouts/scripts/layout.phtml:55 msgid "Set Cue Out" -msgstr "" +msgstr "Set Cue Out" #: airtime_mvc/application/layouts/scripts/layout.phtml:70 msgid "Cursor" -msgstr "" +msgstr "Cursor" #: airtime_mvc/application/layouts/scripts/layout.phtml:71 #: airtime_mvc/application/controllers/LocaleController.php:281 @@ -444,7 +444,7 @@ msgstr "Airtime Password Reset" #: airtime_mvc/application/models/Scheduler.php:72 msgid "Cannot move items out of linked shows" -msgstr "" +msgstr "Cannot move items out of linked shows" #: airtime_mvc/application/models/Scheduler.php:115 msgid "The schedule you're viewing is out of date! (sched mismatch)" @@ -481,7 +481,7 @@ msgstr "The show %s has been previously updated!" #: airtime_mvc/application/models/Scheduler.php:174 msgid "Content in linked shows must be scheduled before or after any one is broadcasted" -msgstr "" +msgstr "Content in linked shows must be scheduled before or after any one is broadcasted" #: airtime_mvc/application/models/Scheduler.php:197 #: airtime_mvc/application/models/Scheduler.php:283 @@ -1125,7 +1125,7 @@ msgstr "Mount cannot be empty with Icecast server." #: airtime_mvc/application/forms/AddShowRepeats.php:10 msgid "Link:" -msgstr "" +msgstr "Link:" #: airtime_mvc/application/forms/AddShowRepeats.php:16 msgid "Repeat Type:" @@ -1184,15 +1184,15 @@ msgstr "Sat" #: airtime_mvc/application/forms/AddShowRepeats.php:45 msgid "Repeat By:" -msgstr "" +msgstr "Repeat By:" #: airtime_mvc/application/forms/AddShowRepeats.php:48 msgid "day of the month" -msgstr "" +msgstr "day of the month" #: airtime_mvc/application/forms/AddShowRepeats.php:48 msgid "day of the week" -msgstr "" +msgstr "day of the week" #: airtime_mvc/application/forms/AddShowRepeats.php:67 msgid "No End?" @@ -1546,8 +1546,8 @@ msgstr "'Length' should be in '00:00:00' format" #: airtime_mvc/application/forms/SmartBlockCriteria.php:513 #: airtime_mvc/application/forms/SmartBlockCriteria.php:526 -msgid "The value should be in timestamp format(eg. 0000-00-00 or 00-00-00 00:00:00)" -msgstr "The value should be in timestamp format(eg. 0000-00-00 or 00-00-00 00:00:00)" +msgid "The value should be in timestamp format (e.g. 0000-00-00 or 0000-00-00 00:00:00)" +msgstr "The value should be in timestamp format (e.g. 0000-00-00 or 0000-00-00 00:00:00)" #: airtime_mvc/application/forms/SmartBlockCriteria.php:540 msgid "The value has to be numeric" @@ -1604,7 +1604,7 @@ msgstr "Password field cannot be empty." #: airtime_mvc/application/forms/GeneralPreferences.php:33 msgid "Default Crossfade Duration (s):" -msgstr "" +msgstr "Default Crossfade Duration (s):" #: airtime_mvc/application/forms/GeneralPreferences.php:40 #: airtime_mvc/application/forms/GeneralPreferences.php:59 @@ -1614,11 +1614,11 @@ msgstr "enter a time in seconds 0{.0}" #: airtime_mvc/application/forms/GeneralPreferences.php:52 msgid "Default Fade In (s):" -msgstr "" +msgstr "Default Fade In (s):" #: airtime_mvc/application/forms/GeneralPreferences.php:71 msgid "Default Fade Out (s):" -msgstr "" +msgstr "Default Fade Out (s):" #: airtime_mvc/application/forms/GeneralPreferences.php:89 #, php-format @@ -1975,11 +1975,11 @@ msgstr "Are you sure you want to delete the selected item(s)?" #: airtime_mvc/application/controllers/LocaleController.php:64 msgid "Scheduled" -msgstr "" +msgstr "Scheduled" #: airtime_mvc/application/controllers/LocaleController.php:65 msgid "Playlist / Block" -msgstr "" +msgstr "Playlist / Block" #: airtime_mvc/application/controllers/LocaleController.php:69 msgid "Bit Rate" @@ -2070,7 +2070,7 @@ msgstr "You are currently uploading files. %sGoing to another screen will cancel #: airtime_mvc/application/controllers/LocaleController.php:113 msgid "Open Media Builder" -msgstr "" +msgstr "Open Media Builder" #: airtime_mvc/application/controllers/LocaleController.php:114 msgid "please put in a time '00:00:00 (.0)'" @@ -2199,8 +2199,8 @@ msgstr "This path is currently not accessible." #: airtime_mvc/application/controllers/LocaleController.php:170 #, php-format -msgid "Some steam types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." -msgstr "" +msgid "Some stream types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." +msgstr "Some stream types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." #: airtime_mvc/application/controllers/LocaleController.php:171 msgid "Connected to the streaming server" @@ -2270,7 +2270,7 @@ msgstr "The show instance doesn't exist anymore!" #: airtime_mvc/application/controllers/LocaleController.php:195 msgid "Warning: Shows cannot be re-linked" -msgstr "" +msgstr "Warning: Shows cannot be re-linked" #: airtime_mvc/application/controllers/LocaleController.php:199 msgid "Show" @@ -2494,15 +2494,15 @@ msgstr "Moving %s Items" #: airtime_mvc/application/controllers/LocaleController.php:294 msgid "Fade Editor" -msgstr "" +msgstr "Fade Editor" #: airtime_mvc/application/controllers/LocaleController.php:295 msgid "Cue Editor" -msgstr "" +msgstr "Cue Editor" #: airtime_mvc/application/controllers/LocaleController.php:296 msgid "Waveform features are available in a browser supporting the Web Audio API" -msgstr "" +msgstr "Waveform features are available in a browser supporting the Web Audio API" #: airtime_mvc/application/controllers/LocaleController.php:299 msgid "Select all" @@ -3096,7 +3096,7 @@ msgstr "Empty playlist" #: airtime_mvc/application/views/scripts/playlist/set-fade.phtml:3 #: airtime_mvc/application/views/scripts/playlist/set-cue.phtml:3 msgid "Show Waveform" -msgstr "" +msgstr "Show Waveform" #: airtime_mvc/application/views/scripts/playlist/set-fade.phtml:6 #: airtime_mvc/application/views/scripts/playlist/playlist.phtml:70 @@ -3143,12 +3143,12 @@ msgstr "New Webstream" #: airtime_mvc/application/views/scripts/playlist/playlist.phtml:21 msgid "Empty playlist content" -msgstr "" +msgstr "Empty playlist content" #: airtime_mvc/application/views/scripts/playlist/playlist.phtml:21 #: airtime_mvc/application/views/scripts/playlist/smart-block.phtml:21 msgid "Clear" -msgstr "" +msgstr "Clear" #: airtime_mvc/application/views/scripts/playlist/playlist.phtml:24 msgid "Shuffle playlist" @@ -3175,7 +3175,7 @@ msgstr "No open playlist" #: airtime_mvc/application/views/scripts/playlist/smart-block.phtml:21 msgid "Empty smart block content" -msgstr "" +msgstr "Empty smart block content" #: airtime_mvc/application/views/scripts/playlist/smart-block.phtml:90 msgid "No open smart block" diff --git a/airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.mo index 87213fdfb..ef33e67cb 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 04cc39939..66f93a264 100644 --- a/airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Airtime 2.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-05-21 09:20-0400\n" -"PO-Revision-Date: 2013-05-17 14:44-0500\n" -"Last-Translator: Denise Rigato \n" +"PO-Revision-Date: 2013-05-22 10:49+0100\n" +"Last-Translator: Daniel James \n" "Language-Team: Spanish Localization \n" "Language: Spanish\n" "MIME-Version: 1.0\n" @@ -1545,8 +1545,8 @@ msgstr "'Length' (la duración) debe establecerse e un formato de '00:00:00' " #: airtime_mvc/application/forms/SmartBlockCriteria.php:513 #: airtime_mvc/application/forms/SmartBlockCriteria.php:526 -msgid "The value should be in timestamp format(eg. 0000-00-00 or 00-00-00 00:00:00)" -msgstr "El valor debe estar en un formato de tiempo (eg. 0000-00-00 or 00-00-00 00:00:00)" +msgid "The value should be in timestamp format (e.g. 0000-00-00 or 0000-00-00 00:00:00)" +msgstr "El valor debe estar en un formato de tiempo (e.g. 0000-00-00 or 0000-00-00 00:00:00)" #: airtime_mvc/application/forms/SmartBlockCriteria.php:540 msgid "The value has to be numeric" @@ -2198,7 +2198,7 @@ msgstr "Esta ruta actualmente está inaccesible." #: airtime_mvc/application/controllers/LocaleController.php:170 #, php-format -msgid "Some steam types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." +msgid "Some stream types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." msgstr "" #: airtime_mvc/application/controllers/LocaleController.php:171 diff --git a/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.mo index 0b21313f5..908dd3830 100644 Binary files a/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.mo differ diff --git a/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po b/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po index ed5f744bf..b3663f916 100644 --- a/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Airtime 2.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-05-21 09:20-0400\n" -"PO-Revision-Date: 2013-05-17 14:44-0500\n" -"Last-Translator: Denise Rigato \n" +"PO-Revision-Date: 2013-05-22 10:49+0100\n" +"Last-Translator: Daniel James \n" "Language-Team: French Localization \n" "Language: \n" "MIME-Version: 1.0\n" @@ -1546,8 +1546,8 @@ msgstr "La 'Durée' doit être au format '00:00:00'" #: airtime_mvc/application/forms/SmartBlockCriteria.php:513 #: airtime_mvc/application/forms/SmartBlockCriteria.php:526 -msgid "The value should be in timestamp format(eg. 0000-00-00 or 00-00-00 00:00:00)" -msgstr "La valeur doit être en format d'horodatage (par exemple 0000-00-00 ou 00-00-00 00:00:00)" +msgid "The value should be in timestamp format (e.g. 0000-00-00 or 0000-00-00 00:00:00)" +msgstr "La valeur doit être en format d'horodatage (par exemple 0000-00-00 ou 0000-00-00 00:00:00)" #: airtime_mvc/application/forms/SmartBlockCriteria.php:540 msgid "The value has to be numeric" @@ -2199,7 +2199,7 @@ msgstr "Ce chemin n'est pas accessible." #: airtime_mvc/application/controllers/LocaleController.php:170 #, php-format -msgid "Some steam types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." +msgid "Some stream types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." msgstr "" #: airtime_mvc/application/controllers/LocaleController.php:171 diff --git a/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.mo index 30a00947e..409bdb80a 100644 Binary files a/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.mo differ diff --git a/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po b/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po index 5d3a6df5b..ed88e074d 100644 --- a/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Airtime 2.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-05-21 09:20-0400\n" -"PO-Revision-Date: 2013-05-17 14:44-0500\n" -"Last-Translator: Denise Rigato \n" +"PO-Revision-Date: 2013-05-22 10:50+0100\n" +"Last-Translator: Daniel James \n" "Language-Team: Hungarian Localization \n" "Language: \n" "MIME-Version: 1.0\n" @@ -1545,8 +1545,8 @@ msgstr "'Hosszúság' '00:00:00' formában lehet" #: airtime_mvc/application/forms/SmartBlockCriteria.php:513 #: airtime_mvc/application/forms/SmartBlockCriteria.php:526 -msgid "The value should be in timestamp format(eg. 0000-00-00 or 00-00-00 00:00:00)" -msgstr "Az értéknek az alábbi időbélyeg formátumban kell lennie (pl. 0000-00-00 vagy 00-00-00 00:00:00)" +msgid "The value should be in timestamp format (e.g. 0000-00-00 or 0000-00-00 00:00:00)" +msgstr "Az értéknek az alábbi időbélyeg formátumban kell lennie (pl. 0000-00-00 vagy 0000-00-00 00:00:00)" #: airtime_mvc/application/forms/SmartBlockCriteria.php:540 msgid "The value has to be numeric" @@ -2198,7 +2198,7 @@ msgstr "Ez az útvonal jelenleg nem elérhető." #: airtime_mvc/application/controllers/LocaleController.php:170 #, php-format -msgid "Some steam types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." +msgid "Some stream types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." msgstr "" #: airtime_mvc/application/controllers/LocaleController.php:171 diff --git a/airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.mo index 38c9451e7..b92cd061b 100644 Binary files a/airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.mo differ diff --git a/airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.po b/airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.po index e0fb95784..8484d30b1 100644 --- a/airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Airtime 2.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-05-21 09:20-0400\n" -"PO-Revision-Date: 2013-05-17 14:44-0500\n" -"Last-Translator: Denise Rigato \n" +"PO-Revision-Date: 2013-05-22 10:51+0100\n" +"Last-Translator: Daniel James \n" "Language-Team: Italian Localization \n" "Language: \n" "MIME-Version: 1.0\n" @@ -1547,8 +1547,8 @@ msgstr "La lunghezza deve essere nel formato '00:00:00'" #: airtime_mvc/application/forms/SmartBlockCriteria.php:513 #: airtime_mvc/application/forms/SmartBlockCriteria.php:526 -msgid "The value should be in timestamp format(eg. 0000-00-00 or 00-00-00 00:00:00)" -msgstr "Il valore deve essere nel formato (es. 0000-00-00 o 00-00-00 00:00:00)" +msgid "The value should be in timestamp format (e.g. 0000-00-00 or 0000-00-00 00:00:00)" +msgstr "Il valore deve essere nel formato (es. 0000-00-00 o 0000-00-00 00:00:00)" #: airtime_mvc/application/forms/SmartBlockCriteria.php:540 msgid "The value has to be numeric" @@ -2200,7 +2200,7 @@ msgstr "Questo percorso non è accessibile attualmente." #: airtime_mvc/application/controllers/LocaleController.php:170 #, php-format -msgid "Some steam types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." +msgid "Some stream types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." msgstr "" #: airtime_mvc/application/controllers/LocaleController.php:171 diff --git a/airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.mo index 709ae108a..e11d62397 100644 Binary files a/airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.mo differ diff --git a/airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po b/airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po index 54a380988..bfc601f46 100644 --- a/airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Airtime 2.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-05-21 09:20-0400\n" -"PO-Revision-Date: 2013-05-17 14:45-0500\n" -"Last-Translator: Denise Rigato \n" +"PO-Revision-Date: 2013-05-22 10:51+0100\n" +"Last-Translator: Daniel James \n" "Language-Team: Korean Localization \n" "Language: ko_KR\n" "MIME-Version: 1.0\n" @@ -1544,8 +1544,8 @@ msgstr "길이는 00:00:00 형태로 입력하세요" #: airtime_mvc/application/forms/SmartBlockCriteria.php:513 #: airtime_mvc/application/forms/SmartBlockCriteria.php:526 -msgid "The value should be in timestamp format(eg. 0000-00-00 or 00-00-00 00:00:00)" -msgstr "이 값은 timestamp 형태(eg. 0000-00-00 or 00-00-00 00:00:00)로 입력해주세요" +msgid "The value should be in timestamp format (e.g. 0000-00-00 or 0000-00-00 00:00:00)" +msgstr "이 값은 timestamp 형태 (e.g. 0000-00-00 or 0000-00-00 00:00:00) 로 입력해주세요" #: airtime_mvc/application/forms/SmartBlockCriteria.php:540 msgid "The value has to be numeric" @@ -2195,7 +2195,7 @@ msgstr "경로에 접근할수 없습니다" #: airtime_mvc/application/controllers/LocaleController.php:170 #, php-format -msgid "Some steam types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." +msgid "Some stream types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." msgstr "" #: airtime_mvc/application/controllers/LocaleController.php:171 diff --git a/airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.mo index a5804281c..a3797bd20 100644 Binary files a/airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.mo differ diff --git a/airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po b/airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po index 1347cdb94..b46b67c06 100644 --- a/airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Airtime 2.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-05-21 09:20-0400\n" -"PO-Revision-Date: 2013-05-17 14:45-0500\n" -"Last-Translator: Denise Rigato \n" +"PO-Revision-Date: 2013-05-22 10:52+0100\n" +"Last-Translator: Daniel James \n" "Language-Team: SEMATpl (licencjonuj.eu) & PallottiFM (pallotti.fm) + radioaktywne.pl \n" "Language: Polski\n" "MIME-Version: 1.0\n" @@ -1546,8 +1546,8 @@ msgstr "Długość powinna być wprowadzona w formacie '00:00:00'" #: airtime_mvc/application/forms/SmartBlockCriteria.php:513 #: airtime_mvc/application/forms/SmartBlockCriteria.php:526 -msgid "The value should be in timestamp format(eg. 0000-00-00 or 00-00-00 00:00:00)" -msgstr "Wartość powinna byc zapisana w formacie timestamp (np. 0000-00-00 lub 00-00-00 00:00:00)" +msgid "The value should be in timestamp format (e.g. 0000-00-00 or 0000-00-00 00:00:00)" +msgstr "Wartość powinna byc zapisana w formacie timestamp (np. 0000-00-00 lub 0000-00-00 00:00:00)" #: airtime_mvc/application/forms/SmartBlockCriteria.php:540 msgid "The value has to be numeric" @@ -2199,7 +2199,7 @@ msgstr "Ściezka jest obecnie niedostepna." #: airtime_mvc/application/controllers/LocaleController.php:170 #, php-format -msgid "Some steam types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." +msgid "Some stream types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." msgstr "" #: airtime_mvc/application/controllers/LocaleController.php:171 diff --git a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.mo index be34d7fe9..a40e94937 100644 Binary files a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.mo differ diff --git a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po index 41f01aafa..a5e311a65 100644 --- a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Airtime 2.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-05-21 09:20-0400\n" -"PO-Revision-Date: 2013-05-17 14:45-0500\n" -"Last-Translator: Denise Rigato \n" +"PO-Revision-Date: 2013-05-22 10:52+0100\n" +"Last-Translator: Daniel James \n" "Language-Team: Brazilian Localization \n" "Language: pt-BR\n" "MIME-Version: 1.0\n" @@ -1547,8 +1547,8 @@ msgstr "A duração deve ser informada no formato '00:00:00'" #: airtime_mvc/application/forms/SmartBlockCriteria.php:513 #: airtime_mvc/application/forms/SmartBlockCriteria.php:526 -msgid "The value should be in timestamp format(eg. 0000-00-00 or 00-00-00 00:00:00)" -msgstr "O valor deve estar no formato timestamp (ex.: 0000-00-00 ou 00-00-00 00:00:00)" +msgid "The value should be in timestamp format (e.g. 0000-00-00 or 0000-00-00 00:00:00)" +msgstr "O valor deve estar no formato timestamp (ex. 0000-00-00 ou 0000-00-00 00:00:00)" #: airtime_mvc/application/forms/SmartBlockCriteria.php:540 msgid "The value has to be numeric" @@ -2200,7 +2200,7 @@ msgstr "O caminho está inacessível no momento." #: airtime_mvc/application/controllers/LocaleController.php:170 #, php-format -msgid "Some steam types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." +msgid "Some stream types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." msgstr "" #: airtime_mvc/application/controllers/LocaleController.php:171 diff --git a/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.mo index c3566a61d..a7458f7e1 100644 Binary files a/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.mo differ diff --git a/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po b/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po index 77543432d..87fd6005d 100644 --- a/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Airtime 2.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-05-21 09:20-0400\n" -"PO-Revision-Date: 2013-05-17 14:45-0500\n" -"Last-Translator: Denise Rigato \n" +"PO-Revision-Date: 2013-05-22 10:53+0100\n" +"Last-Translator: Daniel James \n" "Language-Team: Russian Localization \n" "Language: ru_RU\n" "MIME-Version: 1.0\n" @@ -1548,8 +1548,8 @@ msgstr "\"Длина\" должна быть в формате '00:00:00'" #: airtime_mvc/application/forms/SmartBlockCriteria.php:513 #: airtime_mvc/application/forms/SmartBlockCriteria.php:526 -msgid "The value should be in timestamp format(eg. 0000-00-00 or 00-00-00 00:00:00)" -msgstr "Значение должно быть в формате временной метки (например, 0000-00-00 или 00-00-00 00:00:00)" +msgid "The value should be in timestamp format (e.g. 0000-00-00 or 0000-00-00 00:00:00)" +msgstr "Значение должно быть в формате временной метки (например, 0000-00-00 или 0000-00-00 00:00:00)" #: airtime_mvc/application/forms/SmartBlockCriteria.php:540 msgid "The value has to be numeric" @@ -2201,7 +2201,7 @@ msgstr "Этот путь в настоящий момент недоступе #: airtime_mvc/application/controllers/LocaleController.php:170 #, php-format -msgid "Some steam types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." +msgid "Some stream types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." msgstr "" #: airtime_mvc/application/controllers/LocaleController.php:171 diff --git a/airtime_mvc/locale/template/airtime.po b/airtime_mvc/locale/template/airtime.po index 1790fc3bc..7484ef457 100644 --- a/airtime_mvc/locale/template/airtime.po +++ b/airtime_mvc/locale/template/airtime.po @@ -1541,7 +1541,7 @@ msgstr "" #: airtime_mvc/application/forms/SmartBlockCriteria.php:513 #: airtime_mvc/application/forms/SmartBlockCriteria.php:526 -msgid "The value should be in timestamp format(eg. 0000-00-00 or 00-00-00 00:00:00)" +msgid "The value should be in timestamp format (e.g. 0000-00-00 or 0000-00-00 00:00:00)" msgstr "" #: airtime_mvc/application/forms/SmartBlockCriteria.php:540 diff --git a/airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.mo index 0b9fcac4a..76aa894c7 100644 Binary files a/airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.mo and b/airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.mo differ diff --git a/airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po b/airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po index 1888a0030..a41b4eef1 100644 --- a/airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Airtime 2.3\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-05-21 09:20-0400\n" -"PO-Revision-Date: 2013-05-17 14:45-0500\n" -"Last-Translator: Denise Rigato \n" +"PO-Revision-Date: 2013-05-22 10:55+0100\n" +"Last-Translator: Daniel James \n" "Language-Team: Chinese Localization \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" @@ -1547,8 +1547,8 @@ msgstr "‘长度’格式应该为‘00:00:00’" #: airtime_mvc/application/forms/SmartBlockCriteria.php:513 #: airtime_mvc/application/forms/SmartBlockCriteria.php:526 -msgid "The value should be in timestamp format(eg. 0000-00-00 or 00-00-00 00:00:00)" -msgstr "时间格式错误，应该为形如0000-00-00 或 00-00-00 00:00:00的格式" +msgid "The value should be in timestamp format (e.g. 0000-00-00 or 0000-00-00 00:00:00)" +msgstr "时间格式错误，应该为形如0000-00-00 或 0000-00-00 00:00:00的格式" #: airtime_mvc/application/forms/SmartBlockCriteria.php:540 msgid "The value has to be numeric" @@ -2200,7 +2200,7 @@ msgstr "指定的路径无法访问。" #: airtime_mvc/application/controllers/LocaleController.php:170 #, php-format -msgid "Some steam types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." +msgid "Some stream types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided." msgstr "某些输出流类型需要进一步的环境配置，请参阅%s启用AAC+%s或者%s启用Opus%s。" #: airtime_mvc/application/controllers/LocaleController.php:171 diff --git a/airtime_mvc/public/css/bootstrap.css b/airtime_mvc/public/css/bootstrap.css index efe9abff7..2974d8cda 100644 --- a/airtime_mvc/public/css/bootstrap.css +++ b/airtime_mvc/public/css/bootstrap.css @@ -232,6 +232,9 @@ a.badge:hover { .btn-small [class^="icon-"] { margin-top: 0; } +#pl_edit.btn.btn-small { + margin-left: 10px; +} .btn-mini { padding: 2px 6px; font-size: 11px; @@ -2710,4 +2713,4 @@ fieldset .btn-toolbar { list-style-type: none; margin: 0; padding: 0; -} \ No newline at end of file +} diff --git a/airtime_mvc/public/js/airtime/dashboard/dashboard.js b/airtime_mvc/public/js/airtime/dashboard/dashboard.js index 5725d7b62..33bb89d46 100644 --- a/airtime_mvc/public/js/airtime/dashboard/dashboard.js +++ b/airtime_mvc/public/js/airtime/dashboard/dashboard.js @@ -22,6 +22,13 @@ var live_dj_on_air = false; var scheduled_play_on_air = false; var scheduled_play_source = false; + +//a reference returned by setTimeout. Useful for when we want clearTimeout() +var newSongTimeoutId = null; + +//a reference returned by setTimeout. Useful for when we want clearTimeout() +var newShowTimeoutId = null; + //keep track of how many UI refreshes the ON-AIR light has been off for. //For example, the uiUpdateInterval is every 200ms, so if onAirOffIterations //is 25, then that means 5 seconds have gone by. @@ -34,6 +41,8 @@ var nextSongPrepare = true; var nextShowPrepare = true; function secondsTimer(){ + /* This function constantly calls itself every 'uiUpdateInterval' + * micro-seconds and is responsible for updating the UI. */ if (localRemoteTimeOffset !== null){ var date = new Date(); approximateServerTime = date.getTime() - localRemoteTimeOffset; @@ -79,9 +88,11 @@ function updateProgressBarValue(){ var songElapsedTime = 0; songPercentDone = (approximateServerTime - currentSong.songStartPosixTime)/currentSong.songLengthMs*100; songElapsedTime = approximateServerTime - currentSong.songStartPosixTime; - if (songPercentDone < 0 || songPercentDone > 100){ + if (songPercentDone < 0) { songPercentDone = 0; //currentSong = null; + } else if (songPercentDone > 100) { + songPercentDone = 100; } else { if ((currentSong.media_item_played == true && currentShow.length > 0) || (songElapsedTime < 5000 && currentShow[0].record != 1)) { scheduled_play_line_to_switch.attr("class", "line-to-switch on"); @@ -95,40 +106,13 @@ function updateProgressBarValue(){ } $('#progress-show').attr("class", "progress-show"); } - } else if (nextSong == null) { + } else { scheduled_play_source = false; scheduled_play_line_to_switch.attr("class", "line-to-switch off"); scheduled_play_div.removeClass("ready"); $('#progress-show').attr("class", "progress-show-error"); } $('#progress-bar').attr("style", "width:"+songPercentDone+"%"); - - //calculate how much time left to next song if there is any - if (nextSong !== null && nextSongPrepare){ - var diff = nextSong.songStartPosixTime - approximateServerTime; - if (diff < serverUpdateInterval){ - - //sometimes the diff is negative (-100ms for example). Still looking - //into why this could sometimes happen. - if (diff < 0) - diff=0; - - nextSongPrepare = false; - setTimeout(newSongStart, diff); - } - } - - //calculate how much time left to next show if there is any - if (nextShow.length > 0 && nextShowPrepare){ - var diff = nextShow[0].showStartPosixTime - approximateServerTime; - if (diff < serverUpdateInterval){ - if (diff < 0) - diff=0; - - nextShowPrepare = false; - setTimeout(nextShowStart, diff); - } - } } function updatePlaybar(){ @@ -159,7 +143,7 @@ function updatePlaybar(){ } else { $('#current').html($.i18n._("Current")+": "+$.i18n._("Live Stream")+""); } - } else if (nextSong == null) { + } else { $('#current').html($.i18n._("Current")+": "+$.i18n._("Nothing Scheduled")+""); } } @@ -223,22 +207,66 @@ function calcAdditionalShowData(show){ } } -function parseItems(obj){ +function calculateTimeToNextSong() { + if (approximateServerTime === null) { + return; + } + + if (newSongTimeoutId !== null) { + /* We have a previous timeout set, let's unset it */ + clearTimeout(newSongTimeoutId); + newSongTimeoutId = null; + } + + var diff = nextSong.songStartPosixTime - approximateServerTime; + if (diff < 0) diff=0; + nextSongPrepare = false; + newSongTimeoutId= setTimeout(newSongStart, diff); +} + +function calculateTimeToNextShow() { + if (approximateServerTime === null) { + return; + } + + if (newShowTimeoutId !== null) { + /* We have a previous timeout set, let's unset it */ + clearTimeout(newShowTimeoutId); + newShowTimeoutId = null; + } + + var diff = nextShow[0].showStartPosixTime - approximateServerTime; + if (diff < 0) diff=0; + nextShowPrepare = false; + newShowTimeoutId= setTimeout(nextShowStart, diff); +} + +function parseItems(obj){ $('#time-zone').text(obj.timezone); + previousSong = obj.previous; currentSong = obj.current; nextSong = obj.next; - if (previousSong !== null) + if (previousSong !== null) { calcAdditionalData(previousSong); - if (currentSong !== null) + } + if (currentSong !== null) { calcAdditionalData(currentSong); - if (nextSong !== null) + } + if (nextSong !== null) { calcAdditionalData(nextSong); + calculateTimeToNextSong(); + } - calcAdditionalShowData(obj.currentShow); - calcAdditionalShowData(obj.nextShow); + if (obj.currentShow.length > 0) { + calcAdditionalShowData(obj.currentShow); + } + if (obj.nextShow.length > 0) { + calcAdditionalShowData(obj.nextShow); + calculateTimeToNextShow(); + } currentShow = obj.currentShow; nextShow = obj.nextShow; diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index 070930ee3..d00c8ca0c 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -413,7 +413,7 @@ var AIRTIME = (function(AIRTIME) { if (ele.bVisible) { advanceSearchDiv.append( - "
" + + "
" + "" + "
" + "
"); @@ -447,15 +447,15 @@ var AIRTIME = (function(AIRTIME) { function setFilterElement(iColumn, bVisible){ var actualId = colReorderMap[iColumn]; var selector = "div#advanced_search_col_"+actualId; + var $el = $(selector); + if (bVisible) { - $(selector).show(); + $el.show(); } else { - $(selector).hide(); + $el.hide(); } } - var currentColOrder = new Array(); - oTable = $libTable.dataTable( { // put hidden columns at the top to insure they can never be visible @@ -764,7 +764,8 @@ var AIRTIME = (function(AIRTIME) { "sAlign": "right", "aiExclude": [0, 1, 2], "sSize": "css", - "fnStateChange": setFilterElement + "fnStateChange": setFilterElement, + "buttonText": $.i18n._("Show / hide columns") }, "oColReorder": { diff --git a/airtime_mvc/public/js/airtime/preferences/streamsetting.js b/airtime_mvc/public/js/airtime/preferences/streamsetting.js index 304ce69ff..3fdba7c8c 100644 --- a/airtime_mvc/public/js/airtime/preferences/streamsetting.js +++ b/airtime_mvc/public/js/airtime/preferences/streamsetting.js @@ -403,7 +403,7 @@ function setupEventListeners() { $(".stream_type_help_icon").qtip({ content: { text: sprintf( - $.i18n._("Some steam types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided."), + $.i18n._("Some stream types require extra configuration. Details about enabling %sAAC+ Support%s or %sOpus Support%s are provided."), "", "", "", diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js index 30076dd67..28de74cf9 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -817,17 +817,18 @@ var AIRTIME = (function(AIRTIME){ mod.checkToolBarIcons(); }, + // R = ColReorder, C = ColVis + "sDom": 'R<"dt-process-rel"r><"sb-padded"<"H"C>><"dataTables_scrolling sb-padded"t>', + "oColVis": { - "aiExclude": [ 0, 1 ] + "aiExclude": [ 0, 1 ], + "buttonText": $.i18n._("Show / hide columns"), }, "oColReorder": { "iFixedColumns": 2 }, - - // R = ColReorderResize, C = ColVis - "sDom": 'R<"dt-process-rel"r><"sb-padded"<"H"C>><"dataTables_scrolling sb-padded"t>', - + "sAjaxDataProp": "schedule", "oLanguage": datatables_dict, "sAjaxSource": baseUrl+"showbuilder/builder-feed" diff --git a/airtime_mvc/public/js/datatables/plugin/AIRTIME_DEV_README_COL_VIS b/airtime_mvc/public/js/datatables/plugin/AIRTIME_DEV_README_COL_VIS index 2a04f4f0d..c332d036e 100644 --- a/airtime_mvc/public/js/datatables/plugin/AIRTIME_DEV_README_COL_VIS +++ b/airtime_mvc/public/js/datatables/plugin/AIRTIME_DEV_README_COL_VIS @@ -30,8 +30,4 @@ The new _fnDomBaseButton looks like this: return nButton; }, - --------------------------------------------------------------------------------- -* Line 96 has changed -- "buttonText": "Show / hide columns", -+ "buttonText": $.i18n._("Show / hide columns"), \ No newline at end of file + \ No newline at end of file diff --git a/airtime_mvc/public/js/datatables/plugin/dataTables.ColReorder.js b/airtime_mvc/public/js/datatables/plugin/dataTables.ColReorder.js old mode 100644 new mode 100755 diff --git a/airtime_mvc/public/js/datatables/plugin/dataTables.ColVis.js b/airtime_mvc/public/js/datatables/plugin/dataTables.ColVis.js old mode 100644 new mode 100755 index 4c5c3bfaf..d2d4da8ee --- a/airtime_mvc/public/js/datatables/plugin/dataTables.ColVis.js +++ b/airtime_mvc/public/js/datatables/plugin/dataTables.ColVis.js @@ -1,6 +1,6 @@ /* * File: ColVis.js - * Version: 1.0.7 + * Version: 1.0.8 * CVS: $Id$ * Description: Controls for column visiblity in DataTables * Author: Allan Jardine (www.sprymedia.co.uk) @@ -29,864 +29,883 @@ */ ColVis = function( oDTSettings, oInit ) { - /* Santiy check that we are a new instance */ - if ( !this.CLASS || this.CLASS != "ColVis" ) - { - alert( "Warning: ColVis must be initialised with the keyword 'new'" ); - } - - if ( typeof oInit == 'undefined' ) - { - oInit = {}; - } - - - /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Public class variables - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - - /** - * @namespace Settings object which contains customisable information for ColVis instance - */ - this.s = { - /** - * DataTables settings object - * @property dt - * @type Object - * @default null - */ - "dt": null, - - /** - * Customisation object - * @property oInit - * @type Object - * @default passed in - */ - "oInit": oInit, - - /** - * Callback function to tell the user when the state has changed - * @property fnStateChange - * @type function - * @default null - */ - "fnStateChange": null, - - /** - * Mode of activation. Can be 'click' or 'mouseover' - * @property activate - * @type String - * @default click - */ - "activate": "click", - - /** - * Position of the collection menu when shown - align "left" or "right" - * @property sAlign - * @type String - * @default right - */ - "sAlign": "left", - - /** - * Text used for the button - * @property buttonText - * @type String - * @default Show / hide columns - */ - "buttonText": $.i18n._("Show / hide columns"), - - /** - * Flag to say if the collection is hidden - * @property hidden - * @type boolean - * @default true - */ - "hidden": true, - - /** - * List of columns (integers) which should be excluded from the list - * @property aiExclude - * @type Array - * @default [] - */ - "aiExclude": [], - - /** - * Store the original viisbility settings so they could be restored - * @property abOriginal - * @type Array - * @default [] - */ - "abOriginal": [], - - /** - * Show Show-All button - * @property bShowAll - * @type Array - * @default [] - */ - "bShowAll": false, - - /** - * Show All button text - * @property sShowAll - * @type String - * @default Restore original - */ - "sShowAll": "Show All", - - /** - * Show restore button - * @property bRestore - * @type Array - * @default [] - */ - "bRestore": false, - - /** - * Restore button text - * @property sRestore - * @type String - * @default Restore original - */ - "sRestore": "Restore original", - - /** - * Overlay animation duration in mS - * @property iOverlayFade - * @type Integer - * @default 500 - */ - "iOverlayFade": 500, - - /** - * Label callback for column names. Takes three parameters: 1. the column index, 2. the column - * title detected by DataTables and 3. the TH node for the column - * @property fnLabel - * @type Function - * @default null - */ - "fnLabel": null, - - /** - * Indicate if ColVis should automatically calculate the size of buttons or not. The default - * is for it to do so. Set to "css" to disable the automatic sizing - * @property sSize - * @type String - * @default auto - */ - "sSize": "auto", - - /** - * Indicate if the column list should be positioned by Javascript, visually below the button - * or allow CSS to do the positioning - * @property bCssPosition - * @type boolean - * @default false - */ - "bCssPosition": false - }; - - - /** - * @namespace Common and useful DOM elements for the class instance - */ - this.dom = { - /** - * Wrapper for the button - given back to DataTables as the node to insert - * @property wrapper - * @type Node - * @default null - */ - "wrapper": null, - - /** - * Activation button - * @property button - * @type Node - * @default null - */ - "button": null, - - /** - * Collection list node - * @property collection - * @type Node - * @default null - */ - "collection": null, - - /** - * Background node used for shading the display and event capturing - * @property background - * @type Node - * @default null - */ - "background": null, - - /** - * Element to position over the activation button to catch mouse events when using mouseover - * @property catcher - * @type Node - * @default null - */ - "catcher": null, - - /** - * List of button elements - * @property buttons - * @type Array - * @default [] - */ - "buttons": [], - - /** - * Restore button - * @property restore - * @type Node - * @default null - */ - "restore": null - }; - - /* Store global reference */ - ColVis.aInstances.push( this ); - - /* Constructor logic */ - this.s.dt = oDTSettings; - this._fnConstruct(); - return this; + /* Santiy check that we are a new instance */ + if ( !this.CLASS || this.CLASS != "ColVis" ) + { + alert( "Warning: ColVis must be initialised with the keyword 'new'" ); + } + + if ( typeof oInit == 'undefined' ) + { + oInit = {}; + } + + + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Public class variables + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + + /** + * @namespace Settings object which contains customisable information for ColVis instance + */ + this.s = { + /** + * DataTables settings object + * @property dt + * @type Object + * @default null + */ + "dt": null, + + /** + * Customisation object + * @property oInit + * @type Object + * @default passed in + */ + "oInit": oInit, + + /** + * Callback function to tell the user when the state has changed + * @property fnStateChange + * @type function + * @default null + */ + "fnStateChange": null, + + /** + * Mode of activation. Can be 'click' or 'mouseover' + * @property activate + * @type String + * @default click + */ + "activate": "click", + + /** + * Position of the collection menu when shown - align "left" or "right" + * @property sAlign + * @type String + * @default right + */ + "sAlign": "left", + + /** + * Text used for the button + * @property buttonText + * @type String + * @default Show / hide columns + */ + "buttonText": "Show / hide columns", + + /** + * Flag to say if the collection is hidden + * @property hidden + * @type boolean + * @default true + */ + "hidden": true, + + /** + * List of columns (integers) which should be excluded from the list + * @property aiExclude + * @type Array + * @default [] + */ + "aiExclude": [], + + /** + * Store the original viisbility settings so they could be restored + * @property abOriginal + * @type Array + * @default [] + */ + "abOriginal": [], + + /** + * Show Show-All button + * @property bShowAll + * @type Array + * @default [] + */ + "bShowAll": false, + + /** + * Show All button text + * @property sShowAll + * @type String + * @default Restore original + */ + "sShowAll": "Show All", + + /** + * Show restore button + * @property bRestore + * @type Array + * @default [] + */ + "bRestore": false, + + /** + * Restore button text + * @property sRestore + * @type String + * @default Restore original + */ + "sRestore": "Restore original", + + /** + * Overlay animation duration in mS + * @property iOverlayFade + * @type Integer + * @default 500 + */ + "iOverlayFade": 500, + + /** + * Label callback for column names. Takes three parameters: 1. the column index, 2. the column + * title detected by DataTables and 3. the TH node for the column + * @property fnLabel + * @type Function + * @default null + */ + "fnLabel": null, + + /** + * Indicate if ColVis should automatically calculate the size of buttons or not. The default + * is for it to do so. Set to "css" to disable the automatic sizing + * @property sSize + * @type String + * @default auto + */ + "sSize": "auto", + + /** + * Indicate if the column list should be positioned by Javascript, visually below the button + * or allow CSS to do the positioning + * @property bCssPosition + * @type boolean + * @default false + */ + "bCssPosition": false + }; + + + /** + * @namespace Common and useful DOM elements for the class instance + */ + this.dom = { + /** + * Wrapper for the button - given back to DataTables as the node to insert + * @property wrapper + * @type Node + * @default null + */ + "wrapper": null, + + /** + * Activation button + * @property button + * @type Node + * @default null + */ + "button": null, + + /** + * Collection list node + * @property collection + * @type Node + * @default null + */ + "collection": null, + + /** + * Background node used for shading the display and event capturing + * @property background + * @type Node + * @default null + */ + "background": null, + + /** + * Element to position over the activation button to catch mouse events when using mouseover + * @property catcher + * @type Node + * @default null + */ + "catcher": null, + + /** + * List of button elements + * @property buttons + * @type Array + * @default [] + */ + "buttons": [], + + /** + * Restore button + * @property restore + * @type Node + * @default null + */ + "restore": null + }; + + /* Store global reference */ + ColVis.aInstances.push( this ); + + /* Constructor logic */ + this.s.dt = oDTSettings; + this._fnConstruct(); + return this; }; ColVis.prototype = { - /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Public methods - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - - /** - * Rebuild the list of buttons for this instance (i.e. if there is a column header update) - * @method fnRebuild - * @returns void - */ - "fnRebuild": function () - { - /* Remove the old buttons */ - for ( var i=this.dom.buttons.length-1 ; i>=0 ; i-- ) - { - if ( this.dom.buttons[i] !== null ) - { - this.dom.collection.removeChild( this.dom.buttons[i] ); - } - } - this.dom.buttons.splice( 0, this.dom.buttons.length ); - - if ( this.dom.restore ) - { - this.dom.restore.parentNode( this.dom.restore ); - } - - /* Re-add them (this is not the optimal way of doing this, it is fast and effective) */ - this._fnAddButtons(); - - /* Update the checkboxes */ - this._fnDrawCallback(); - }, - - - - /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Private methods (they are of course public in JS, but recommended as private) - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - - /** - * Constructor logic - * @method _fnConstruct - * @returns void - * @private - */ - "_fnConstruct": function () - { - this._fnApplyCustomisation(); - - var that = this; - this.dom.wrapper = document.createElement('div'); - this.dom.wrapper.className = "ColVis TableTools"; - - this.dom.button = this._fnDomBaseButton( this.s.buttonText ); - this.dom.button.className += " ColVis_MasterButton"; - this.dom.wrapper.appendChild( this.dom.button ); - - this.dom.catcher = this._fnDomCatcher(); - this.dom.collection = this._fnDomCollection(); - this.dom.background = this._fnDomBackground(); - - this._fnAddButtons(); - - /* Store the original visbility information */ - for ( var i=0, iLen=this.s.dt.aoColumns.length ; i=0 ; i-- ) + { + if ( this.dom.buttons[i] !== null ) + { + this.dom.collection.removeChild( this.dom.buttons[i] ); + } + } + this.dom.buttons.splice( 0, this.dom.buttons.length ); + + if ( this.dom.restore ) + { + this.dom.restore.parentNode( this.dom.restore ); + } + + /* Re-add them (this is not the optimal way of doing this, it is fast and effective) */ + this._fnAddButtons(); + + /* Update the checkboxes */ + this._fnDrawCallback(); + }, + + + + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Private methods (they are of course public in JS, but recommended as private) + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + + /** + * Constructor logic + * @method _fnConstruct + * @returns void + * @private + */ + "_fnConstruct": function () + { + this._fnApplyCustomisation(); + + var that = this; + var i, iLen; + this.dom.wrapper = document.createElement('div'); + this.dom.wrapper.className = "ColVis TableTools"; + + this.dom.button = this._fnDomBaseButton( this.s.buttonText ); + this.dom.button.className += " ColVis_MasterButton"; + this.dom.wrapper.appendChild( this.dom.button ); + + this.dom.catcher = this._fnDomCatcher(); + this.dom.collection = this._fnDomCollection(); + this.dom.background = this._fnDomBackground(); + + this._fnAddButtons(); + + /* Store the original visbility information */ + for ( i=0, iLen=this.s.dt.aoColumns.length ; i'+this.s.sRestore+'' ); - - $(nButton).click( function (e) { - for ( var i=0, iLen=that.s.abOriginal.length ; i'+this.s.sShowAll+'' ); - - $(nButton).click( function (e) { - for ( var i=0, iLen=that.s.abOriginal.length ; i'+ - ''+sTitle+'' ); - - $(nButton).click( function (e) { - var showHide = !$('input', this).is(":checked"); - if ( e.target.nodeName.toLowerCase() == "input" ) - { - showHide = $('input', this).is(":checked"); - } - - /* Need to consider the case where the initialiser created more than one table - change the - * API index that DataTables is using - */ - var oldIndex = $.fn.dataTableExt.iApiIndex; - $.fn.dataTableExt.iApiIndex = that._fnDataTablesApiIndex.call(that); + /* If columns are reordered, then we need to update our exclude list and + * rebuild the displayed list + */ + $(this.s.dt.oInstance).bind( 'column-reorder', function ( e, oSettings, oReorder ) { + for ( i=0, iLen=that.s.aiExclude.length ; i"); - nSpan.innerHTML = text; - - $(nButton).bind( 'click', function (e) { - that._fnCollectionShow(); - e.preventDefault(); - } ); - - return nButton; - }, - - - /** - * Create the element used to contain list the columns (it is shown and hidden as needed) - * @method _fnDomCollection - * @returns {Node} div container for the collection - * @private - */ - "_fnDomCollection": function () - { - var that = this; - var nHidden = document.createElement('div'); - nHidden.style.display = "none"; - nHidden.className = !this.s.dt.bJUI ? "ColVis_collection TableTools_collection" : - "ColVis_collection TableTools_collection ui-buttonset ui-buttonset-multi"; - - if ( !this.s.bCssPosition ) - { - nHidden.style.position = "absolute"; - } - $(nHidden).css('opacity', 0); - - return nHidden; - }, - - - /** - * An element to be placed on top of the activate button to catch events - * @method _fnDomCatcher - * @returns {Node} div container for the collection - * @private - */ - "_fnDomCatcher": function () - { - var - that = this, - nCatcher = document.createElement('div'); - nCatcher.className = "ColVis_catcher TableTools_catcher"; - - $(nCatcher).click( function () { - that._fnCollectionHide.call( that, null, null ); - } ); - - return nCatcher; - }, - - - /** - * Create the element used to shade the background, and capture hide events (it is shown and - * hidden as needed) - * @method _fnDomBackground - * @returns {Node} div container for the background - * @private - */ - "_fnDomBackground": function () - { - var that = this; - - var nBackground = document.createElement('div'); - nBackground.style.position = "absolute"; - nBackground.style.left = "0px"; - nBackground.style.top = "0px"; - nBackground.className = "ColVis_collectionBackground TableTools_collectionBackground"; - $(nBackground).css('opacity', 0); - - $(nBackground).click( function () { - that._fnCollectionHide.call( that, null, null ); - } ); - - /* When considering a mouse over action for the activation, we also consider a mouse out - * which is the same as a mouse over the background - without all the messing around of - * bubbling events. Use the catcher element to avoid messing around with bubbling - */ - if ( this.s.activate == "mouseover" ) - { - $(nBackground).mouseover( function () { - that.s.overcollection = false; - that._fnCollectionHide.call( that, null, null ); - } ); - } - - return nBackground; - }, - - - /** - * Show the show / hide list and the background - * @method _fnCollectionShow - * @returns void - * @private - */ - "_fnCollectionShow": function () - { - var that = this, i, iLen; - var oPos = $(this.dom.button).offset(); - var nHidden = this.dom.collection; - var nBackground = this.dom.background; - var iDivX = parseInt(oPos.left, 10); - var iDivY = parseInt(oPos.top + $(this.dom.button).outerHeight(), 10); - - if ( !this.s.bCssPosition ) - { - nHidden.style.top = iDivY+"px"; - nHidden.style.left = iDivX+"px"; - } - nHidden.style.display = "block"; - $(nHidden).css('opacity',0); - - var iWinHeight = $(window).height(), iDocHeight = $(document).height(), - iWinWidth = $(window).width(), iDocWidth = $(document).width(); - - nBackground.style.height = ((iWinHeight>iDocHeight)? iWinHeight : iDocHeight) +"px"; - nBackground.style.width = ((iWinWidth'+this.s.sRestore+'' ); + + $(nButton).click( function (e) { + for ( var i=0, iLen=that.s.abOriginal.length ; i'+this.s.sShowAll+'' ); + + $(nButton).click( function (e) { + for ( var i=0, iLen=that.s.abOriginal.length ; i'+ + ''+sTitle+'' ); + + $(nButton).click( function (e) { + var showHide = !$('input', this).is(":checked"); + if ( e.target.nodeName.toLowerCase() == "input" ) + { + showHide = $('input', this).is(":checked"); + } + + /* Need to consider the case where the initialiser created more than one table - change the + * API index that DataTables is using + */ + var oldIndex = $.fn.dataTableExt.iApiIndex; + $.fn.dataTableExt.iApiIndex = that._fnDataTablesApiIndex.call(that); - var iDivWidth = $(nHidden).outerWidth(); - var iDivHeight = $(nHidden).outerHeight(); - - if ( iDivX + iDivWidth > iDocWidth ) - { - nHidden.style.left = (iDocWidth-iDivWidth)+"px"; - } - } - - /* This results in a very small delay for the end user but it allows the animation to be - * much smoother. If you don't want the animation, then the setTimeout can be removed - */ - setTimeout( function () { - $(nHidden).animate({"opacity": 1}, that.s.iOverlayFade); - $(nBackground).animate({"opacity": 0.1}, that.s.iOverlayFade, 'linear', function () { - /* In IE6 if you set the checked attribute of a hidden checkbox, then this is not visually - * reflected. As such, we need to do it here, once it is visible. Unbelievable. - */ - if ( jQuery.browser.msie && jQuery.browser.version == "6.0" ) - { - that._fnDrawCallback(); - } - }); - }, 10 ); - - this.s.hidden = false; - }, - - - /** - * Hide the show / hide list and the background - * @method _fnCollectionHide - * @returns void - * @private - */ - "_fnCollectionHide": function ( ) - { - var that = this; - - if ( !this.s.hidden && this.dom.collection !== null ) - { - this.s.hidden = true; - - $(this.dom.collection).animate({"opacity": 0}, that.s.iOverlayFade, function (e) { - this.style.display = "none"; - } ); - - $(this.dom.background).animate({"opacity": 0}, that.s.iOverlayFade, function (e) { - document.body.removeChild( that.dom.background ); - document.body.removeChild( that.dom.catcher ); - } ); - } - }, - - - /** - * Alter the colspan on any fnOpen rows - */ - "_fnAdjustOpenRows": function () - { - var aoOpen = this.s.dt.aoOpenRows; - var iVisible = this.s.dt.oApi._fnVisbleColumns( this.s.dt ); - - for ( var i=0, iLen=aoOpen.length ; i