diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md similarity index 64% rename from CONTRIBUTING.md rename to .github/CONTRIBUTING.md index 5cb9715546cb8..9df1f82be5060 100644 --- a/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -2,14 +2,14 @@ Contributing to the Joomla! CMS™ =============== You are welcome to submit a contribution for review and possible inclusion in the Joomla! CMS but, before it will be accepted, we ask that you follow these simple steps: -1) Open an issue on our [Issue Tracker](http://issues.joomla.org/) or here on GitHub. If you can, please provide a fix and create a pull request (PR) instead; this will automatically create an issue for you. +1) Open an issue on our [Issue Tracker](https://issues.joomla.org/) or here on GitHub. If you can, please provide a fix and create a pull request (PR) instead; this will automatically create an issue for you. -2) Follow the [Joomla! Coding Standards](http://joomla.github.io/coding-standards). +2) Follow the [Joomla! Coding Standards](https://joomla.github.io/coding-standards). 3) When filing an issue or opening a PR, please include a clear title and description. The title should be a short summary of an issue and, if possible, should include a reference to an open issue. For example, `Invalid Query in com_admin (Ref #1234)` would be sufficient. All issues and PRs should include a description with as much detail as possible. If it is a PR, include what the issue is, what the PR is addressing, testing instructions and environmental information (PHP version, database driver and version, and other data you can retrieve from your site's system information view) in case the issue is specific to certain environments. If additional information is needed, please be prepared to provide it as our community members review your submission. -4) Report security issues to the Joomla! Security Strike Team (JSST) at security@joomla.org or use the [JSST contact form](http://developer.joomla.org/contact-security-team.html). Please do not use the public tracker for security issues. +4) Report security issues to the Joomla! Security Strike Team (JSST) at security@joomla.org or use the [JSST contact form](https://developer.joomla.org/contact-security-team.html). Please do not use the public tracker for security issues. Please be patient as not all items will be tested immediately (remember, all bug testing for the Joomla! CMS is done by volunteers) and be receptive to feedback about your code. @@ -21,6 +21,5 @@ There are other branches available which serve specific purposes. | ------ | ------- | | staging | Current codebase. | | master | Each commit made to staging gets tested if it passes unit tests and codestyle rules. It is then merged into master. This is done automatically. | -| 2.5.x | Branch for the Joomla 2.5.x series. Currently in maintenance mode with EOL end of 2014. No new features are accepted here. | -| 3.2.x | Branch for the Joomla 3.2.x series. Currently in security mode with EOL Oct 2014. Only security issues are fixed. | -| 3.4-dev | Branch for the next minor Joomla version. New backward compatible features go into this branch. Commits to staging will be applied to this branch as well. | +| 2.5.x | Branch for the Joomla 2.5.x series. Support for this version has ended, no patches are accepted here. | +| 3.6.x | Branch for the next minor Joomla version. New backward compatible features go into this branch. Commits to staging will be applied to this branch as well. | diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 0000000000000..722c66ca930c7 --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,18 @@ +#### Steps to reproduce the issue + + + +#### Expected result + + + +#### Actual result + + + +#### System information (as much as possible) + + + +#### Additional comments + diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 0000000000000..2434a62ddbf49 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,5 @@ +Pull Request for Issue # . + +#### Summary of Changes + +#### Testing Instructions diff --git a/.gitignore b/.gitignore index d8ef0e38896fd..9cfa3c08dc80d 100644 --- a/.gitignore +++ b/.gitignore @@ -64,6 +64,8 @@ Desktop.ini /libraries/vendor/ircmaxell/password-compat/phpunit.xml.dist /libraries/vendor/ircmaxell/password-compat/README.md /libraries/vendor/ircmaxell/password-compat/version-test.php +/libraries/vendor/joomla/*/.gitignore +/libraries/vendor/joomla/*/.gitmodules /libraries/vendor/joomla/*/docs /libraries/vendor/joomla/*/Tests /libraries/vendor/joomla/*/vendor @@ -87,6 +89,17 @@ Desktop.ini /libraries/vendor/leafo/lessphp/Makefile /libraries/vendor/leafo/lessphp/package.sh /libraries/vendor/leafo/lessphp/README.md +/libraries/vendor/paragonie/random_compat/.gitignore +/libraries/vendor/paragonie/random_compat/.scrutinizer.yml +/libraries/vendor/paragonie/random_compat/.travis.yml +/libraries/vendor/paragonie/random_compat/dist +/libraries/vendor/paragonie/random_compat/other +/libraries/vendor/paragonie/random_compat/CHANGELOG.md +/libraries/vendor/paragonie/random_compat/ERRATA.md +/libraries/vendor/paragonie/random_compat/README.md +/libraries/vendor/paragonie/random_compat/SECURITY.md +/libraries/vendor/paragonie/random_compat/composer.json +/libraries/vendor/paragonie/random_compat/tests /libraries/vendor/phpmailer/phpmailer/docs /libraries/vendor/phpmailer/phpmailer/examples /libraries/vendor/phpmailer/phpmailer/language @@ -98,10 +111,17 @@ Desktop.ini /libraries/vendor/phpmailer/phpmailer/composer.json /libraries/vendor/phpmailer/phpmailer/README.md /libraries/vendor/phpmailer/phpmailer/travis.phpunit.xml.dist +/libraries/vendor/phpmailer/phpmailer/extras/README.md +/libraries/vendor/phpmailer/phpmailer/get_oauth_token.php /libraries/vendor/psr/log/Psr/Log/Test /libraries/vendor/psr/log/.gitignore /libraries/vendor/psr/log/composer.json /libraries/vendor/psr/log/README.md +/libraries/vendor/symfony/polyfill-php56/composer.json +/libraries/vendor/symfony/polyfill-php56/README.md +/libraries/vendor/symfony/polyfill-util/composer.json +/libraries/vendor/symfony/polyfill-util/README.md +/libraries/vendor/symfony/polyfill-util/TestListener.php /libraries/vendor/symfony/yaml/Tests /libraries/vendor/symfony/yaml/.gitignore /libraries/vendor/symfony/yaml/CHANGELOG.md diff --git a/.travis.yml b/.travis.yml index 10837ae2ab437..6d528c3ffd0fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,14 +3,32 @@ sudo: false language: php -php: - - 5.3 - - 5.4 - - 5.5 - - 5.6 - - 7.0 +env: + global: + - RUN_PHPCS="no" + - INSTALL_MEMCACHE="yes" + - INSTALL_MEMCACHED="yes" + - INSTALL_REDIS="yes" + +matrix: + include: + - php: 5.3 + env: INSTALL_APC="yes" + - php: 5.4 + env: INSTALL_APC="yes" + - php: 5.5 + env: INSTALL_APCU="yes" + - php: 5.6 + env: RUN_PHPCS="yes" INSTALL_APCU="yes" + - php: 7.0 + env: INSTALL_APCU="yes" INSTALL_APCU_BC_BETA="no" INSTALL_MEMCACHE="no" INSTALL_MEMCACHED="no" INSTALL_REDIS="no" # Disabled apcu_bc install until https://github.com/travis-ci/travis-ci/issues/5207 is resolved + - php: hhvm + env: INSTALL_APCU_BC_BETA="no" INSTALL_MEMCACHE="no" INSTALL_MEMCACHED="no" INSTALL_REDIS="no" # Disabled items that currently do not work in travis-ci hhvm + allow_failures: + - php: hhvm services: + - memcache - memcached - redis-server @@ -25,16 +43,17 @@ before_script: # Set up Apache # - ./build/travis/php-apache.sh # Enable additional PHP extensions - - if [ $TRAVIS_PHP_VERSION != "7.0" ]; then phpenv config-add build/travis/phpenv/memcached.ini; fi - # PHP 5.3 and 5.4 use APC - - if [ $TRAVIS_PHP_VERSION == "5.3" ] || [ $TRAVIS_PHP_VERSION == "5.4" ]; then phpenv config-add build/travis/phpenv/apc-$TRAVIS_PHP_VERSION.ini; fi - # PHP 5.5+ use APCu - - if [ $TRAVIS_PHP_VERSION == "5.5" ] || [ $TRAVIS_PHP_VERSION == "5.6" ]; then printf "\n" | pecl install apcu-beta; fi - - if [ $TRAVIS_PHP_VERSION != "7.0" ]; then phpenv config-add build/travis/phpenv/redis.ini; fi + - if [[ $INSTALL_MEMCACHE == "yes" ]]; then phpenv config-add build/travis/phpenv/memcached.ini; fi + - if [[ $INSTALL_MEMCACHED == "yes" ]]; then phpenv config-add build/travis/phpenv/memcached.ini; fi + - if [[ $INSTALL_APC == "yes" ]]; then phpenv config-add build/travis/phpenv/apc-$TRAVIS_PHP_VERSION.ini; fi + - if [[ $INSTALL_APCU == "yes" && $TRAVIS_PHP_VERSION = 5.* ]]; then printf "\n" | pecl install apcu-4.0.10 && phpenv config-add build/travis/phpenv/apcu-$TRAVIS_PHP_VERSION.ini; fi + - if [[ $INSTALL_APCU == "yes" && $TRAVIS_PHP_VERSION = 7.* ]]; then printf "\n" | pecl install apcu-beta && phpenv config-add build/travis/phpenv/apcu-$TRAVIS_PHP_VERSION.ini; fi + - if [[ $INSTALL_APCU_BC_BETA == "yes" ]]; then printf "\n" | pecl install apcu_bc-beta; fi + - if [[ $INSTALL_REDIS == "yes" ]]; then phpenv config-add build/travis/phpenv/redis.ini; fi script: - libraries/vendor/bin/phpunit --configuration travisci-phpunit.xml - - if [ $TRAVIS_PHP_VERSION != "7.0" ]; then libraries/vendor/bin/phpcs --report=full --extensions=php -p --standard=build/phpcs/Joomla .; fi + - if [[ $RUN_PHPCS == "yes" ]]; then libraries/vendor/bin/phpcs --report=full --extensions=php -p --standard=build/phpcs/Joomla .; fi branches: except: diff --git a/README.md b/README.md index 12d2a28c5f4a9..6ade44bbbb16d 100644 --- a/README.md +++ b/README.md @@ -3,14 +3,14 @@ Joomla! CMS™ [![Analytics](https://ga-beacon.appspot.com/UA-544070-3/joomla-cm Build Status --------------------- -Travis-CI: [![Build Status](https://travis-ci.org/joomla/joomla-cms.png)](https://travis-ci.org/joomla/joomla-cms) +Travis-CI: [![Build Status](https://travis-ci.org/joomla/joomla-cms.svg?branch=staging)](https://travis-ci.org/joomla/joomla-cms) Jenkins: [![Build Status](http://build.joomla.org/job/cms/badge/icon)](http://build.joomla.org/job/cms/) What is this? --------------------- * This is a Joomla! 3.x installation/upgrade package. * Joomla's [Official website](https://www.joomla.org). -* Joomla! 3.4 [version history](https://docs.joomla.org/Joomla_3.4_version_history). +* Joomla! 3.5 [version history](https://docs.joomla.org/Joomla_3.5_version_history). * Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/master). What is Joomla? @@ -79,13 +79,13 @@ Do you want to improve Joomla? -------------------- * How do you [request a feature](https://docs.joomla.org/How_do_you_request_a_feature%3F)? * How do you [report a bug](https://docs.joomla.org/Filing_bugs_and_issues)? -* Get Involved: Joomla! is community developed software. [Join the community](http://volunteers.joomla.org/). +* Get Involved: Joomla! is community developed software. [Join the community](https://volunteers.joomla.org/). * Documentation for [Developers](https://docs.joomla.org/Developers). * Documentation for [Web designers](https://docs.joomla.org/Web_designers). Copyright --------------------- -* Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +* Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. * [Special Thanks](https://docs.joomla.org/Joomla!_Credits_and_Thanks) * Distributed under the GNU General Public License version 2 or later * See [License details](https://docs.joomla.org/Joomla_Licenses) diff --git a/README.txt b/README.txt index f05a127c06132..741ce6ac10ba6 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,7 @@ 1- What is this? * This is a Joomla! installation/upgrade package to version 3.x * Joomla! Official site: https://www.joomla.org - * Joomla! 3.4 version history - https://docs.joomla.org/Joomla_3.4_version_history + * Joomla! 3.5 version history - https://docs.joomla.org/Joomla_3.5_version_history * Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/master 2- What is Joomla? @@ -60,12 +60,12 @@ 12- Do you want to improve Joomla? * How do you request a feature? https://docs.joomla.org/How_do_you_request_a_feature%3F * How do you report a bug? https://docs.joomla.org/Filing_bugs_and_issues - * Get Involved: Joomla! is a community developed software. Join the community at http://volunteers.joomla.org/ + * Get Involved: Joomla! is a community developed software. Join the community at https://volunteers.joomla.org/ * Are you a Developer? https://docs.joomla.org/Developers * Are you a Web designer? https://docs.joomla.org/Web_designers Copyright: - * Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + * Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. * Special Thanks: https://docs.joomla.org/Joomla!_Credits_and_Thanks * Distributed under the GNU General Public License version 2 or later * See Licenses details at https://docs.joomla.org/Joomla_Licenses diff --git a/administrator/components/com_admin/admin.php b/administrator/components/com_admin/admin.php index 267127a92c6e5..6e6070e94c736 100644 --- a/administrator/components/com_admin/admin.php +++ b/administrator/components/com_admin/admin.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/admin.xml b/administrator/components/com_admin/admin.xml index 2b24adc0bd93f..17e6b4c535508 100644 --- a/administrator/components/com_admin/admin.xml +++ b/administrator/components/com_admin/admin.xml @@ -3,7 +3,7 @@ com_admin Joomla! Project April 2006 - (C) 2005 - 2015 Open Source Matters. All rights reserved. + (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/components/com_admin/controller.php b/administrator/components/com_admin/controller.php index c5d3a24e92de5..c8f1fa7d86b59 100644 --- a/administrator/components/com_admin/controller.php +++ b/administrator/components/com_admin/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/controllers/profile.php b/administrator/components/com_admin/controllers/profile.php index ccfb0eb9bee8f..b34ea7c252f8e 100644 --- a/administrator/components/com_admin/controllers/profile.php +++ b/administrator/components/com_admin/controllers/profile.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/helpers/html/directory.php b/administrator/components/com_admin/helpers/html/directory.php index 70eb5e0df9dfe..a4c7cdb583376 100644 --- a/administrator/components/com_admin/helpers/html/directory.php +++ b/administrator/components/com_admin/helpers/html/directory.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/helpers/html/phpsetting.php b/administrator/components/com_admin/helpers/html/phpsetting.php index 312c15c4b94c7..77dbdbd93b28a 100644 --- a/administrator/components/com_admin/helpers/html/phpsetting.php +++ b/administrator/components/com_admin/helpers/html/phpsetting.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/helpers/html/system.php b/administrator/components/com_admin/helpers/html/system.php index 33b7a840d5cca..448f38609e90c 100644 --- a/administrator/components/com_admin/helpers/html/system.php +++ b/administrator/components/com_admin/helpers/html/system.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/models/help.php b/administrator/components/com_admin/models/help.php index 1b07a6358e13b..f18f7f2a155c3 100644 --- a/administrator/components/com_admin/models/help.php +++ b/administrator/components/com_admin/models/help.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/models/profile.php b/administrator/components/com_admin/models/profile.php index a825833f54015..e97d292bd73f0 100644 --- a/administrator/components/com_admin/models/profile.php +++ b/administrator/components/com_admin/models/profile.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/models/sysinfo.php b/administrator/components/com_admin/models/sysinfo.php index 30f538b2fa90b..380811284370d 100644 --- a/administrator/components/com_admin/models/sysinfo.php +++ b/administrator/components/com_admin/models/sysinfo.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -50,6 +50,95 @@ class AdminModelSysInfo extends JModelLegacy */ protected $php_info = null; + /** + * Array containing the phpinfo() data. + * + * @var array + * + * @since 3.5 + */ + protected $phpInfoArray; + + /** + * Private/critical data that we don't want to share + * + * @var array + * + * @since 3.5 + */ + protected $privateSettings = array( + 'phpInfoArray' => array( + 'CONTEXT_DOCUMENT_ROOT', + 'Cookie', + 'DOCUMENT_ROOT', + 'extension_dir', + 'error_log', + 'Host', + 'HTTP_COOKIE', + 'HTTP_HOST', + 'HTTP_ORIGIN', + 'HTTP_REFERER', + 'HTTP Request', + 'include_path', + 'mysql.default_socket', + 'MYSQL_SOCKET', + 'MYSQL_INCLUDE', + 'MYSQL_LIBS', + 'mysqli.default_socket', + 'MYSQLI_SOCKET', + 'PATH', + 'Path to sendmail', + 'pdo_mysql.default_socket', + 'Referer', + 'REMOTE_ADDR', + 'SCRIPT_FILENAME', + 'sendmail_path', + 'SERVER_ADDR', + 'SERVER_ADMIN', + 'Server Administrator', + 'SERVER_NAME', + 'Server Root', + 'session.name', + 'session.save_path', + 'upload_tmp_dir', + 'User/Group', + 'open_basedir' + ), + 'other' => array( + 'db', + 'dbprefix', + 'fromname', + 'live_site', + 'log_path', + 'mailfrom', + 'memcache_server_host', + 'memcached_server_host', + 'open_basedir', + 'Origin', + 'proxy_host', + 'proxy_user', + 'proxy_pass', + 'secret', + 'sendmail', + 'session.save_path', + 'session_memcache_server_host', + 'session_memcached_server_host', + 'sitename', + 'smtphost', + 'tmp_path', + 'open_basedir' + ) + ); + + /** + * System values that can be "safely" shared + * + * @var array + * + * @since 3.5 + */ + protected $safeData; + /** * Information about writable state of directories * @@ -66,6 +155,71 @@ class AdminModelSysInfo extends JModelLegacy */ protected $editor = null; + /** + * Remove sections of data marked as private in the privateSettings + * + * @param array $dataArray Array with data tha may contain private informati + * @param string $dataType Type of data to search for an specific section in the privateSettings array + * + * @return array + * + * @since 3.5 + */ + protected function cleanPrivateData($dataArray, $dataType = 'other') + { + $dataType = isset($this->privateSettings[$dataType]) ? $dataType : 'other'; + + $privateSettings = $this->privateSettings[$dataType]; + + if (!$privateSettings) + { + return $dataArray; + } + + foreach ($dataArray as $section => $values) + { + if (is_array($values)) + { + $dataArray[$section] = $this->cleanPrivateData($values, $dataType); + } + + if (in_array($section, $privateSettings, true)) + { + $dataArray[$section] = $this->cleanSectionPrivateData($values); + } + } + + return $dataArray; + } + + /** + * Offuscate section values + * + * @param mixed $sectionValues Section data + * + * @return mixed + * + * @since 3.5 + */ + protected function cleanSectionPrivateData($sectionValues) + { + if (!is_array($sectionValues)) + { + if (strstr($sectionValues, JPATH_ROOT)) + { + $sectionValues = 'xxxxxx'; + } + return strlen($sectionValues) ? 'xxxxxx' : ''; + } + + foreach ($sectionValues as $setting => $value) + { + $sectionValues[$setting] = strlen($value) ? 'xxxxxx' : ''; + } + + return $sectionValues; + } + /** * Method to get the PHP settings * @@ -96,7 +250,8 @@ public function &getPhpSettings() 'zlib' => extension_loaded('zlib'), 'zip' => function_exists('zip_open') && function_exists('zip_read'), 'mbstring' => extension_loaded('mbstring'), - 'iconv' => function_exists('iconv') + 'iconv' => function_exists('iconv'), + 'max_input_vars' => ini_get('max_input_vars'), ); return $this->php_settings; @@ -142,20 +297,21 @@ public function &getInfo() return $this->info; } - $version = new JVersion; - $platform = new JPlatform; - $db = $this->getDbo(); + $version = new JVersion; + $platform = new JPlatform; + $db = $this->getDbo(); $this->info = array( - 'php' => php_uname(), - 'dbversion' => $db->getVersion(), - 'dbcollation' => $db->getCollation(), - 'phpversion' => phpversion(), - 'server' => isset($_SERVER['SERVER_SOFTWARE']) ? $_SERVER['SERVER_SOFTWARE'] : getenv('SERVER_SOFTWARE'), - 'sapi_name' => php_sapi_name(), - 'version' => $version->getLongVersion(), - 'platform' => $platform->getLongVersion(), - 'useragent' => isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : "" + 'php' => php_uname(), + 'dbversion' => $db->getVersion(), + 'dbcollation' => $db->getCollation(), + 'dbconnectioncollation' => $db->getConnectionCollation(), + 'phpversion' => phpversion(), + 'server' => isset($_SERVER['SERVER_SOFTWARE']) ? $_SERVER['SERVER_SOFTWARE'] : getenv('SERVER_SOFTWARE'), + 'sapi_name' => php_sapi_name(), + 'version' => $version->getLongVersion(), + 'platform' => $platform->getLongVersion(), + 'useragent' => isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : "" ); return $this->info; @@ -173,6 +329,37 @@ public function phpinfoEnabled() return !in_array('phpinfo', explode(',', ini_get('disable_functions'))); } + /** + * Method to get filter data from the model + * + * @param string $dataType Type of data to get safely + * @param bool $public If true no sensitive information will be removed + * + * @return array + * + * @since 3.5 + */ + public function getSafeData($dataType, $public = true) + { + if (isset($this->safeData[$dataType])) + { + return $this->safeData[$dataType]; + } + + $methodName = 'get' . ucfirst($dataType); + + if (!method_exists($this, $methodName)) + { + return array(); + } + + $data = $this->$methodName($public); + + $this->safeData[$dataType] = $this->cleanPrivateData($data, $dataType); + + return $this->safeData[$dataType]; + } + /** * Method to get the PHP info * @@ -212,14 +399,106 @@ public function &getPHPInfo() return $this->php_info; } + /** + * Get phpinfo() output as array + * + * @return array + * + * @since 3.5 + */ + public function getPhpInfoArray() + { + // Already cached + if (null !== $this->phpInfoArray) + { + return $this->phpInfoArray; + } + + $phpInfo = $this->getPhpInfo(); + + $this->phpInfoArray = $this->parsePhpInfo($phpInfo); + + return $this->phpInfoArray; + } + + /** + * Method to get a list of installed extensions + * + * @return array installed extensions + * + * @since 3.5 + */ + public function getExtensions() + { + $installed = array(); + $db = JFactory::getDbo(); + $query = $db->getQuery(true) + ->select('*') + ->from($db->qn('#__extensions')); + $db->setQuery($query); + + try + { + $extensions = $db->loadObjectList(); + } + catch (Exception $e) + { + JLog::add(JText::sprintf('JLIB_DATABASE_ERROR_FUNCTION_FAILED', $e->getCode(), $e->getMessage()), JLog::WARNING, 'jerror'); + + return $installed; + } + + if (empty($extensions)) + { + return $installed; + } + + foreach ($extensions as $extension) + { + if (strlen($extension->name) == 0) + { + continue; + } + + $installed[$extension->name] = array( + 'name' => $extension->name, + 'type' => $extension->type, + 'author' => 'unknown', + 'version' => 'unknown', + 'creationDate' => 'unknown', + 'authorUrl' => 'unknown' + ); + + $manifest = json_decode($extension->manifest_cache); + + if (!$manifest instanceof stdClass) + { + continue; + } + + $extraData = array( + 'author' => $manifest->author, + 'version' => $manifest->version, + 'creationDate' => $manifest->creationDate, + 'authorUrl' => $manifest->authorUrl + ); + + $installed[$extension->name] = array_merge($installed[$extension->name], $extraData); + } + + return $installed; + } + /** * Method to get the directory states * + * @param bool $public If true no information is going to be removed + * * @return array States of directories * * @since 1.6 */ - public function getDirectory() + public function getDirectory($public = false) { if (!empty($this->directories)) { @@ -328,8 +607,16 @@ public function getDirectory() $this->addDirectory('administrator/cache', JPATH_CACHE, 'COM_ADMIN_CACHE_DIRECTORY'); } - $this->addDirectory($registry->get('log_path', JPATH_ROOT . '/log'), $registry->get('log_path', JPATH_ROOT . '/log'), 'COM_ADMIN_LOG_DIRECTORY'); - $this->addDirectory($registry->get('tmp_path', JPATH_ROOT . '/tmp'), $registry->get('tmp_path', JPATH_ROOT . '/tmp'), 'COM_ADMIN_TEMP_DIRECTORY'); + if ($public) + { + $this->addDirectory('log', $registry->get('log_path', JPATH_ROOT . '/log'), 'COM_ADMIN_LOG_DIRECTORY'); + $this->addDirectory('tmp', $registry->get('tmp_path', JPATH_ROOT . '/tmp'), 'COM_ADMIN_TEMP_DIRECTORY'); + } + else + { + $this->addDirectory($registry->get('log_path', JPATH_ROOT . '/log'), $registry->get('log_path', JPATH_ROOT . '/log'), 'COM_ADMIN_LOG_DIRECTORY'); + $this->addDirectory($registry->get('tmp_path', JPATH_ROOT . '/tmp'), $registry->get('tmp_path', JPATH_ROOT . '/tmp'), 'COM_ADMIN_TEMP_DIRECTORY'); + } return $this->directories; } @@ -369,4 +656,52 @@ public function &getEditor() return $this->editor; } + + /** + * Parse phpinfo output into an array + * Source https://gist.github.com/sbmzhcn/6255314 + * + * @param string $html Output of phpinfo() + * + * @return array + * + * @since 3.5 + */ + protected function parsePhpInfo($html) + { + $html = strip_tags($html, '

'); + $html = preg_replace('/]*>([^<]+)<\/th>/', '\1', $html); + $html = preg_replace('/]*>([^<]+)<\/td>/', '\1', $html); + $t = preg_split('/(]*>[^<]+<\/h2>)/', $html, -1, PREG_SPLIT_DELIM_CAPTURE); + $r = array(); + $count = count($t); + $p1 = '([^<]+)<\/info>'; + $p2 = '/' . $p1 . '\s*' . $p1 . '\s*' . $p1 . '/'; + $p3 = '/' . $p1 . '\s*' . $p1 . '/'; + + for ($i = 1; $i < $count; $i++) + { + if (preg_match('/]*>([^<]+)<\/h2>/', $t[$i], $matchs)) + { + $name = trim($matchs[1]); + $vals = explode("\n", $t[$i + 1]); + + foreach ($vals AS $val) + { + // 3cols + if (preg_match($p2, $val, $matchs)) + { + $r[$name][trim($matchs[1])] = array(trim($matchs[2]), trim($matchs[3])); + } + // 2cols + elseif (preg_match($p3, $val, $matchs)) + { + $r[$name][trim($matchs[1])] = trim($matchs[2]); + } + } + } + } + + return $r; + } } diff --git a/administrator/components/com_admin/postinstall/eaccelerator.php b/administrator/components/com_admin/postinstall/eaccelerator.php index 619521f24d3d6..41bbba3772dc0 100644 --- a/administrator/components/com_admin/postinstall/eaccelerator.php +++ b/administrator/components/com_admin/postinstall/eaccelerator.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * * This file contains post-installation message handling for eAccelerator compatibility. diff --git a/administrator/components/com_admin/postinstall/htaccess.php b/administrator/components/com_admin/postinstall/htaccess.php index a6e816d00a6a6..7f6e3c213d7f8 100644 --- a/administrator/components/com_admin/postinstall/htaccess.php +++ b/administrator/components/com_admin/postinstall/htaccess.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * * This file contains post-installation message handling for notifying users of a change diff --git a/administrator/components/com_admin/postinstall/languageaccess340.php b/administrator/components/com_admin/postinstall/languageaccess340.php index 431854d9267dd..3d483e99507b4 100644 --- a/administrator/components/com_admin/postinstall/languageaccess340.php +++ b/administrator/components/com_admin/postinstall/languageaccess340.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * * This file contains post-installation message handling for the checks if the installation is diff --git a/administrator/components/com_admin/postinstall/phpversion.php b/administrator/components/com_admin/postinstall/phpversion.php index 39fa54c58cb7c..5ace364fd8136 100644 --- a/administrator/components/com_admin/postinstall/phpversion.php +++ b/administrator/components/com_admin/postinstall/phpversion.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * * This file contains post-installation message handling for the checking minimum PHP version support diff --git a/administrator/components/com_admin/postinstall/statscollection.php b/administrator/components/com_admin/postinstall/statscollection.php new file mode 100644 index 0000000000000..d5aa1a02996e4 --- /dev/null +++ b/administrator/components/com_admin/postinstall/statscollection.php @@ -0,0 +1,24 @@ +updateDatabase(); $this->clearRadCache(); $this->updateAssets(); + $this->clearStatsCache(); + $this->convertTablesToUtf8mb4(); + $this->cleanJoomlaCache(); + + // VERY IMPORTANT! THIS METHOD SHOULD BE CALLED LAST, SINCE IT COULD + // LOGOUT ALL THE USERS + $this->flushSessions(); + } + + /** + * Method to clear our stats plugin cache to ensure we get fresh data on Joomla Update + * + * @return void + * + * @since 3.5 + */ + protected function clearStatsCache() + { + $db = JFactory::getDbo(); + + try + { + // Get the params for the stats plugin + $params = $db->setQuery( + $db->getQuery(true) + ->select($db->quoteName('params')) + ->from($db->quoteName('#__extensions')) + ->where($db->quoteName('type') . ' = ' . $db->quote('plugin')) + ->where($db->quoteName('folder') . ' = ' . $db->quote('system')) + ->where($db->quoteName('element') . ' = ' . $db->quote('stats')) + )->loadResult(); + } + catch (Exception $e) + { + echo JText::sprintf('JLIB_DATABASE_ERROR_FUNCTION_FAILED', $e->getCode(), $e->getMessage()) . '
'; + + return; + } + + $params = json_decode($params, true); + + // Reset the last run parameter + if (isset($params['lastrun'])) + { + $params['lastrun'] = ''; + } + + $params = json_encode($params); + + $query = $db->getQuery(true) + ->update($db->quoteName('#__extensions')) + ->set($db->quoteName('params') . ' = ' . $db->quote($params)) + ->where($db->quoteName('type') . ' = ' . $db->quote('plugin')) + ->where($db->quoteName('folder') . ' = ' . $db->quote('system')) + ->where($db->quoteName('element') . ' = ' . $db->quote('stats')); + + try + { + $db->setQuery($query)->execute(); + } + catch (Exception $e) + { + echo JText::sprintf('JLIB_DATABASE_ERROR_FUNCTION_FAILED', $e->getCode(), $e->getMessage()) . '
'; + + return; + } } /** @@ -275,6 +341,7 @@ protected function updateManifestCaches() array('plugin', 'yubikey', 'twofactorauth', 0), array('plugin', 'updatenotification', 'system', 0), array('plugin', 'module', 'editors-xtd', 0), + array('plugin', 'stats', 'system', 0), // Templates array('template', 'beez3', '', 0), @@ -341,18 +408,29 @@ protected function updateManifestCaches() public function deleteUnexistingFiles() { $files = array( + // Joomla 1.6 - 1.7 - 2.5 '/libraries/cms/cmsloader.php', + '/libraries/joomla/database/databaseexception.php', + '/libraries/joomla/database/databasequery.php', + '/libraries/joomla/environment/response.php', '/libraries/joomla/form/fields/templatestyle.php', '/libraries/joomla/form/fields/user.php', '/libraries/joomla/form/fields/menu.php', '/libraries/joomla/form/fields/helpsite.php', + '/libraries/joomla/github/gists.php', + '/libraries/joomla/github/issues.php', + '/libraries/joomla/github/pulls.php', + '/libraries/joomla/log/logentry.php', '/administrator/components/com_admin/sql/updates/mysql/1.7.0.sql', '/administrator/components/com_admin/sql/updates/sqlsrv/2.5.2-2012-03-05.sql', '/administrator/components/com_admin/sql/updates/sqlsrv/2.5.3-2012-03-13.sql', '/administrator/components/com_admin/sql/updates/sqlsrv/index.html', + '/administrator/components/com_content/models/fields/filters.php', '/administrator/components/com_users/controllers/config.php', + '/administrator/components/com_users/helpers/levels.php', '/administrator/language/en-GB/en-GB.plg_system_finder.ini', '/administrator/language/en-GB/en-GB.plg_system_finder.sys.ini', + '/administrator/modules/mod_quickicon/tmpl/default_button.php', '/media/editors/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin_src.js', '/media/editors/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin_src.js', '/media/editors/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin_src.js', @@ -425,7 +503,6 @@ public function deleteUnexistingFiles() '/administrator/components/com_installer/models/fields/group.php', '/administrator/components/com_installer/models/fields/index.html', '/administrator/components/com_installer/models/fields/search.php', - '/administrator/components/com_installer/models/fields/type.php', '/administrator/components/com_installer/models/forms/index.html', '/administrator/components/com_installer/models/forms/manage.xml', '/administrator/components/com_installer/views/install/tmpl/default_form.php', @@ -1322,7 +1399,15 @@ public function deleteUnexistingFiles() '/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/Exception/ExceptionInterface.php', '/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/Exception/ParseException.php', '/libraries/vendor/symfony/yaml/Symfony/Component/Yaml/Exception/RuntimeException.php', - '/administrator/components/com_tags/helpers/tags.php', + '/libraries/vendor/phpmailer/phpmailer/extras/class.html2text.php', + '/libraries/joomla/document/error/error.php', + '/libraries/joomla/document/feed/feed.php', + '/libraries/joomla/document/html/html.php', + '/libraries/joomla/document/image/image.php', + '/libraries/joomla/document/json/json.php', + '/libraries/joomla/document/opensearch/opensearch.php', + '/libraries/joomla/document/raw/raw.php', + '/libraries/joomla/document/xml/xml.php', ); // TODO There is an issue while deleting folders using the ftp mode @@ -1334,9 +1419,6 @@ public function deleteUnexistingFiles() // Joomla 3.0 '/administrator/components/com_contact/elements', '/administrator/components/com_content/elements', - '/administrator/components/com_installer/models/fields', - '/administrator/components/com_installer/models/forms', - '/administrator/components/com_modules/models/fields', '/administrator/components/com_newsfeeds/elements', '/administrator/components/com_templates/views/prevuuw/tmpl', '/administrator/components/com_templates/views/prevuuw', @@ -1413,7 +1495,12 @@ public function deleteUnexistingFiles() '/libraries/vendor/symfony/yaml/Symfony/Component/Yaml', '/libraries/vendor/symfony/yaml/Symfony/Component', '/libraries/vendor/symfony/yaml/Symfony', - '/administrator/components/com_tags/helpers', + '/libraries/joomla/document/error', + '/libraries/joomla/document/image', + '/libraries/joomla/document/json', + '/libraries/joomla/document/opensearch', + '/libraries/joomla/document/raw', + '/libraries/joomla/document/xml', ); jimport('joomla.filesystem.file'); @@ -1512,4 +1599,290 @@ public function updateAssets() return true; } + + /** + * If we migrated the session from the previous system, flush all the active sessions. + * Otherwise users will be logged in, but not able to do anything since they don't have + * a valid session + * + * @return boolean + */ + public function flushSessions() + { + /** + * The session may have not been started yet (e.g. CLI-based Joomla! update scripts). Let's make sure we do + * have a valid session. + */ + $session = JFactory::getSession(); + + /** + * Restarting the Session require a new login for the current user so lets check if we have a active session + * and only if not restart it. + * For B/C reasons we need to use getState as isActive is not available in 2.5 + */ + if ($session->getState() !== 'active') + { + $session->restart(); + } + + // If $_SESSION['__default'] is no longer set we do not have a migrated session, therefore we can quit. + if (!isset($_SESSION['__default'])) + { + return true; + } + + $db = JFactory::getDbo(); + + try + { + switch ($db->name) + { + // MySQL database, use TRUNCATE (faster, more resilient) + case 'pdomysql': + case 'mysql': + case 'mysqli': + $db->truncateTable('#__session'); + break; + + // Non-MySQL databases, use a simple DELETE FROM query + default: + $query = $db->getQuery(true) + ->delete($db->qn('#__session')); + $db->setQuery($query)->execute(); + break; + } + } + catch (Exception $e) + { + echo JText::sprintf('JLIB_DATABASE_ERROR_FUNCTION_FAILED', $e->getCode(), $e->getMessage()) . '
'; + + return false; + } + + return true; + } + + /** + * Converts the site's database tables to support UTF-8 Multibyte. + * + * Note that this is a modified of InstallerModelDatabase::convertTablesToUtf8mb4() + * that doesn't use JDatabase functions introduced in 3.5.0 which would cause errors + * when upgrading from a version before 3.5.0 + * + * @return void + * + * @since 3.5 + */ + private function convertTablesToUtf8mb4() + { + $db = JFactory::getDbo(); + + // This is only required for MySQL databases + $name = $db->getName(); + + if (stristr($name, 'mysql') === false) + { + return; + } + + // Check if utf8mb4 is supported and set required conversion status + $utf8mb4Support = false; + + if ($this->serverClaimsUtf8mb4Support($name)) + { + $utf8mb4Support = true; + $converted = 2; + } + else + { + $converted = 1; + } + + // Check conversion status in database + $db->setQuery('SELECT ' . $db->quoteName('converted') + . ' FROM ' . $db->quoteName('#__utf8_conversion') + ); + + try + { + $convertedDB = $db->loadResult(); + } + catch (Exception $e) + { + JFactory::getApplication()->enqueueMessage(JText::_('JLIB_DATABASE_ERROR_DATABASE_UPGRADE_FAILED'), 'error'); + + return; + } + + // Nothing to do, saved conversion status from DB is equal to required + if ($convertedDB == $converted) + { + return; + } + + // Step 1: Drop indexes later to be added again with column lengths limitations at step 2 + $fileName1 = JPATH_ADMINISTRATOR . "/components/com_admin/sql/others/mysql/utf8mb4-conversion-01.sql"; + + if (is_file($fileName1)) + { + $fileContents1 = @file_get_contents($fileName1); + $queries1 = $db->splitSql($fileContents1); + + if (!empty($queries1)) + { + foreach ($queries1 as $query1) + { + try + { + $db->setQuery($query1)->execute(); + } + catch (Exception $e) + { + // If the query fails we will go on. It just means the index to be dropped does not exist. + } + } + } + } + + // Step 2: Perform the index modifications and conversions + $fileName2 = JPATH_ADMINISTRATOR . "/components/com_admin/sql/others/mysql/utf8mb4-conversion-02.sql"; + + if (is_file($fileName2)) + { + $fileContents2 = @file_get_contents($fileName2); + $queries2 = $db->splitSql($fileContents2); + + if (!empty($queries2)) + { + foreach ($queries2 as $query2) + { + // Downgrade the query if utf8mb4 isn't supported + if (!$utf8mb4Support) + { + $query2 = $this->convertUtf8mb4QueryToUtf8($query2); + } + + try + { + $db->setQuery($query2)->execute(); + } + catch (Exception $e) + { + $converted = 0; + + // Still render the error message from the Exception object + JFactory::getApplication()->enqueueMessage($e->getMessage(), 'error'); + } + } + } + } + + // Show if there was some error + if ($converted == 0) + { + // Show an error message telling to check database problems + JFactory::getApplication()->enqueueMessage(JText::_('JLIB_DATABASE_ERROR_DATABASE_UPGRADE_FAILED'), 'error'); + } + + // Set flag in database if the update is done. + $db->setQuery('UPDATE ' . $db->quoteName('#__utf8_conversion') + . ' SET ' . $db->quoteName('converted') . ' = ' . $converted . ';')->execute(); + } + + /** + * Does the database server claim to have support for UTF-8 Multibyte (utf8mb4) collation? + * + * This is a modified version of the function in JDatabase::serverClaimsUtf8mb4Support() - it is + * duplicated here for people upgrading from a version lower than 3.5.0 through extension manager + * which will still have the old database driver loaded at this point. + * + * @param string $format The type of database connection. + * + * @return boolean + * + * @since 3.5.0 + */ + private function serverClaimsUtf8mb4Support($format) + { + $db = JFactory::getDbo(); + + switch ($format) + { + case 'mysql': + $client_version = mysql_get_client_info(); + $server_version = $db->getVersion(); + break; + case 'mysqli': + $client_version = mysqli_get_client_info(); + $server_version = $db->getVersion(); + break; + case 'pdomysql': + $client_version = $db->getOption(PDO::ATTR_CLIENT_VERSION); + $server_version = $db->getOption(PDO::ATTR_SERVER_VERSION); + break; + default: + $client_version = false; + $server_version = false; + } + + if ($client_version && version_compare($server_version, '5.5.3', '>=')) + { + if (strpos($client_version, 'mysqlnd') !== false) + { + $client_version = preg_replace('/^\D+([\d.]+).*/', '$1', $client_version); + + return version_compare($client_version, '5.0.9', '>='); + } + else + { + return version_compare($client_version, '5.5.3', '>='); + } + } + + return false; + } + + /** + * Downgrade a CREATE TABLE or ALTER TABLE query from utf8mb4 (UTF-8 Multibyte) to plain utf8. Used when the server + * doesn't support UTF-8 Multibyte. + * + * This is a modified version of the function in JDatabase::convertUtf8mb4QueryToUtf8() - it is duplicated here for + * people upgrading from a version lower than 3.5.0 through extension manager which will still have the old database + * driver loaded at this point. This is missing the check for utf8mb4 in JDatabaseDriver we make this check in the + * updater elsewhere. + * + * @param string $query The query to convert + * + * @return string The converted query + * + * @since 3.5 + */ + private function convertUtf8mb4QueryToUtf8($query) + { + // If it's not an ALTER TABLE or CREATE TABLE command there's nothing to convert + $beginningOfQuery = substr($query, 0, 12); + $beginningOfQuery = strtoupper($beginningOfQuery); + + if (!in_array($beginningOfQuery, array('ALTER TABLE ', 'CREATE TABLE'))) + { + return $query; + } + + // Replace utf8mb4 with utf8 + return str_replace('utf8mb4', 'utf8', $query); + } + + /** + * This method clean the Joomla Cache using the method `clean` from the com_cache model + * + * @return void + * + * @since 3.5.1 + */ + private function cleanJoomlaCache() + { + JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_cache/models'); + $model = JModelLegacy::getInstance('cache', 'CacheModel'); + $model->clean(); + } } diff --git a/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-01.sql b/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-01.sql new file mode 100644 index 0000000000000..cd40e0b8ae7b3 --- /dev/null +++ b/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-01.sql @@ -0,0 +1,30 @@ +-- +-- Step 1 of the UTF-8 Multibyte (utf8mb4) conversion for MySQL +-- +-- Drop indexes which will be added again in step 2, utf8mb4-conversion-02.sql. +-- +-- Do not rename this file or any other of the utf8mb4-conversion-*.sql +-- files unless you want to change PHP code, too. +-- +-- This file here will be processed ignoring any exceptions caused by indexes +-- to be dropped do not exist. +-- +-- The file for step 2 will the be processed with reporting exceptions. +-- + +ALTER TABLE `#__banners` DROP KEY `idx_metakey_prefix`; +ALTER TABLE `#__banner_clients` DROP KEY `idx_metakey_prefix`; +ALTER TABLE `#__categories` DROP KEY `idx_path`; +ALTER TABLE `#__categories` DROP KEY `idx_alias`; +ALTER TABLE `#__content_types` DROP KEY `idx_alias`; +ALTER TABLE `#__finder_links` DROP KEY `idx_title`; +ALTER TABLE `#__menu` DROP KEY `idx_alias`; +ALTER TABLE `#__menu` DROP KEY `idx_client_id_parent_id_alias_language`; +ALTER TABLE `#__menu` DROP KEY `idx_path`; +ALTER TABLE `#__redirect_links` DROP KEY `idx_old_url`; +ALTER TABLE `#__tags` DROP KEY `idx_path`; +ALTER TABLE `#__tags` DROP KEY `idx_alias`; +ALTER TABLE `#__ucm_content` DROP KEY `idx_alias`; +ALTER TABLE `#__ucm_content` DROP KEY `idx_title`; +ALTER TABLE `#__ucm_content` DROP KEY `idx_content_type`; +ALTER TABLE `#__users` DROP KEY `idx_name`; diff --git a/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-02.sql b/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-02.sql new file mode 100644 index 0000000000000..7bb87849af6c6 --- /dev/null +++ b/administrator/components/com_admin/sql/others/mysql/utf8mb4-conversion-02.sql @@ -0,0 +1,230 @@ +-- +-- Step 2 of the UTF-8 Multibyte (utf8mb4) conversion for MySQL +-- +-- Enlarge some database columns to avoid data losses, then convert all tables +-- to utf8mb4 or utf8, then set default character sets and collations for all +-- tables, then add back indexes previosly dropped with step 1, +-- utf8mb4-conversion-01.sql, but addd them back with limited lenghts of +-- columns. +-- +-- Do not rename this file or any other of the utf8mb4-conversion-*.sql +-- files unless you want to change PHP code, too. +-- +-- IMPORTANT: When adding an index modification to this file for limiting the +-- length by which one or more columns go into that index, +-- +-- 1. remember to add the statement to drop the index to the file for step 1, +-- utf8mb4-conversion-01.sql, and +-- +-- 2. check if the index is created created or modified in some old schema +-- update sql in an "ALTER TABLE" statement and limit the column length +-- there, too ("CREATE TABLE" is ok, no need to modify those). +-- +-- This file here will the be processed with reporting exceptions, in opposite +-- to the file for step 1. +-- + +-- +-- Step 2.1: Enlarge columns to avoid data loss on later conversion to utf8mb4 +-- + +ALTER TABLE `#__banners` MODIFY `alias` varchar(400) NOT NULL DEFAULT ''; +ALTER TABLE `#__banners` MODIFY `metakey_prefix` varchar(400) NOT NULL DEFAULT ''; +ALTER TABLE `#__categories` MODIFY `path` varchar(400) NOT NULL DEFAULT ''; +ALTER TABLE `#__categories` MODIFY `alias` varchar(400) NOT NULL DEFAULT ''; +ALTER TABLE `#__content_types` MODIFY `type_alias` varchar(400) NOT NULL DEFAULT ''; +ALTER TABLE `#__finder_links` MODIFY `title` varchar(400) DEFAULT NULL; +ALTER TABLE `#__contact_details` MODIFY `alias` varchar(400) NOT NULL DEFAULT ''; +ALTER TABLE `#__content` MODIFY `alias` varchar(400) NOT NULL DEFAULT ''; +ALTER TABLE `#__menu` MODIFY `alias` varchar(400) NOT NULL COMMENT 'The SEF alias of the menu item.'; +ALTER TABLE `#__newsfeeds` MODIFY `alias` varchar(400) NOT NULL DEFAULT ''; +ALTER TABLE `#__tags` MODIFY `path` varchar(400) NOT NULL DEFAULT ''; +ALTER TABLE `#__tags` MODIFY `alias` varchar(400) NOT NULL DEFAULT ''; +ALTER TABLE `#__ucm_content` MODIFY `core_type_alias` varchar(400) NOT NULL DEFAULT '' COMMENT 'FK to the content types table'; +ALTER TABLE `#__ucm_content` MODIFY `core_title` varchar(400) NOT NULL; +ALTER TABLE `#__ucm_content` MODIFY `core_alias` varchar(400) NOT NULL DEFAULT ''; +ALTER TABLE `#__users` MODIFY `name` varchar(400) NOT NULL DEFAULT ''; + +-- +-- Step 2.2: Convert all tables to utf8mb4 chracter set with utf8mb4_unicode_ci collation +-- except #__finder_xxx tables, those will have utf8mb4_general_ci collation. +-- Note: The database driver for mysql will change utf8mb4 to utf8 if utf8mb4 is not supported +-- + +ALTER TABLE `#__assets` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__associations` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__banners` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__banner_clients` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__banner_tracks` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__categories` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__contact_details` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__content` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__content_frontpage` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__content_rating` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__content_types` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__contentitem_tag_map` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__core_log_searches` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__extensions` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__finder_filters` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_links` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_links_terms0` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_links_terms1` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_links_terms2` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_links_terms3` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_links_terms4` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_links_terms5` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_links_terms6` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_links_terms7` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_links_terms8` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_links_terms9` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_links_termsa` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_links_termsb` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_links_termsc` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_links_termsd` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_links_termse` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_links_termsf` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_taxonomy` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_taxonomy_map` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_terms` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_terms_common` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_tokens` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_tokens_aggregate` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_types` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__languages` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__menu` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__menu_types` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__messages` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__messages_cfg` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__modules` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__modules_menu` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__newsfeeds` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__overrider` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__postinstall_messages` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__redirect_links` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__schemas` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__session` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__tags` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__template_styles` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__ucm_base` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__ucm_content` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__ucm_history` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__updates` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__update_sites` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__update_sites_extensions` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__usergroups` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__users` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__user_keys` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__user_notes` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__user_profiles` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__user_usergroup_map` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__utf8_conversion` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__viewlevels` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; + +-- +-- Step 2.3: Set collation to utf8mb4_bin for formerly utf8_bin collated columns +-- and for the lang_code column of the languages table +-- + +ALTER TABLE `#__banners` MODIFY `alias` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT ''; +ALTER TABLE `#__categories` MODIFY `alias` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT ''; +ALTER TABLE `#__contact_details` MODIFY `alias` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT ''; +ALTER TABLE `#__content` MODIFY `alias` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT ''; +ALTER TABLE `#__languages` MODIFY `lang_code` char(7) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL; +ALTER TABLE `#__menu` MODIFY `alias` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT 'The SEF alias of the menu item.'; +ALTER TABLE `#__newsfeeds` MODIFY `alias` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT ''; +ALTER TABLE `#__tags` MODIFY `alias` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT ''; +ALTER TABLE `#__ucm_content` MODIFY `core_alias` varchar(400) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT ''; + +-- +-- Step 2.4: Set default character set and collation for all tables +-- + +ALTER TABLE `#__assets` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__associations` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__banners` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__banner_clients` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__banner_tracks` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__categories` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__contact_details` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__content` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__content_frontpage` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__content_rating` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__content_types` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__contentitem_tag_map` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__core_log_searches` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__extensions` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__finder_filters` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_links` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_links_terms0` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_links_terms1` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_links_terms2` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_links_terms3` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_links_terms4` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_links_terms5` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_links_terms6` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_links_terms7` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_links_terms8` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_links_terms9` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_links_termsa` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_links_termsb` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_links_termsc` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_links_termsd` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_links_termse` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_links_termsf` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_taxonomy` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_taxonomy_map` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_terms` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_terms_common` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_tokens` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_tokens_aggregate` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__finder_types` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +ALTER TABLE `#__languages` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__menu` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__menu_types` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__messages` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__messages_cfg` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__modules` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__modules_menu` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__newsfeeds` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__overrider` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__postinstall_messages` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__redirect_links` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__schemas` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__session` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__tags` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__template_styles` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__ucm_base` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__ucm_content` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__ucm_history` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__updates` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__update_sites` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__update_sites_extensions` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__usergroups` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__users` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__user_keys` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__user_notes` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__user_profiles` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__user_usergroup_map` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__utf8_conversion` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; +ALTER TABLE `#__viewlevels` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; + +-- +-- Step 2.5: Limit indexes to first 100 so their max allowed lengths would not get exceeded with utf8mb4 +-- + +ALTER TABLE `#__banners` ADD KEY `idx_metakey_prefix` (`metakey_prefix`(100)); +ALTER TABLE `#__banner_clients` ADD KEY `idx_metakey_prefix` (`metakey_prefix`(100)); +ALTER TABLE `#__categories` ADD KEY `idx_path` (`path`(100)); +ALTER TABLE `#__categories` ADD KEY `idx_alias` (`alias`(100)); +ALTER TABLE `#__content_types` ADD KEY `idx_alias` (`type_alias`(100)); +ALTER TABLE `#__finder_links` ADD KEY `idx_title` (`title`(100)); +ALTER TABLE `#__menu` ADD KEY `idx_alias` (`alias`(100)); +ALTER TABLE `#__menu` ADD UNIQUE `idx_client_id_parent_id_alias_language` (`client_id`,`parent_id`,`alias`(100),`language`); +ALTER TABLE `#__menu` ADD KEY `idx_path` (`path`(100)); +ALTER TABLE `#__redirect_links` ADD KEY `idx_old_url` (`old_url`(100)); +ALTER TABLE `#__tags` ADD KEY `idx_path` (`path`(100)); +ALTER TABLE `#__tags` ADD KEY `idx_alias` (`alias`(100)); +ALTER TABLE `#__ucm_content` ADD KEY `idx_alias` (`core_alias`(100)); +ALTER TABLE `#__ucm_content` ADD KEY `idx_title` (`core_title`(100)); +ALTER TABLE `#__ucm_content` ADD KEY `idx_content_type` (`core_type_alias`(100)); +ALTER TABLE `#__users` ADD KEY `idx_name` (`name`(100)); diff --git a/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-21-1.sql b/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-21-1.sql index b5f69d4ceb7db..933e10eea633f 100644 --- a/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-21-1.sql +++ b/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-21-1.sql @@ -2,7 +2,7 @@ INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder` (27, 'com_finder', 'component', 'com_finder', '', 1, 1, 0, 0, '', '{"show_description":"1","description_length":255,"allow_empty_query":"0","show_url":"1","show_advanced":"1","expand_advanced":"0","show_date_filters":"0","highlight_terms":"1","opensearch_name":"","opensearch_description":"","batch_size":"50","memory_table_limit":30000,"title_multiplier":"1.7","text_multiplier":"0.7","meta_multiplier":"1.2","path_multiplier":"2.0","misc_multiplier":"0.3","stemmer":"porter_en"}', '', '', 0, '0000-00-00 00:00:00', 0, 0), (439, 'plg_captcha_recaptcha', 'plugin', 'recaptcha', 'captcha', 0, 1, 1, 0, '{}', '{"public_key":"","private_key":"","theme":"clean"}', '', '', 0, '0000-00-00 00:00:00', 0, 0), (440, 'plg_system_highlight', 'plugin', 'highlight', 'system', 0, 1, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 7, 0), -(441, 'plg_content_finder', 'plugin', 'finder', 'content', 0, 0, 1, 0, '{"legacy":false,"name":"plg_content_finder","type":"plugin","creationDate":"December 2011","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"1.7.0","description":"PLG_CONTENT_FINDER_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0), +(441, 'plg_content_finder', 'plugin', 'finder', 'content', 0, 0, 1, 0, '{"legacy":false,"name":"plg_content_finder","type":"plugin","creationDate":"December 2011","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"1.7.0","description":"PLG_CONTENT_FINDER_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0), (442, 'plg_finder_categories', 'plugin', 'categories', 'finder', 0, 1, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 1, 0), (443, 'plg_finder_contacts', 'plugin', 'contacts', 'finder', 0, 1, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 2, 0), (444, 'plg_finder_content', 'plugin', 'content', 'finder', 0, 1, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 3, 0), diff --git a/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-24.sql b/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-24.sql index 8f7014c7014f2..bbaaff3f6193c 100644 --- a/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-24.sql +++ b/administrator/components/com_admin/sql/updates/mysql/2.5.0-2011-12-24.sql @@ -1,3 +1,8 @@ ALTER TABLE `#__menu` DROP INDEX `idx_client_id_parent_id_alias`; -ALTER TABLE `#__menu` ADD UNIQUE `idx_client_id_parent_id_alias_language` ( `client_id` , `parent_id` , `alias` , `language` ); \ No newline at end of file +-- +-- The following statment had to be modified for utf8mb4 in Joomla! 3.5.1, changing +-- `alias` to `alias`(100) +-- + +ALTER TABLE `#__menu` ADD UNIQUE `idx_client_id_parent_id_alias_language` ( `client_id` , `parent_id` , `alias`(100) , `language` ); \ No newline at end of file diff --git a/administrator/components/com_admin/sql/updates/mysql/2.5.1-2012-01-26.sql b/administrator/components/com_admin/sql/updates/mysql/2.5.1-2012-01-26.sql index 45b1b32f9ae08..4a7484a0dc568 100644 --- a/administrator/components/com_admin/sql/updates/mysql/2.5.1-2012-01-26.sql +++ b/administrator/components/com_admin/sql/updates/mysql/2.5.1-2012-01-26.sql @@ -1,5 +1,5 @@ INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES -(314, 'mod_version', 'module', 'mod_version', '', 1, 1, 1, 0, '{"legacy":false,"name":"mod_version","type":"module","creationDate":"January 2012","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"2.5.0","description":"MOD_VERSION_XML_DESCRIPTION","group":""}', '{"format":"short","product":"1","cache":"0"}', '', '', 0, '0000-00-00 00:00:00', 0, 0); +(314, 'mod_version', 'module', 'mod_version', '', 1, 1, 1, 0, '{"legacy":false,"name":"mod_version","type":"module","creationDate":"January 2012","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"2.5.0","description":"MOD_VERSION_XML_DESCRIPTION","group":""}', '{"format":"short","product":"1","cache":"0"}', '', '', 0, '0000-00-00 00:00:00', 0, 0); INSERT INTO `#__modules` (`title`, `note`, `content`, `ordering`, `position`, `checked_out`, `checked_out_time`, `publish_up`, `publish_down`, `published`, `module`, `access`, `showtitle`, `params`, `client_id`, `language`) VALUES ('Joomla Version', '', '', 1, 'footer', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_version', 3, 1, '{"format":"short","product":"1","layout":"_:default","moduleclass_sfx":"","cache":"0"}', 1, '*'); diff --git a/administrator/components/com_admin/sql/updates/mysql/2.5.4-2012-03-18.sql b/administrator/components/com_admin/sql/updates/mysql/2.5.4-2012-03-18.sql index b0f720f91929b..578e3b4405853 100644 --- a/administrator/components/com_admin/sql/updates/mysql/2.5.4-2012-03-18.sql +++ b/administrator/components/com_admin/sql/updates/mysql/2.5.4-2012-03-18.sql @@ -1,5 +1,5 @@ INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES -(28, 'com_joomlaupdate', 'component', 'com_joomlaupdate', '', 1, 1, 0, 1, '{"legacy":false,"name":"com_joomlaupdate","type":"component","creationDate":"February 2012","author":"Joomla! Project","copyright":"(C) 2005 - 2015 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"2.5.2","description":"COM_JOOMLAUPDATE_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0); +(28, 'com_joomlaupdate', 'component', 'com_joomlaupdate', '', 1, 1, 0, 1, '{"legacy":false,"name":"com_joomlaupdate","type":"component","creationDate":"February 2012","author":"Joomla! Project","copyright":"(C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"2.5.2","description":"COM_JOOMLAUPDATE_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0); INSERT INTO `#__menu` (`menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `ordering`, `checked_out`, `checked_out_time`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`) VALUES ('menu', 'com_joomlaupdate', 'Joomla! Update', '', 'Joomla! Update', 'index.php?option=com_joomlaupdate', 'component', 0, 1, 1, 28, 0, 0, '0000-00-00 00:00:00', 0, 0, 'class:joomlaupdate', 0, '', 41, 42, 0, '*', 1); diff --git a/administrator/components/com_admin/sql/updates/mysql/2.5.4-2012-03-19.sql b/administrator/components/com_admin/sql/updates/mysql/2.5.4-2012-03-19.sql index 91535684a87b5..1f43a493b7030 100644 --- a/administrator/components/com_admin/sql/updates/mysql/2.5.4-2012-03-19.sql +++ b/administrator/components/com_admin/sql/updates/mysql/2.5.4-2012-03-19.sql @@ -1,6 +1,6 @@ ALTER TABLE `#__languages` ADD COLUMN `access` integer unsigned NOT NULL default 0 AFTER `published`; -ALTER TABLE `#__languages` ADD KEY `idx_access` (`access`); +ALTER TABLE `#__languages` ADD INDEX `idx_access` (`access`); UPDATE `#__categories` SET `extension` = 'com_users.notes' WHERE `extension` = 'com_users'; diff --git a/administrator/components/com_admin/sql/updates/mysql/3.0.0.sql b/administrator/components/com_admin/sql/updates/mysql/3.0.0.sql index b157675f083cd..3c0deb57c80c0 100644 --- a/administrator/components/com_admin/sql/updates/mysql/3.0.0.sql +++ b/administrator/components/com_admin/sql/updates/mysql/3.0.0.sql @@ -1,5 +1,5 @@ -ALTER TABLE `#__users` DROP KEY `usertype`; -ALTER TABLE `#__session` DROP KEY `whosonline`; +ALTER TABLE `#__users` DROP INDEX `usertype`; +ALTER TABLE `#__session` DROP INDEX `whosonline`; DROP TABLE IF EXISTS `#__update_categories`; @@ -114,9 +114,9 @@ ALTER TABLE `#__finder_tokens_aggregate` ADD COLUMN `language` char(3) NOT NULL INSERT INTO `#__extensions` (`name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES - ('isis', 'template', 'isis', '', 1, 1, 1, 0, '{"name":"isis","type":"template","creationDate":"3\\/30\\/2012","author":"Kyle Ledbetter","copyright":"Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"","version":"1.0","description":"TPL_ISIS_XML_DESCRIPTION","group":""}', '{"templateColor":"","logoFile":""}', '', '', 0, '0000-00-00 00:00:00', 0, 0), - ('protostar', 'template', 'protostar', '', 0, 1, 1, 0, '{"name":"protostar","type":"template","creationDate":"4\\/30\\/2012","author":"Kyle Ledbetter","copyright":"Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"","version":"1.0","description":"TPL_PROTOSTAR_XML_DESCRIPTION","group":""}', '{"templateColor":"","logoFile":"","googleFont":"1","googleFontName":"Open+Sans","fluidContainer":"0"}', '', '', 0, '0000-00-00 00:00:00', 0, 0), - ('beez3', 'template', 'beez3', '', 0, 1, 1, 0, '{"legacy":false,"name":"beez3","type":"template","creationDate":"25 November 2009","author":"Angie Radtke","copyright":"Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.","authorEmail":"a.radtke@derauftritt.de","authorUrl":"http:\\/\\/www.der-auftritt.de","version":"1.6.0","description":"TPL_BEEZ3_XML_DESCRIPTION","group":""}', '{"wrapperSmall":"53","wrapperLarge":"72","sitetitle":"","sitedescription":"","navposition":"center","templatecolor":"nature"}', '', '', 0, '0000-00-00 00:00:00', 0, 0); + ('isis', 'template', 'isis', '', 1, 1, 1, 0, '{"name":"isis","type":"template","creationDate":"3\\/30\\/2012","author":"Kyle Ledbetter","copyright":"Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"","version":"1.0","description":"TPL_ISIS_XML_DESCRIPTION","group":""}', '{"templateColor":"","logoFile":""}', '', '', 0, '0000-00-00 00:00:00', 0, 0), + ('protostar', 'template', 'protostar', '', 0, 1, 1, 0, '{"name":"protostar","type":"template","creationDate":"4\\/30\\/2012","author":"Kyle Ledbetter","copyright":"Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"","version":"1.0","description":"TPL_PROTOSTAR_XML_DESCRIPTION","group":""}', '{"templateColor":"","logoFile":"","googleFont":"1","googleFontName":"Open+Sans","fluidContainer":"0"}', '', '', 0, '0000-00-00 00:00:00', 0, 0), + ('beez3', 'template', 'beez3', '', 0, 1, 1, 0, '{"legacy":false,"name":"beez3","type":"template","creationDate":"25 November 2009","author":"Angie Radtke","copyright":"Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved.","authorEmail":"a.radtke@derauftritt.de","authorUrl":"http:\\/\\/www.der-auftritt.de","version":"1.6.0","description":"TPL_BEEZ3_XML_DESCRIPTION","group":""}', '{"wrapperSmall":"53","wrapperLarge":"72","sitetitle":"","sitedescription":"","navposition":"center","templatecolor":"nature"}', '', '', 0, '0000-00-00 00:00:00', 0, 0); INSERT INTO `#__template_styles` (`template`, `client_id`, `home`, `title`, `params`) VALUES ('protostar', 0, '0', 'protostar - Default', '{"templateColor":"","logoFile":"","googleFont":"1","googleFontName":"Open+Sans","fluidContainer":"0"}'), @@ -139,7 +139,7 @@ SET home = 0 WHERE template = 'bluestork'; INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES -(315, 'mod_stats_admin', 'module', 'mod_stats_admin', '', 1, 1, 1, 0, '{"name":"mod_stats_admin","type":"module","creationDate":"September 2012","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"MOD_STATS_XML_DESCRIPTION","group":""}', '{"serverinfo":"0","siteinfo":"0","counter":"0","increase":"0","cache":"1","cache_time":"900","cachemode":"static"}', '', '', 0, '0000-00-00 00:00:00', 0, 0); +(315, 'mod_stats_admin', 'module', 'mod_stats_admin', '', 1, 1, 1, 0, '{"name":"mod_stats_admin","type":"module","creationDate":"September 2012","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"MOD_STATS_XML_DESCRIPTION","group":""}', '{"serverinfo":"0","siteinfo":"0","counter":"0","increase":"0","cache":"1","cache_time":"900","cachemode":"static"}', '', '', 0, '0000-00-00 00:00:00', 0, 0); UPDATE `#__update_sites` SET location = 'http://update.joomla.org/language/translationlist_3.xml' diff --git a/administrator/components/com_admin/sql/updates/mysql/3.1.0.sql b/administrator/components/com_admin/sql/updates/mysql/3.1.0.sql index 1e181ca2fc79f..01b93ec654c73 100644 --- a/administrator/components/com_admin/sql/updates/mysql/3.1.0.sql +++ b/administrator/components/com_admin/sql/updates/mysql/3.1.0.sql @@ -156,10 +156,10 @@ CREATE TABLE IF NOT EXISTS `#__ucm_content` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Contains core content data in name spaced fields'; INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES -(29, 'com_tags', 'component', 'com_tags', '', 1, 1, 1, 1, '{"legacy":false,"name":"com_tags","type":"component","creationDate":"March 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2015 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_TAGS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0), -(316, 'mod_tags_popular', 'module', 'mod_tags_popular', '', 0, 1, 1, 0, '{"name":"mod_tags_popular","type":"module","creationDate":"January 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.0","description":"MOD_TAGS_POPULAR_XML_DESCRIPTION","group":""}', '{"maximum":"5","timeframe":"alltime","owncache":"1"}', '', '', 0, '0000-00-00 00:00:00', 0, 0), -(317, 'mod_tags_similar', 'module', 'mod_tags_similar', '', 0, 1, 1, 0, '{"name":"mod_tags_similar","type":"module","creationDate":"January 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.0","description":"MOD_TAGS_SIMILAR_XML_DESCRIPTION","group":""}', '{"maximum":"5","matchtype":"any","owncache":"1"}', '', '', 0, '0000-00-00 00:00:00', 0, 0), -(447, 'plg_finder_tags', 'plugin', 'tags', 'finder', 0, 1, 1, 0, '{"name":"plg_finder_tags","type":"plugin","creationDate":"February 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2015 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"PLG_FINDER_TAGS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0); +(29, 'com_tags', 'component', 'com_tags', '', 1, 1, 1, 1, '{"legacy":false,"name":"com_tags","type":"component","creationDate":"March 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_TAGS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0), +(316, 'mod_tags_popular', 'module', 'mod_tags_popular', '', 0, 1, 1, 0, '{"name":"mod_tags_popular","type":"module","creationDate":"January 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.0","description":"MOD_TAGS_POPULAR_XML_DESCRIPTION","group":""}', '{"maximum":"5","timeframe":"alltime","owncache":"1"}', '', '', 0, '0000-00-00 00:00:00', 0, 0), +(317, 'mod_tags_similar', 'module', 'mod_tags_similar', '', 0, 1, 1, 0, '{"name":"mod_tags_similar","type":"module","creationDate":"January 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.0","description":"MOD_TAGS_SIMILAR_XML_DESCRIPTION","group":""}', '{"maximum":"5","matchtype":"any","owncache":"1"}', '', '', 0, '0000-00-00 00:00:00', 0, 0), +(447, 'plg_finder_tags', 'plugin', 'tags', 'finder', 0, 1, 1, 0, '{"name":"plg_finder_tags","type":"plugin","creationDate":"February 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"PLG_FINDER_TAGS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0); INSERT INTO `#__menu` (`menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `checked_out`, `checked_out_time`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`) VALUES ('main', 'com_tags', 'Tags', '', 'Tags', 'index.php?option=com_tags', 'component', 0, 1, 1, 29, 0, '0000-00-00 00:00:00', 0, 1, 'class:tags', 0, '', 45, 46, 0, '', 1); diff --git a/administrator/components/com_admin/sql/updates/mysql/3.2.0.sql b/administrator/components/com_admin/sql/updates/mysql/3.2.0.sql index a7eeeb18a65ef..20efac2137959 100644 --- a/administrator/components/com_admin/sql/updates/mysql/3.2.0.sql +++ b/administrator/components/com_admin/sql/updates/mysql/3.2.0.sql @@ -19,13 +19,13 @@ UPDATE `#__extensions` SET `params` = '{"template_positions_display":"0","upload UPDATE `#__extensions` SET `params` = '{"lineNumbers":"1","lineWrapping":"1","matchTags":"1","matchBrackets":"1","marker-gutter":"1","autoCloseTags":"1","autoCloseBrackets":"1","autoFocus":"1","theme":"default","tabmode":"indent"}' WHERE `extension_id` = 410; INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES -(30, 'com_contenthistory', 'component', 'com_contenthistory', '', 1, 1, 1, 0, '{"name":"com_contenthistory","type":"component","creationDate":"May 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2015 Open Source Matters. All rights reserved.\\n\\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"COM_CONTENTHISTORY_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0), -(31, 'com_ajax', 'component', 'com_ajax', '', 1, 1, 1, 0, '{"name":"com_ajax","type":"component","creationDate":"August 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2015 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"COM_AJAX_DESC","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0), +(30, 'com_contenthistory', 'component', 'com_contenthistory', '', 1, 1, 1, 0, '{"name":"com_contenthistory","type":"component","creationDate":"May 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2016 Open Source Matters. All rights reserved.\\n\\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"COM_CONTENTHISTORY_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0), +(31, 'com_ajax', 'component', 'com_ajax', '', 1, 1, 1, 0, '{"name":"com_ajax","type":"component","creationDate":"August 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"COM_AJAX_DESC","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0), (32, 'com_postinstall', 'component', 'com_postinstall', '', 1, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0), (105, 'FOF', 'library', 'fof', '', 0, 1, 1, 1, '{"legacy":false,"name":"FOF","type":"library","creationDate":"2013-10-08","author":"Nicholas K. Dionysopoulos \/ Akeeba Ltd","copyright":"(C)2011-2013 Nicholas K. Dionysopoulos","authorEmail":"nicholas@akeebabackup.com","authorUrl":"https:\/\/www.akeebabackup.com","version":"2.1.rc4","description":"Framework-on-Framework (FOF) - A rapid component development framework for Joomla!","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0), -(448, 'plg_twofactorauth_totp', 'plugin', 'totp', 'twofactorauth', 0, 0, 1, 0, '{"name":"plg_twofactorauth_totp","type":"plugin","creationDate":"August 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2015 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"PLG_TWOFACTORAUTH_TOTP_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0), -(449, 'plg_authentication_cookie', 'plugin', 'cookie', 'authentication', 0, 1, 1, 0, '{"name":"plg_authentication_cookie","type":"plugin","creationDate":"July 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"PLG_AUTH_COOKIE_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0), -(450, 'plg_twofactorauth_yubikey', 'plugin', 'yubikey', 'twofactorauth', 0, 0, 1, 0, '{"name":"plg_twofactorauth_yubikey","type":"plugin","creationDate":"Se[ptember 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2015 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"PLG_TWOFACTORAUTH_YUBIKEY_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0); +(448, 'plg_twofactorauth_totp', 'plugin', 'totp', 'twofactorauth', 0, 0, 1, 0, '{"name":"plg_twofactorauth_totp","type":"plugin","creationDate":"August 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"PLG_TWOFACTORAUTH_TOTP_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0), +(449, 'plg_authentication_cookie', 'plugin', 'cookie', 'authentication', 0, 1, 1, 0, '{"name":"plg_authentication_cookie","type":"plugin","creationDate":"July 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"PLG_AUTH_COOKIE_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0), +(450, 'plg_twofactorauth_yubikey', 'plugin', 'yubikey', 'twofactorauth', 0, 0, 1, 0, '{"name":"plg_twofactorauth_yubikey","type":"plugin","creationDate":"Se[ptember 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"PLG_TWOFACTORAUTH_YUBIKEY_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0); INSERT INTO `#__menu` (`menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `checked_out`, `checked_out_time`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`) VALUES ('main', 'com_postinstall', 'Post-installation messages', '', 'Post-installation messages', 'index.php?option=com_postinstall', 'component', 0, 1, 1, 32, 0, '0000-00-00 00:00:00', 0, 1, 'class:postinstall', 0, '', 45, 46, 0, '*', 1); diff --git a/administrator/components/com_admin/sql/updates/mysql/3.4.0-2014-09-16.sql b/administrator/components/com_admin/sql/updates/mysql/3.4.0-2014-09-16.sql index ae45c099bc09f..37620c9c50f00 100644 --- a/administrator/components/com_admin/sql/updates/mysql/3.4.0-2014-09-16.sql +++ b/administrator/components/com_admin/sql/updates/mysql/3.4.0-2014-09-16.sql @@ -1,2 +1,6 @@ -ALTER TABLE `#__redirect_links` ADD header smallint(3) NOT NULL DEFAULT 301; -ALTER TABLE `#__redirect_links` MODIFY new_url varchar(255); +ALTER TABLE `#__redirect_links` ADD COLUMN `header` smallint(3) NOT NULL DEFAULT 301; +-- +-- The following statement has to be disabled because it conflicts with +-- a later change added with Joomla! 3.5.0 for long URLs in this table +-- +-- ALTER TABLE `#__redirect_links` MODIFY `new_url` varchar(255); diff --git a/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-07-01.sql b/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-07-01.sql index 7ee66ff2de6c4..e76947836f087 100644 --- a/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-07-01.sql +++ b/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-07-01.sql @@ -1,89 +1,2 @@ --- WARNING: Do not rename this file with a different date. It MUST run before any other table updates when upgrading to Joomla! 3.5.0 - --- Index and field changes to cater for UTF-8 Multibyte (utf8mb4) -ALTER TABLE `#__menu` DROP KEY `idx_client_id_parent_id_alias_language`, ADD UNIQUE KEY `idx_client_id_parent_id_alias_language` (`client_id`,`parent_id`,`alias`(191),`language`); - -ALTER TABLE `#__redirect_links` DROP KEY `idx_link_old`, ADD UNIQUE KEY `idx_link_old` (`old_url`(191)); - ALTER TABLE `#__session` MODIFY `session_id` varchar(191) NOT NULL DEFAULT ''; - ALTER TABLE `#__user_keys` MODIFY `series` varchar(191) NOT NULL; - --- Convert utf8_bin collated columns to utf8mb4_bin collation -ALTER TABLE `#__banners` MODIFY `alias` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT ''; -ALTER TABLE `#__categories` MODIFY `alias` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT ''; -ALTER TABLE `#__contact_details` MODIFY `alias` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT ''; -ALTER TABLE `#__content` MODIFY `alias` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT ''; -ALTER TABLE `#__menu` MODIFY `alias` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT 'The SEF alias of the menu item.'; -ALTER TABLE `#__newsfeeds` MODIFY `alias` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT ''; -ALTER TABLE `#__tags` MODIFY `alias` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT ''; -ALTER TABLE `#__ucm_content` MODIFY `core_alias` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT ''; - --- Convert all tables to UTF-8 Multibyte (utf8mb4) -ALTER TABLE `#__assets` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__associations` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__banners` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__banner_clients` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__banner_tracks` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__categories` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__contact_details` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__content` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__content_frontpage` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__content_rating` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__content_types` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__contentitem_tag_map` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__core_log_searches` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__extensions` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__finder_filters` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__finder_links` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__finder_links_terms0` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__finder_links_terms1` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__finder_links_terms2` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__finder_links_terms3` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__finder_links_terms4` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__finder_links_terms5` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__finder_links_terms6` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__finder_links_terms7` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__finder_links_terms8` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__finder_links_terms9` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__finder_links_termsa` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__finder_links_termsb` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__finder_links_termsc` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__finder_links_termsd` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__finder_links_termse` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__finder_links_termsf` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__finder_taxonomy` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__finder_taxonomy_map` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__finder_terms` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__finder_terms_common` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__finder_tokens` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__finder_tokens_aggregate` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__finder_types` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__languages` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__menu` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__menu_types` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__messages` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__messages_cfg` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__modules` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__modules_menu` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__newsfeeds` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__overrider` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__postinstall_messages` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__redirect_links` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__schemas` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__session` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__tags` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__template_styles` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__ucm_base` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__ucm_content` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__ucm_history` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__updates` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__update_sites` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__update_sites_extensions` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__usergroups` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__users` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__user_keys` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__user_notes` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__user_profiles` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__user_usergroup_map` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; -ALTER TABLE `#__viewlevels` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; \ No newline at end of file diff --git a/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-10-26.sql b/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-10-26.sql index 43051a47355d3..dfc9043ae9c8b 100644 --- a/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-10-26.sql +++ b/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-10-26.sql @@ -1,2 +1,2 @@ -AlTER TABLE `#__contentitem_tag_map` DROP INDEX `idx_tag`; -AlTER TABLE `#__contentitem_tag_map` DROP INDEX `idx_type`; +ALTER TABLE `#__contentitem_tag_map` DROP INDEX `idx_tag`; +ALTER TABLE `#__contentitem_tag_map` DROP INDEX `idx_type`; diff --git a/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-10-30.sql b/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-10-30.sql new file mode 100644 index 0000000000000..a3fbadebb349c --- /dev/null +++ b/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-10-30.sql @@ -0,0 +1 @@ +UPDATE `#__menu` SET `title` = 'com_contact_contacts' WHERE `id` = 8; diff --git a/administrator/components/com_admin/sql/updates/mysql/3.4.2-2015-05-03.sql b/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-11-04.sql similarity index 83% rename from administrator/components/com_admin/sql/updates/mysql/3.4.2-2015-05-03.sql rename to administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-11-04.sql index e2921fc346193..41eb98fccb3b7 100644 --- a/administrator/components/com_admin/sql/updates/mysql/3.4.2-2015-05-03.sql +++ b/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-11-04.sql @@ -1,2 +1,4 @@ +DELETE FROM `#__menu` WHERE `title` = 'com_messages_read' AND `client_id` = 1; + INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES (452, 'plg_system_updatenotification', 'plugin', 'updatenotification', 'system', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0); diff --git a/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-11-05.sql b/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-11-05.sql new file mode 100644 index 0000000000000..4f75f640e3a56 --- /dev/null +++ b/administrator/components/com_admin/sql/updates/mysql/3.5.0-2015-11-05.sql @@ -0,0 +1,6 @@ +INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES +(454, 'plg_system_stats', 'plugin', 'stats', 'system', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0); + +INSERT INTO `#__postinstall_messages` (`extension_id`, `title_key`, `description_key`, `action_key`, `language_extension`, `language_client_id`, `type`, `action_file`, `action`, `condition_file`, `condition_method`, `version_introduced`, `enabled`) +VALUES +(700, 'COM_CPANEL_MSG_STATS_COLLECTION_TITLE', 'COM_CPANEL_MSG_STATS_COLLECTION_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/statscollection.php', 'admin_postinstall_statscollection_condition', '3.5.0', 1); diff --git a/administrator/components/com_admin/sql/updates/mysql/3.5.0-2016-02-26.sql b/administrator/components/com_admin/sql/updates/mysql/3.5.0-2016-02-26.sql new file mode 100644 index 0000000000000..0aa843cbfbc91 --- /dev/null +++ b/administrator/components/com_admin/sql/updates/mysql/3.5.0-2016-02-26.sql @@ -0,0 +1,14 @@ +-- +-- Create a table for UTF-8 Multibyte (utf8mb4) conversion for MySQL in +-- order to check if the conversion has been performed and if not show a +-- message about database problem in the database schema view. +-- +-- The value of `converted` can be 0 (not converted yet after update), +-- 1 (converted to utf8), or 2 (converted to utf8mb4). +-- + +CREATE TABLE IF NOT EXISTS `#__utf8_conversion` ( + `converted` tinyint(4) NOT NULL DEFAULT 0 +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci; + +INSERT INTO `#__utf8_conversion` (`converted`) VALUES (0); diff --git a/administrator/components/com_admin/sql/updates/mysql/3.5.0-2016-03-01.sql b/administrator/components/com_admin/sql/updates/mysql/3.5.0-2016-03-01.sql new file mode 100644 index 0000000000000..38ab528a6cadd --- /dev/null +++ b/administrator/components/com_admin/sql/updates/mysql/3.5.0-2016-03-01.sql @@ -0,0 +1,5 @@ +ALTER TABLE `#__redirect_links` DROP INDEX `idx_link_old`; +ALTER TABLE `#__redirect_links` MODIFY `old_url` VARCHAR(2048) NOT NULL; +ALTER TABLE `#__redirect_links` MODIFY `new_url` VARCHAR(2048) NOT NULL; +ALTER TABLE `#__redirect_links` MODIFY `referer` VARCHAR(2048) NOT NULL; +ALTER TABLE `#__redirect_links` ADD INDEX `idx_old_url` (`old_url`(100)); diff --git a/administrator/components/com_admin/sql/updates/mysql/3.5.1-2016-03-25.sql b/administrator/components/com_admin/sql/updates/mysql/3.5.1-2016-03-25.sql new file mode 100644 index 0000000000000..f6c320b8cc24e --- /dev/null +++ b/administrator/components/com_admin/sql/updates/mysql/3.5.1-2016-03-25.sql @@ -0,0 +1,5 @@ +-- +-- Make #__user_keys.user_id fit to #__users.username +-- + +ALTER TABLE `#__user_keys` MODIFY `user_id` varchar(150) NOT NULL; diff --git a/administrator/components/com_admin/sql/updates/mysql/3.5.1-2016-03-29.sql b/administrator/components/com_admin/sql/updates/mysql/3.5.1-2016-03-29.sql new file mode 100644 index 0000000000000..86ecda89c6258 --- /dev/null +++ b/administrator/components/com_admin/sql/updates/mysql/3.5.1-2016-03-29.sql @@ -0,0 +1,7 @@ +-- +-- Reset UTF-8 Multibyte (utf8mb4) or UTF-8 conversion status +-- to force a new conversion when updating from version 3.5.0 +-- + +UPDATE `#__utf8_conversion` SET `converted` = 0 + WHERE (SELECT COUNT(*) FROM `#__schemas` WHERE `extension_id`=700 AND `version_id` LIKE '3.5.0%') = 1; \ No newline at end of file diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.1.0.sql b/administrator/components/com_admin/sql/updates/postgresql/3.1.0.sql index 202896757b60f..fe5c364e0a808 100644 --- a/administrator/components/com_admin/sql/updates/postgresql/3.1.0.sql +++ b/administrator/components/com_admin/sql/updates/postgresql/3.1.0.sql @@ -47,7 +47,7 @@ CREATE TABLE "#__contentitem_tag_map" ( CONSTRAINT "uc_ItemnameTagid" UNIQUE ("type_alias", "content_item_id", "tag_id") ); -CREATE INDEX "#__contentitem_tag_map_idx_tag_name" ON "#__contentitem_tag_map" ("tag_id", "type_alias"); +CREATE INDEX "#__contentitem_tag_map_idx_tag_type" ON "#__contentitem_tag_map" ("tag_id", "type_alias"); CREATE INDEX "#__contentitem_tag_map_idx_date_id" ON "#__contentitem_tag_map" ("tag_date", "tag_id"); CREATE INDEX "#__contentitem_tag_map_idx_tag" ON "#__contentitem_tag_map" ("tag_id"); CREATE INDEX "#__contentitem_tag_map_idx_core_content_id" ON "#__contentitem_tag_map" ("core_content_id"); @@ -183,11 +183,11 @@ CREATE INDEX "#__ucm_content_idx_core_type_id" ON "#__ucm_content" ("core_type_i -- Add extensions table records -- INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES -(29, 'com_tags', 'component', 'com_tags', '', 1, 1, 1, 1, '{"legacy":false,"name":"com_tags","type":"component","creationDate":"March 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2015 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_TAGS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0), -(315, 'mod_stats_admin', 'module', 'mod_stats_admin', '', 1, 1, 1, 0, '{"name":"mod_stats_admin","type":"module","creationDate":"September 2012","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"MOD_STATS_XML_DESCRIPTION","group":""}', '{"serverinfo":"0","siteinfo":"0","counter":"0","increase":"0","cache":"1","cache_time":"900","cachemode":"static"}', '', '', 0, '1970-01-01 00:00:00', 0, 0), -(316, 'mod_tags_popular', 'module', 'mod_tags_popular', '', 0, 1, 1, 0, '{"name":"mod_tags_popular","type":"module","creationDate":"January 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.0","description":"MOD_TAGS_POPULAR_XML_DESCRIPTION","group":""}', '{"maximum":"5","timeframe":"alltime","owncache":"1"}', '', '', 0, '1970-01-01 00:00:00', 0, 0), -(317, 'mod_tags_similar', 'module', 'mod_tags_similar', '', 0, 1, 1, 0, '{"name":"mod_tags_similar","type":"module","creationDate":"January 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.0","description":"MOD_TAGS_SIMILAR_XML_DESCRIPTION","group":""}', '{"maximum":"5","matchtype":"any","owncache":"1"}', '', '', 0, '1970-01-01 00:00:00', 0, 0), -(447, 'plg_finder_tags', 'plugin', 'tags', 'finder', 0, 1, 1, 0, '{"name":"plg_finder_tags","type":"plugin","creationDate":"February 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2015 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"PLG_FINDER_TAGS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0); +(29, 'com_tags', 'component', 'com_tags', '', 1, 1, 1, 1, '{"legacy":false,"name":"com_tags","type":"component","creationDate":"March 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_TAGS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0), +(315, 'mod_stats_admin', 'module', 'mod_stats_admin', '', 1, 1, 1, 0, '{"name":"mod_stats_admin","type":"module","creationDate":"September 2012","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"MOD_STATS_XML_DESCRIPTION","group":""}', '{"serverinfo":"0","siteinfo":"0","counter":"0","increase":"0","cache":"1","cache_time":"900","cachemode":"static"}', '', '', 0, '1970-01-01 00:00:00', 0, 0), +(316, 'mod_tags_popular', 'module', 'mod_tags_popular', '', 0, 1, 1, 0, '{"name":"mod_tags_popular","type":"module","creationDate":"January 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.0","description":"MOD_TAGS_POPULAR_XML_DESCRIPTION","group":""}', '{"maximum":"5","timeframe":"alltime","owncache":"1"}', '', '', 0, '1970-01-01 00:00:00', 0, 0), +(317, 'mod_tags_similar', 'module', 'mod_tags_similar', '', 0, 1, 1, 0, '{"name":"mod_tags_similar","type":"module","creationDate":"January 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.0","description":"MOD_TAGS_SIMILAR_XML_DESCRIPTION","group":""}', '{"maximum":"5","matchtype":"any","owncache":"1"}', '', '', 0, '1970-01-01 00:00:00', 0, 0), +(447, 'plg_finder_tags', 'plugin', 'tags', 'finder', 0, 1, 1, 0, '{"name":"plg_finder_tags","type":"plugin","creationDate":"February 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"PLG_FINDER_TAGS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0); -- -- Add menu table records diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.2.0.sql b/administrator/components/com_admin/sql/updates/postgresql/3.2.0.sql index d16dc8f2f9dcd..82047821dfbb2 100644 --- a/administrator/components/com_admin/sql/updates/postgresql/3.2.0.sql +++ b/administrator/components/com_admin/sql/updates/postgresql/3.2.0.sql @@ -19,13 +19,13 @@ UPDATE "#__extensions" SET "params" = '{"template_positions_display":"0","upload UPDATE "#__extensions" SET "params" = '{"lineNumbers":"1","lineWrapping":"1","matchTags":"1","matchBrackets":"1","marker-gutter":"1","autoCloseTags":"1","autoCloseBrackets":"1","autoFocus":"1","theme":"default","tabmode":"indent"}' WHERE "extension_id" = 410; INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES -(30, 'com_contenthistory', 'component', 'com_contenthistory', '', 1, 1, 1, 0, '{"name":"com_contenthistory","type":"component","creationDate":"May 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2015 Open Source Matters. All rights reserved.\\n\\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"COM_CONTENTHISTORY_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0), -(31, 'com_ajax', 'component', 'com_ajax', '', 1, 1, 1, 0, '{"name":"com_ajax","type":"component","creationDate":"August 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2015 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"COM_AJAX_DESC","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0), +(30, 'com_contenthistory', 'component', 'com_contenthistory', '', 1, 1, 1, 0, '{"name":"com_contenthistory","type":"component","creationDate":"May 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2016 Open Source Matters. All rights reserved.\\n\\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"COM_CONTENTHISTORY_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0), +(31, 'com_ajax', 'component', 'com_ajax', '', 1, 1, 1, 0, '{"name":"com_ajax","type":"component","creationDate":"August 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"COM_AJAX_DESC","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0), (32, 'com_postinstall', 'component', 'com_postinstall', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0), (105, 'FOF', 'library', 'fof', '', 0, 1, 1, 1, '{"legacy":false,"name":"FOF","type":"library","creationDate":"2013-10-08","author":"Nicholas K. Dionysopoulos \/ Akeeba Ltd","copyright":"(C)2011-2013 Nicholas K. Dionysopoulos","authorEmail":"nicholas@akeebabackup.com","authorUrl":"https:\/\/www.akeebabackup.com","version":"2.1.rc4","description":"Framework-on-Framework (FOF) - A rapid component development framework for Joomla!","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0), -(448, 'plg_twofactorauth_totp', 'plugin', 'totp', 'twofactorauth', 0, 0, 1, 0, '{"name":"plg_twofactorauth_totp","type":"plugin","creationDate":"August 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2015 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"PLG_TWOFACTORAUTH_TOTP_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0), -(449, 'plg_authentication_cookie', 'plugin', 'cookie', 'authentication', 0, 1, 1, 0, '{"name":"plg_authentication_cookie","type":"plugin","creationDate":"July 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"PLG_AUTH_COOKIE_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0), -(450, 'plg_twofactorauth_yubikey', 'plugin', 'yubikey', 'twofactorauth', 0, 0, 1, 0, '{"name":"plg_twofactorauth_yubikey","type":"plugin","creationDate":"Se[ptember 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2015 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"PLG_TWOFACTORAUTH_YUBIKEY_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0); +(448, 'plg_twofactorauth_totp', 'plugin', 'totp', 'twofactorauth', 0, 0, 1, 0, '{"name":"plg_twofactorauth_totp","type":"plugin","creationDate":"August 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"PLG_TWOFACTORAUTH_TOTP_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0), +(449, 'plg_authentication_cookie', 'plugin', 'cookie', 'authentication', 0, 1, 1, 0, '{"name":"plg_authentication_cookie","type":"plugin","creationDate":"July 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"PLG_AUTH_COOKIE_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0), +(450, 'plg_twofactorauth_yubikey', 'plugin', 'yubikey', 'twofactorauth', 0, 0, 1, 0, '{"name":"plg_twofactorauth_yubikey","type":"plugin","creationDate":"Se[ptember 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"PLG_TWOFACTORAUTH_YUBIKEY_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0); INSERT INTO "#__menu" ("menutype", "title", "alias", "note", "path", "link", "type", "published", "parent_id", "level", "component_id", "checked_out", "checked_out_time", "browserNav", "access", "img", "template_style_id", "params", "lft", "rgt", "home", "language", "client_id") VALUES ('main', 'com_postinstall', 'Post-installation messages', '', 'Post-installation messages', 'index.php?option=com_postinstall', 'component', 0, 1, 1, 32, 0, '1970-01-01 00:00:00', 0, 1, 'class:postinstall', 0, '', 45, 46, 0, '*', 1); diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2014-09-16.sql b/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2014-09-16.sql index d9c98a189b2f8..0419468e8bb46 100644 --- a/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2014-09-16.sql +++ b/administrator/components/com_admin/sql/updates/postgresql/3.4.0-2014-09-16.sql @@ -1,2 +1,6 @@ ALTER TABLE "#__redirect_links" ADD COLUMN "header" INTEGER DEFAULT 301 NOT NULL; -ALTER TABLE "#__redirect_links" ALTER COLUMN "new_url" DROP NOT NULL; +-- +-- The following statement has to be disabled because it conflicts with +-- a later change added with Joomla! 3.5.0 for long URLs in this table +-- +-- ALTER TABLE "#__redirect_links" ALTER COLUMN "new_url" DROP NOT NULL; diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-10-26.sql b/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-10-26.sql index 2b7791e332d54..05080ce112570 100644 --- a/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-10-26.sql +++ b/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-10-26.sql @@ -1,2 +1,2 @@ -AlTER TABLE "#__contentitem_tag_map" DROP INDEX "#__contentitem_tag_map_idx_tag"; -AlTER TABLE "#__contentitem_tag_map" DROP INDEX "#__contentitem_tag_map_idx_type"; +DROP INDEX "#__contentitem_tag_map_idx_tag"; +DROP INDEX "#__contentitem_tag_map_idx_type"; diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-10-30.sql b/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-10-30.sql new file mode 100644 index 0000000000000..ce62b18de2f06 --- /dev/null +++ b/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-10-30.sql @@ -0,0 +1 @@ +UPDATE "#__menu" SET "title" = 'com_contact_contacts' WHERE "id" = 8; diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.4.2-2015-05-03.sql b/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-11-04.sql similarity index 83% rename from administrator/components/com_admin/sql/updates/postgresql/3.4.2-2015-05-03.sql rename to administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-11-04.sql index 895cf8faf99e6..492e6a06219fd 100644 --- a/administrator/components/com_admin/sql/updates/postgresql/3.4.2-2015-05-03.sql +++ b/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-11-04.sql @@ -1,2 +1,4 @@ +DELETE FROM "#__menu" WHERE "title" = 'com_messages_read' AND "client_id" = 1; + INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES (452, 'plg_system_updatenotification', 'plugin', 'updatenotification', 'system', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0); diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-11-05.sql b/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-11-05.sql new file mode 100644 index 0000000000000..e099d77e49c1d --- /dev/null +++ b/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2015-11-05.sql @@ -0,0 +1,5 @@ +INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES +(454, 'plg_system_stats', 'plugin', 'stats', 'system', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0); + +INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled") VALUES +(700, 'COM_CPANEL_MSG_STATS_COLLECTION_TITLE', 'COM_CPANEL_MSG_STATS_COLLECTION_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/statscollection.php', 'admin_postinstall_statscollection_condition', '3.5.0', 1); diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2016-03-01.sql b/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2016-03-01.sql new file mode 100644 index 0000000000000..804efa3edd1dc --- /dev/null +++ b/administrator/components/com_admin/sql/updates/postgresql/3.5.0-2016-03-01.sql @@ -0,0 +1,5 @@ +ALTER TABLE "#__redirect_links" DROP CONSTRAINT "#__redirect_links_idx_link_old"; +ALTER TABLE "#__redirect_links" ALTER COLUMN "old_url" TYPE character varying(2048); +ALTER TABLE "#__redirect_links" ALTER COLUMN "new_url" TYPE character varying(2048); +ALTER TABLE "#__redirect_links" ALTER COLUMN "referer" TYPE character varying(2048); +CREATE INDEX "#__idx_link_old" ON "#__redirect_links" ("old_url"); diff --git a/administrator/components/com_admin/sql/updates/sqlazure/2.5.4-2012-03-18.sql b/administrator/components/com_admin/sql/updates/sqlazure/2.5.4-2012-03-18.sql index 2c896d3cbcefa..4d1dd335e032d 100644 --- a/administrator/components/com_admin/sql/updates/sqlazure/2.5.4-2012-03-18.sql +++ b/administrator/components/com_admin/sql/updates/sqlazure/2.5.4-2012-03-18.sql @@ -1,7 +1,7 @@ SET IDENTITY_INSERT #__extensions ON; INSERT INTO #__extensions (extension_id, name, type, element, folder, client_id, enabled, access, protected, manifest_cache, params, custom_data, system_data, checked_out, checked_out_time, ordering, state) -SELECT 28, 'com_joomlaupdate', 'component', 'com_joomlaupdate', '', 1, 1, 0, 1, '{"legacy":false,"name":"com_joomlaupdate","type":"component","creationDate":"February 2012","author":"Joomla! Project","copyright":"(C) 2005 - 2015 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"2.5.2","description":"COM_JOOMLAUPDATE_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1900-01-01 00:00:00', 0, 0; +SELECT 28, 'com_joomlaupdate', 'component', 'com_joomlaupdate', '', 1, 1, 0, 1, '{"legacy":false,"name":"com_joomlaupdate","type":"component","creationDate":"February 2012","author":"Joomla! Project","copyright":"(C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"2.5.2","description":"COM_JOOMLAUPDATE_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1900-01-01 00:00:00', 0, 0; SET IDENTITY_INSERT #__extensions OFF; diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.1.0.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.1.0.sql index a6c32d0497914..250e50631bcb3 100644 --- a/administrator/components/com_admin/sql/updates/sqlazure/3.1.0.sql +++ b/administrator/components/com_admin/sql/updates/sqlazure/3.1.0.sql @@ -320,7 +320,7 @@ CREATE NONCLUSTERED INDEX [idx_core_type_id] ON [#__ucm_content] SET IDENTITY_INSERT #__extensions ON; INSERT INTO #__extensions (extension_id, name, type, element, folder, client_id, enabled, access, protected, manifest_cache, params, custom_data, system_data, checked_out, checked_out_time, ordering, state) - SELECT 29, 'com_tags', 'component', 'com_tags', '', 1, 1, 1, 1, '{"name":"com_joomlaupdate","type":"component","creationDate":"March 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2015 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.0","description":"COM_TAGS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1900-01-01 00:00:00', 0, 0; + SELECT 29, 'com_tags', 'component', 'com_tags', '', 1, 1, 1, 1, '{"name":"com_joomlaupdate","type":"component","creationDate":"March 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2016 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.0","description":"COM_TAGS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1900-01-01 00:00:00', 0, 0; SET IDENTITY_INSERT #__extensions OFF; diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2014-09-16.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2014-09-16.sql index ac849cc922a3f..0238aa251b9b7 100644 --- a/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2014-09-16.sql +++ b/administrator/components/com_admin/sql/updates/sqlazure/3.4.0-2014-09-16.sql @@ -1,2 +1,6 @@ ALTER TABLE [#__redirect_links] ADD [header] [smallint] NOT NULL DEFAULT 301; -ALTER TABLE [#__redirect_links] ALTER COLUMN [new_url] [nvarchar](255) NULL; \ No newline at end of file +-- +-- The following statement has to be disabled because it conflicts with +-- a later change added with Joomla! 3.5.0 for long URLs in this table +-- +-- ALTER TABLE [#__redirect_links] ALTER COLUMN [new_url] [nvarchar](255) NULL; diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-10-26.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-10-26.sql index 05ed505765d1e..b3adba686e7e1 100644 --- a/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-10-26.sql +++ b/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-10-26.sql @@ -1,3 +1,3 @@ -AlTER TABLE [#__contentitem_tag_map] DROP INDEX [idx_tag_name]; -AlTER TABLE [#__contentitem_tag_map] DROP INDEX [idx_tag]; -AlTER TABLE [#__contentitem_tag_map] DROP INDEX [idx_type]; +ALTER TABLE [#__contentitem_tag_map] DROP INDEX [idx_tag_name]; +ALTER TABLE [#__contentitem_tag_map] DROP INDEX [idx_tag]; +ALTER TABLE [#__contentitem_tag_map] DROP INDEX [idx_type]; diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-10-30.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-10-30.sql new file mode 100644 index 0000000000000..c652a5057f9f1 --- /dev/null +++ b/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-10-30.sql @@ -0,0 +1 @@ +UPDATE [#__menu] SET [title] = 'com_contact_contacts' WHERE [id] = 8; diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.4.2-2015-05-03.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-11-04.sql similarity index 85% rename from administrator/components/com_admin/sql/updates/sqlazure/3.4.2-2015-05-03.sql rename to administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-11-04.sql index 0435fa8fa6402..4403fa83d4575 100644 --- a/administrator/components/com_admin/sql/updates/sqlazure/3.4.2-2015-05-03.sql +++ b/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-11-04.sql @@ -1,3 +1,5 @@ +DELETE FROM [#__menu] WHERE [title] = 'com_messages_read' AND [client_id] = 1; + SET IDENTITY_INSERT [#__extensions] ON; INSERT [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state]) diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-11-05.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-11-05.sql new file mode 100644 index 0000000000000..225b844bd91d9 --- /dev/null +++ b/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2015-11-05.sql @@ -0,0 +1,9 @@ +SET IDENTITY_INSERT [#__extensions] ON; + +INSERT [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state]) +SELECT 454, 'plg_system_stats', 'plugin', 'stats', 'system', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0; + +SET IDENTITY_INSERT [#__extensions] OFF; + +INSERT INTO #__postinstall_messages ([extension_id], [title_key], [description_key], [action_key], [language_extension], [language_client_id], [type], [action_file], [action], [condition_file], [condition_method], [version_introduced], [enabled]) +SELECT 700, 'COM_CPANEL_MSG_STATS_COLLECTION_TITLE', 'COM_CPANEL_MSG_STATS_COLLECTION_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/statscollection.php', 'admin_postinstall_statscollection_condition', '3.5.0', 1; diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2016-03-01.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2016-03-01.sql new file mode 100644 index 0000000000000..e0a8f66108285 --- /dev/null +++ b/administrator/components/com_admin/sql/updates/sqlazure/3.5.0-2016-03-01.sql @@ -0,0 +1,8 @@ +ALTER TABLE [#__redirect_links] DROP CONSTRAINT [#__redirect_links$idx_link_old]; +ALTER TABLE [#__redirect_links] ALTER COLUMN [old_url] [nvarchar](2048) NOT NULL; +ALTER TABLE [#__redirect_links] ALTER COLUMN [new_url] [nvarchar](2048) NOT NULL; +ALTER TABLE [#__redirect_links] ALTER COLUMN [referer] [nvarchar](2048) NOT NULL; +CREATE NONCLUSTERED INDEX [idx_old_url] ON [#__redirect_links] +( + [old_url] ASC +)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF); diff --git a/administrator/components/com_admin/views/help/tmpl/default.php b/administrator/components/com_admin/views/help/tmpl/default.php index cceef76a1b191..16ac0bf336023 100644 --- a/administrator/components/com_admin/views/help/tmpl/default.php +++ b/administrator/components/com_admin/views/help/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/views/help/view.html.php b/administrator/components/com_admin/views/help/view.html.php index 6b1f5971f6bed..ea30135a52781 100644 --- a/administrator/components/com_admin/views/help/view.html.php +++ b/administrator/components/com_admin/views/help/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/views/profile/tmpl/edit.php b/administrator/components/com_admin/views/profile/tmpl/edit.php index 61b890fa98553..1e75bf73e83a2 100644 --- a/administrator/components/com_admin/views/profile/tmpl/edit.php +++ b/administrator/components/com_admin/views/profile/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -40,7 +40,7 @@
label; ?>
fieldname == 'password2') : ?> - + input; ?>
diff --git a/administrator/components/com_admin/views/profile/view.html.php b/administrator/components/com_admin/views/profile/view.html.php index 05962b0c1fb15..88a556cfaaba5 100644 --- a/administrator/components/com_admin/views/profile/view.html.php +++ b/administrator/components/com_admin/views/profile/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/views/sysinfo/tmpl/default.php b/administrator/components/com_admin/views/sysinfo/tmpl/default.php index d1aa1eb6fb2c3..0cc9d6a344f20 100644 --- a/administrator/components/com_admin/views/sysinfo/tmpl/default.php +++ b/administrator/components/com_admin/views/sysinfo/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -13,7 +13,7 @@ JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); ?> -
+
@@ -41,6 +41,8 @@
+ +
diff --git a/administrator/components/com_admin/views/sysinfo/tmpl/default_config.php b/administrator/components/com_admin/views/sysinfo/tmpl/default_config.php index ed149a9637ada..322ca6f2f5d22 100644 --- a/administrator/components/com_admin/views/sysinfo/tmpl/default_config.php +++ b/administrator/components/com_admin/views/sysinfo/tmpl/default_config.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/views/sysinfo/tmpl/default_directory.php b/administrator/components/com_admin/views/sysinfo/tmpl/default_directory.php index 30a54988d7c78..4d4d32534c5fb 100644 --- a/administrator/components/com_admin/views/sysinfo/tmpl/default_directory.php +++ b/administrator/components/com_admin/views/sysinfo/tmpl/default_directory.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/views/sysinfo/tmpl/default_phpinfo.php b/administrator/components/com_admin/views/sysinfo/tmpl/default_phpinfo.php index 739859f41ea03..74d77a04c524a 100644 --- a/administrator/components/com_admin/views/sysinfo/tmpl/default_phpinfo.php +++ b/administrator/components/com_admin/views/sysinfo/tmpl/default_phpinfo.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/views/sysinfo/tmpl/default_phpsettings.php b/administrator/components/com_admin/views/sysinfo/tmpl/default_phpsettings.php index 7e0096c1c59d7..3be760867ba62 100644 --- a/administrator/components/com_admin/views/sysinfo/tmpl/default_phpsettings.php +++ b/administrator/components/com_admin/views/sysinfo/tmpl/default_phpsettings.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -157,6 +157,14 @@ php_settings['iconv']); ?> + + + + + + php_settings['max_input_vars']); ?> + + diff --git a/administrator/components/com_admin/views/sysinfo/tmpl/default_system.php b/administrator/components/com_admin/views/sysinfo/tmpl/default_system.php index f9f49d75cadcd..359622981a71c 100644 --- a/administrator/components/com_admin/views/sysinfo/tmpl/default_system.php +++ b/administrator/components/com_admin/views/sysinfo/tmpl/default_system.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_admin/views/sysinfo/view.html.php b/administrator/components/com_admin/views/sysinfo/view.html.php index b9c465c516f42..ea3f5d2b0a4dc 100644 --- a/administrator/components/com_admin/views/sysinfo/view.html.php +++ b/administrator/components/com_admin/views/sysinfo/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_admin * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -116,6 +116,8 @@ protected function _setSubMenu() protected function addToolbar() { JToolbarHelper::title(JText::_('COM_ADMIN_SYSTEM_INFORMATION'), 'info-2 systeminfo'); + JToolbarHelper::link(JRoute::_('index.php?option=com_admin&view=sysinfo&format=text'), 'COM_ADMIN_DOWNLOAD_SYSTEM_INFORMATION_TEXT', 'download'); + JToolbarHelper::link(JRoute::_('index.php?option=com_admin&view=sysinfo&format=json'), 'COM_ADMIN_DOWNLOAD_SYSTEM_INFORMATION_JSON', 'download'); JToolbarHelper::help('JHELP_SITE_SYSTEM_INFORMATION'); } } diff --git a/administrator/components/com_admin/views/sysinfo/view.json.php b/administrator/components/com_admin/views/sysinfo/view.json.php new file mode 100644 index 0000000000000..ac787f1bb206d --- /dev/null +++ b/administrator/components/com_admin/views/sysinfo/view.json.php @@ -0,0 +1,67 @@ +authorise('core.admin')) + { + return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR')); + } + + header('MIME-Version: 1.0'); + header('Content-Disposition: attachment; filename="systeminfo-' . date("c") . '.json"'); + header('Content-Transfer-Encoding: binary'); + + $data = $this->getLayoutData(); + + echo json_encode($data); + + JFactory::getApplication()->close(); + } + + /** + * Get the data for the view + * + * @return array + * + * @since 3.5 + */ + protected function getLayoutData() + { + $model = $this->getModel(); + + return array( + 'info' => $model->getSafeData('info'), + 'phpSettings' => $model->getSafeData('phpSettings'), + 'config' => $model->getSafeData('config'), + 'directories' => $model->getSafeData('directory', true), + 'phpInfo' => $model->getSafeData('phpInfoArray'), + 'extensions' => $model->getSafeData('extensions') + ); + } +} diff --git a/administrator/components/com_admin/views/sysinfo/view.text.php b/administrator/components/com_admin/views/sysinfo/view.text.php new file mode 100644 index 0000000000000..e71c9bf622f81 --- /dev/null +++ b/administrator/components/com_admin/views/sysinfo/view.text.php @@ -0,0 +1,176 @@ +authorise('core.admin')) + { + return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR')); + } + + header('Content-Type: text/plain; charset=utf-8'); + header('Content-Description: File Transfer'); + header('Content-Disposition: attachment; filename="systeminfo-' . date("c") . '.txt"'); + header('Cache-Control: must-revalidate'); + + $data = $this->getLayoutData(); + + $lines = array(); + + foreach ($data as $sectionName => $section) + { + $customRenderingMethod = 'render' . ucfirst($sectionName); + + if (method_exists($this, $customRenderingMethod)) + { + $lines[] = $this->$customRenderingMethod($section['title'], $section['data']); + } + else + { + $lines[] = $this->renderSection($section['title'], $section['data']); + } + } + + echo str_replace(JPATH_ROOT, 'xxxxxx', implode("\n\n", $lines)); + + JFactory::getApplication()->close(); + } + + /** + * Get the data for the view + * + * @return array + * + * @since 3.5 + */ + protected function getLayoutData() + { + $model = $this->getModel(); + + return array( + 'info' => array( + 'title' => JText::_('COM_ADMIN_SYSTEM_INFORMATION', true), + 'data' => $model->getSafeData('info') + ), + 'phpSettings' => array( + 'title' => JText::_('COM_ADMIN_PHP_SETTINGS', true), + 'data' => $model->getSafeData('phpSettings') + ), + 'config' => array( + 'title' => JText::_('COM_ADMIN_CONFIGURATION_FILE', true), + 'data' => $model->getSafeData('config') + ), + 'directories' => array( + 'title' => JText::_('COM_ADMIN_DIRECTORY_PERMISSIONS', true), + 'data' => $model->getSafeData('directory', true) + ), + 'phpInfo' => array( + 'title' => JText::_('COM_ADMIN_PHP_INFORMATION', true), + 'data' => $model->getSafeData('phpInfoArray') + ), + 'extensions' => array( + 'title' => JText::_('COM_ADMIN_EXTENSIONS', true), + 'data' => $model->getSafeData('extensions') + ) + ); + } + + /** + * Render a section + * + * @param string $sectionName Name of the section to render + * @param array $sectionData Data of the section to render + * @param integer $level Depth level for indentation + * + * @return string + * + * @since 3.5 + */ + protected function renderSection($sectionName, $sectionData, $level = 0) + { + $lines = array(); + + $margin = ($level > 0) ? str_repeat("\t", $level) : null; + + $lines[] = $margin . "============="; + $lines[] = $margin . $sectionName; + $lines[] = $margin . "============="; + $level++; + + foreach ($sectionData as $name => $value) + { + if (is_array($value)) + { + if ($name == 'Directive') + { + continue; + } + + $lines[] = ""; + $lines[] = $this->renderSection($name, $value, $level); + } + else + { + if (is_bool($value)) + { + $value = $value ? 'true' : 'false'; + } + + if (is_int($name) && ($name == 0 || $name == 1)) + { + $name = ($name == 0 ? 'Local Value' : 'Master Value'); + } + + $lines[] = $margin . $name . ': ' . $value; + } + } + + return implode("\n", $lines); + } + + /** + * Specific rendering for directories + * + * @param string $sectionName Name of the section + * @param array $sectionData Directories information + * @param integer $level Starting level + * + * @return string + * + * @since 3.5 + */ + protected function renderDirectories($sectionName, $sectionData, $level = -1) + { + foreach ($sectionData as $directory => $data) + { + $sectionData[$directory] = $data['writable'] ? ' writable' : ' NOT writable'; + } + + return $this->renderSection($sectionName, $sectionData, $level); + } +} diff --git a/administrator/components/com_ajax/ajax.php b/administrator/components/com_ajax/ajax.php index a6558dfff4755..17d705d268047 100644 --- a/administrator/components/com_ajax/ajax.php +++ b/administrator/components/com_ajax/ajax.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_ajax * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_ajax/ajax.xml b/administrator/components/com_ajax/ajax.xml index c3bdf97582af8..45a1a3c17753c 100644 --- a/administrator/components/com_ajax/ajax.xml +++ b/administrator/components/com_ajax/ajax.xml @@ -3,7 +3,7 @@ com_ajax Joomla! Project August 2013 - (C) 2005 - 2015 Open Source Matters. All rights reserved. + (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/components/com_banners/banners.php b/administrator/components/com_banners/banners.php index d24679d0f6cd3..2f2891af53155 100644 --- a/administrator/components/com_banners/banners.php +++ b/administrator/components/com_banners/banners.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/banners.xml b/administrator/components/com_banners/banners.xml index efd87b79315f0..bcb02355da5e2 100644 --- a/administrator/components/com_banners/banners.xml +++ b/administrator/components/com_banners/banners.xml @@ -3,7 +3,7 @@ com_banners Joomla! Project April 2006 - (C) 2005 - 2015 Open Source Matters. All rights reserved. + (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/components/com_banners/config.xml b/administrator/components/com_banners/config.xml index 1e056e3777ec2..2c9f298c9523c 100644 --- a/administrator/components/com_banners/config.xml +++ b/administrator/components/com_banners/config.xml @@ -12,15 +12,15 @@ default="0" > + value="1">COM_BANNERS_FIELD_VALUE_UNLIMITED + value="2">COM_BANNERS_FIELD_VALUE_YEARLY + value="3">COM_BANNERS_FIELD_VALUE_MONTHLY + value="4">COM_BANNERS_FIELD_VALUE_WEEKLY + value="5">COM_BANNERS_FIELD_VALUE_DAILY select('COUNT(DISTINCT cp.id) AS count_published'); - $query->join('LEFT', '#__banners AS cp ON cp.catid = a.id AND cp.state = 1'); - - // Count unpublished items - $query->select('COUNT(DISTINCT cu.id) AS count_unpublished'); - $query->join('LEFT', '#__banners AS cu ON cu.catid = a.id AND cu.state = 0'); + $db = JFactory::getDbo(); - // Count archived items - $query->select('COUNT(DISTINCT ca.id) AS count_archived'); - $query->join('LEFT', '#__banners AS ca ON ca.catid = a.id AND ca.state = 2'); + foreach ($items as $item) + { + $item->count_trashed = 0; + $item->count_archived = 0; + $item->count_unpublished = 0; + $item->count_published = 0; + $query = $db->getQuery(true); + $query->select('state, count(*) AS count') + ->from($db->qn('#__banners')) + ->where('catid = ' . (int) $item->id) + ->group('state'); + $db->setQuery($query); + $banners = $db->loadObjectList(); - // Count trashed items - $query->select('COUNT(DISTINCT ct.id) AS count_trashed'); - $query->join('LEFT', '#__banners AS ct ON ct.catid = a.id AND ct.state = -2'); + foreach ($banners as $banner) + { + if ($banner->state == 1) + { + $item->count_published = $banner->count; + } + + if ($banner->state == 0) + { + $item->count_unpublished = $banner->count; + } + + if ($banner->state == 2) + { + $item->count_archived = $banner->count; + } + + if ($banner->state == -2) + { + $item->count_trashed = $banner->count; + } + } + } - return $query; + return $items; } - } diff --git a/administrator/components/com_banners/helpers/html/banner.php b/administrator/components/com_banners/helpers/html/banner.php index 2027e1c841302..0203da6d42156 100644 --- a/administrator/components/com_banners/helpers/html/banner.php +++ b/administrator/components/com_banners/helpers/html/banner.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/models/banner.php b/administrator/components/com_banners/models/banner.php index 57cd7d93ca485..be1048ac9672c 100644 --- a/administrator/components/com_banners/models/banner.php +++ b/administrator/components/com_banners/models/banner.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/models/banners.php b/administrator/components/com_banners/models/banners.php index d42997ba3674c..8c2c686dcc49c 100644 --- a/administrator/components/com_banners/models/banners.php +++ b/administrator/components/com_banners/models/banners.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -117,7 +117,7 @@ protected function getListQuery() $query->from($db->quoteName('#__banners') . ' AS a'); // Join over the language - $query->select('l.title AS language_title') + $query->select('l.title AS language_title, l.image AS language_image') ->join('LEFT', $db->quoteName('#__languages') . ' AS l ON l.lang_code = a.language'); // Join over the users for the checked out user. diff --git a/administrator/components/com_banners/models/client.php b/administrator/components/com_banners/models/client.php index 2c83b4a0a6ea0..4cec12149b146 100644 --- a/administrator/components/com_banners/models/client.php +++ b/administrator/components/com_banners/models/client.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/models/clients.php b/administrator/components/com_banners/models/clients.php index 975890ef01ebf..34594a3fa377c 100644 --- a/administrator/components/com_banners/models/clients.php +++ b/administrator/components/com_banners/models/clients.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/models/download.php b/administrator/components/com_banners/models/download.php index 561e8c9f1ebdb..f810cb098d535 100644 --- a/administrator/components/com_banners/models/download.php +++ b/administrator/components/com_banners/models/download.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/models/fields/bannerclient.php b/administrator/components/com_banners/models/fields/bannerclient.php index 140719936ee12..ec9281ed9a341 100644 --- a/administrator/components/com_banners/models/fields/bannerclient.php +++ b/administrator/components/com_banners/models/fields/bannerclient.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/models/fields/clicks.php b/administrator/components/com_banners/models/fields/clicks.php index f302f59cb71bc..63011d33d2bdd 100644 --- a/administrator/components/com_banners/models/fields/clicks.php +++ b/administrator/components/com_banners/models/fields/clicks.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/models/fields/impmade.php b/administrator/components/com_banners/models/fields/impmade.php index fe36a6220b305..796500c9e7a7d 100644 --- a/administrator/components/com_banners/models/fields/impmade.php +++ b/administrator/components/com_banners/models/fields/impmade.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/models/fields/imptotal.php b/administrator/components/com_banners/models/fields/imptotal.php index 0824c8899410a..b68ac67251060 100644 --- a/administrator/components/com_banners/models/fields/imptotal.php +++ b/administrator/components/com_banners/models/fields/imptotal.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/models/forms/banner.xml b/administrator/components/com_banners/models/forms/banner.xml index 77e591087bae2..b4d5607f64044 100644 --- a/administrator/components/com_banners/models/forms/banner.xml +++ b/administrator/components/com_banners/models/forms/banner.xml @@ -50,8 +50,8 @@ labelclass="control-label" /> - - - - - - diff --git a/administrator/components/com_banners/models/forms/client.xml b/administrator/components/com_banners/models/forms/client.xml index a14cc0ac8bf21..0ff3a5bedb428 100644 --- a/administrator/components/com_banners/models/forms/client.xml +++ b/administrator/components/com_banners/models/forms/client.xml @@ -47,15 +47,15 @@ > - - - - - diff --git a/administrator/components/com_banners/models/forms/filter_banners.xml b/administrator/components/com_banners/models/forms/filter_banners.xml index 7dcec86178fcd..a470c4bd65ff8 100644 --- a/administrator/components/com_banners/models/forms/filter_banners.xml +++ b/administrator/components/com_banners/models/forms/filter_banners.xml @@ -66,6 +66,8 @@ + + diff --git a/administrator/components/com_banners/models/forms/filter_clients.xml b/administrator/components/com_banners/models/forms/filter_clients.xml index 2609e159f3975..83f7b1fdbb1cd 100644 --- a/administrator/components/com_banners/models/forms/filter_clients.xml +++ b/administrator/components/com_banners/models/forms/filter_clients.xml @@ -25,11 +25,11 @@ onchange="this.form.submit();" > - - - - - + + + + + @@ -45,12 +45,10 @@ - - + + - - diff --git a/administrator/components/com_banners/models/forms/filter_tracks.xml b/administrator/components/com_banners/models/forms/filter_tracks.xml new file mode 100644 index 0000000000000..d0f601b096d77 --- /dev/null +++ b/administrator/components/com_banners/models/forms/filter_tracks.xml @@ -0,0 +1,76 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/administrator/components/com_banners/models/tracks.php b/administrator/components/com_banners/models/tracks.php index 9a20870adbd07..7689f402d8cd4 100644 --- a/administrator/components/com_banners/models/tracks.php +++ b/administrator/components/com_banners/models/tracks.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/tables/banner.php b/administrator/components/com_banners/tables/banner.php index 90a171e2fcddf..f853ec9b7619a 100644 --- a/administrator/components/com_banners/tables/banner.php +++ b/administrator/components/com_banners/tables/banner.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -92,6 +92,21 @@ public function check() $this->ordering = self::getNextOrder($this->_db->quoteName('catid') . '=' . $this->_db->quote($this->catid) . ' AND state>=0'); } + if (empty($this->publish_up)) + { + $this->publish_up = $this->getDbo()->getNullDate(); + } + + if (empty($this->publish_down)) + { + $this->publish_down = $this->getDbo()->getNullDate(); + } + + if (empty($this->modified)) + { + $this->modified = $this->getDbo()->getNullDate(); + } + return true; } @@ -178,19 +193,19 @@ public function store($updateNulls = false) break; case 2: $date = JFactory::getDate('+1 year ' . date('Y-m-d', strtotime('now'))); - $this->reset = $this->_db->quote($date->toSql()); + $this->reset = $date->toSql(); break; case 3: $date = JFactory::getDate('+1 month ' . date('Y-m-d', strtotime('now'))); - $this->reset = $this->_db->quote($date->toSql()); + $this->reset = $date->toSql(); break; case 4: $date = JFactory::getDate('+7 day ' . date('Y-m-d', strtotime('now'))); - $this->reset = $this->_db->quote($date->toSql()); + $this->reset = $date->toSql(); break; case 5: $date = JFactory::getDate('+1 day ' . date('Y-m-d', strtotime('now'))); - $this->reset = $this->_db->quote($date->toSql()); + $this->reset = $date->toSql(); break; } diff --git a/administrator/components/com_banners/tables/client.php b/administrator/components/com_banners/tables/client.php index e57a801efe52c..ae0e62f1fe4b9 100644 --- a/administrator/components/com_banners/tables/client.php +++ b/administrator/components/com_banners/tables/client.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/views/banner/tmpl/edit.php b/administrator/components/com_banners/views/banner/tmpl/edit.php index 0c19270abd2be..2a16281941ec4 100644 --- a/administrator/components/com_banners/views/banner/tmpl/edit.php +++ b/administrator/components/com_banners/views/banner/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/views/banner/view.html.php b/administrator/components/com_banners/views/banner/view.html.php index ace9e45b16e9e..e6c289e23ff14 100644 --- a/administrator/components/com_banners/views/banner/view.html.php +++ b/administrator/components/com_banners/views/banner/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/views/banners/tmpl/default.php b/administrator/components/com_banners/views/banners/tmpl/default.php index 62c6410944cce..0c8054c75309a 100644 --- a/administrator/components/com_banners/views/banners/tmpl/default.php +++ b/administrator/components/com_banners/views/banners/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -151,7 +151,7 @@ escape($item->alias)); ?>
- escape($item->category_title); ?> + escape($item->category_title); ?>
@@ -173,7 +173,7 @@ language == '*'): ?> - language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> + language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . ' ' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> diff --git a/administrator/components/com_banners/views/banners/tmpl/default_batch.php b/administrator/components/com_banners/views/banners/tmpl/default_batch.php index 2c7ac73742556..133dfd5e13683 100644 --- a/administrator/components/com_banners/views/banners/tmpl/default_batch.php +++ b/administrator/components/com_banners/views/banners/tmpl/default_batch.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * * @deprecated 3.4 Use default_batch_body and default_batch_footer diff --git a/administrator/components/com_banners/views/banners/tmpl/default_batch_body.php b/administrator/components/com_banners/views/banners/tmpl/default_batch_body.php index d24864eb90199..65970763025fd 100644 --- a/administrator/components/com_banners/views/banners/tmpl/default_batch_body.php +++ b/administrator/components/com_banners/views/banners/tmpl/default_batch_body.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/views/banners/tmpl/default_batch_footer.php b/administrator/components/com_banners/views/banners/tmpl/default_batch_footer.php index 6082476dd8eda..36609599d9bc0 100644 --- a/administrator/components/com_banners/views/banners/tmpl/default_batch_footer.php +++ b/administrator/components/com_banners/views/banners/tmpl/default_batch_footer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/views/banners/view.html.php b/administrator/components/com_banners/views/banners/view.html.php index 5946f188ff6ae..dc842b884bb39 100644 --- a/administrator/components/com_banners/views/banners/view.html.php +++ b/administrator/components/com_banners/views/banners/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -111,19 +111,19 @@ protected function addToolbar() if ($canDo->get('core.edit.state')) { - if ($this->state->get('filter.state') != 2) + if ($this->state->get('filter.published') != 2) { JToolbarHelper::publish('banners.publish', 'JTOOLBAR_PUBLISH', true); JToolbarHelper::unpublish('banners.unpublish', 'JTOOLBAR_UNPUBLISH', true); } - if ($this->state->get('filter.state') != -1) + if ($this->state->get('filter.published') != -1) { - if ($this->state->get('filter.state') != 2) + if ($this->state->get('filter.published') != 2) { JToolbarHelper::archiveList('banners.archive'); } - elseif ($this->state->get('filter.state') == 2) + elseif ($this->state->get('filter.published') == 2) { JToolbarHelper::unarchiveList('banners.publish'); } @@ -149,9 +149,9 @@ protected function addToolbar() JToolbar::getInstance('toolbar')->appendButton('Custom', $dhtml, 'batch'); } - if ($this->state->get('filter.state') == -2 && $canDo->get('core.delete')) + if ($this->state->get('filter.published') == -2 && $canDo->get('core.delete')) { - JToolbarHelper::deleteList('', 'banners.delete', 'JTOOLBAR_EMPTY_TRASH'); + JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'banners.delete', 'JTOOLBAR_EMPTY_TRASH'); } elseif ($canDo->get('core.edit.state')) { diff --git a/administrator/components/com_banners/views/client/tmpl/edit.php b/administrator/components/com_banners/views/client/tmpl/edit.php index 867343414cb97..172c0bc4cb68e 100644 --- a/administrator/components/com_banners/views/client/tmpl/edit.php +++ b/administrator/components/com_banners/views/client/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/views/client/view.html.php b/administrator/components/com_banners/views/client/view.html.php index ed6def5ae32aa..cc3e9f6b730e6 100644 --- a/administrator/components/com_banners/views/client/view.html.php +++ b/administrator/components/com_banners/views/client/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/views/clients/tmpl/default.php b/administrator/components/com_banners/views/clients/tmpl/default.php index 7a10ba60e56ab..8449a6ad38696 100644 --- a/administrator/components/com_banners/views/clients/tmpl/default.php +++ b/administrator/components/com_banners/views/clients/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/views/clients/view.html.php b/administrator/components/com_banners/views/clients/view.html.php index 497d46f7a8e3e..c5f7e0e3a3154 100644 --- a/administrator/components/com_banners/views/clients/view.html.php +++ b/administrator/components/com_banners/views/clients/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -103,7 +103,7 @@ protected function addToolbar() if ($this->state->get('filter.state') == -2 && $canDo->get('core.delete')) { - JToolbarHelper::deleteList('', 'clients.delete', 'JTOOLBAR_EMPTY_TRASH'); + JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'clients.delete', 'JTOOLBAR_EMPTY_TRASH'); } elseif ($canDo->get('core.edit.state')) { diff --git a/administrator/components/com_banners/views/download/tmpl/default.php b/administrator/components/com_banners/views/download/tmpl/default.php index 1f5d88f3e7e4a..85277d11c0dc8 100644 --- a/administrator/components/com_banners/views/download/tmpl/default.php +++ b/administrator/components/com_banners/views/download/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/views/download/view.html.php b/administrator/components/com_banners/views/download/view.html.php index c6c28bdde0f46..3066e0c9660ba 100644 --- a/administrator/components/com_banners/views/download/view.html.php +++ b/administrator/components/com_banners/views/download/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_banners/views/tracks/tmpl/default.php b/administrator/components/com_banners/views/tracks/tmpl/default.php index 5263e732564a4..80cbda1cd9471 100644 --- a/administrator/components/com_banners/views/tracks/tmpl/default.php +++ b/administrator/components/com_banners/views/tracks/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -22,8 +22,8 @@ JFactory::getDocument()->addScriptDeclaration(' Joomla.orderTable = function() { - table = document.getElementById("sortTable"); - direction = document.getElementById("directionTable"); + table = document.getElementById("list_sortTable"); + direction = document.getElementById("list_directionTable"); order = table.options[table.selectedIndex].value; if (order != "' . $listOrder . '") { @@ -57,27 +57,9 @@ state->get('filter.end'), 'filter_end', 'filter_end', '%Y-%m-%d', array('size' => 10, 'onchange' => "this.form.fireEvent('submit');this.form.submit()")); ?> -
- - pagination->getLimitBox(); ?> -
-
- - -
-
- - -
+ $this)); ?> items)) : ?>
@@ -116,7 +98,7 @@ name; ?>
- category_title; ?> + escape($item->category_title); ?>
diff --git a/administrator/components/com_banners/views/tracks/view.html.php b/administrator/components/com_banners/views/tracks/view.html.php index 9e32d0083a53f..f5f1b52f6800d 100644 --- a/administrator/components/com_banners/views/tracks/view.html.php +++ b/administrator/components/com_banners/views/tracks/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -48,9 +48,11 @@ class BannersViewTracks extends JViewLegacy */ public function display($tpl = null) { - $this->items = $this->get('Items'); + $this->items = $this->get('Items'); $this->pagination = $this->get('Pagination'); - $this->state = $this->get('State'); + $this->state = $this->get('State'); + $this->filterForm = $this->get('FilterForm'); + $this->activeFilters = $this->get('ActiveFilters'); // Check for errors. if (count($errors = $this->get('Errors'))) @@ -103,29 +105,6 @@ protected function addToolbar() JHtmlSidebar::setAction('index.php?option=com_banners&view=tracks'); - JHtmlSidebar::addFilter( - JText::_('COM_BANNERS_SELECT_CLIENT'), - 'filter_client_id', - JHtml::_('select.options', BannersHelper::getClientOptions(), 'value', 'text', $this->state->get('filter.client_id')) - ); - - JHtmlSidebar::addFilter( - JText::_('JOPTION_SELECT_CATEGORY'), - 'filter_category_id', - JHtml::_('select.options', JHtml::_('category.options', 'com_banners'), 'value', 'text', $this->state->get('filter.category_id')) - ); - - JHtmlSidebar::addFilter( - JText::_('COM_BANNERS_SELECT_TYPE'), - 'filter_type', - JHtml::_( - 'select.options', - array(JHtml::_('select.option', 1, JText::_('COM_BANNERS_IMPRESSION')), JHtml::_('select.option', 2, JText::_('COM_BANNERS_CLICK'))), - 'value', - 'text', - $this->state->get('filter.type') - ) - ); } /** diff --git a/administrator/components/com_banners/views/tracks/view.raw.php b/administrator/components/com_banners/views/tracks/view.raw.php index dc8a68efeed63..a05bebeded6b0 100644 --- a/administrator/components/com_banners/views/tracks/view.raw.php +++ b/administrator/components/com_banners/views/tracks/view.raw.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_cache/cache.php b/administrator/components/com_cache/cache.php index 1d1ad2d8dde71..694adac16ccab 100644 --- a/administrator/components/com_cache/cache.php +++ b/administrator/components/com_cache/cache.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_cache * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_cache/cache.xml b/administrator/components/com_cache/cache.xml index 05bd49ffeda3b..d0012e076050b 100644 --- a/administrator/components/com_cache/cache.xml +++ b/administrator/components/com_cache/cache.xml @@ -3,7 +3,7 @@ com_cache Joomla! Project April 2006 - (C) 2005 - 2015 Open Source Matters. All rights reserved. + (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/components/com_cache/controller.php b/administrator/components/com_cache/controller.php index 0c4f827f84fac..94606d98fc371 100644 --- a/administrator/components/com_cache/controller.php +++ b/administrator/components/com_cache/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_cache * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -72,7 +72,7 @@ public function display($cachable = false, $urlparams = false) public function delete() { // Check for request forgeries - JSession::checkToken() or jexit(JText::_('JInvalid_Token')); + JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN')); $cid = $this->input->post->get('cid', array(), 'array'); @@ -98,7 +98,7 @@ public function delete() public function purge() { // Check for request forgeries - JSession::checkToken() or jexit(JText::_('JInvalid_Token')); + JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN')); $model = $this->getModel('cache'); $ret = $model->purge(); diff --git a/administrator/components/com_cache/helpers/cache.php b/administrator/components/com_cache/helpers/cache.php index b8b19002db850..034bbb8d697fd 100644 --- a/administrator/components/com_cache/helpers/cache.php +++ b/administrator/components/com_cache/helpers/cache.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_cache * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_cache/layouts/joomla/searchtools/default.php b/administrator/components/com_cache/layouts/joomla/searchtools/default.php new file mode 100644 index 0000000000000..d769673a53951 --- /dev/null +++ b/administrator/components/com_cache/layouts/joomla/searchtools/default.php @@ -0,0 +1,41 @@ +addStyleDeclaration(" + /* Fixed filter field in search bar */ + .js-stools .js-stools-client_id { + float: left; + margin-right: 10px; + min-width: 220px; + } + html[dir=rtl] .js-stools .js-stools-client_id { + float: right; + margin-left: 10px + margin-right: 0; + } + .js-stools .js-stools-container-bar .js-stools-field-filter .chzn-container { + padding: 3px 0; + } + "); + + // Client id filter doesn't have to activate the filter bar + unset($data['view']->activeFilters['client_id']); +} + +// Display the main joomla layout +echo JLayoutHelper::render('joomla.searchtools.default', $data, null, array('component' => 'none')); diff --git a/administrator/components/com_cache/layouts/joomla/searchtools/default/bar.php b/administrator/components/com_cache/layouts/joomla/searchtools/default/bar.php new file mode 100644 index 0000000000000..9606872f3f720 --- /dev/null +++ b/administrator/components/com_cache/layouts/joomla/searchtools/default/bar.php @@ -0,0 +1,25 @@ +filterForm->getField('client_id'); +?> +
+ input; ?> +
+ 'none')); diff --git a/administrator/components/com_cache/models/cache.php b/administrator/components/com_cache/models/cache.php index 95937ab294496..6056bdfbe5036 100644 --- a/administrator/components/com_cache/models/cache.php +++ b/administrator/components/com_cache/models/cache.php @@ -3,12 +3,14 @@ * @package Joomla.Administrator * @subpackage com_cache * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; +use Joomla\Utilities\ArrayHelper; + /** * Cache Model * @@ -37,6 +39,28 @@ class CacheModelCache extends JModelList */ protected $_pagination = null; + /** + * Constructor. + * + * @param array $config An optional associative array of configuration settings. + * + * @since 3.5 + */ + public function __construct($config = array()) + { + if (empty($config['filter_fields'])) + { + $config['filter_fields'] = array( + 'group', + 'count', + 'size', + 'cliend_id', + ); + } + + parent::__construct($config); + } + /** * Method to auto-populate the model state. * @@ -49,15 +73,39 @@ class CacheModelCache extends JModelList * * @since 1.6 */ - protected function populateState($ordering = null, $direction = null) + protected function populateState($ordering = 'group', $direction = 'asc') { - $clientId = $this->getUserStateFromRequest($this->context . '.filter.client_id', 'filter_client_id', 0, 'int'); - $this->setState('clientId', $clientId == 1 ? 1 : 0); + // Load the filter state. + $this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search', '', 'string')); - $client = JApplicationHelper::getClientInfo($clientId); - $this->setState('client', $client); + // Special case for client id. + $clientId = (int) $this->getUserStateFromRequest($this->context . '.client_id', 'client_id', 0, 'int'); + $clientId = (!in_array($clientId, array (0, 1))) ? 0 : $clientId; + $this->setState('client_id', $clientId); - parent::populateState('group', 'asc'); + parent::populateState($ordering, $direction); + } + + /** + * Method to get a store id based on model configuration state. + * + * This is necessary because the model is used by the component and + * different modules that might need different sets of data or different + * ordering requirements. + * + * @param string $id A prefix for the store id. + * + * @return string A store id. + * + * @since 3.5 + */ + protected function getStoreId($id = '') + { + // Compile the store id. + $id .= ':' . $this->getState('client_id'); + $id .= ':' . $this->getState('filter.search'); + + return parent::getStoreId($id); } /** @@ -70,28 +118,38 @@ public function getData() if (empty($this->_data)) { $cache = $this->getCache(); - $data = $cache->getAll(); + $data = $cache->getAll(); - if ($data != false) + if ($data && count($data) > 0) { - $this->_data = $data; - $this->_total = count($data); - - if ($this->_total) + // Process filter by search term. + if ($search = $this->getState('filter.search')) { - // Apply custom ordering. - $ordering = $this->getState('list.ordering'); - $direction = ($this->getState('list.direction') == 'asc') ? 1 : (-1); - - jimport('joomla.utilities.arrayhelper'); - $this->_data = JArrayHelper::sortObjects($data, $ordering, $direction); - - // Apply custom pagination. - if ($this->_total > $this->getState('list.limit') && $this->getState('list.limit')) + foreach ($data as $key => $cacheItem) { - $this->_data = array_slice($this->_data, $this->getState('list.start'), $this->getState('list.limit')); + if (stripos($cacheItem->group, $search) === false) + { + unset($data[$key]); + continue; + } } } + + // Process ordering. + $listOrder = $this->getState('list.ordering', 'group'); + $listDirn = $this->getState('list.direction', 'ASC'); + + $this->_data = ArrayHelper::sortObjects($data, $listOrder, strtolower($listDirn) === 'desc' ? -1 : 1, true, true); + + // Process pagination. + $limit = (int) $this->getState('list.limit', 25); + + if ($limit !== 0) + { + $start = (int) $this->getState('list.start', 0); + + return array_slice($this->_data, $start, $limit); + } } else { @@ -115,7 +173,7 @@ public function getCache() 'defaultgroup' => '', 'storage' => $conf->get('cache_handler', ''), 'caching' => true, - 'cachebase' => ($this->getState('clientId') == 1) ? JPATH_ADMINISTRATOR . '/cache' : $conf->get('cache_path', JPATH_SITE . '/cache') + 'cachebase' => ($this->getState('client_id') === 1) ? JPATH_ADMINISTRATOR . '/cache' : $conf->get('cache_path', JPATH_SITE . '/cache') ); $cache = JCache::getInstance('', $options); @@ -130,7 +188,7 @@ public function getCache() */ public function getClient() { - return $this->getState('client'); + return JApplicationHelper::getClientInfo($this->getState('client_id', 0)); } /** diff --git a/administrator/components/com_cache/models/forms/filter_cache.xml b/administrator/components/com_cache/models/forms/filter_cache.xml new file mode 100644 index 0000000000000..68940783950cd --- /dev/null +++ b/administrator/components/com_cache/models/forms/filter_cache.xml @@ -0,0 +1,48 @@ + +
+ + + + + + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/administrator/components/com_cache/views/cache/tmpl/default.php b/administrator/components/com_cache/views/cache/tmpl/default.php index 2cac6f30a6056..be05d593ad36a 100644 --- a/administrator/components/com_cache/views/cache/tmpl/default.php +++ b/administrator/components/com_cache/views/cache/tmpl/default.php @@ -3,76 +3,84 @@ * @package Joomla.Administrator * @subpackage com_cache * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; JHtml::_('formbehavior.chosen', 'select'); +JHtml::_('bootstrap.tooltip'); $listOrder = $this->escape($this->state->get('list.ordering')); $listDirn = $this->escape($this->state->get('list.direction')); ?> -
+ sidebar)) : ?>
sidebar; ?>
- - - - - - - - - - - - - - - - data as $folder => $item) : ?> - - - - - + data as $folder => $item) : ?> + + + + + + + + +
- - - - - - - -
- pagination->getListFooter(); ?> -
- - - - - count; ?> - - size*1024); ?> + +
+ + $this, 'options' => array('filterButton' => false))); ?> +
+ data)) : ?> +
+ +
+ + + + + + + + + + + + + - - -
+ + + + + + + +
+ pagination->getListFooter(); ?>
- - - - - - - + +
+ + + + + count; ?> + + size*1024); ?> +
+ + + +
diff --git a/administrator/components/com_cache/views/cache/view.html.php b/administrator/components/com_cache/views/cache/view.html.php index 281944e12c1a6..7256632c1f5fc 100644 --- a/administrator/components/com_cache/views/cache/view.html.php +++ b/administrator/components/com_cache/views/cache/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_cache * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -16,6 +16,10 @@ */ class CacheViewCache extends JViewLegacy { + /** + * @var object client object. + * @deprecated 4.0 + */ protected $client; protected $data; @@ -33,10 +37,11 @@ class CacheViewCache extends JViewLegacy */ public function display($tpl = null) { - $this->data = $this->get('Data'); - $this->client = $this->get('Client'); - $this->pagination = $this->get('Pagination'); - $this->state = $this->get('State'); + $this->data = $this->get('Data'); + $this->pagination = $this->get('Pagination'); + $this->state = $this->get('State'); + $this->filterForm = $this->get('FilterForm'); + $this->activeFilters = $this->get('ActiveFilters'); // Check for errors. if (count($errors = $this->get('Errors'))) @@ -60,7 +65,17 @@ public function display($tpl = null) */ protected function addToolbar() { - JToolbarHelper::title(JText::_('COM_CACHE_CLEAR_CACHE'), 'lightning clear'); + $state = $this->get('State'); + + if ($state->get('client_id') == 1) + { + JToolbarHelper::title(JText::_('COM_CACHE_CLEAR_CACHE_ADMIN_TITLE'), 'lightning clear'); + } + else + { + JToolbarHelper::title(JText::_('COM_CACHE_CLEAR_CACHE_SITE_TITLE'), 'lightning clear'); + } + JToolbarHelper::custom('delete', 'delete.png', 'delete_f2.png', 'JTOOLBAR_DELETE', true); JToolbarHelper::divider(); @@ -73,12 +88,5 @@ protected function addToolbar() JToolbarHelper::help('JHELP_SITE_MAINTENANCE_CLEAR_CACHE'); JHtmlSidebar::setAction('index.php?option=com_cache'); - - JHtmlSidebar::addFilter( - // @todo We need an actual label here. - '', - 'filter_client_id', - JHtml::_('select.options', CacheHelper::getClientOptions(), 'value', 'text', $this->state->get('clientId')) - ); } } diff --git a/administrator/components/com_cache/views/purge/tmpl/default.php b/administrator/components/com_cache/views/purge/tmpl/default.php index b07a7a47f90bf..e66384ed14931 100644 --- a/administrator/components/com_cache/views/purge/tmpl/default.php +++ b/administrator/components/com_cache/views/purge/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_cache * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_cache/views/purge/view.html.php b/administrator/components/com_cache/views/purge/view.html.php index cd6c4db255c94..aeb521d33e697 100644 --- a/administrator/components/com_cache/views/purge/view.html.php +++ b/administrator/components/com_cache/views/purge/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_cache * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/categories.php b/administrator/components/com_categories/categories.php index 4b8ae12683a1a..91219048d14de 100644 --- a/administrator/components/com_categories/categories.php +++ b/administrator/components/com_categories/categories.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/categories.xml b/administrator/components/com_categories/categories.xml index b7ede7096de4e..16b1b1d1e4786 100644 --- a/administrator/components/com_categories/categories.xml +++ b/administrator/components/com_categories/categories.xml @@ -3,7 +3,7 @@ com_categories Joomla! Project December 2007 - (C) 2005 - 2015 Open Source Matters. All rights reserved. + (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/components/com_categories/controller.php b/administrator/components/com_categories/controller.php index 7b54b77c480b7..ae7e2ce010b59 100644 --- a/administrator/components/com_categories/controller.php +++ b/administrator/components/com_categories/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/controllers/categories.php b/administrator/components/com_categories/controllers/categories.php index bbc4e62118821..d3bb231a7550d 100644 --- a/administrator/components/com_categories/controllers/categories.php +++ b/administrator/components/com_categories/controllers/categories.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/controllers/category.php b/administrator/components/com_categories/controllers/category.php index 716099545eb5b..c8d6c0d21a273 100644 --- a/administrator/components/com_categories/controllers/category.php +++ b/administrator/components/com_categories/controllers/category.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/helpers/association.php b/administrator/components/com_categories/helpers/association.php index e910ab389c5fc..58dc67af7e8ec 100644 --- a/administrator/components/com_categories/helpers/association.php +++ b/administrator/components/com_categories/helpers/association.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/helpers/categories.php b/administrator/components/com_categories/helpers/categories.php index 4e4d603c3411e..60c74bcbc9420 100644 --- a/administrator/components/com_categories/helpers/categories.php +++ b/administrator/components/com_categories/helpers/categories.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -99,40 +99,12 @@ public static function getActions($extension, $categoryId = 0) */ public static function getAssociations($pk, $extension = 'com_content') { + $langAssociations = JLanguageAssociations::getAssociations($extension, '#__categories', 'com_categories.item', $pk, 'id', 'alias', ''); $associations = array(); - $db = JFactory::getDbo(); - $query = $db->getQuery(true) - ->from('#__categories as c') - ->join('INNER', '#__associations as a ON a.id = c.id AND a.context=' . $db->quote('com_categories.item')) - ->join('INNER', '#__associations as a2 ON a.key = a2.key') - ->join('INNER', '#__categories as c2 ON a2.id = c2.id AND c2.extension = ' . $db->quote($extension)) - ->where('c.id =' . (int) $pk) - ->where('c.extension = ' . $db->quote($extension)); - $select = array( - 'c2.language', - $query->concatenate(array('c2.id', 'c2.alias'), ':') . ' AS id' - ); - $query->select($select); - $db->setQuery($query); - try + foreach ($langAssociations as $langAssociation) { - $contentitems = $db->loadObjectList('language'); - } - catch (RuntimeException $exception) - { - JError::raiseWarning(500, $exception->getMessage()); - - return array(); - } - - foreach ($contentitems as $tag => $item) - { - // Do not return itself as result - if ((int) $item->id != $pk) - { - $associations[$tag] = $item->id; - } + $associations[$langAssociation->language] = $langAssociation->id; } return $associations; diff --git a/administrator/components/com_categories/helpers/html/categoriesadministrator.php b/administrator/components/com_categories/helpers/html/categoriesadministrator.php index a99ca26689184..07aa6cd3d3f4a 100644 --- a/administrator/components/com_categories/helpers/html/categoriesadministrator.php +++ b/administrator/components/com_categories/helpers/html/categoriesadministrator.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/models/categories.php b/administrator/components/com_categories/models/categories.php index a8cf668c93800..9567a10fad494 100644 --- a/administrator/components/com_categories/models/categories.php +++ b/administrator/components/com_categories/models/categories.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -65,7 +65,12 @@ public function __construct($config = array()) protected function populateState($ordering = null, $direction = null) { $app = JFactory::getApplication(); - $context = $this->context; + + // Adjust the context to support modal layouts. + if ($layout = $app->input->get('layout')) + { + $this->context .= '.' . $layout; + } $extension = $app->getUserStateFromRequest('com_categories.categories.filter.extension', 'extension', 'com_content', 'cmd'); @@ -78,19 +83,19 @@ protected function populateState($ordering = null, $direction = null) // Extract the optional section name $this->setState('filter.section', (count($parts) > 1) ? $parts[1] : null); - $search = $this->getUserStateFromRequest($context . '.search', 'filter_search'); + $search = $this->getUserStateFromRequest($this->context . '.search', 'filter_search'); $this->setState('filter.search', $search); - $level = $this->getUserStateFromRequest($context . '.filter.level', 'filter_level'); + $level = $this->getUserStateFromRequest($this->context . '.filter.level', 'filter_level'); $this->setState('filter.level', $level); - $access = $this->getUserStateFromRequest($context . '.filter.access', 'filter_access'); + $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access'); $this->setState('filter.access', $access); - $published = $this->getUserStateFromRequest($context . '.filter.published', 'filter_published', ''); + $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', ''); $this->setState('filter.published', $published); - $language = $this->getUserStateFromRequest($context . '.filter.language', 'filter_language', ''); + $language = $this->getUserStateFromRequest($this->context . '.filter.language', 'filter_language', ''); $this->setState('filter.language', $language); $tag = $this->getUserStateFromRequest($this->context . '.filter.tag', 'filter_tag', ''); @@ -147,10 +152,6 @@ protected function getListQuery() $query = $db->getQuery(true); $user = JFactory::getUser(); - // Determine for which component the category manager retrieves its categories (for item count) - $jinput = JFactory::getApplication()->input; - $countitemhelper = JPATH_ADMINISTRATOR . "/components/" . $jinput->get('extension') . '/helpers/countitems.php'; - // Select the required fields from the table. $query->select( $this->getState( @@ -164,7 +165,7 @@ protected function getListQuery() $query->from('#__categories AS a'); // Join over the language - $query->select('l.title AS language_title') + $query->select('l.title AS language_title, l.image AS language_image') ->join('LEFT', $db->quoteName('#__languages') . ' AS l ON l.lang_code = a.language'); // Join over the users for the checked out user. @@ -281,15 +282,27 @@ protected function getListQuery() } // Group by on Categories for JOIN with component tables to count items - $query->group('a.id'); - - // Load Helper file of the component for which com_categories displays the categories - $classname = ucfirst(substr($extension, 4)) . 'Helper'; - if (class_exists($classname) && method_exists($classname, 'countItems')) - { - // Get the SQL to extend the com_category $query object with item count (published, unpublished, trashed) - $classname::countItems($query); - } + $query->group('a.id, + a.title, + a.alias, + a.note, + a.published, + a.access, + a.checked_out, + a.checked_out_time, + a.created_user_id, + a.path, + a.parent_id, + a.level, + a.lft, + a.rgt, + a.language, + l.title, + l.image, + uc.name, + ag.title, + ua.name' + ); return $query; } @@ -331,4 +344,64 @@ public function getAssoc() return $assoc; } + + /** + * Method to get an array of data items. + * + * @return mixed An array of data items on success, false on failure. + * + * @since 12.2 + */ + public function getItems() + { + $items = parent::getItems(); + + if ($items != false) + { + $extension = $this->getState('filter.extension'); + + $this->countItems($items, $extension); + } + + return $items; + } + + /** + * Method to load the countItems method from the extensions + * + * @param stdClass[] &$items The category items + * @param string $extension The category extension + * + * @return void + * + * @since 3.5 + */ + public function countItems(&$items, $extension) + { + $parts = explode('.', $extension); + $component = $parts[0]; + $section = null; + + if (count($parts) > 1) + { + $section = $parts[1]; + } + + // Try to find the component helper. + $eName = str_replace('com_', '', $component); + $file = JPath::clean(JPATH_ADMINISTRATOR . '/components/' . $component . '/helpers/' . $eName . '.php'); + + if (file_exists($file)) + { + require_once $file; + + $prefix = ucfirst(str_replace('com_', '', $component)); + $cName = $prefix . 'Helper'; + + if (class_exists($cName) && is_callable(array($cName, 'countItems'))) + { + call_user_func(array($cName, 'countItems'), $items, $section); + } + } + } } diff --git a/administrator/components/com_categories/models/category.php b/administrator/components/com_categories/models/category.php index 3f14ba53f711c..44d3d4c4df45b 100644 --- a/administrator/components/com_categories/models/category.php +++ b/administrator/components/com_categories/models/category.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -574,9 +574,12 @@ public function save($data) // Adding self to the association $associations = $data['associations']; + // Unset any invalid associations + $associations = Joomla\Utilities\ArrayHelper::toInteger($associations); + foreach ($associations as $tag => $id) { - if (empty($id)) + if (!$id) { unset($associations[$tag]); } @@ -620,7 +623,7 @@ public function save($data) foreach ($associations as $id) { - $query->values($id . ',' . $db->quote($this->associationsContext) . ',' . $db->quote($key)); + $query->values(((int) $id) . ',' . $db->quote($this->associationsContext) . ',' . $db->quote($key)); } $db->setQuery($query); diff --git a/administrator/components/com_categories/models/fields/categoryedit.php b/administrator/components/com_categories/models/fields/categoryedit.php index cf6f558a9d493..19de4d275a555 100644 --- a/administrator/components/com_categories/models/fields/categoryedit.php +++ b/administrator/components/com_categories/models/fields/categoryedit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/models/fields/categoryparent.php b/administrator/components/com_categories/models/fields/categoryparent.php index 6f73c2fadc36a..130b32eee0858 100644 --- a/administrator/components/com_categories/models/fields/categoryparent.php +++ b/administrator/components/com_categories/models/fields/categoryparent.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/models/fields/modal/category.php b/administrator/components/com_categories/models/fields/modal/category.php index 5b91041c71236..b0e8b5fb9d4d8 100644 --- a/administrator/components/com_categories/models/fields/modal/category.php +++ b/administrator/components/com_categories/models/fields/modal/category.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -156,21 +156,21 @@ protected function getInput() . ' title="' . JHtml::tooltipText('COM_CATEGORIES_EDIT_CATEGORY') . '" >' . '' . JText::_('JACTION_EDIT') . ''; - - $html[] = JHtml::_( - 'bootstrap.renderModal', - 'modalCategory-' . $this->id, - array( - 'url' => $link . '&' . JSession::getFormToken() . '=1"', - 'title' => JText::_('COM_CATEGORIES_SELECT_A_CATEGORY'), - 'width' => '800px', - 'height' => '300px', - 'footer' => '' - ) - ); } + $html[] = JHtml::_( + 'bootstrap.renderModal', + 'modalCategory-' . $this->id, + array( + 'url' => $link . '&' . JSession::getFormToken() . '=1"', + 'title' => JText::_('COM_CATEGORIES_SELECT_A_CATEGORY'), + 'width' => '800px', + 'height' => '300px', + 'footer' => '' + ) + ); + // Clear category button if ($allowClear) { diff --git a/administrator/components/com_categories/tables/category.php b/administrator/components/com_categories/tables/category.php index 988c4fe5d4957..238c565bc4893 100644 --- a/administrator/components/com_categories/tables/category.php +++ b/administrator/components/com_categories/tables/category.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/views/categories/tmpl/default.php b/administrator/components/com_categories/views/categories/tmpl/default.php index 6af21b4e166ae..b565caa7b1b86 100644 --- a/administrator/components/com_categories/views/categories/tmpl/default.php +++ b/administrator/components/com_categories/views/categories/tmpl/default.php @@ -3,12 +3,14 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; +use Joomla\String\Inflector; + // Include the component HTML helpers. JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); @@ -24,7 +26,22 @@ $listDirn = $this->escape($this->state->get('list.direction')); $ordering = ($listOrder == 'a.lft'); $saveOrder = ($listOrder == 'a.lft' && strtolower($listDirn) == 'asc'); -$component = $app->input->get('extension'); +$parts = explode('.', $extension); +$component = $parts[0]; +$section = null; + +if (count($parts) > 1) +{ + $section = $parts[1]; + + $inflector = Inflector::getInstance(); + + if (!$inflector->isPlural($section)) + { + $section = $inflector->toPlural($section); + } +} + $columns = 7; if ($saveOrder) @@ -66,25 +83,25 @@ items[0]) && property_exists($this->items[0], 'count_published')) : $columns++; ?> - + items[0]) && property_exists($this->items[0], 'count_unpublished')) : $columns++; ?> - + items[0]) && property_exists($this->items[0], 'count_archived')) : $columns++; ?> - + items[0]) && property_exists($this->items[0], 'count_trashed')) : $columns++; ?> - + @@ -96,7 +113,7 @@ - + state->get('list.direction'), $this->state->get('list.ordering')); ?> @@ -193,25 +210,25 @@ items[0]) && property_exists($this->items[0], 'count_published')) : ?> - " title="" href="id . '&filter[published]=1' . '&filter[level]=' . (int) $item->level);?>"> + " title="" href="id . '&filter[published]=1' . '&filter[level]=' . (int) $item->level);?>"> count_published; ?> items[0]) && property_exists($this->items[0], 'count_unpublished')) : ?> - " title="" href="id . '&filter[published]=0' . '&filter[level]=' . (int) $item->level);?>"> + " title="" href="id . '&filter[published]=0' . '&filter[level]=' . (int) $item->level);?>"> count_unpublished; ?> items[0]) && property_exists($this->items[0], 'count_archived')) : ?> - " title="" href="id . '&filter[published]=2' . '&filter[level]=' . (int) $item->level);?>"> + " title="" href="id . '&filter[published]=2' . '&filter[level]=' . (int) $item->level);?>"> count_archived; ?> items[0]) && property_exists($this->items[0], 'count_trashed')) : ?> - " title="" href="id . '&filter[published]=-2' . '&filter[level]=' . (int) $item->level);?>"> + " title="" href="id . '&filter[published]=-2' . '&filter[level]=' . (int) $item->level);?>"> count_trashed; ?> @@ -230,7 +247,7 @@ language == '*') : ?> - language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> + language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . ' ' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> diff --git a/administrator/components/com_categories/views/categories/tmpl/default_batch.php b/administrator/components/com_categories/views/categories/tmpl/default_batch.php index fe70569a01f9f..c2266fe9795c9 100644 --- a/administrator/components/com_categories/views/categories/tmpl/default_batch.php +++ b/administrator/components/com_categories/views/categories/tmpl/default_batch.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * * @deprecated 3.4 Use default_batch_body and default_batch_footer @@ -11,8 +11,6 @@ defined('_JEXEC') or die; -JHtml::_('formbehavior.chosen', 'select'); - $options = array( JHtml::_('select.option', 'c', JText::_('JLIB_HTML_BATCH_COPY')), JHtml::_('select.option', 'm', JText::_('JLIB_HTML_BATCH_MOVE')) diff --git a/administrator/components/com_categories/views/categories/tmpl/default_batch_body.php b/administrator/components/com_categories/views/categories/tmpl/default_batch_body.php index 2dec9adc40cf7..6e614f078f997 100644 --- a/administrator/components/com_categories/views/categories/tmpl/default_batch_body.php +++ b/administrator/components/com_categories/views/categories/tmpl/default_batch_body.php @@ -3,13 +3,11 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; -JHtml::_('formbehavior.chosen', 'select'); - $options = array( JHtml::_('select.option', 'c', JText::_('JLIB_HTML_BATCH_COPY')), JHtml::_('select.option', 'm', JText::_('JLIB_HTML_BATCH_MOVE')) @@ -55,4 +53,4 @@
- \ No newline at end of file + diff --git a/administrator/components/com_categories/views/categories/tmpl/default_batch_footer.php b/administrator/components/com_categories/views/categories/tmpl/default_batch_footer.php index f409abc221e22..5f4d1005de53f 100644 --- a/administrator/components/com_categories/views/categories/tmpl/default_batch_footer.php +++ b/administrator/components/com_categories/views/categories/tmpl/default_batch_footer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_categories/views/categories/tmpl/modal.php b/administrator/components/com_categories/views/categories/tmpl/modal.php index 95fb0d54f5379..3c0b2d56620dd 100644 --- a/administrator/components/com_categories/views/categories/tmpl/modal.php +++ b/administrator/components/com_categories/views/categories/tmpl/modal.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -86,7 +86,7 @@ - + language == '*'): ?> - language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> + language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . ' ' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> diff --git a/administrator/components/com_categories/views/categories/view.html.php b/administrator/components/com_categories/views/categories/view.html.php index 13f8a8645c844..7c0ceee11dbe9 100644 --- a/administrator/components/com_categories/views/categories/view.html.php +++ b/administrator/components/com_categories/views/categories/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -218,7 +218,7 @@ protected function addToolbar() if ($this->state->get('filter.published') == -2 && $canDo->get('core.delete', $component)) { - JToolbarHelper::deleteList('', 'categories.delete', 'JTOOLBAR_EMPTY_TRASH'); + JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'categories.delete', 'JTOOLBAR_EMPTY_TRASH'); } elseif ($canDo->get('core.edit.state')) { diff --git a/administrator/components/com_categories/views/category/tmpl/edit.php b/administrator/components/com_categories/views/category/tmpl/edit.php index f2e3cb1a4612b..648e0c303860b 100644 --- a/administrator/components/com_categories/views/category/tmpl/edit.php +++ b/administrator/components/com_categories/views/category/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -20,12 +20,15 @@ $input = $app->input; $assoc = JLanguageAssociations::isEnabled(); +// Are associations implemented for this extension? +$extensionassoc = array_key_exists('item_associations', $this->form->getFieldsets()); JFactory::getDocument()->addScriptDeclaration(' Joomla.submitbutton = function(task) { if (task == "category.cancel" || document.formvalidator.isValid(document.getElementById("item-form"))) { + jQuery("#permissions-sliders select").attr("disabled", "disabled"); ' . $this->form->getField("description")->save() . ' Joomla.submitform(task, document.getElementById("item-form")); } @@ -67,7 +70,7 @@ - + loadTemplate('associations'); ?> diff --git a/administrator/components/com_categories/views/category/tmpl/edit_associations.php b/administrator/components/com_categories/views/category/tmpl/edit_associations.php index 48449b3a3d226..b8751b02e7143 100644 --- a/administrator/components/com_categories/views/category/tmpl/edit_associations.php +++ b/administrator/components/com_categories/views/category/tmpl/edit_associations.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/views/category/tmpl/edit_extrafields.php b/administrator/components/com_categories/views/category/tmpl/edit_extrafields.php index 7b6f9bb87a3a5..5f3b6e5115efa 100644 --- a/administrator/components/com_categories/views/category/tmpl/edit_extrafields.php +++ b/administrator/components/com_categories/views/category/tmpl/edit_extrafields.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * * @deprecated 3.2 diff --git a/administrator/components/com_categories/views/category/tmpl/edit_metadata.php b/administrator/components/com_categories/views/category/tmpl/edit_metadata.php index 28e4ecf7033d2..9b229292958cc 100644 --- a/administrator/components/com_categories/views/category/tmpl/edit_metadata.php +++ b/administrator/components/com_categories/views/category/tmpl/edit_metadata.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/views/category/tmpl/edit_options.php b/administrator/components/com_categories/views/category/tmpl/edit_options.php index 7b6f9bb87a3a5..5f3b6e5115efa 100644 --- a/administrator/components/com_categories/views/category/tmpl/edit_options.php +++ b/administrator/components/com_categories/views/category/tmpl/edit_options.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * * @deprecated 3.2 diff --git a/administrator/components/com_categories/views/category/tmpl/modal.php b/administrator/components/com_categories/views/category/tmpl/modal.php index 28a73f99d7b19..c56c4f0f626c1 100644 --- a/administrator/components/com_categories/views/category/tmpl/modal.php +++ b/administrator/components/com_categories/views/category/tmpl/modal.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/views/category/tmpl/modal_associations.php b/administrator/components/com_categories/views/category/tmpl/modal_associations.php index 48449b3a3d226..b8751b02e7143 100644 --- a/administrator/components/com_categories/views/category/tmpl/modal_associations.php +++ b/administrator/components/com_categories/views/category/tmpl/modal_associations.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/views/category/tmpl/modal_extrafields.php b/administrator/components/com_categories/views/category/tmpl/modal_extrafields.php index 69c0bfe170edc..bb2b8dfd6d714 100644 --- a/administrator/components/com_categories/views/category/tmpl/modal_extrafields.php +++ b/administrator/components/com_categories/views/category/tmpl/modal_extrafields.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/views/category/tmpl/modal_metadata.php b/administrator/components/com_categories/views/category/tmpl/modal_metadata.php index 28e4ecf7033d2..9b229292958cc 100644 --- a/administrator/components/com_categories/views/category/tmpl/modal_metadata.php +++ b/administrator/components/com_categories/views/category/tmpl/modal_metadata.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/views/category/tmpl/modal_options.php b/administrator/components/com_categories/views/category/tmpl/modal_options.php index 500bbabca9887..2642ce5a16229 100644 --- a/administrator/components/com_categories/views/category/tmpl/modal_options.php +++ b/administrator/components/com_categories/views/category/tmpl/modal_options.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_categories/views/category/view.html.php b/administrator/components/com_categories/views/category/view.html.php index 0a0da7a7573fa..8afb511250e7a 100644 --- a/administrator/components/com_categories/views/category/view.html.php +++ b/administrator/components/com_categories/views/category/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_categories * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_checkin/checkin.php b/administrator/components/com_checkin/checkin.php index 1381ee8716f5b..911bb2603dc5d 100644 --- a/administrator/components/com_checkin/checkin.php +++ b/administrator/components/com_checkin/checkin.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_checkin * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_checkin/checkin.xml b/administrator/components/com_checkin/checkin.xml index 0b191bfa44364..ac1b240d73955 100644 --- a/administrator/components/com_checkin/checkin.xml +++ b/administrator/components/com_checkin/checkin.xml @@ -2,7 +2,7 @@ com_checkin Joomla! Project - (C) 2005 - 2015 Open Source Matters. All rights reserved. + (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/components/com_checkin/controller.php b/administrator/components/com_checkin/controller.php index e0031239e715f..10c98ab196783 100644 --- a/administrator/components/com_checkin/controller.php +++ b/administrator/components/com_checkin/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_checkin * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -40,7 +40,7 @@ public function display($cachable = false, $urlparams = array()) public function checkin() { // Check for request forgeries - JSession::checkToken() or jexit(JText::_('JInvalid_Token')); + JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN')); $ids = $this->input->get('cid', array(), 'array'); diff --git a/administrator/components/com_checkin/models/checkin.php b/administrator/components/com_checkin/models/checkin.php index e0be698e30408..b686166b0b85e 100644 --- a/administrator/components/com_checkin/models/checkin.php +++ b/administrator/components/com_checkin/models/checkin.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_checkin * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -31,6 +31,27 @@ class CheckinModelCheckin extends JModelList */ protected $tables; + /** + * Constructor. + * + * @param array $config An optional associative array of configuration settings. + * + * @see JController + * @since 3.5 + */ + public function __construct($config = array()) + { + if (empty($config['filter_fields'])) + { + $config['filter_fields'] = array( + 'table', + 'count', + ); + } + + parent::__construct($config); + } + /** * Method to auto-populate the model state. * @@ -45,8 +66,7 @@ class CheckinModelCheckin extends JModelList */ protected function populateState($ordering = null, $direction = null) { - $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search'); - $this->setState('filter.search', $search); + $this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search')); // List state information. parent::populateState('table', 'asc'); @@ -185,9 +205,10 @@ public function getItems() $this->total = count($results); + // Order items by table if ($this->getState('list.ordering') == 'table') { - if ($this->getState('list.direction') == 'asc') + if (strtolower($this->getState('list.direction')) == 'asc') { ksort($results); } @@ -196,9 +217,10 @@ public function getItems() krsort($results); } } + // Order items by number of items else { - if ($this->getState('list.direction') == 'asc') + if (strtolower($this->getState('list.direction')) == 'asc') { asort($results); } @@ -208,7 +230,16 @@ public function getItems() } } - $this->items = array_slice($results, $this->getState('list.start'), $this->getState('list.limit')); + // Pagination + $limit = (int) $this->getState('list.limit'); + if ($limit !== 0) + { + $this->items = array_slice($results, $this->getState('list.start'), $limit); + } + else + { + $this->items = $results; + } } return $this->items; diff --git a/administrator/components/com_checkin/models/forms/filter_checkin.xml b/administrator/components/com_checkin/models/forms/filter_checkin.xml new file mode 100644 index 0000000000000..9c9b67ff14f99 --- /dev/null +++ b/administrator/components/com_checkin/models/forms/filter_checkin.xml @@ -0,0 +1,37 @@ + +
+ + + + + + + + + + + + + +
diff --git a/administrator/components/com_checkin/views/checkin/tmpl/default.php b/administrator/components/com_checkin/views/checkin/tmpl/default.php index 69c6df7694aff..bd05ba4c48e12 100644 --- a/administrator/components/com_checkin/views/checkin/tmpl/default.php +++ b/administrator/components/com_checkin/views/checkin/tmpl/default.php @@ -3,71 +3,75 @@ * @package Joomla.Administrator * @subpackage com_checkin * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; JHtml::_('bootstrap.tooltip'); +JHtml::_('behavior.multiselect'); +JHtml::_('formbehavior.chosen', 'select'); $listOrder = $this->escape($this->state->get('list.ordering')); -$listDirn = $this->escape($this->state->get('list.direction')); +$listDirn = $this->escape($this->state->get('list.direction')); ?>
+sidebar)) : ?>
sidebar; ?>
-
-
- -
-
- - -
-
+ +
+ + $this, 'options' => array('filterButton' => false))); ?>
- - - - - - - - - - - items as $table => $count): ?> - - - + + items as $table => $count): ?> + + + + + + + + +
- -
- + items)) : ?> +
+ +
+ + + + + + + + + + + + - - - - - - - - - -
+ pagination->getListFooter(); ?>
- pagination->getListFooter(); ?> -
+ +
+ + + 0) : ?> + + + + +
+ - -
diff --git a/administrator/components/com_checkin/views/checkin/view.html.php b/administrator/components/com_checkin/views/checkin/view.html.php index b854e68f6e095..2fb4183ae6a59 100644 --- a/administrator/components/com_checkin/views/checkin/view.html.php +++ b/administrator/components/com_checkin/views/checkin/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_checkin * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -65,6 +65,12 @@ public function display($tpl = null) $this->pagination = $this->get('Pagination'); $this->state = $this->get('State'); + if ($this->getLayout() == 'default') + { + $this->filterForm = $this->get('FilterForm'); + $this->activeFilters = $this->get('ActiveFilters'); + } + // Check for errors. if (count($errors = $this->get('Errors'))) { diff --git a/administrator/components/com_config/config.php b/administrator/components/com_config/config.php index 0c42f0b3d29fc..49802926eb3a4 100644 --- a/administrator/components/com_config/config.php +++ b/administrator/components/com_config/config.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/config.xml b/administrator/components/com_config/config.xml index 789ee6b5b859a..e6b8962b0e7f8 100644 --- a/administrator/components/com_config/config.xml +++ b/administrator/components/com_config/config.xml @@ -3,7 +3,7 @@ com_config Joomla! Project April 2006 - (C) 2005 - 2015 Open Source Matters. All rights reserved. + (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/components/com_config/controller.php b/administrator/components/com_config/controller.php index 920da67644bb0..b5a95534648ed 100644 --- a/administrator/components/com_config/controller.php +++ b/administrator/components/com_config/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/controller/application/cancel.php b/administrator/components/com_config/controller/application/cancel.php index 71fa02a74f53e..25cd0a63354af 100644 --- a/administrator/components/com_config/controller/application/cancel.php +++ b/administrator/components/com_config/controller/application/cancel.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/controller/application/display.php b/administrator/components/com_config/controller/application/display.php index 4342eedfc0b7a..ef60b111a6e13 100644 --- a/administrator/components/com_config/controller/application/display.php +++ b/administrator/components/com_config/controller/application/display.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Joomla.Config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/controller/application/refreshhelp.php b/administrator/components/com_config/controller/application/refreshhelp.php deleted file mode 100644 index 539d7ac483e5e..0000000000000 --- a/administrator/components/com_config/controller/application/refreshhelp.php +++ /dev/null @@ -1,57 +0,0 @@ -app->enqueueMessage(JText::_('COM_CONFIG_ERROR_HELPREFRESH_FETCH'), 'error'); - $this->app->redirect(JRoute::_('index.php?option=com_config', false)); - } - elseif (!JFile::write(JPATH_BASE . '/help/helpsites.xml', $data)) - { - $this->app->enqueueMessage(JText::_('COM_CONFIG_ERROR_HELPREFRESH_ERROR_STORE'), 'error'); - $this->app->redirect(JRoute::_('index.php?option=com_config', false)); - } - else - { - $this->app->enqueueMessage(JText::_('COM_CONFIG_HELPREFRESH_SUCCESS'), 'error'); - $this->app->redirect(JRoute::_('index.php?option=com_config', false)); - } - } -} diff --git a/administrator/components/com_config/controller/application/removeroot.php b/administrator/components/com_config/controller/application/removeroot.php index dc649929a3478..4ee0281443d79 100644 --- a/administrator/components/com_config/controller/application/removeroot.php +++ b/administrator/components/com_config/controller/application/removeroot.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_config/controller/application/save.php b/administrator/components/com_config/controller/application/save.php index 52f1c2cca238b..550cd04198add 100644 --- a/administrator/components/com_config/controller/application/save.php +++ b/administrator/components/com_config/controller/application/save.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_config/controller/application/sendtestmail.php b/administrator/components/com_config/controller/application/sendtestmail.php new file mode 100644 index 0000000000000..3190f95897e70 --- /dev/null +++ b/administrator/components/com_config/controller/application/sendtestmail.php @@ -0,0 +1,43 @@ +app->enqueueMessage(JText::_('JINVALID_TOKEN')); + $this->app->redirect('index.php'); + } + + if (!JFactory::getUser()->authorise('core.admin')) + { + $this->app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR')); + $this->app->redirect('index.php'); + } + + $model = new ConfigModelApplication; + echo new JResponseJson($model->sendTestMail()); + JFactory::getApplication()->close(); + } +} diff --git a/administrator/components/com_config/controller/application/store.php b/administrator/components/com_config/controller/application/store.php new file mode 100644 index 0000000000000..c6b9fbfe3dea9 --- /dev/null +++ b/administrator/components/com_config/controller/application/store.php @@ -0,0 +1,56 @@ +authorise('core.admin')) + { + $this->app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR')); + $this->app->redirect('index.php'); + } + + // Get Post DATA + $permissions = array( + 'component' => $this->input->get->get('comp'), + 'action' => $this->input->get->get('action'), + 'rule' => $this->input->get->get('rule'), + 'value' => $this->input->get->get('value'), + 'title' => $this->input->get->get('title', '', 'RAW') + ); + + if (!(substr($permissions['component'], -6) == '.false')) + { + // Load Permissions from Session and send to Model + $model = new ConfigModelApplication; + $response = $model->storePermissions($permissions); + + echo new JResponseJson(json_encode($response)); + } + else + { + echo new JResponseJson(json_encode(false), 0); + } + } +} diff --git a/administrator/components/com_config/controller/component/cancel.php b/administrator/components/com_config/controller/component/cancel.php index 8a96f61808bfd..d2260df7dfe50 100644 --- a/administrator/components/com_config/controller/component/cancel.php +++ b/administrator/components/com_config/controller/component/cancel.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/controller/component/display.php b/administrator/components/com_config/controller/component/display.php index 286f2e15adc70..547165e07e24a 100644 --- a/administrator/components/com_config/controller/component/display.php +++ b/administrator/components/com_config/controller/component/display.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Joomla.Config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/controller/component/save.php b/administrator/components/com_config/controller/component/save.php index dd26788f93568..e8ef75ecb3594 100644 --- a/administrator/components/com_config/controller/component/save.php +++ b/administrator/components/com_config/controller/component/save.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/controllers/application.php b/administrator/components/com_config/controllers/application.php index 450c2866924a1..f51de6fcd8b2c 100644 --- a/administrator/components/com_config/controllers/application.php +++ b/administrator/components/com_config/controllers/application.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -66,22 +66,6 @@ public function cancel() return $controller->execute(); } - /** - * Method to refresh the help display. - * - * @return void - * - * @deprecated 4.0 Use ConfigControllerApplicationRefreshhelp instead. - */ - public function refreshHelp() - { - JLog::add('ConfigControllerApplication is deprecated. Use ConfigControllerApplicationRefreshhelp instead.', JLog::WARNING, 'deprecated'); - - $controller = new ConfigControllerApplicationRefreshhelp; - - $controller->execute(); - } - /** * Method to remove the root property from the configuration. * diff --git a/administrator/components/com_config/controllers/component.php b/administrator/components/com_config/controllers/component.php index 3e38f2cb70614..76b711c5fbb5a 100644 --- a/administrator/components/com_config/controllers/component.php +++ b/administrator/components/com_config/controllers/component.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/helper/config.php b/administrator/components/com_config/helper/config.php index 90428fc054296..7d6c74eccec29 100644 --- a/administrator/components/com_config/helper/config.php +++ b/administrator/components/com_config/helper/config.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -74,11 +74,14 @@ public static function getComponentsWithConfig($authCheck = true) { if (self::hasComponentConfig($component) && (!$authCheck || $user->authorise('core.manage', $component))) { - $result[] = $component; + self::loadLanguageForComponent($component); + $result[$component] = JApplicationHelper::stringURLSafe(JText::_($component)) . '_' . $component; } } - return $result; + asort($result); + + return array_keys($result); } /** @@ -92,17 +95,33 @@ public static function getComponentsWithConfig($authCheck = true) */ public static function loadLanguageForComponents($components) { - $lang = JFactory::getLanguage(); - foreach ($components as $component) { - if (!empty($component)) - { - // Load the core file then - // Load extension-local file. - $lang->load($component . '.sys', JPATH_BASE, null, false, true) - || $lang->load($component . '.sys', JPATH_ADMINISTRATOR . '/components/' . $component, null, false, true); - } + self::loadLanguageForComponent($component); } } + + /** + * Load the sys language for the given component. + * + * @param string $component component name. + * + * @return void + * + * @since 3.5 + */ + public static function loadLanguageForComponent($component) + { + if (empty($component)) + { + return; + } + + $lang = JFactory::getLanguage(); + + // Load the core file then + // Load extension-local file. + $lang->load($component . '.sys', JPATH_BASE, null, false, true) + || $lang->load($component . '.sys', JPATH_ADMINISTRATOR . '/components/' . $component, null, false, true); + } } diff --git a/administrator/components/com_config/model/application.php b/administrator/components/com_config/model/application.php index b5cc9cda94017..c546cbba44390 100644 --- a/administrator/components/com_config/model/application.php +++ b/administrator/components/com_config/model/application.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -327,4 +327,149 @@ private function writeConfigFile(Registry $config) return true; } + + /** + * Method to store the permission values in the asset table. + * + * This method will get an array with permission key value pairs and transform it + * into json and update the asset table in the database. + * + * @param string $permission Need an array with Permissions (component, rule, value and title) + * + * @return boolean True on success, false on failure. + * + * @since 3.5 + */ + public function storePermissions($permission) + { + try + { + // Load the current settings for this component + $query = $this->db->getQuery(true) + ->select($this->db->quoteName(array('name', 'rules'))) + ->from($this->db->quoteName('#__assets')) + ->where($this->db->quoteName('name') . ' = ' . $this->db->quote($permission['component'])); + + $this->db->setQuery($query); + + // Load the results as a list of stdClass objects (see later for more options on retrieving data). + $results = $this->db->loadAssocList(); + + if (empty($results)) + { + $data = array(); + $data[$permission['action']] = array(); + $data[$permission['action']] = array($permission['rule'] => $permission['value']); + + $rules = new JAccessRules($data); + $asset = JTable::getInstance('asset'); + $asset->rules = (string) $rules; + $asset->name = (string) $permission['component']; + $asset->title = (string) $permission['title']; + + if (!$asset->check() || !$asset->store()) + { + JFactory::getApplication()->enqueueMessage(JText::_('SOME_ERROR_CODE'), 'error'); + + return false; + } + + return true; + } + else + { + // Decode the rule settings + $temp = json_decode($results[0]['rules'], true); + + // Check if a new value is to be set + if (isset($permission['value'])) + { + // Check if we already have an action entry + if (!isset($temp[$permission['action']])) + { + $temp[$permission['action']] = array(); + } + + // Check if we already have a rule entry + if (!isset($temp[$permission['action']][$permission['rule']])) + { + $temp[$permission['action']][$permission['rule']] = array(); + } + + // Set the new permission + $temp[$permission['action']][$permission['rule']] = intval($permission['value']); + + // Check if we have an inherited setting + if (strlen($permission['value']) == 0) + { + unset($temp[$permission['action']][$permission['rule']]); + } + } + else + { + // There is no value so remove the action as it's not needed + unset($temp[$permission['action']]); + } + + // Store the new permissions + $temp = json_encode($temp); + $query = $this->db->getQuery(true) + ->update($this->db->quoteName('#__assets')) + ->set('rules = ' . $this->db->quote($temp)) + ->where($this->db->quoteName('name') . ' = ' . $this->db->quote($permission['component'])); + + $this->db->setQuery($query); + + $result = $this->db->execute(); + + return (bool) $result; + } + } + catch (Exception $e) + { + return $e->getMessage(); + } + } + + /** + * Method to send a test mail which is called via an AJAX request + * + * @return bool + * + * @since 3.5 + * @throws Exception + */ + public function sendTestMail() + { + // Set the new values to test with the current settings + $app = JFactory::getApplication(); + $input = $app->input; + + $app->set('smtpauth', $input->get('smtpauth')); + $app->set('smtpuser', $input->get('smtpuser', '', 'STRING')); + $app->set('smtppass', $input->get('smtppass', '', 'RAW')); + $app->set('smtphost', $input->get('smtphost')); + $app->set('smtpsecure', $input->get('smtpsecure')); + $app->set('smtpport', $input->get('smtpport')); + $app->set('mailfrom', $input->get('mailfrom', '', 'STRING')); + $app->set('fromname', $input->get('fromname', '', 'STRING')); + $app->set('mailer', $input->get('mailer')); + $app->set('mailonline', $input->get('mailonline')); + + // Prepare email and send try to send it + $mailSubject = JText::sprintf('COM_CONFIG_SENDMAIL_SUBJECT', $app->get('sitename')); + $mailBody = JText::sprintf('COM_CONFIG_SENDMAIL_BODY', JText::_('COM_CONFIG_SENDMAIL_METHOD_' . strtoupper($app->get('mailer')))); + + if (JFactory::getMailer()->sendMail($app->get('mailfrom'), $app->get('fromname'), $app->get('mailfrom'), $mailSubject, $mailBody) === true) + { + $methodName = JText::_('COM_CONFIG_SENDMAIL_METHOD_' . strtoupper($app->get('mailer'))); + $app->enqueueMessage(JText::sprintf('COM_CONFIG_SENDMAIL_SUCCESS', $app->get('mailfrom'), $methodName), 'success'); + + return true; + } + + $app->enqueueMessage(JText::_('COM_CONFIG_SENDMAIL_ERROR'), 'error'); + + return false; + } } diff --git a/administrator/components/com_config/model/component.php b/administrator/components/com_config/model/component.php index eb1d3e7f7f635..7c5525d741d64 100644 --- a/administrator/components/com_config/model/component.php +++ b/administrator/components/com_config/model/component.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/model/field/filters.php b/administrator/components/com_config/model/field/filters.php index 26c0f5c29b9c5..ffc34737d906e 100644 --- a/administrator/components/com_config/model/field/filters.php +++ b/administrator/components/com_config/model/field/filters.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/model/form/application.xml b/administrator/components/com_config/model/form/application.xml index 54c46e2d518bb..9ccd31971e44e 100644 --- a/administrator/components/com_config/model/form/application.xml +++ b/administrator/components/com_config/model/form/application.xml @@ -9,7 +9,6 @@ default="2" label="COM_CONFIG_FIELD_CACHE_LABEL" description="COM_CONFIG_FIELD_CACHE_DESC" - required="true" filter="integer"> @@ -216,6 +215,7 @@ type="text" label="COM_CONFIG_FIELD_DATABASE_HOST_LABEL" description="COM_CONFIG_FIELD_DATABASE_HOST_DESC" + required="true" filter="string" size="30" /> @@ -224,6 +224,7 @@ type="text" label="COM_CONFIG_FIELD_DATABASE_USERNAME_LABEL" description="COM_CONFIG_FIELD_DATABASE_USERNAME_DESC" + required="true" filter="string" size="30" /> @@ -232,6 +233,7 @@ type="text" label="COM_CONFIG_FIELD_DATABASE_NAME_LABEL" description="COM_CONFIG_FIELD_DATABASE_NAME_DESC" + required="true" filter="string" size="30" /> @@ -399,8 +401,7 @@ type="timezone" default="UTC" label="COM_CONFIG_FIELD_SERVER_TIMEZONE_LABEL" - description="COM_CONFIG_FIELD_SERVER_TIMEZONE_DESC" - required="true"> + description="COM_CONFIG_FIELD_SERVER_TIMEZONE_DESC"> @@ -428,7 +429,6 @@ default="mail" label="COM_CONFIG_FIELD_MAIL_MAILER_LABEL" description="COM_CONFIG_FIELD_MAIL_MAILER_DESC" - required="true" filter="word"> @@ -747,7 +747,6 @@ default="none" label="COM_CONFIG_FIELD_SESSION_HANDLER_LABEL" description="COM_CONFIG_FIELD_SESSION_HANDLER_DESC" - required="true" filter="word" /> @@ -884,7 +881,6 @@ default="1" label="COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_LABEL" description="COM_CONFIG_FIELD_DEFAULT_ACCESS_LEVEL_DESC" - required="true" filter="integer" /> + showDefault="false" + />
@@ -973,7 +969,6 @@ type="text" label="COM_CONFIG_FIELD_COOKIE_PATH_LABEL" description="COM_CONFIG_FIELD_COOKIE_PATH_DESC" - required="false" filter="string" size="40" />
diff --git a/administrator/components/com_config/models/application.php b/administrator/components/com_config/models/application.php index 1c8a64c2ee887..6f6d2fb8f4e5c 100644 --- a/administrator/components/com_config/models/application.php +++ b/administrator/components/com_config/models/application.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/models/component.php b/administrator/components/com_config/models/component.php index c646b3e1e929c..c5e280bf0aa02 100644 --- a/administrator/components/com_config/models/component.php +++ b/administrator/components/com_config/models/component.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/html.php b/administrator/components/com_config/view/application/html.php index 89effe812a464..5c16eea8e8091 100644 --- a/administrator/components/com_config/view/application/html.php +++ b/administrator/components/com_config/view/application/html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/json.php b/administrator/components/com_config/view/application/json.php index fd3f83e8e0822..404b3cb6e6802 100644 --- a/administrator/components/com_config/view/application/json.php +++ b/administrator/components/com_config/view/application/json.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default.php b/administrator/components/com_config/view/application/tmpl/default.php index 3ffef1d492810..f3f39a8181bd2 100644 --- a/administrator/components/com_config/view/application/tmpl/default.php +++ b/administrator/components/com_config/view/application/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -21,6 +21,7 @@ { if (task === "config.cancel.application" || document.formvalidator.isValid(document.getElementById("application-form"))) { + jQuery("#permissions-sliders select").attr("disabled", "disabled"); Joomla.submitform(task, document.getElementById("application-form")); } }; diff --git a/administrator/components/com_config/view/application/tmpl/default_cache.php b/administrator/components/com_config/view/application/tmpl/default_cache.php index 0badb9c1befca..c7efa368a3a08 100644 --- a/administrator/components/com_config/view/application/tmpl/default_cache.php +++ b/administrator/components/com_config/view/application/tmpl/default_cache.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default_cookie.php b/administrator/components/com_config/view/application/tmpl/default_cookie.php index 001a0ebf9e809..4415f6ba39558 100644 --- a/administrator/components/com_config/view/application/tmpl/default_cookie.php +++ b/administrator/components/com_config/view/application/tmpl/default_cookie.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default_database.php b/administrator/components/com_config/view/application/tmpl/default_database.php index 15157ab031b39..677fe190478e9 100644 --- a/administrator/components/com_config/view/application/tmpl/default_database.php +++ b/administrator/components/com_config/view/application/tmpl/default_database.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default_debug.php b/administrator/components/com_config/view/application/tmpl/default_debug.php index 576939b21dc8d..c60b92fc58679 100644 --- a/administrator/components/com_config/view/application/tmpl/default_debug.php +++ b/administrator/components/com_config/view/application/tmpl/default_debug.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default_filters.php b/administrator/components/com_config/view/application/tmpl/default_filters.php index b42da84f232cf..dc1efa587ee65 100644 --- a/administrator/components/com_config/view/application/tmpl/default_filters.php +++ b/administrator/components/com_config/view/application/tmpl/default_filters.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default_ftp.php b/administrator/components/com_config/view/application/tmpl/default_ftp.php index 780e7c12bdbd3..bf3305073dc8f 100644 --- a/administrator/components/com_config/view/application/tmpl/default_ftp.php +++ b/administrator/components/com_config/view/application/tmpl/default_ftp.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default_ftplogin.php b/administrator/components/com_config/view/application/tmpl/default_ftplogin.php index 074a2a3e17043..e30c29e821170 100644 --- a/administrator/components/com_config/view/application/tmpl/default_ftplogin.php +++ b/administrator/components/com_config/view/application/tmpl/default_ftplogin.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default_locale.php b/administrator/components/com_config/view/application/tmpl/default_locale.php index a45c000b5ab3f..fe4efb5439a5d 100644 --- a/administrator/components/com_config/view/application/tmpl/default_locale.php +++ b/administrator/components/com_config/view/application/tmpl/default_locale.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default_mail.php b/administrator/components/com_config/view/application/tmpl/default_mail.php index bdfed8d60c827..002cdc3af5349 100644 --- a/administrator/components/com_config/view/application/tmpl/default_mail.php +++ b/administrator/components/com_config/view/application/tmpl/default_mail.php @@ -3,12 +3,21 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; +JHtml::script('system/sendtestmail.js', false, true); +JFactory::getDocument()->addScriptDeclaration(' + var sendtestmail_url = "' . addslashes(JUri::base()) . 'index.php?option=com_config&task=config.sendtestmail.application&format=json&' . JSession::getFormToken() . '=1"; + '); + $this->name = JText::_('COM_CONFIG_MAIL_SETTINGS'); $this->fieldsname = 'mail'; echo JLayoutHelper::render('joomla.content.options_default', $this); + +echo ''; diff --git a/administrator/components/com_config/view/application/tmpl/default_metadata.php b/administrator/components/com_config/view/application/tmpl/default_metadata.php index 88a565e5ee7fd..f8f8b57faa234 100644 --- a/administrator/components/com_config/view/application/tmpl/default_metadata.php +++ b/administrator/components/com_config/view/application/tmpl/default_metadata.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default_navigation.php b/administrator/components/com_config/view/application/tmpl/default_navigation.php index ceabd3e9d36f8..2aa16da939cb4 100644 --- a/administrator/components/com_config/view/application/tmpl/default_navigation.php +++ b/administrator/components/com_config/view/application/tmpl/default_navigation.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default_permissions.php b/administrator/components/com_config/view/application/tmpl/default_permissions.php index 0f430c99dbb93..c1e85995d44f6 100644 --- a/administrator/components/com_config/view/application/tmpl/default_permissions.php +++ b/administrator/components/com_config/view/application/tmpl/default_permissions.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default_proxy.php b/administrator/components/com_config/view/application/tmpl/default_proxy.php index a18e14f340245..2c9a68033852a 100644 --- a/administrator/components/com_config/view/application/tmpl/default_proxy.php +++ b/administrator/components/com_config/view/application/tmpl/default_proxy.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default_seo.php b/administrator/components/com_config/view/application/tmpl/default_seo.php index 1eb60f2ec7ada..a8137eac54253 100644 --- a/administrator/components/com_config/view/application/tmpl/default_seo.php +++ b/administrator/components/com_config/view/application/tmpl/default_seo.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default_server.php b/administrator/components/com_config/view/application/tmpl/default_server.php index feccaea7c7731..21d7bdb873a06 100644 --- a/administrator/components/com_config/view/application/tmpl/default_server.php +++ b/administrator/components/com_config/view/application/tmpl/default_server.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default_session.php b/administrator/components/com_config/view/application/tmpl/default_session.php index 6ca041b914f62..fae4c6c12c294 100644 --- a/administrator/components/com_config/view/application/tmpl/default_session.php +++ b/administrator/components/com_config/view/application/tmpl/default_session.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default_site.php b/administrator/components/com_config/view/application/tmpl/default_site.php index 0136fff02d104..585556df82b48 100644 --- a/administrator/components/com_config/view/application/tmpl/default_site.php +++ b/administrator/components/com_config/view/application/tmpl/default_site.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/application/tmpl/default_system.php b/administrator/components/com_config/view/application/tmpl/default_system.php index f2742d54d7bd5..05601f1f54604 100644 --- a/administrator/components/com_config/view/application/tmpl/default_system.php +++ b/administrator/components/com_config/view/application/tmpl/default_system.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_config/view/component/html.php b/administrator/components/com_config/view/component/html.php index 50f40d4c972a5..1fdf484e4e97a 100644 --- a/administrator/components/com_config/view/component/html.php +++ b/administrator/components/com_config/view/component/html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -66,7 +66,6 @@ public function render() $this->component = &$component; $this->components = ConfigHelperConfig::getComponentsWithConfig(); - ConfigHelperConfig::loadLanguageForComponents($this->components); $this->userIsSuperAdmin = $user->authorise('core.admin'); $this->currentComponent = JFactory::getApplication()->input->get('component'); diff --git a/administrator/components/com_config/view/component/tmpl/default.php b/administrator/components/com_config/view/component/tmpl/default.php index 6a099bcc1af1e..088b53e9f3c28 100644 --- a/administrator/components/com_config/view/component/tmpl/default.php +++ b/administrator/components/com_config/view/component/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -23,6 +23,7 @@ { if (task === "config.cancel.component" || document.formvalidator.isValid(document.getElementById("component-form"))) { + jQuery("#permissions-sliders select").attr("disabled", "disabled"); Joomla.submitform(task, document.getElementById("component-form")); } }; @@ -61,19 +62,25 @@ ?> form->getFieldset($name) as $field) : ?> getAttribute('showon')) - { + $datashowon = ''; + if ($showonstring = $field->getAttribute('showon')) { JHtml::_('jquery.framework'); JHtml::_('script', 'jui/cms.js', false, true); - $id = $this->form->getFormControl(); - $showon = explode(':', $showon, 2); - $class = ' showon_' . implode(' showon_', explode(',', $showon[1])); - $rel = ' rel="showon_' . $id . '[' . $showon[0] . ']"'; + $showonarr = array(); + + foreach (preg_split('%\[AND\]|\[OR\]%', $showonstring) as $showonfield) + { + $showon = explode(':', $showonfield, 2); + $showonarr[] = array( + 'field' => $this->form->getFormControl() . '[' . $this->form->getFieldAttribute($showon[0], 'name') . ']', + 'values' => explode(',', $showon[1]), + 'op' => (preg_match('%\[(AND|OR)\]' . $showonfield . '%', $showonstring, $matches)) ? $matches[1] : '' + ); + } + $datashowon = ' data-showon=\'' . json_encode($showonarr) . '\''; } ?> -
> +
> hidden && $name != "permissions") : ?>
label; ?> diff --git a/administrator/components/com_config/view/component/tmpl/default_navigation.php b/administrator/components/com_config/view/component/tmpl/default_navigation.php index ff56fb86c4236..439e54d783bc5 100644 --- a/administrator/components/com_config/view/component/tmpl/default_navigation.php +++ b/administrator/components/com_config/view/component/tmpl/default_navigation.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contact/contact.php b/administrator/components/com_contact/contact.php index c22523deaf2de..7489fc3e734bc 100644 --- a/administrator/components/com_contact/contact.php +++ b/administrator/components/com_contact/contact.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contact/contact.xml b/administrator/components/com_contact/contact.xml index 8a2811ef12586..b3e743ca08556 100644 --- a/administrator/components/com_contact/contact.xml +++ b/administrator/components/com_contact/contact.xml @@ -3,7 +3,7 @@ com_contact Joomla! Project April 2006 - (C) 2005 - 2015 Open Source Matters. All rights reserved. + (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/components/com_contact/controller.php b/administrator/components/com_contact/controller.php index 58559e617b124..5d8ca9f15c08d 100644 --- a/administrator/components/com_contact/controller.php +++ b/administrator/components/com_contact/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contact/controllers/contact.php b/administrator/components/com_contact/controllers/contact.php index 4bc220bcc73be..9a65904d90cb0 100644 --- a/administrator/components/com_contact/controllers/contact.php +++ b/administrator/components/com_contact/controllers/contact.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contact/controllers/contacts.php b/administrator/components/com_contact/controllers/contacts.php index 3ce459b88994d..3614051442973 100644 --- a/administrator/components/com_contact/controllers/contacts.php +++ b/administrator/components/com_contact/controllers/contacts.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contact/helpers/contact.php b/administrator/components/com_contact/helpers/contact.php index eb41c2d414763..8b55524bcbafd 100644 --- a/administrator/components/com_contact/helpers/contact.php +++ b/administrator/components/com_contact/helpers/contact.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -43,31 +43,54 @@ public static function addSubmenu($vName) /** * Adds Count Items for Category Manager. * - * @param JDatabaseQuery &$query The query object of com_categories + * @param stdClass[] &$items The banner category objects * - * @return JDatabaseQuery + * @return stdClass[] * - * @since 3.4 + * @since 3.5 */ - public static function countItems(&$query) + public static function countItems(&$items) { - // Join articles to categories and count published items - $query->select('COUNT(DISTINCT cp.id) AS count_published'); - $query->join('LEFT', '#__contact_details AS cp ON cp.catid = a.id AND cp.published = 1'); + $db = JFactory::getDbo(); - // Count unpublished items - $query->select('COUNT(DISTINCT cu.id) AS count_unpublished'); - $query->join('LEFT', '#__contact_details AS cu ON cu.catid = a.id AND cu.published = 0'); + foreach ($items as $item) + { + $item->count_trashed = 0; + $item->count_archived = 0; + $item->count_unpublished = 0; + $item->count_published = 0; + $query = $db->getQuery(true); + $query->select('published AS state, count(*) AS count') + ->from($db->qn('#__contact_details')) + ->where('catid = ' . (int) $item->id) + ->group('published'); + $db->setQuery($query); + $contacts = $db->loadObjectList(); - // Count archived items - $query->select('COUNT(DISTINCT ca.id) AS count_archived'); - $query->join('LEFT', '#__contact_details AS ca ON ca.catid = a.id AND ca.published = 2'); + foreach ($contacts as $contact) + { + if ($contact->state == 1) + { + $item->count_published = $contact->count; + } - // Count trashed items - $query->select('COUNT(DISTINCT ct.id) AS count_trashed'); - $query->join('LEFT', '#__contact_details AS ct ON ct.catid = a.id AND ct.published = -2'); + if ($contact->state == 0) + { + $item->count_unpublished = $contact->count; + } - return $query; - } + if ($contact->state == 2) + { + $item->count_archived = $contact->count; + } + + if ($contact->state == -2) + { + $item->count_trashed = $contact->count; + } + } + } + return $items; + } } diff --git a/administrator/components/com_contact/helpers/html/contact.php b/administrator/components/com_contact/helpers/html/contact.php index 543ccda37c3c1..8c95ce739fba0 100644 --- a/administrator/components/com_contact/helpers/html/contact.php +++ b/administrator/components/com_contact/helpers/html/contact.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contact/models/contact.php b/administrator/components/com_contact/models/contact.php index b06c723933c3a..8b0f79dbf57ed 100644 --- a/administrator/components/com_contact/models/contact.php +++ b/administrator/components/com_contact/models/contact.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contact/models/contacts.php b/administrator/components/com_contact/models/contacts.php index 10e00d2ad7f50..d400f7195ec32 100644 --- a/administrator/components/com_contact/models/contacts.php +++ b/administrator/components/com_contact/models/contacts.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -181,6 +181,7 @@ protected function getListQuery() // Join over the language $query->select($db->quoteName('l.title', 'language_title')) + ->select($db->quoteName('l.image', 'language_image')) ->join( 'LEFT', $db->quoteName('#__languages', 'l') . ' ON ' . $db->quoteName('l.lang_code') . ' = ' . $db->quoteName('a.language') @@ -226,10 +227,27 @@ protected function getListQuery() $db->quoteName( array( 'a.id', - 'ul.name', - 'l.title', - 'uc.name', - 'ag.title', + 'a.name', + 'a.alias', + 'a.checked_out', + 'a.checked_out_time', + 'a.catid', + 'a.user_id', + 'a.published', + 'a.access', + 'a.created', + 'a.created_by', + 'a.ordering', + 'a.featured', + 'a.language', + 'a.publish_up', + 'a.publish_down', + 'ul.name' , + 'ul.email', + 'l.title' , + 'l.image' , + 'uc.name' , + 'ag.title' , 'c.title' ) ) diff --git a/administrator/components/com_contact/models/fields/modal/contact.php b/administrator/components/com_contact/models/fields/modal/contact.php index 9bd88be42730a..e127419c43ba3 100644 --- a/administrator/components/com_contact/models/fields/modal/contact.php +++ b/administrator/components/com_contact/models/fields/modal/contact.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -154,7 +154,7 @@ protected function getInput() 'title' => JText::_('COM_CONTACT_CHANGE_CONTACT'), 'width' => '800px', 'height' => '300px', - 'footer' => '' ) ); diff --git a/administrator/components/com_contact/models/forms/filter_contacts.xml b/administrator/components/com_contact/models/forms/filter_contacts.xml index ab7561bfdcda0..9553c77c93434 100755 --- a/administrator/components/com_contact/models/forms/filter_contacts.xml +++ b/administrator/components/com_contact/models/forms/filter_contacts.xml @@ -65,7 +65,7 @@ label="COM_CONTACT_LIST_FULL_ORDERING" description="COM_CONTACT_LIST_FULL_ORDERING_DESC" onchange="this.form.submit();" - default="a.id DESC" + default="a.name ASC" > @@ -76,16 +76,17 @@ - - - - - - + + + + + + + - ', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?> + - + - + - + - + - + - + - - + + - + @@ -155,7 +155,7 @@ escape($item->alias));?>
- category_title; ?> + escape($item->category_title); ?>
@@ -182,7 +182,7 @@ language == '*'):?> - language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> + language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . ' ' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> diff --git a/administrator/components/com_contact/views/contacts/tmpl/default_batch.php b/administrator/components/com_contact/views/contacts/tmpl/default_batch.php index 535e8e5ef0f97..109711418af92 100644 --- a/administrator/components/com_contact/views/contacts/tmpl/default_batch.php +++ b/administrator/components/com_contact/views/contacts/tmpl/default_batch.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contact/views/contacts/tmpl/default_batch_body.php b/administrator/components/com_contact/views/contacts/tmpl/default_batch_body.php index fe5531d26cb99..3a4c521afe4d9 100644 --- a/administrator/components/com_contact/views/contacts/tmpl/default_batch_body.php +++ b/administrator/components/com_contact/views/contacts/tmpl/default_batch_body.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_contact/views/contacts/tmpl/default_batch_footer.php b/administrator/components/com_contact/views/contacts/tmpl/default_batch_footer.php index b645fb8863ec5..9d7c2b1d04cea 100644 --- a/administrator/components/com_contact/views/contacts/tmpl/default_batch_footer.php +++ b/administrator/components/com_contact/views/contacts/tmpl/default_batch_footer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_contact/views/contacts/tmpl/modal.php b/administrator/components/com_contact/views/contacts/tmpl/modal.php index 06d9a39c6ba24..fcbad26c1bcf7 100644 --- a/administrator/components/com_contact/views/contacts/tmpl/modal.php +++ b/administrator/components/com_contact/views/contacts/tmpl/modal.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -14,7 +14,6 @@ JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); JHtml::_('bootstrap.tooltip'); -JHtml::_('behavior.framework', true); JHtml::_('formbehavior.chosen', 'select'); $input = JFactory::getApplication()->input; @@ -91,7 +90,7 @@ - + @@ -148,7 +147,7 @@ language == '*'):?> - language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> + language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . ' ' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> diff --git a/administrator/components/com_contact/views/contacts/view.html.php b/administrator/components/com_contact/views/contacts/view.html.php index 92210567d1921..7308cb0880da8 100644 --- a/administrator/components/com_contact/views/contacts/view.html.php +++ b/administrator/components/com_contact/views/contacts/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -145,7 +145,7 @@ protected function addToolbar() if ($this->state->get('filter.published') == -2 && $canDo->get('core.delete')) { - JToolbarHelper::deleteList('', 'contacts.delete', 'JTOOLBAR_EMPTY_TRASH'); + JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'contacts.delete', 'JTOOLBAR_EMPTY_TRASH'); } elseif ($canDo->get('core.edit.state')) { diff --git a/administrator/components/com_content/content.php b/administrator/components/com_content/content.php index 38d2aa111f93a..516564ec579fe 100644 --- a/administrator/components/com_content/content.php +++ b/administrator/components/com_content/content.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/content.xml b/administrator/components/com_content/content.xml index 743146fb40bb0..304834e462a4a 100644 --- a/administrator/components/com_content/content.xml +++ b/administrator/components/com_content/content.xml @@ -3,7 +3,7 @@ com_content Joomla! Project April 2006 - (C) 2005 - 2015 Open Source Matters. All rights reserved. + (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/components/com_content/controller.php b/administrator/components/com_content/controller.php index 5ce1e85f22dbb..065a54952d5f0 100644 --- a/administrator/components/com_content/controller.php +++ b/administrator/components/com_content/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/controllers/article.php b/administrator/components/com_content/controllers/article.php index c04346006d7da..c633d649a11b5 100644 --- a/administrator/components/com_content/controllers/article.php +++ b/administrator/components/com_content/controllers/article.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/controllers/articles.php b/administrator/components/com_content/controllers/articles.php index 412f11429913c..3e28c237ed5e1 100644 --- a/administrator/components/com_content/controllers/articles.php +++ b/administrator/components/com_content/controllers/articles.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/controllers/featured.php b/administrator/components/com_content/controllers/featured.php index 67a3b8c828399..089df321927db 100644 --- a/administrator/components/com_content/controllers/featured.php +++ b/administrator/components/com_content/controllers/featured.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -91,6 +91,7 @@ public function publish() public function getModel($name = 'Feature', $prefix = 'ContentModel', $config = array('ignore_request' => true)) { $model = parent::getModel($name, $prefix, $config); + return $model; } } diff --git a/administrator/components/com_content/helpers/content.php b/administrator/components/com_content/helpers/content.php index 7d677c069371d..e6ed1099741c5 100644 --- a/administrator/components/com_content/helpers/content.php +++ b/administrator/components/com_content/helpers/content.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -53,7 +53,7 @@ public static function addSubmenu($vName) * @return string The filtered string * * @deprecated 4.0 Use JComponentHelper::filterText() instead. - */ + */ public static function filterText($text) { JLog::add('ContentHelper::filterText() is deprecated. Use JComponentHelper::filterText() instead.', JLog::WARNING, 'deprecated'); @@ -64,31 +64,54 @@ public static function filterText($text) /** * Adds Count Items for Category Manager. * - * @param JDatabaseQuery &$query The query object of com_categories + * @param stdClass[] &$items The banner category objects * - * @return JDatabaseQuery + * @return stdClass[] * - * @since 3.4 + * @since 3.5 */ - public static function countItems(&$query) + public static function countItems(&$items) { - // Join articles to categories and count published items - $query->select('COUNT(DISTINCT cp.id) AS count_published'); - $query->join('LEFT', '#__content AS cp ON cp.catid = a.id AND cp.state = 1'); + $db = JFactory::getDbo(); - // Count unpublished items - $query->select('COUNT(DISTINCT cu.id) AS count_unpublished'); - $query->join('LEFT', '#__content AS cu ON cu.catid = a.id AND cu.state = 0'); + foreach ($items as $item) + { + $item->count_trashed = 0; + $item->count_archived = 0; + $item->count_unpublished = 0; + $item->count_published = 0; + $query = $db->getQuery(true); + $query->select('state, count(*) AS count') + ->from($db->qn('#__content')) + ->where('catid = ' . (int) $item->id) + ->group('state'); + $db->setQuery($query); + $articles = $db->loadObjectList(); - // Count archived items - $query->select('COUNT(DISTINCT ca.id) AS count_archived'); - $query->join('LEFT', '#__content AS ca ON ca.catid = a.id AND ca.state = 2'); + foreach ($articles as $article) + { + if ($article->state == 1) + { + $item->count_published = $article->count; + } - // Count trashed items - $query->select('COUNT(DISTINCT ct.id) AS count_trashed'); - $query->join('LEFT', '#__content AS ct ON ct.catid = a.id AND ct.state = -2'); + if ($article->state == 0) + { + $item->count_unpublished = $article->count; + } - return $query; - } + if ($article->state == 2) + { + $item->count_archived = $article->count; + } + if ($article->state == -2) + { + $item->count_trashed = $article->count; + } + } + } + + return $items; + } } diff --git a/administrator/components/com_content/helpers/html/contentadministrator.php b/administrator/components/com_content/helpers/html/contentadministrator.php index 3f70c8c5a038a..8d25ff1198f7b 100644 --- a/administrator/components/com_content/helpers/html/contentadministrator.php +++ b/administrator/components/com_content/helpers/html/contentadministrator.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/models/article.php b/administrator/components/com_content/models/article.php index 75e401854f7ae..ecb9555427681 100644 --- a/administrator/components/com_content/models/article.php +++ b/administrator/components/com_content/models/article.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -117,6 +117,7 @@ protected function batchCopy($value, $pks, $contexts) if (!$this->table->check()) { $this->setError($this->table->getError()); + return false; } @@ -126,6 +127,7 @@ protected function batchCopy($value, $pks, $contexts) if (!$this->table->store()) { $this->setError($this->table->getError()); + return false; } @@ -170,6 +172,7 @@ protected function canDelete($record) { return false; } + $user = JFactory::getUser(); return $user->authorise('core.delete', 'com_content.article.' . (int) $record->id); @@ -332,10 +335,12 @@ public function getForm($data = array(), $loadData = true) { // Get the form. $form = $this->loadForm('com_content.article', 'article', array('control' => 'jform', 'load_data' => $loadData)); + if (empty($form)) { return false; } + $jinput = JFactory::getApplication()->input; // The front end calls this model and uses a_id to avoid id clashes so we need to check for that first. @@ -348,6 +353,7 @@ public function getForm($data = array(), $loadData = true) { $id = $jinput->get('id', 0); } + // Determine correct permissions to check. if ($this->getState('article.id')) { @@ -663,6 +669,7 @@ public function featured($pks, $value = 0) catch (Exception $e) { $this->setError($e->getMessage()); + return false; } @@ -735,6 +742,7 @@ protected function preprocessForm(JForm $form, $data, $group = 'content') $field->addAttribute('clear', 'true'); } } + if ($add) { $form->load($addform, false); diff --git a/administrator/components/com_content/models/articles.php b/administrator/components/com_content/models/articles.php index ea58c35031545..824f24d4ae07e 100644 --- a/administrator/components/com_content/models/articles.php +++ b/administrator/components/com_content/models/articles.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -74,7 +74,7 @@ public function __construct($config = array()) * * @since 1.6 */ - protected function populateState($ordering = null, $direction = null) + protected function populateState($ordering = 'a.id', $direction = 'desc') { $app = JFactory::getApplication(); @@ -109,7 +109,7 @@ protected function populateState($ordering = null, $direction = null) $this->setState('filter.tag', $tag); // List state information. - parent::populateState('a.id', 'desc'); + parent::populateState($ordering, $direction); // Force a language $forcedLanguage = $app->input->get('forcedLanguage'); @@ -174,7 +174,7 @@ protected function getListQuery() $query->from('#__content AS a'); // Join over the language - $query->select('l.title AS language_title') + $query->select('l.title AS language_title, l.image AS language_image') ->join('LEFT', $db->quoteName('#__languages') . ' AS l ON l.lang_code = a.language'); // Join over the users for the checked out user. @@ -199,7 +199,7 @@ protected function getListQuery() $query->select('COUNT(asso2.id)>1 as association') ->join('LEFT', '#__associations AS asso ON asso.id = a.id AND asso.context=' . $db->quote('com_content.item')) ->join('LEFT', '#__associations AS asso2 ON asso2.key = asso.key') - ->group('a.id, l.title, uc.name, ag.title, c.title, ua.name'); + ->group('a.id, l.title, l.image, uc.name, ag.title, c.title, ua.name'); } // Filter by access level. diff --git a/administrator/components/com_content/models/feature.php b/administrator/components/com_content/models/feature.php index 8498fe8b369c4..f3730034575d5 100644 --- a/administrator/components/com_content/models/feature.php +++ b/administrator/components/com_content/models/feature.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/models/featured.php b/administrator/components/com_content/models/featured.php index 34f40a941a7d8..2603f5377207d 100644 --- a/administrator/components/com_content/models/featured.php +++ b/administrator/components/com_content/models/featured.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -86,7 +86,7 @@ protected function getListQuery($resolveFKs = true) $query->from('#__content AS a'); // Join over the language - $query->select('l.title AS language_title') + $query->select('l.title AS language_title, l.image AS language_image') ->join('LEFT', $db->quoteName('#__languages') . ' AS l ON l.lang_code = a.language'); // Join over the content table. @@ -202,4 +202,21 @@ protected function getListQuery($resolveFKs = true) return $query; } + + /** + * Method to auto-populate the model state. + * + * Note. Calling getState in this method will result in recursion. + * + * @param string $ordering An optional ordering field. + * @param string $direction An optional direction (asc|desc). + * + * @return void + * + * @since 3.5 + */ + protected function populateState($ordering = 'a.title', $direction = 'asc') + { + parent::populateState($ordering, $direction); + } } diff --git a/administrator/components/com_content/models/fields/modal/article.php b/administrator/components/com_content/models/fields/modal/article.php index 659d402e3f437..fbefc0d4411d3 100644 --- a/administrator/components/com_content/models/fields/modal/article.php +++ b/administrator/components/com_content/models/fields/modal/article.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -178,7 +178,7 @@ protected function getInput() 'title' => JText::_('COM_CONTENT_CHANGE_ARTICLE'), 'width' => '800px', 'height' => '300px', - 'footer' => '' ) ); diff --git a/administrator/components/com_content/models/forms/filter_featured.xml b/administrator/components/com_content/models/forms/filter_featured.xml index e14981f8168f5..72d975bb24635 100644 --- a/administrator/components/com_content/models/forms/filter_featured.xml +++ b/administrator/components/com_content/models/forms/filter_featured.xml @@ -90,14 +90,14 @@ default="a.title ASC" > - - + + @@ -106,10 +106,10 @@ - - + + - \ No newline at end of file + diff --git a/administrator/components/com_content/tables/featured.php b/administrator/components/com_content/tables/featured.php index 177bee49883f3..6b4e455649ce3 100644 --- a/administrator/components/com_content/tables/featured.php +++ b/administrator/components/com_content/tables/featured.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/views/article/tmpl/edit.php b/administrator/components/com_content/views/article/tmpl/edit.php index e22e7a0e2590a..063d502d734ea 100644 --- a/administrator/components/com_content/views/article/tmpl/edit.php +++ b/administrator/components/com_content/views/article/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -65,6 +65,7 @@ { if (task == "article.cancel" || document.formvalidator.isValid(document.getElementById("item-form"))) { + jQuery("#permissions-sliders select").attr("disabled", "disabled"); ' . $this->form->getField('articletext')->save() . ' Joomla.submitform(task, document.getElementById("item-form")); } diff --git a/administrator/components/com_content/views/article/tmpl/edit_associations.php b/administrator/components/com_content/views/article/tmpl/edit_associations.php index f662cc15df807..e65a294fdea1c 100644 --- a/administrator/components/com_content/views/article/tmpl/edit_associations.php +++ b/administrator/components/com_content/views/article/tmpl/edit_associations.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/views/article/tmpl/edit_metadata.php b/administrator/components/com_content/views/article/tmpl/edit_metadata.php index 86e3e00548b95..7b4a0fc70c4be 100644 --- a/administrator/components/com_content/views/article/tmpl/edit_metadata.php +++ b/administrator/components/com_content/views/article/tmpl/edit_metadata.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/views/article/tmpl/modal.php b/administrator/components/com_content/views/article/tmpl/modal.php index d8b35be6d3f42..1c6a5c2b062a3 100644 --- a/administrator/components/com_content/views/article/tmpl/modal.php +++ b/administrator/components/com_content/views/article/tmpl/modal.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/views/article/tmpl/modal_associations.php b/administrator/components/com_content/views/article/tmpl/modal_associations.php index f662cc15df807..e65a294fdea1c 100644 --- a/administrator/components/com_content/views/article/tmpl/modal_associations.php +++ b/administrator/components/com_content/views/article/tmpl/modal_associations.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/views/article/tmpl/modal_metadata.php b/administrator/components/com_content/views/article/tmpl/modal_metadata.php index 86e3e00548b95..7b4a0fc70c4be 100644 --- a/administrator/components/com_content/views/article/tmpl/modal_metadata.php +++ b/administrator/components/com_content/views/article/tmpl/modal_metadata.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/views/article/tmpl/pagebreak.php b/administrator/components/com_content/views/article/tmpl/pagebreak.php index 1a868afc5f80a..81ae6e166f2f0 100644 --- a/administrator/components/com_content/views/article/tmpl/pagebreak.php +++ b/administrator/components/com_content/views/article/tmpl/pagebreak.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/views/article/view.html.php b/administrator/components/com_content/views/article/view.html.php index 301adcdc92af3..8dc74b058cd63 100644 --- a/administrator/components/com_content/views/article/view.html.php +++ b/administrator/components/com_content/views/article/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_content/views/articles/tmpl/default.php b/administrator/components/com_content/views/articles/tmpl/default.php index 91272fd808cdb..df6de84a3b3f6 100644 --- a/administrator/components/com_content/views/articles/tmpl/default.php +++ b/administrator/components/com_content/views/articles/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -79,7 +79,7 @@ - + @@ -197,7 +197,7 @@ language == '*'):?> - language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> + language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . ' ' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> diff --git a/administrator/components/com_content/views/articles/tmpl/default_batch.php b/administrator/components/com_content/views/articles/tmpl/default_batch.php index d863b93bcbd32..5bff3050cc0b9 100644 --- a/administrator/components/com_content/views/articles/tmpl/default_batch.php +++ b/administrator/components/com_content/views/articles/tmpl/default_batch.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * * @deprecated 3.4 Use default_batch_body and default_batch_footer diff --git a/administrator/components/com_content/views/articles/tmpl/default_batch_body.php b/administrator/components/com_content/views/articles/tmpl/default_batch_body.php index 339700b176991..a7e3ce264e4e8 100644 --- a/administrator/components/com_content/views/articles/tmpl/default_batch_body.php +++ b/administrator/components/com_content/views/articles/tmpl/default_batch_body.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_content/views/articles/tmpl/default_batch_footer.php b/administrator/components/com_content/views/articles/tmpl/default_batch_footer.php index 988e50d0b3524..dbb91d518fad1 100644 --- a/administrator/components/com_content/views/articles/tmpl/default_batch_footer.php +++ b/administrator/components/com_content/views/articles/tmpl/default_batch_footer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_content/views/articles/tmpl/modal.php b/administrator/components/com_content/views/articles/tmpl/modal.php index cba1e5f2899c6..6bec07110bb99 100644 --- a/administrator/components/com_content/views/articles/tmpl/modal.php +++ b/administrator/components/com_content/views/articles/tmpl/modal.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -20,7 +20,6 @@ JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); JHtml::_('bootstrap.tooltip'); -JHtml::_('behavior.framework', true); JHtml::_('formbehavior.chosen', 'select'); $function = $app->input->getCmd('function', 'jSelectArticle'); @@ -95,7 +94,7 @@ - + @@ -150,7 +149,7 @@ language == '*'):?> - language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> + language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . ' ' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> diff --git a/administrator/components/com_content/views/articles/view.html.php b/administrator/components/com_content/views/articles/view.html.php index 7f1580a5736ff..5ab4e34a9b9c0 100644 --- a/administrator/components/com_content/views/articles/view.html.php +++ b/administrator/components/com_content/views/articles/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -130,7 +130,7 @@ protected function addToolbar() if ($this->state->get('filter.published') == -2 && $canDo->get('core.delete')) { - JToolbarHelper::deleteList('', 'articles.delete', 'JTOOLBAR_EMPTY_TRASH'); + JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'articles.delete', 'JTOOLBAR_EMPTY_TRASH'); } elseif ($canDo->get('core.edit.state')) { diff --git a/administrator/components/com_content/views/featured/tmpl/default.php b/administrator/components/com_content/views/featured/tmpl/default.php index 91731ed00b1fd..5eb8e932d9e16 100644 --- a/administrator/components/com_content/views/featured/tmpl/default.php +++ b/administrator/components/com_content/views/featured/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -67,7 +67,7 @@ - + @@ -175,7 +175,7 @@ language == '*'):?> - language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> + language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . ' ' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> diff --git a/administrator/components/com_content/views/featured/view.html.php b/administrator/components/com_content/views/featured/view.html.php index f9b0d4b2d2e8b..d47b64a54b258 100644 --- a/administrator/components/com_content/views/featured/view.html.php +++ b/administrator/components/com_content/views/featured/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -102,7 +102,7 @@ protected function addToolbar() if ($state->get('filter.published') == -2 && $canDo->get('core.delete')) { - JToolbarHelper::deleteList('', 'articles.delete', 'JTOOLBAR_EMPTY_TRASH'); + JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'articles.delete', 'JTOOLBAR_EMPTY_TRASH'); } elseif ($canDo->get('core.edit.state')) { diff --git a/administrator/components/com_contenthistory/contenthistory.php b/administrator/components/com_contenthistory/contenthistory.php index 6b9d367eaf29e..5e76938a84ef3 100644 --- a/administrator/components/com_contenthistory/contenthistory.php +++ b/administrator/components/com_contenthistory/contenthistory.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contenthistory * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contenthistory/contenthistory.xml b/administrator/components/com_contenthistory/contenthistory.xml index 69575ae61fe24..c0dc5a0424ec2 100644 --- a/administrator/components/com_contenthistory/contenthistory.xml +++ b/administrator/components/com_contenthistory/contenthistory.xml @@ -3,7 +3,7 @@ com_contenthistory Joomla! Project May 2013 - (C) 2005 - 2015 Open Source Matters. All rights reserved. + (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/components/com_contenthistory/controller.php b/administrator/components/com_contenthistory/controller.php index fc29c460e449f..341e1db177d4e 100644 --- a/administrator/components/com_contenthistory/controller.php +++ b/administrator/components/com_contenthistory/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contenthistory * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contenthistory/controllers/history.php b/administrator/components/com_contenthistory/controllers/history.php index b13c322368070..2cd1108e441fc 100644 --- a/administrator/components/com_contenthistory/controllers/history.php +++ b/administrator/components/com_contenthistory/controllers/history.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contenthistory * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contenthistory/controllers/preview.php b/administrator/components/com_contenthistory/controllers/preview.php index 13cc9461ebd8c..54da2cddf759e 100644 --- a/administrator/components/com_contenthistory/controllers/preview.php +++ b/administrator/components/com_contenthistory/controllers/preview.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contenthistory * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contenthistory/helpers/contenthistory.php b/administrator/components/com_contenthistory/helpers/contenthistory.php index ea5ea3484512b..f18da818c0fcd 100644 --- a/administrator/components/com_contenthistory/helpers/contenthistory.php +++ b/administrator/components/com_contenthistory/helpers/contenthistory.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contenthistory * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contenthistory/helpers/html/textdiff.php b/administrator/components/com_contenthistory/helpers/html/textdiff.php index 1b956464079ce..b202c5bad6d1b 100644 --- a/administrator/components/com_contenthistory/helpers/html/textdiff.php +++ b/administrator/components/com_contenthistory/helpers/html/textdiff.php @@ -3,7 +3,7 @@ * @package Joomla.Libraries * @subpackage HTML * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_contenthistory/models/compare.php b/administrator/components/com_contenthistory/models/compare.php index 6394eea7161fa..f1847762ae03c 100644 --- a/administrator/components/com_contenthistory/models/compare.php +++ b/administrator/components/com_contenthistory/models/compare.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contenthistory * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contenthistory/models/history.php b/administrator/components/com_contenthistory/models/history.php index e110278e20f7c..d91429362a167 100644 --- a/administrator/components/com_contenthistory/models/history.php +++ b/administrator/components/com_contenthistory/models/history.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contenthistory * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -67,7 +67,7 @@ protected function canEdit($record) * Make sure user has edit privileges for this content item. Note that we use edit permissions * for the content item, not delete permissions for the content history row. */ - $user = JFactory::getUser(); + $user = JFactory::getUser(); $result = $user->authorise('core.edit', $typeAlias . '.' . (int) $record->ucm_item_id); } } diff --git a/administrator/components/com_contenthistory/models/preview.php b/administrator/components/com_contenthistory/models/preview.php index 81831f07aecde..c93e16bbfd205 100644 --- a/administrator/components/com_contenthistory/models/preview.php +++ b/administrator/components/com_contenthistory/models/preview.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contenthistory * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contenthistory/views/compare/tmpl/compare.php b/administrator/components/com_contenthistory/views/compare/tmpl/compare.php index a83d22c300313..abafce3d744be 100644 --- a/administrator/components/com_contenthistory/views/compare/tmpl/compare.php +++ b/administrator/components/com_contenthistory/views/compare/tmpl/compare.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contenthistory/views/compare/view.html.php b/administrator/components/com_contenthistory/views/compare/view.html.php index c31fc90fcfde2..5fae9f48afaaa 100644 --- a/administrator/components/com_contenthistory/views/compare/view.html.php +++ b/administrator/components/com_contenthistory/views/compare/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contenthistory * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contenthistory/views/history/tmpl/modal.php b/administrator/components/com_contenthistory/views/history/tmpl/modal.php index 56b249f84a99e..45c1c0569a5fe 100644 --- a/administrator/components/com_contenthistory/views/history/tmpl/modal.php +++ b/administrator/components/com_contenthistory/views/history/tmpl/modal.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -91,19 +91,19 @@
+ + + + +
@@ -111,7 +111,7 @@ - - "}var d,e,f,g,h,k,l,m=this,n=m._id,o=0;for(d=c(),d.push({text:tinymce.translate("No color"),color:"transparent"}),f='
+ @@ -142,7 +142,7 @@ items as $item) : ?>
+ version_id); ?> diff --git a/administrator/components/com_contenthistory/views/history/view.html.php b/administrator/components/com_contenthistory/views/history/view.html.php index 50f791bbe7f7f..28d2b2a5cdc37 100644 --- a/administrator/components/com_contenthistory/views/history/view.html.php +++ b/administrator/components/com_contenthistory/views/history/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contenthistory * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contenthistory/views/preview/tmpl/preview.php b/administrator/components/com_contenthistory/views/preview/tmpl/preview.php index b138cf27d72b4..43c8ae773d567 100644 --- a/administrator/components/com_contenthistory/views/preview/tmpl/preview.php +++ b/administrator/components/com_contenthistory/views/preview/tmpl/preview.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_contenthistory/views/preview/view.html.php b/administrator/components/com_contenthistory/views/preview/view.html.php index c4c1c2ce74272..0e4af8b9badfd 100644 --- a/administrator/components/com_contenthistory/views/preview/view.html.php +++ b/administrator/components/com_contenthistory/views/preview/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_contenthistory * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_cpanel/controller.php b/administrator/components/com_cpanel/controller.php index 88df0d8f54617..db88d03936161 100644 --- a/administrator/components/com_cpanel/controller.php +++ b/administrator/components/com_cpanel/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_cpanel * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_cpanel/cpanel.php b/administrator/components/com_cpanel/cpanel.php index 986a9995a49e6..fa51a70f3364c 100644 --- a/administrator/components/com_cpanel/cpanel.php +++ b/administrator/components/com_cpanel/cpanel.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_cpanel * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_cpanel/cpanel.xml b/administrator/components/com_cpanel/cpanel.xml index f92fa5410dda6..12d1ae8a1e8e5 100644 --- a/administrator/components/com_cpanel/cpanel.xml +++ b/administrator/components/com_cpanel/cpanel.xml @@ -3,7 +3,7 @@ com_cpanel Joomla! Project April 2006 - (C) 2005 - 2015 Open Source Matters. All rights reserved. + (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/components/com_cpanel/views/cpanel/tmpl/default.php b/administrator/components/com_cpanel/views/cpanel/tmpl/default.php index fef887d226070..ef41c8eb86592 100644 --- a/administrator/components/com_cpanel/views/cpanel/tmpl/default.php +++ b/administrator/components/com_cpanel/views/cpanel/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_cpanel * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_cpanel/views/cpanel/view.html.php b/administrator/components/com_cpanel/views/cpanel/view.html.php index 91f163d10e501..e69ca447112db 100644 --- a/administrator/components/com_cpanel/views/cpanel/view.html.php +++ b/administrator/components/com_cpanel/views/cpanel/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_cpanel * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_finder/controller.php b/administrator/components/com_finder/controller.php index 3ffbcf407d84e..502775321d565 100644 --- a/administrator/components/com_finder/controller.php +++ b/administrator/components/com_finder/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/controllers/filter.php b/administrator/components/com_finder/controllers/filter.php index b9b83b32becc9..d45e24cad9cba 100644 --- a/administrator/components/com_finder/controllers/filter.php +++ b/administrator/components/com_finder/controllers/filter.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/controllers/filters.php b/administrator/components/com_finder/controllers/filters.php index f3c0e33ee73b3..0d68b8e06efc8 100644 --- a/administrator/components/com_finder/controllers/filters.php +++ b/administrator/components/com_finder/controllers/filters.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/controllers/index.php b/administrator/components/com_finder/controllers/index.php index fd36a2a0fd93b..411bc7115460f 100644 --- a/administrator/components/com_finder/controllers/index.php +++ b/administrator/components/com_finder/controllers/index.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/controllers/indexer.json.php b/administrator/components/com_finder/controllers/indexer.json.php index 7992ed7addac5..59691469f8dde 100644 --- a/administrator/components/com_finder/controllers/indexer.json.php +++ b/administrator/components/com_finder/controllers/indexer.json.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/controllers/maps.php b/administrator/components/com_finder/controllers/maps.php index 25c1a1243d207..6e0cb859e60c5 100644 --- a/administrator/components/com_finder/controllers/maps.php +++ b/administrator/components/com_finder/controllers/maps.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/finder.php b/administrator/components/com_finder/finder.php index 6ffbb165c9862..ad1107f561c0a 100644 --- a/administrator/components/com_finder/finder.php +++ b/administrator/components/com_finder/finder.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/finder.xml b/administrator/components/com_finder/finder.xml index 915394e18bbb7..81b231ca67754 100644 --- a/administrator/components/com_finder/finder.xml +++ b/administrator/components/com_finder/finder.xml @@ -2,7 +2,7 @@ com_finder Joomla! Project - (C) 2005 - 2015 Open Source Matters. All rights reserved. + (C) 2005 - 2016 Open Source Matters. All rights reserved. August 2011 GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org diff --git a/administrator/components/com_finder/helpers/finder.php b/administrator/components/com_finder/helpers/finder.php index 47d7ece240056..f8e389be7909b 100644 --- a/administrator/components/com_finder/helpers/finder.php +++ b/administrator/components/com_finder/helpers/finder.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/html/finder.php b/administrator/components/com_finder/helpers/html/finder.php index 6010102eee2c9..cdf4f7eb08e15 100644 --- a/administrator/components/com_finder/helpers/html/finder.php +++ b/administrator/components/com_finder/helpers/html/finder.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ @@ -92,7 +92,7 @@ public static function mapslist() // Compile the options. $options = array(); - $options[] = JHtml::_('select.option', '1', JText::_('COM_FINDER_MAPS_BRANCHES')); + $options[] = JHtml::_('select.option', '1', JText::_('COM_FINDER_MAPS_SELECT_BRANCH')); foreach ($rows as $row) { diff --git a/administrator/components/com_finder/helpers/indexer/adapter.php b/administrator/components/com_finder/helpers/indexer/adapter.php index 3e131ac429dbe..3f07c68075431 100644 --- a/administrator/components/com_finder/helpers/indexer/adapter.php +++ b/administrator/components/com_finder/helpers/indexer/adapter.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/indexer/driver/mysql.php b/administrator/components/com_finder/helpers/indexer/driver/mysql.php index 8c1d8fd6ec1fb..5e7f150c098d8 100644 --- a/administrator/components/com_finder/helpers/indexer/driver/mysql.php +++ b/administrator/components/com_finder/helpers/indexer/driver/mysql.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/indexer/driver/postgresql.php b/administrator/components/com_finder/helpers/indexer/driver/postgresql.php index 13d360750ca31..5cff3a7b8ce27 100644 --- a/administrator/components/com_finder/helpers/indexer/driver/postgresql.php +++ b/administrator/components/com_finder/helpers/indexer/driver/postgresql.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/indexer/driver/sqlsrv.php b/administrator/components/com_finder/helpers/indexer/driver/sqlsrv.php index e597952a5651a..e71d2dcd6c18f 100644 --- a/administrator/components/com_finder/helpers/indexer/driver/sqlsrv.php +++ b/administrator/components/com_finder/helpers/indexer/driver/sqlsrv.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/indexer/helper.php b/administrator/components/com_finder/helpers/indexer/helper.php index 461620679e0d7..79d501ae9c769 100644 --- a/administrator/components/com_finder/helpers/indexer/helper.php +++ b/administrator/components/com_finder/helpers/indexer/helper.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/indexer/indexer.php b/administrator/components/com_finder/helpers/indexer/indexer.php index 212831a0d4aa9..4da8fbc310635 100644 --- a/administrator/components/com_finder/helpers/indexer/indexer.php +++ b/administrator/components/com_finder/helpers/indexer/indexer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/indexer/parser.php b/administrator/components/com_finder/helpers/indexer/parser.php index e2ebd05e1b37a..d52023af23315 100644 --- a/administrator/components/com_finder/helpers/indexer/parser.php +++ b/administrator/components/com_finder/helpers/indexer/parser.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/indexer/parser/html.php b/administrator/components/com_finder/helpers/indexer/parser/html.php index 8237bbab3d1e0..44dc4db3d4df3 100644 --- a/administrator/components/com_finder/helpers/indexer/parser/html.php +++ b/administrator/components/com_finder/helpers/indexer/parser/html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/indexer/parser/rtf.php b/administrator/components/com_finder/helpers/indexer/parser/rtf.php index 5b3813e0218e1..0e05cb90c341c 100644 --- a/administrator/components/com_finder/helpers/indexer/parser/rtf.php +++ b/administrator/components/com_finder/helpers/indexer/parser/rtf.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/indexer/parser/txt.php b/administrator/components/com_finder/helpers/indexer/parser/txt.php index a86014843d811..caaf10771b7ac 100644 --- a/administrator/components/com_finder/helpers/indexer/parser/txt.php +++ b/administrator/components/com_finder/helpers/indexer/parser/txt.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/indexer/query.php b/administrator/components/com_finder/helpers/indexer/query.php index 25d8961c96a52..f95d4e0c23e2d 100644 --- a/administrator/components/com_finder/helpers/indexer/query.php +++ b/administrator/components/com_finder/helpers/indexer/query.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/indexer/result.php b/administrator/components/com_finder/helpers/indexer/result.php index de48e2d587c61..ef7ad089c8488 100644 --- a/administrator/components/com_finder/helpers/indexer/result.php +++ b/administrator/components/com_finder/helpers/indexer/result.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/indexer/stemmer.php b/administrator/components/com_finder/helpers/indexer/stemmer.php index 1f32b3e9e8368..1629c2bc4ff90 100644 --- a/administrator/components/com_finder/helpers/indexer/stemmer.php +++ b/administrator/components/com_finder/helpers/indexer/stemmer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/indexer/stemmer/fr.php b/administrator/components/com_finder/helpers/indexer/stemmer/fr.php index 5effa58d32e2e..1ce973c626a5d 100644 --- a/administrator/components/com_finder/helpers/indexer/stemmer/fr.php +++ b/administrator/components/com_finder/helpers/indexer/stemmer/fr.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/indexer/stemmer/porter_en.php b/administrator/components/com_finder/helpers/indexer/stemmer/porter_en.php index 503bf1cac2fdf..3963243854ba6 100644 --- a/administrator/components/com_finder/helpers/indexer/stemmer/porter_en.php +++ b/administrator/components/com_finder/helpers/indexer/stemmer/porter_en.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/indexer/stemmer/snowball.php b/administrator/components/com_finder/helpers/indexer/stemmer/snowball.php index 1e1d85d7820f8..df1f23db4842a 100644 --- a/administrator/components/com_finder/helpers/indexer/stemmer/snowball.php +++ b/administrator/components/com_finder/helpers/indexer/stemmer/snowball.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/indexer/taxonomy.php b/administrator/components/com_finder/helpers/indexer/taxonomy.php index 4e7312dd44cdd..447829d49f518 100644 --- a/administrator/components/com_finder/helpers/indexer/taxonomy.php +++ b/administrator/components/com_finder/helpers/indexer/taxonomy.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/indexer/token.php b/administrator/components/com_finder/helpers/indexer/token.php index 12d772fa08d16..12fcfdd5fca05 100644 --- a/administrator/components/com_finder/helpers/indexer/token.php +++ b/administrator/components/com_finder/helpers/indexer/token.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/helpers/language.php b/administrator/components/com_finder/helpers/language.php index 7212e38c4bbe5..3d47afb42b601 100644 --- a/administrator/components/com_finder/helpers/language.php +++ b/administrator/components/com_finder/helpers/language.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/models/fields/branches.php b/administrator/components/com_finder/models/fields/branches.php new file mode 100644 index 0000000000000..ae6f63e2d4ea0 --- /dev/null +++ b/administrator/components/com_finder/models/fields/branches.php @@ -0,0 +1,40 @@ +getState('filter.search')) { $search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($this->getState('filter.search')), true) . '%')); - $query->where('( a.title LIKE \'%' . $search . '%\' )'); + $query->where('( a.title LIKE ' . $search . ' )'); } // If the model is set to check item state, add to the query. @@ -79,7 +79,7 @@ protected function getListQuery() } // Add the list ordering clause. - $query->order($db->escape($this->getState('list.ordering') . ' ' . $db->escape($this->getState('list.direction')))); + $query->order($db->escape($this->getState('list.ordering', 'a.title') . ' ' . $db->escape($this->getState('list.direction')))); return $query; } diff --git a/administrator/components/com_finder/models/forms/filter_filters.xml b/administrator/components/com_finder/models/forms/filter_filters.xml new file mode 100644 index 0000000000000..4c5dedc916ace --- /dev/null +++ b/administrator/components/com_finder/models/forms/filter_filters.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + diff --git a/administrator/components/com_finder/models/forms/filter_index.xml b/administrator/components/com_finder/models/forms/filter_index.xml new file mode 100644 index 0000000000000..bc94c3c29fc3d --- /dev/null +++ b/administrator/components/com_finder/models/forms/filter_index.xml @@ -0,0 +1,43 @@ + +
+ + + + + + + + + + + + +
diff --git a/administrator/components/com_finder/models/forms/filter_maps.xml b/administrator/components/com_finder/models/forms/filter_maps.xml new file mode 100644 index 0000000000000..ec70c76b34417 --- /dev/null +++ b/administrator/components/com_finder/models/forms/filter_maps.xml @@ -0,0 +1,42 @@ + +
+
+ + + + + + + + + + + + + + diff --git a/administrator/components/com_finder/models/index.php b/administrator/components/com_finder/models/index.php index cbb95a6b89678..8e212257bfc25 100644 --- a/administrator/components/com_finder/models/index.php +++ b/administrator/components/com_finder/models/index.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ @@ -49,7 +49,8 @@ public function __construct($config = array()) 'title', 'l.title', 'type_id', 'l.type_id', 'url', 'l.url', - 'indexdate', 'l.indexdate' + 'indexdate', 'l.indexdate', + 'type' ); } @@ -193,11 +194,20 @@ protected function getListQuery() $query->where('l.published = ' . (int) $this->getState('filter.state')); } - // Check the search phrase. + // Check the search phrase. if ($this->getState('filter.search') != '') { $search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($this->getState('filter.search')), true) . '%')); - $query->where('l.title LIKE ' . $search . ' OR l.url LIKE ' . $search . ' OR l.indexdate LIKE ' . $search); + + // Do not filter by indexdate if $search contains non-ascii characters + if (preg_match('/[^\x00-\x7F]/', $search)) + { + $query->where('l.title LIKE ' . $search . ' OR l.url LIKE ' . $search); + } + else + { + $query->where('l.title LIKE ' . $search . ' OR l.url LIKE ' . $search . ' OR l.indexdate LIKE ' . $search); + } } // Handle the list ordering. diff --git a/administrator/components/com_finder/models/indexer.php b/administrator/components/com_finder/models/indexer.php index 595402d40baf7..e84788b457f8b 100644 --- a/administrator/components/com_finder/models/indexer.php +++ b/administrator/components/com_finder/models/indexer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/models/maps.php b/administrator/components/com_finder/models/maps.php index bcf0c50e746d9..71335abc7e0db 100644 --- a/administrator/components/com_finder/models/maps.php +++ b/administrator/components/com_finder/models/maps.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ @@ -30,7 +30,8 @@ public function __construct($config = array()) { $config['filter_fields'] = array( 'state', 'a.state', - 'title', 'a.title' + 'title', 'a.title', + 'branch' ); } diff --git a/administrator/components/com_finder/models/statistics.php b/administrator/components/com_finder/models/statistics.php index 3b2e05e0fc90b..045081d6579ae 100644 --- a/administrator/components/com_finder/models/statistics.php +++ b/administrator/components/com_finder/models/statistics.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/tables/filter.php b/administrator/components/com_finder/tables/filter.php index 160f509e18fe9..03133c41ca2f3 100644 --- a/administrator/components/com_finder/tables/filter.php +++ b/administrator/components/com_finder/tables/filter.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/tables/link.php b/administrator/components/com_finder/tables/link.php index 02e915506b51f..9c9df444bdbfd 100644 --- a/administrator/components/com_finder/tables/link.php +++ b/administrator/components/com_finder/tables/link.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/tables/map.php b/administrator/components/com_finder/tables/map.php index 9ef293f5fcdd9..b9d524c683ed3 100644 --- a/administrator/components/com_finder/tables/map.php +++ b/administrator/components/com_finder/tables/map.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/views/filter/tmpl/edit.php b/administrator/components/com_finder/views/filter/tmpl/edit.php index ba9140ef90280..779ca5839704b 100644 --- a/administrator/components/com_finder/views/filter/tmpl/edit.php +++ b/administrator/components/com_finder/views/filter/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/views/filter/view.html.php b/administrator/components/com_finder/views/filter/view.html.php index bbe2a9d30c4bb..2bd7166cc32c2 100644 --- a/administrator/components/com_finder/views/filter/view.html.php +++ b/administrator/components/com_finder/views/filter/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ diff --git a/administrator/components/com_finder/views/filters/tmpl/default.php b/administrator/components/com_finder/views/filters/tmpl/default.php index 74dc348ce1699..c7a62fef1b00c 100644 --- a/administrator/components/com_finder/views/filters/tmpl/default.php +++ b/administrator/components/com_finder/views/filters/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ @@ -39,24 +39,17 @@ ?>
-sidebar)) : ?> + sidebar)) : ?>
sidebar; ?>
- -
- -
-
- -
-
- - -
-
-
+ +
+ + $this)); ?> diff --git a/administrator/components/com_finder/views/filters/view.html.php b/administrator/components/com_finder/views/filters/view.html.php index 0a2114438901a..fe8802584c62f 100644 --- a/administrator/components/com_finder/views/filters/view.html.php +++ b/administrator/components/com_finder/views/filters/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ @@ -32,6 +32,8 @@ public function display($tpl = null) $this->pagination = $this->get('Pagination'); $this->total = $this->get('Total'); $this->state = $this->get('State'); + $this->filterForm = $this->get('FilterForm'); + $this->activeFilters = $this->get('ActiveFilters'); FinderHelper::addSubmenu('filters'); @@ -94,13 +96,5 @@ protected function addToolbar() JToolbarHelper::deleteList('', 'filters.delete'); JToolbarHelper::divider(); } - - JHtmlSidebar::setAction('index.php?option=com_finder&view=filters'); - - JHtmlSidebar::addFilter( - JText::_('COM_FINDER_INDEX_FILTER_BY_STATE'), - 'filter_state', - JHtml::_('select.options', JHtml::_('finder.statelist'), 'value', 'text', $this->state->get('filter.state')) - ); } } diff --git a/administrator/components/com_finder/views/index/tmpl/default.php b/administrator/components/com_finder/views/index/tmpl/default.php index 683d62a945963..a751512ef90ca 100644 --- a/administrator/components/com_finder/views/index/tmpl/default.php +++ b/administrator/components/com_finder/views/index/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ @@ -60,20 +60,7 @@
-
-
- -
-
- - -
-
- - pagination->getLimitBox(); ?> -
-
-
+ $this)); ?> pluginState['plg_content_finder']->enabled) : ?>
@@ -126,7 +113,7 @@
- - diff --git a/administrator/components/com_languages/views/multilangstatus/view.html.php b/administrator/components/com_languages/views/multilangstatus/view.html.php index 387b59e4488a8..7062e2131b144 100644 --- a/administrator/components/com_languages/views/multilangstatus/view.html.php +++ b/administrator/components/com_languages/views/multilangstatus/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -32,9 +32,9 @@ public function display($tpl = null) $this->switchers = MultilangstatusHelper::getLangswitchers(); $this->listUsersError = MultilangstatusHelper::getContacts(); $this->contentlangs = MultilangstatusHelper::getContentlangs(); - $this->site_langs = MultilangstatusHelper::getSitelangs(); + $this->site_langs = JLanguageMultilang::getSiteLangs(); $this->statuses = MultilangstatusHelper::getStatus(); - $this->homepages = MultilangstatusHelper::getHomepages(); + $this->homepages = JLanguageMultilang::getSiteHomePages(); parent::display($tpl); } diff --git a/administrator/components/com_languages/views/override/tmpl/edit.php b/administrator/components/com_languages/views/override/tmpl/edit.php index 98e214f088fd3..e247e929bdcfc 100644 --- a/administrator/components/com_languages/views/override/tmpl/edit.php +++ b/administrator/components/com_languages/views/override/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -17,9 +17,15 @@ $expired = ($this->state->get("cache_expired") == 1 ) ? '1' : ''; +JHtml::_('stylesheet', 'overrider/overrider.css', array(), true); + +JHtml::_('behavior.core'); +JHtml::_('jquery.framework'); +JHtml::_('script', 'overrider/overrider.min.js', false, true, false, true); + JFactory::getDocument()->addScriptDeclaration(' - jQuery(document).ready(function() { - document.getElementById("jform_searchstring").addEvent("focus", function() { + jQuery(document).ready(function($) { + $("#jform_searchstring").on("focus", function() { if (!Joomla.overrider.states.refreshed) { var expired = "' . $expired . '"; @@ -29,7 +35,7 @@ Joomla.overrider.states.refreshed = true; } } - this.removeClass("invalid"); + $(this).removeClass("invalid"); }); }); @@ -49,50 +55,50 @@ item->key) ? JText::_('COM_LANGUAGES_VIEW_OVERRIDE_EDIT_NEW_OVERRIDE_LEGEND') : JText::_('COM_LANGUAGES_VIEW_OVERRIDE_EDIT_EDIT_OVERRIDE_LEGEND'); ?>
- form->getLabel('key'); ?> + form->getLabel('language'); ?>
- form->getInput('key'); ?> + form->getInput('language'); ?>
- form->getLabel('override'); ?> + form->getLabel('client'); ?>
- form->getInput('override'); ?> + form->getInput('client'); ?>
- state->get('filter.client') == 'administrator') : ?>
- form->getLabel('both'); ?> + form->getLabel('key'); ?>
- form->getInput('both'); ?> + form->getInput('key'); ?>
- -
-
- form->getLabel('language'); ?> -
-
- form->getInput('language'); ?> -
+
+
+ form->getLabel('override'); ?>
+
+ form->getInput('override'); ?> +
+
+ state->get('filter.client') == 'administrator') : ?>
- form->getLabel('client'); ?> + form->getLabel('both'); ?>
- form->getInput('client'); ?> + form->getInput('both'); ?>
+
diff --git a/administrator/components/com_languages/views/override/view.html.php b/administrator/components/com_languages/views/override/view.html.php index 82c10f79b3993..623a4be2b0f36 100644 --- a/administrator/components/com_languages/views/override/view.html.php +++ b/administrator/components/com_languages/views/override/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -51,10 +51,6 @@ class LanguagesViewOverride extends JViewLegacy */ public function display($tpl = null) { - JHtml::_('stylesheet', 'overrider/overrider.css', array(), true); - JHtml::_('behavior.framework', true); - JHtml::_('script', 'overrider/overrider.js', false, true); - $this->form = $this->get('Form'); $this->item = $this->get('Item'); $this->state = $this->get('State'); diff --git a/administrator/components/com_languages/views/overrides/tmpl/default.php b/administrator/components/com_languages/views/overrides/tmpl/default.php index df0ac07aac9be..982a3ca094688 100644 --- a/administrator/components/com_languages/views/overrides/tmpl/default.php +++ b/administrator/components/com_languages/views/overrides/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_languages/views/overrides/view.html.php b/administrator/components/com_languages/views/overrides/view.html.php index 4d31c4414bc1e..a188d53364b3d 100644 --- a/administrator/components/com_languages/views/overrides/view.html.php +++ b/administrator/components/com_languages/views/overrides/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -94,7 +94,7 @@ protected function addToolbar() if ($canDo->get('core.delete') && $this->pagination->total) { - JToolbarHelper::deleteList('', 'overrides.delete'); + JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'overrides.delete', 'JTOOLBAR_DELETE'); } if (JFactory::getUser()->authorise('core.admin')) diff --git a/administrator/components/com_login/controller.php b/administrator/components/com_login/controller.php index e8caee886a077..5cb1264f83df4 100644 --- a/administrator/components/com_login/controller.php +++ b/administrator/components/com_login/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_login * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -84,7 +84,7 @@ public function login() */ public function logout() { - JSession::checkToken('request') or jexit(JText::_('JInvalid_Token')); + JSession::checkToken('request') or jexit(JText::_('JINVALID_TOKEN')); $app = JFactory::getApplication(); diff --git a/administrator/components/com_login/login.php b/administrator/components/com_login/login.php index 878961ec8c7ec..1c8e2ade310da 100644 --- a/administrator/components/com_login/login.php +++ b/administrator/components/com_login/login.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_login * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_login/login.xml b/administrator/components/com_login/login.xml index 123184ad6f076..ce0f8d6aa5504 100644 --- a/administrator/components/com_login/login.xml +++ b/administrator/components/com_login/login.xml @@ -3,7 +3,7 @@ com_login Joomla! Project April 2006 - (C) 2005 - 2015 Open Source Matters. All rights reserved. + (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/components/com_login/models/login.php b/administrator/components/com_login/models/login.php index 19caa14157924..7b7fb2c3461a5 100644 --- a/administrator/components/com_login/models/login.php +++ b/administrator/components/com_login/models/login.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_login * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_login/views/login/tmpl/default.php b/administrator/components/com_login/views/login/tmpl/default.php index 9d7ebc56fc31e..86546ccadd8ed 100644 --- a/administrator/components/com_login/views/login/tmpl/default.php +++ b/administrator/components/com_login/views/login/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_login * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_login/views/login/view.html.php b/administrator/components/com_login/views/login/view.html.php index 62e2ad6a05c3d..35a5bb3f01f0c 100644 --- a/administrator/components/com_login/views/login/view.html.php +++ b/administrator/components/com_login/views/login/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_login * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/controller.php b/administrator/components/com_media/controller.php index 218fa8b4439b4..f90061d4c9ac1 100644 --- a/administrator/components/com_media/controller.php +++ b/administrator/components/com_media/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -29,7 +29,9 @@ class MediaController extends JControllerLegacy public function display($cachable = false, $urlparams = false) { JPluginHelper::importPlugin('content'); - $vName = $this->input->get('view', 'media'); + + $vType = JFactory::getDocument()->getType(); + $vName = $this->input->get('view', 'media'); switch ($vName) { @@ -61,9 +63,6 @@ public function display($cachable = false, $urlparams = false) break; } - $document = JFactory::getDocument(); - $vType = $document->getType(); - // Get/Create the view $view = $this->getView($vName, $vType, '', array('base_path' => JPATH_COMPONENT_ADMINISTRATOR)); diff --git a/administrator/components/com_media/controllers/file.json.php b/administrator/components/com_media/controllers/file.json.php index 9a5bb546942b3..f6878dd3b2560 100644 --- a/administrator/components/com_media/controllers/file.json.php +++ b/administrator/components/com_media/controllers/file.json.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -34,8 +34,9 @@ public function upload() if (!JSession::checkToken('request')) { $response = array( - 'status' => '0', - 'error' => JText::_('JINVALID_TOKEN') + 'status' => '0', + 'message' => JText::_('JINVALID_TOKEN'), + 'error' => JText::_('JINVALID_TOKEN') ); echo json_encode($response); @@ -59,8 +60,9 @@ public function upload() || $_SERVER['CONTENT_LENGTH'] > $mediaHelper->toBytes(ini_get('memory_limit'))) { $response = array( - 'status' => '0', - 'error' => JText::_('COM_MEDIA_ERROR_WARNFILETOOLARGE') + 'status' => '0', + 'message' => JText::_('COM_MEDIA_ERROR_WARNFILETOOLARGE'), + 'error' => JText::_('COM_MEDIA_ERROR_WARNFILETOOLARGE') ); echo json_encode($response); @@ -70,39 +72,41 @@ public function upload() // Set FTP credentials, if given JClientHelper::setCredentialsFromRequest('ftp'); - // Make the filename safe - $file['name'] = JFile::makeSafe($file['name']); - - if (!isset($file['name'])) + if (isset($file['name'])) { - $response = array( - 'status' => '0', - 'error' => JText::_('COM_MEDIA_ERROR_BAD_REQUEST') - ); + // Make the filename safe + $file['name'] = JFile::makeSafe($file['name']); - echo json_encode($response); + // We need a URL safe name + $fileparts = pathinfo(COM_MEDIA_BASE . '/' . $folder . '/' . $file['name']); - return; - } + // Transform filename to punycode + $fileparts['filename'] = JStringPunycode::toPunycode($fileparts['filename']); + $tempExt = (!empty($fileparts['extension'])) ? strtolower($fileparts['extension']) : ''; - // The request is valid - $err = null; + // Transform filename to punycode, then neglect otherthan non-alphanumeric characters & underscores. Also transform extension to lowercase + $safeFileName = preg_replace(array("/[\\s]/", "/[^a-zA-Z0-9_]/"), array("_", ""), $fileparts['filename']) . '.' . $tempExt; - $filepath = JPath::clean(COM_MEDIA_BASE . '/' . $folder . '/' . strtolower($file['name'])); + // Create filepath with safe-filename + $files['final'] = $fileparts['dirname'] . DIRECTORY_SEPARATOR . $safeFileName; + $file['name'] = $safeFileName; - if (!MediaHelper::canUpload($file, $err)) - { - JLog::add('Invalid: ' . $filepath . ': ' . $err, JLog::INFO, 'upload'); + $filepath = JPath::clean($files['final']); - $response = array( - 'status' => '0', - 'error' => JText::_($err) - ); + if (!$mediaHelper->canUpload($file, 'com_media')) + { + JLog::add('Invalid: ' . $filepath, JLog::INFO, 'upload'); - echo json_encode($response); + $response = array( + 'status' => '0', + 'message' => JText::_('COM_MEDIA_ERROR_UNABLE_TO_UPLOAD_FILE'), + 'error' => JText::_('COM_MEDIA_ERROR_UNABLE_TO_UPLOAD_FILE') + ); - return; - } + echo json_encode($response); + + return; + } // Trigger the onContentBeforeSave event. JPluginHelper::importPlugin('content'); @@ -111,77 +115,100 @@ public function upload() $object_file->filepath = $filepath; $result = $dispatcher->trigger('onContentBeforeSave', array('com_media.file', &$object_file, true)); - if (in_array(false, $result, true)) - { - // There are some errors in the plugins - JLog::add('Errors before save: ' . $object_file->filepath . ' : ' . implode(', ', $object_file->getErrors()), JLog::INFO, 'upload'); - - $response = array( - 'status' => '0', - 'error' => JText::plural('COM_MEDIA_ERROR_BEFORE_SAVE', count($errors = $object_file->getErrors()), implode('
', $errors)) - ); - - echo json_encode($response); - - return; + if (in_array(false, $result, true)) + { + // There are some errors in the plugins + JLog::add('Errors before save: ' . $object_file->filepath . ' : ' . implode(', ', $object_file->getErrors()), JLog::INFO, 'upload'); + + $response = array( + 'status' => '0', + 'message' => JText::plural('COM_MEDIA_ERROR_BEFORE_SAVE', count($errors = $object_file->getErrors()), implode('
', $errors)), + 'error' => JText::plural('COM_MEDIA_ERROR_BEFORE_SAVE', count($errors = $object_file->getErrors()), implode('
', $errors)) + ); + + echo json_encode($response); + + return; + } + + if (JFile::exists($object_file->filepath)) + { + // File exists + JLog::add('File exists: ' . $object_file->filepath . ' by user_id ' . $user->id, JLog::INFO, 'upload'); + + $response = array( + 'status' => '0', + 'message' => JText::_('COM_MEDIA_ERROR_FILE_EXISTS'), + 'error' => JText::_('COM_MEDIA_ERROR_FILE_EXISTS'), + 'location' => str_replace(JPATH_ROOT, '', $filepath) + ); + + echo json_encode($response); + + return; + } + elseif (!$user->authorise('core.create', 'com_media')) + { + // File does not exist and user is not authorised to create + JLog::add('Create not permitted: ' . $object_file->filepath . ' by user_id ' . $user->id, JLog::INFO, 'upload'); + + $response = array( + 'status' => '0', + 'error' => JText::_('COM_MEDIA_ERROR_CREATE_NOT_PERMITTED'), + 'message' => JText::_('COM_MEDIA_ERROR_CREATE_NOT_PERMITTED') + ); + + echo json_encode($response); + + return; + } + + if (!JFile::upload($object_file->tmp_name, $object_file->filepath)) + { + // Error in upload + JLog::add('Error on upload: ' . $object_file->filepath, JLog::INFO, 'upload'); + + $response = array( + 'status' => '0', + 'message' => JText::_('COM_MEDIA_ERROR_UNABLE_TO_UPLOAD_FILE'), + 'error' => JText::_('COM_MEDIA_ERROR_UNABLE_TO_UPLOAD_FILE') + ); + + echo json_encode($response); + + return; + } + else + { + // Trigger the onContentAfterSave event. + $dispatcher->trigger('onContentAfterSave', array('com_media.file', &$object_file, true)); + JLog::add($folder, JLog::INFO, 'upload'); + + $returnUrl = str_replace(JPATH_ROOT, '', $object_file->filepath); + + $response = array( + 'status' => '1', + 'message' => JText::sprintf('COM_MEDIA_UPLOAD_COMPLETE', $returnUrl), + 'error' => JText::sprintf('COM_MEDIA_UPLOAD_COMPLETE', $returnUrl), + 'location' => str_replace('\\', '/', $returnUrl) + ); + + echo json_encode($response); + + return; + } } - - if (JFile::exists($object_file->filepath)) + else { - // File exists - JLog::add('File exists: ' . $object_file->filepath . ' by user_id ' . $user->id, JLog::INFO, 'upload'); - $response = array( - 'status' => '0', - 'error' => JText::_('COM_MEDIA_ERROR_FILE_EXISTS') + 'status' => '0', + 'error' => JText::_('COM_MEDIA_ERROR_BAD_REQUEST'), + 'message' => JText::_('COM_MEDIA_ERROR_BAD_REQUEST') ); echo json_encode($response); return; } - - if (!$user->authorise('core.create', 'com_media')) - { - // File does not exist and user is not authorised to create - JLog::add('Create not permitted: ' . $object_file->filepath . ' by user_id ' . $user->id, JLog::INFO, 'upload'); - - $response = array( - 'status' => '0', - 'error' => JText::_('COM_MEDIA_ERROR_CREATE_NOT_PERMITTED') - ); - - echo json_encode($response); - - return; - } - - if (!JFile::upload($object_file->tmp_name, $object_file->filepath)) - { - // Error in upload - JLog::add('Error on upload: ' . $object_file->filepath, JLog::INFO, 'upload'); - - $response = array( - 'status' => '0', - 'error' => JText::_('COM_MEDIA_ERROR_UNABLE_TO_UPLOAD_FILE') - ); - - echo json_encode($response); - - return; - } - - // Trigger the onContentAfterSave event. - $dispatcher->trigger('onContentAfterSave', array('com_media.file', &$object_file, true)); - JLog::add($folder, JLog::INFO, 'upload'); - - $response = array( - 'status' => '1', - 'error' => JText::sprintf('COM_MEDIA_UPLOAD_COMPLETE', substr($object_file->filepath, strlen(COM_MEDIA_BASE))) - ); - - echo json_encode($response); - - return; } } diff --git a/administrator/components/com_media/controllers/file.php b/administrator/components/com_media/controllers/file.php index 9ff4cc49b23bc..2610996826a98 100644 --- a/administrator/components/com_media/controllers/file.php +++ b/administrator/components/com_media/controllers/file.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -94,6 +94,7 @@ public function upload() foreach ($files as &$file) { $file['name'] = JFile::makeSafe($file['name']); + $file['name'] = str_replace(' ', '-', $file['name']); $file['filepath'] = JPath::clean(implode(DIRECTORY_SEPARATOR, array(COM_MEDIA_BASE, $this->folder, $file['name']))); if (($file['error'] == 1) diff --git a/administrator/components/com_media/controllers/folder.php b/administrator/components/com_media/controllers/folder.php index 8ff0baa1441e0..4841d82d2f52f 100644 --- a/administrator/components/com_media/controllers/folder.php +++ b/administrator/components/com_media/controllers/folder.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/helpers/media.php b/administrator/components/com_media/helpers/media.php index e3097f15fbb58..97b8c2641c10d 100644 --- a/administrator/components/com_media/helpers/media.php +++ b/administrator/components/com_media/helpers/media.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/layouts/toolbar/deletemedia.php b/administrator/components/com_media/layouts/toolbar/deletemedia.php index bc8d6369096ee..cce8257c7d23d 100644 --- a/administrator/components/com_media/layouts/toolbar/deletemedia.php +++ b/administrator/components/com_media/layouts/toolbar/deletemedia.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/layouts/toolbar/newfolder.php b/administrator/components/com_media/layouts/toolbar/newfolder.php index 30077a2b111d1..4fb9601744790 100644 --- a/administrator/components/com_media/layouts/toolbar/newfolder.php +++ b/administrator/components/com_media/layouts/toolbar/newfolder.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/layouts/toolbar/uploadmedia.php b/administrator/components/com_media/layouts/toolbar/uploadmedia.php index fabd39b812e86..12c851d03e3d3 100644 --- a/administrator/components/com_media/layouts/toolbar/uploadmedia.php +++ b/administrator/components/com_media/layouts/toolbar/uploadmedia.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/media.php b/administrator/components/com_media/media.php index e866ef0365189..10177130b20a8 100644 --- a/administrator/components/com_media/media.php +++ b/administrator/components/com_media/media.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/media.xml b/administrator/components/com_media/media.xml index c5423007cc692..a9d3b946f002a 100644 --- a/administrator/components/com_media/media.xml +++ b/administrator/components/com_media/media.xml @@ -3,7 +3,7 @@ com_media Joomla! Project April 2006 - (C) 2005 - 2015 Open Source Matters. All rights reserved. + (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/components/com_media/models/forms/index.html b/administrator/components/com_media/models/forms/index.html deleted file mode 100644 index 2efb97f319a35..0000000000000 --- a/administrator/components/com_media/models/forms/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/administrator/components/com_media/models/list.php b/administrator/components/com_media/models/list.php index 05fda8d5b819c..37070116fbf35 100644 --- a/administrator/components/com_media/models/list.php +++ b/administrator/components/com_media/models/list.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -116,6 +116,7 @@ public function getList() $images = array (); $folders = array (); $docs = array (); + $videos = array (); $fileList = false; $folderList = false; @@ -187,6 +188,13 @@ public function getList() $images[] = $tmp; break; + // Video + case 'mp4': + $tmp->icon_32 = "media/mime-icon-32/" . $ext . ".png"; + $tmp->icon_16 = "media/mime-icon-16/" . $ext . ".png"; + $videos[] = $tmp; + break; + // Non-image document default: $tmp->icon_32 = "media/mime-icon-32/" . $ext . ".png"; @@ -215,8 +223,22 @@ public function getList() } } - $list = array('folders' => $folders, 'docs' => $docs, 'images' => $images); + $list = array('folders' => $folders, 'docs' => $docs, 'images' => $images, 'videos' => $videos); return $list; } + + /** + * Get the videos on the current folder + * + * @return array + * + * @since 3.5 + */ + public function getVideos() + { + $list = $this->getList(); + + return $list['videos']; + } } diff --git a/administrator/components/com_media/models/manager.php b/administrator/components/com_media/models/manager.php index 07fee670fc2ad..25d51b050a025 100644 --- a/administrator/components/com_media/models/manager.php +++ b/administrator/components/com_media/models/manager.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/images/tmpl/default.php b/administrator/components/com_media/views/images/tmpl/default.php index ba58d5ed64c98..86c6efdc855ce 100644 --- a/administrator/components/com_media/views/images/tmpl/default.php +++ b/administrator/components/com_media/views/images/tmpl/default.php @@ -3,25 +3,25 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; -JHtml::_('formbehavior.chosen', 'select'); - -// Load tooltip instance without HTML support because we have a HTML tag in the tip -JHtml::_('bootstrap.tooltip', '.noHtmlTip', array('html' => false)); - $user = JFactory::getUser(); $input = JFactory::getApplication()->input; $params = JComponentHelper::getParams('com_media'); $lang = JFactory::getLanguage(); +JHtml::_('formbehavior.chosen', 'select'); + +// Load tooltip instance without HTML support because we have a HTML tag in the tip +JHtml::_('bootstrap.tooltip', '.noHtmlTip', array('html' => false)); + // Include jQuery JHtml::_('jquery.framework'); -JHtml::_('script', 'media/popup-imagemanager.js', false, true); +JHtml::_('script', 'media/popup-imagemanager.min.js', false, true, false, false, true); JHtml::_('stylesheet', 'media/popup-imagemanager.css', array(), true); if ($lang->isRtl()) @@ -31,7 +31,7 @@ JFactory::getDocument()->addScriptDeclaration( " - var image_base_path = '" . $params->get('image_path', 'images') . "/'; + var image_base_path = '" . $params->get('image_path', 'images') . "/'; " ); ?> @@ -41,7 +41,7 @@
-
+
@@ -51,8 +51,9 @@
- - + +
@@ -70,63 +71,63 @@
state->get('field.id')):?> -
-
- -
-
- +
+
+ +
+
+ +
-
state->get('field.id')):?> -
-
-
- -
-
- -
-
-
-
- -
-
- -
-
-
-
-
-
- +
+
+
+ +
+
+ +
-
- +
+
+ +
+
+ +
-
-
- +
+
+
+ +
+
+ +
-
- - - +
+
+ +
+
+ + + +
-
@@ -135,9 +136,8 @@
- authorise('core.create', 'com_media')) : ?> -
+
@@ -153,4 +153,4 @@ set('com_media.return_url', 'index.php?option=com_media&view=images&tmpl=component&fieldid=' . $input->getCmd('fieldid', '') . '&e_name=' . $input->getCmd('e_name') . '&asset=' . $input->getCmd('asset') . '&author=' . $input->getCmd('author')); ?>
- diff --git a/administrator/components/com_media/views/images/view.html.php b/administrator/components/com_media/views/images/view.html.php index 1645c49cc942d..248bd9b5d6865 100644 --- a/administrator/components/com_media/views/images/view.html.php +++ b/administrator/components/com_media/views/images/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/imageslist/tmpl/default.php b/administrator/components/com_media/views/imageslist/tmpl/default.php index 9975e40b8ebce..8bbe21a3c4c11 100644 --- a/administrator/components/com_media/views/imageslist/tmpl/default.php +++ b/administrator/components/com_media/views/imageslist/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -19,6 +19,16 @@ } JFactory::getDocument()->addScriptDeclaration("var ImageManager = window.parent.ImageManager;"); +JFactory::getDocument()->addStyleDeclaration( + " + @media (max-width: 767px) { + li.imgOutline.thumbnail.height-80.width-80.center { + float: left; + margin-left: 15px; + } + } + " +); ?> images) > 0 || count($this->folders) > 0) : ?>
    diff --git a/administrator/components/com_media/views/imageslist/tmpl/default_folder.php b/administrator/components/com_media/views/imageslist/tmpl/default_folder.php index 435283b8270cc..9a8886ee3de9b 100644 --- a/administrator/components/com_media/views/imageslist/tmpl/default_folder.php +++ b/administrator/components/com_media/views/imageslist/tmpl/default_folder.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/imageslist/tmpl/default_image.php b/administrator/components/com_media/views/imageslist/tmpl/default_image.php index ca9cffa417533..c181768d1dd98 100644 --- a/administrator/components/com_media/views/imageslist/tmpl/default_image.php +++ b/administrator/components/com_media/views/imageslist/tmpl/default_image.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/imageslist/view.html.php b/administrator/components/com_media/views/imageslist/view.html.php index 3be7db86c62a4..5ced441d84818 100644 --- a/administrator/components/com_media/views/imageslist/view.html.php +++ b/administrator/components/com_media/views/imageslist/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/media/tmpl/default.php b/administrator/components/com_media/views/media/tmpl/default.php index e0a7e45c70fea..2a1cfd745dfda 100644 --- a/administrator/components/com_media/views/media/tmpl/default.php +++ b/administrator/components/com_media/views/media/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -33,6 +33,8 @@ JHtml::_('behavior.keepalive'); JHtml::_('bootstrap.framework'); JHtml::_('script', 'media/mediamanager.min.js', false, true); +JHtml::_('script', 'media/mediaelement-and-player.js', false, true); +JHtml::_('stylesheet', 'media/mediaelementplayer.css', array(), true); JHtml::_('stylesheet', 'system/mootree.css', array(), true); if ($lang->isRtl()) @@ -115,18 +117,29 @@
- JText::_('COM_MEDIA_PREVIEW'), - 'footer' => '' ), '
preview
' ); + +echo JHtml::_( + 'bootstrap.renderModal', + 'videoPreview', + array( + 'title' => JText::_('COM_MEDIA_PREVIEW'), + 'footer' => '' + ), + '
' +); ?>
diff --git a/administrator/components/com_media/views/media/tmpl/default_folders.php b/administrator/components/com_media/views/media/tmpl/default_folders.php index b404ee07ab9a5..ddc070f0283d3 100644 --- a/administrator/components/com_media/views/media/tmpl/default_folders.php +++ b/administrator/components/com_media/views/media/tmpl/default_folders.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/media/tmpl/default_navigation.php b/administrator/components/com_media/views/media/tmpl/default_navigation.php index 40e1c4f25dd65..75e75a0620025 100644 --- a/administrator/components/com_media/views/media/tmpl/default_navigation.php +++ b/administrator/components/com_media/views/media/tmpl/default_navigation.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/media/view.html.php b/administrator/components/com_media/views/media/view.html.php index af15a1744235a..e39372fcf966d 100644 --- a/administrator/components/com_media/views/media/view.html.php +++ b/administrator/components/com_media/views/media/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/medialist/tmpl/default.php b/administrator/components/com_media/views/medialist/tmpl/default.php index bd51f931f7856..d99218d8c8909 100644 --- a/administrator/components/com_media/views/medialist/tmpl/default.php +++ b/administrator/components/com_media/views/medialist/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/medialist/tmpl/details.php b/administrator/components/com_media/views/medialist/tmpl/details.php index 79762bcd78dd6..c17b907deaa58 100644 --- a/administrator/components/com_media/views/medialist/tmpl/details.php +++ b/administrator/components/com_media/views/medialist/tmpl/details.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -12,19 +12,40 @@ $params = JComponentHelper::getParams('com_media'); $path = 'file_path'; +JHtml::_('jquery.framework'); + JFactory::getDocument()->addScriptDeclaration( " jQuery(document).ready(function($){ window.parent.document.updateUploader(); $('.img-preview, .preview').each(function(index, value) { $(this).on('click', function(e) { - window.parent.jQuery('#imagePreviewSrc').attr('src', $(this).attr('href')); - window.parent.jQuery('#imagePreview').modal('show'); + window.parent.jQuery('#imagePreviewSrc').attr('src', $(this).attr('href')); + window.parent.jQuery('#imagePreview').modal('show'); + return false; + }); + }); + $('.video-preview').each(function(index, value) { + $(this).unbind('click'); + $(this).on('click', function(e) { + e.preventDefault(); + window.parent.jQuery('#videoPreview').modal('show'); + + var elementInitialised = window.parent.jQuery('#mejsPlayer').attr('src'); + + if (!elementInitialised) + { + window.parent.jQuery('#mejsPlayer').attr('src', $(this).attr('href')); + window.parent.jQuery('#mejsPlayer').mediaelementplayer(); + } + + window.parent.jQuery('#mejsPlayer')[0].player.media.setSrc($(this).attr('href')); + return false; }); }); }); - " + " ); ?>
@@ -65,6 +86,11 @@ echo $this->loadTemplate('doc'); endfor; ?> + videos); $i < $n; $i++) : + $this->setVideo($i); + echo $this->loadTemplate('video'); + endfor; ?> + images); $i < $n; $i++) : $this->setImage($i); echo $this->loadTemplate('img'); diff --git a/administrator/components/com_media/views/medialist/tmpl/details_doc.php b/administrator/components/com_media/views/medialist/tmpl/details_doc.php index 3753ae4f5da65..f75420636886b 100644 --- a/administrator/components/com_media/views/medialist/tmpl/details_doc.php +++ b/administrator/components/com_media/views/medialist/tmpl/details_doc.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_media/views/medialist/tmpl/details_folder.php b/administrator/components/com_media/views/medialist/tmpl/details_folder.php index a76016dd70c0d..8f2467c9699fe 100644 --- a/administrator/components/com_media/views/medialist/tmpl/details_folder.php +++ b/administrator/components/com_media/views/medialist/tmpl/details_folder.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_media/views/medialist/tmpl/details_img.php b/administrator/components/com_media/views/medialist/tmpl/details_img.php index 03e180f7ad64a..fab73ddd9d32f 100644 --- a/administrator/components/com_media/views/medialist/tmpl/details_img.php +++ b/administrator/components/com_media/views/medialist/tmpl/details_img.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/medialist/tmpl/details_up.php b/administrator/components/com_media/views/medialist/tmpl/details_up.php index eaa869b6311dd..24c52fdbdf381 100644 --- a/administrator/components/com_media/views/medialist/tmpl/details_up.php +++ b/administrator/components/com_media/views/medialist/tmpl/details_up.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/medialist/tmpl/details_video.php b/administrator/components/com_media/views/medialist/tmpl/details_video.php new file mode 100644 index 0000000000000..7cc7e71f1177e --- /dev/null +++ b/administrator/components/com_media/views/medialist/tmpl/details_video.php @@ -0,0 +1,54 @@ +trigger('onContentBeforeDisplay', array('com_media.file', &$this->_tmp_video, &$params)); + +JFactory::getDocument()->addScriptDeclaration(" +jQuery(document).ready(function($){ + window.parent.jQuery('#videoPreview').on('hidden', function () { + window.parent.jQuery('#mejsPlayer')[0].player.pause(); + }); +}); +"); +?> + +
+ + + + + authorise('core.delete', 'com_media')):?> + + + + +trigger('onContentAfterDisplay', array('com_media.file', &$this->_tmp_video, &$params)); diff --git a/administrator/components/com_media/views/medialist/tmpl/thumbs.php b/administrator/components/com_media/views/medialist/tmpl/thumbs.php index 9e31f45ad56bc..7a2de699ad51d 100644 --- a/administrator/components/com_media/views/medialist/tmpl/thumbs.php +++ b/administrator/components/com_media/views/medialist/tmpl/thumbs.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -11,6 +11,8 @@ $params = JComponentHelper::getParams('com_media'); $path = 'file_path'; +JHtml::_('jquery.framework'); + JFactory::getDocument()->addScriptDeclaration( " jQuery(document).ready(function($){ @@ -22,8 +24,27 @@ return false; }); }); + $('.video-preview').each(function(index, value) { + $(this).unbind('click'); + $(this).on('click', function(e) { + e.preventDefault(); + window.parent.jQuery('#videoPreview').modal('show'); + + var elementInitialised = window.parent.jQuery('#mejsPlayer').attr('src'); + + if (!elementInitialised) + { + window.parent.jQuery('#mejsPlayer').attr('src', $(this).attr('href')); + window.parent.jQuery('#mejsPlayer').mediaelementplayer(); + } + + window.parent.jQuery('#mejsPlayer')[0].player.media.setSrc($(this).attr('href')); + + return false; + }); + }); }); - " + " ); ?> @@ -53,6 +74,11 @@ echo $this->loadTemplate('doc'); endfor; ?> + videos); $i < $n; $i++) : + $this->setVideo($i); + echo $this->loadTemplate('video'); + endfor; ?> + images); $i < $n; $i++) : $this->setImage($i); echo $this->loadTemplate('img'); diff --git a/administrator/components/com_media/views/medialist/tmpl/thumbs_doc.php b/administrator/components/com_media/views/medialist/tmpl/thumbs_doc.php index 73926e4d524e7..146f250cbcc56 100644 --- a/administrator/components/com_media/views/medialist/tmpl/thumbs_doc.php +++ b/administrator/components/com_media/views/medialist/tmpl/thumbs_doc.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/medialist/tmpl/thumbs_folder.php b/administrator/components/com_media/views/medialist/tmpl/thumbs_folder.php index 213bc353e4bec..113073dd5430c 100644 --- a/administrator/components/com_media/views/medialist/tmpl/thumbs_folder.php +++ b/administrator/components/com_media/views/medialist/tmpl/thumbs_folder.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/medialist/tmpl/thumbs_img.php b/administrator/components/com_media/views/medialist/tmpl/thumbs_img.php index c786cec823033..7206239e652e4 100644 --- a/administrator/components/com_media/views/medialist/tmpl/thumbs_img.php +++ b/administrator/components/com_media/views/medialist/tmpl/thumbs_img.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/medialist/tmpl/thumbs_up.php b/administrator/components/com_media/views/medialist/tmpl/thumbs_up.php index 00b213e31d303..d4a21bad3b61c 100644 --- a/administrator/components/com_media/views/medialist/tmpl/thumbs_up.php +++ b/administrator/components/com_media/views/medialist/tmpl/thumbs_up.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_media/views/medialist/tmpl/thumbs_video.php b/administrator/components/com_media/views/medialist/tmpl/thumbs_video.php new file mode 100644 index 0000000000000..e479e50687e8a --- /dev/null +++ b/administrator/components/com_media/views/medialist/tmpl/thumbs_video.php @@ -0,0 +1,45 @@ +trigger('onContentBeforeDisplay', array('com_media.file', &$this->_tmp_video, &$params)); + +JFactory::getDocument()->addScriptDeclaration(" +jQuery(document).ready(function($){ + window.parent.jQuery('#videoPreview').on('hidden', function () { + window.parent.jQuery('#mejsPlayer')[0].player.pause(); + }); +}); +"); +?> + +
  • + authorise('core.delete', 'com_media')):?> + × + +
    + +
    + _tmp_video->icon_32, $this->_tmp_video->title, null, true); ?> +
    +
    + + _tmp_video->name, 10, false); ?> + +
    +
    • +trigger('onContentAfterDisplay', array('com_media.file', &$this->_tmp_video, &$params)); diff --git a/administrator/components/com_media/views/medialist/view.html.php b/administrator/components/com_media/views/medialist/view.html.php index 6a92dd1777416..80c1c1a9c88f6 100644 --- a/administrator/components/com_media/views/medialist/view.html.php +++ b/administrator/components/com_media/views/medialist/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -40,12 +40,13 @@ public function display($tpl = null) $images = $this->get('images'); $documents = $this->get('documents'); $folders = $this->get('folders'); + $videos = $this->get('videos'); $state = $this->get('state'); // Check for invalid folder name if (empty($state->folder)) { - $dirname = JRequest::getVar('folder', '', '', 'string'); + $dirname = JFactory::getApplication()->input->getPath('folder', ''); if (!empty($dirname)) { @@ -59,6 +60,7 @@ public function display($tpl = null) $this->documents = &$documents; $this->folders = &$folders; $this->state = &$state; + $this->videos = &$videos; parent::display($tpl); } @@ -125,4 +127,25 @@ public function setDoc($index = 0) $this->_tmp_doc = new JObject; } } + + /** + * Set the active video + * + * @param integer $index Doc position + * + * @return void + * + * @since 3.5 + */ + public function setVideo($index = 0) + { + if (isset($this->videos[$index])) + { + $this->_tmp_video = &$this->videos[$index]; + } + else + { + $this->_tmp_video = new JObject; + } + } } diff --git a/administrator/components/com_menus/controller.php b/administrator/components/com_menus/controller.php index 9fc4bff6e03ec..18aa9a4a9a8be 100644 --- a/administrator/components/com_menus/controller.php +++ b/administrator/components/com_menus/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/controllers/item.php b/administrator/components/com_menus/controllers/item.php index 02781fb537c55..361616f334fe2 100644 --- a/administrator/components/com_menus/controllers/item.php +++ b/administrator/components/com_menus/controllers/item.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/controllers/items.php b/administrator/components/com_menus/controllers/items.php index b06925c002359..a9bcdb99f176f 100644 --- a/administrator/components/com_menus/controllers/items.php +++ b/administrator/components/com_menus/controllers/items.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/controllers/menu.php b/administrator/components/com_menus/controllers/menu.php index 52179e5d60ba1..068fd78652c19 100644 --- a/administrator/components/com_menus/controllers/menu.php +++ b/administrator/components/com_menus/controllers/menu.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/controllers/menus.php b/administrator/components/com_menus/controllers/menus.php index e75bce5d15d2d..79a76bb56cc5a 100644 --- a/administrator/components/com_menus/controllers/menus.php +++ b/administrator/components/com_menus/controllers/menus.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/helpers/html/menus.php b/administrator/components/com_menus/helpers/html/menus.php index 0418e35542bdf..e2e3e8e711e24 100644 --- a/administrator/components/com_menus/helpers/html/menus.php +++ b/administrator/components/com_menus/helpers/html/menus.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/helpers/menus.php b/administrator/components/com_menus/helpers/menus.php index d193defcaeb3f..c1e1e73a64d26 100644 --- a/administrator/components/com_menus/helpers/menus.php +++ b/administrator/components/com_menus/helpers/menus.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -148,13 +148,23 @@ public static function getMenuLinks($menuType = null, $parentId = 0, $mode = 0, { $db = JFactory::getDbo(); $query = $db->getQuery(true) - ->select('a.id AS value, a.title AS text, a.alias, a.level, a.menutype, a.type, a.published, a.template_style_id, a.checked_out, a.language') + ->select('a.id AS value, + a.title AS text, + a.alias, + a.level, + a.menutype, + a.type, + a.published, + a.template_style_id, + a.checked_out, + a.language, + a.lft') ->from('#__menu AS a') ->join('LEFT', $db->quoteName('#__menu') . ' AS b ON a.lft > b.lft AND a.rgt < b.rgt'); if (JLanguageMultilang::isEnabled()) { - $query->select('l.title AS language_title, l.image as language_image') + $query->select('l.title AS language_title, l.image AS language_image') ->join('LEFT', $db->quoteName('#__languages') . ' AS l ON l.lang_code = a.language'); } @@ -194,9 +204,42 @@ public static function getMenuLinks($menuType = null, $parentId = 0, $mode = 0, $query->where('a.published IN ' . $published); } - $query->where('a.published != -2') - ->group('a.id, a.title, a.alias, a.level, a.menutype, a.type, a.template_style_id, a.checked_out, a.lft') - ->order('a.lft ASC'); + $query->where('a.published != -2'); + + if (JLanguageMultilang::isEnabled()) + { + $query->group( + 'a.id , + a.title , + a.alias, + a.level, + a.menutype, + a.type, + a.published, + a.template_style_id, + a.checked_out, + a.language, + a.lft, + l.title , + l.image'); + } + else + { + $query->group( + 'a.id , + a.title , + a.alias, + a.level, + a.menutype, + a.type, + a.published, + a.template_style_id, + a.checked_out, + a.language, + a.lft'); + } + + $query->order('a.lft ASC'); // Get the options. $db->setQuery($query); @@ -273,33 +316,11 @@ public static function getMenuLinks($menuType = null, $parentId = 0, $mode = 0, */ public static function getAssociations($pk) { + $langAssociations = JLanguageAssociations::getAssociations('com_menus', '#__menu', 'com_menus.item', $pk, 'id', '', ''); $associations = array(); - $db = JFactory::getDbo(); - $query = $db->getQuery(true) - ->from('#__menu as m') - ->join('INNER', '#__associations as a ON a.id=m.id AND a.context=' . $db->quote('com_menus.item')) - ->join('INNER', '#__associations as a2 ON a.key=a2.key') - ->join('INNER', '#__menu as m2 ON a2.id=m2.id') - ->where('m.id=' . (int) $pk) - ->select('m2.language, m2.id'); - $db->setQuery($query); - - try - { - $menuitems = $db->loadObjectList('language'); - } - catch (RuntimeException $e) + foreach ($langAssociations as $langAssociation) { - throw new Exception($e->getMessage(), 500); - } - - foreach ($menuitems as $tag => $item) - { - // Do not return itself as result - if ((int) $item->id != $pk) - { - $associations[$tag] = $item->id; - } + $associations[$langAssociation->language] = $langAssociation->id; } return $associations; diff --git a/administrator/components/com_menus/layouts/joomla/searchtools/default.php b/administrator/components/com_menus/layouts/joomla/searchtools/default.php index 77b5981715f7b..3afdc077ffd1c 100644 --- a/administrator/components/com_menus/layouts/joomla/searchtools/default.php +++ b/administrator/components/com_menus/layouts/joomla/searchtools/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -14,26 +14,30 @@ // Receive overridable options $data['options'] = !empty($data['options']) ? $data['options'] : array(); -$doc = JFactory::getDocument(); +if ($data['view'] instanceof MenusViewItems) +{ + $doc = JFactory::getDocument(); -$doc->addStyleDeclaration(" - /* Fixed filter field in search bar */ - .js-stools .js-stools-menutype { - float: left; - margin-right: 10px; - } - html[dir=rtl] .js-stools .js-stools-menutype { - float: right; - margin-left: 10px - margin-right: 0; - } - .js-stools .js-stools-container-bar .js-stools-field-filter .chzn-container { - padding: 3px 0; - } -"); + $doc->addStyleDeclaration(" + /* Fixed filter field in search bar */ + .js-stools .js-stools-menutype { + float: left; + margin-right: 10px; + min-width: 220px; + } + html[dir=rtl] .js-stools .js-stools-menutype { + float: right; + margin-left: 10px + margin-right: 0; + } + .js-stools .js-stools-container-bar .js-stools-field-filter .chzn-container { + padding: 3px 0; + } + "); -// Menutype filter doesn't have to activate the filter bar -unset($data['view']->activeFilters['menutype']); + // Menutype filter doesn't have to activate the filter bar + unset($data['view']->activeFilters['menutype']); +} // Display the main joomla layout echo JLayoutHelper::render('joomla.searchtools.default', $data, null, array('component' => 'none')); diff --git a/administrator/components/com_menus/layouts/joomla/searchtools/default/bar.php b/administrator/components/com_menus/layouts/joomla/searchtools/default/bar.php index 9ff137923d142..adb2e34ce74ff 100644 --- a/administrator/components/com_menus/layouts/joomla/searchtools/default/bar.php +++ b/administrator/components/com_menus/layouts/joomla/searchtools/default/bar.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -11,12 +11,16 @@ $data = $displayData; -// We will get the menutype filter & remove it from the form filters -$menuTypeField = $data['view']->filterForm->getField('menutype'); +if ($data['view'] instanceof MenusViewItems) +{ + // We will get the menutype filter & remove it from the form filters + $menuTypeField = $data['view']->filterForm->getField('menutype'); ?> -
    - input; ?> -
    +
    + input; ?> +
    'none')); diff --git a/administrator/components/com_menus/menus.php b/administrator/components/com_menus/menus.php index cabb61b425482..d65440794e602 100644 --- a/administrator/components/com_menus/menus.php +++ b/administrator/components/com_menus/menus.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/menus.xml b/administrator/components/com_menus/menus.xml index e086b21ce85fd..96a45f87a837b 100644 --- a/administrator/components/com_menus/menus.xml +++ b/administrator/components/com_menus/menus.xml @@ -3,7 +3,7 @@ com_menusJoomla! ProjectApril 2006 - (C) 2005 - 2015 Open Source Matters. All rights reserved. + (C) 2005 - 2016 Open Source Matters. All rights reserved.GNU General Public License version 2 or later; see LICENSE.txtadmin@joomla.orgwww.joomla.org diff --git a/administrator/components/com_menus/models/fields/menuordering.php b/administrator/components/com_menus/models/fields/menuordering.php index a4ccc8e07bc95..d78d8e19252e5 100644 --- a/administrator/components/com_menus/models/fields/menuordering.php +++ b/administrator/components/com_menus/models/fields/menuordering.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/models/fields/menuparent.php b/administrator/components/com_menus/models/fields/menuparent.php index f80df134d9c4d..6f247e912c7ae 100644 --- a/administrator/components/com_menus/models/fields/menuparent.php +++ b/administrator/components/com_menus/models/fields/menuparent.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/models/fields/menutype.php b/administrator/components/com_menus/models/fields/menutype.php index bc584dd2a5b90..94a412f0f6f2f 100644 --- a/administrator/components/com_menus/models/fields/menutype.php +++ b/administrator/components/com_menus/models/fields/menutype.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -94,7 +94,7 @@ function jSelectPosition_' . $this->id . '(name) { 'title' => JText::_('COM_MENUS_ITEM_FIELD_TYPE_LABEL'), 'width' => '800px', 'height' => '300px', - 'footer' => '' ) ); diff --git a/administrator/components/com_menus/models/forms/filter_items.xml b/administrator/components/com_menus/models/forms/filter_items.xml index 8f4ec675b1fdd..0b7f2f2c5ddf2 100644 --- a/administrator/components/com_menus/models/forms/filter_items.xml +++ b/administrator/components/com_menus/models/forms/filter_items.xml @@ -19,9 +19,9 @@ @@ -45,27 +45,27 @@ - - - + + + @@ -81,7 +81,7 @@ - + @@ -90,10 +90,10 @@ diff --git a/administrator/components/com_menus/models/forms/filter_menus.xml b/administrator/components/com_menus/models/forms/filter_menus.xml new file mode 100644 index 0000000000000..1817dc31ae090 --- /dev/null +++ b/administrator/components/com_menus/models/forms/filter_menus.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + diff --git a/administrator/components/com_menus/models/forms/item_alias.xml b/administrator/components/com_menus/models/forms/item_alias.xml index 5f6f040726090..cc5586dbcf540 100644 --- a/administrator/components/com_menus/models/forms/item_alias.xml +++ b/administrator/components/com_menus/models/forms/item_alias.xml @@ -36,7 +36,18 @@ - + + + + diff --git a/administrator/components/com_menus/models/forms/item_component.xml b/administrator/components/com_menus/models/forms/item_component.xml index b7018fd97998f..101b3e87704ba 100644 --- a/administrator/components/com_menus/models/forms/item_component.xml +++ b/administrator/components/com_menus/models/forms/item_component.xml @@ -27,7 +27,18 @@ - + + + +
    - + + + + +
    diff --git a/administrator/components/com_menus/models/forms/item_separator.xml b/administrator/components/com_menus/models/forms/item_separator.xml index 9f03f77077a29..67bfe0e48ed27 100644 --- a/administrator/components/com_menus/models/forms/item_separator.xml +++ b/administrator/components/com_menus/models/forms/item_separator.xml @@ -22,7 +22,18 @@ - + + + + diff --git a/administrator/components/com_menus/models/forms/item_url.xml b/administrator/components/com_menus/models/forms/item_url.xml index 868e99fa60b5d..b6307cc4027e0 100644 --- a/administrator/components/com_menus/models/forms/item_url.xml +++ b/administrator/components/com_menus/models/forms/item_url.xml @@ -12,6 +12,26 @@ type="text" label="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL" description="COM_MENUS_ITEM_FIELD_ANCHOR_CSS_DESC" /> + + + + @@ -25,7 +45,18 @@ - + + + + diff --git a/administrator/components/com_menus/models/item.php b/administrator/components/com_menus/models/item.php index 77add57c6c7fd..ba0524dc5ce17 100644 --- a/administrator/components/com_menus/models/item.php +++ b/administrator/components/com_menus/models/item.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -1284,9 +1284,12 @@ public function save($data) // Adding self to the association $associations = $data['associations']; + // Unset any invalid associations + $associations = Joomla\Utilities\ArrayHelper::toInteger($associations); + foreach ($associations as $tag => $id) { - if (empty($id)) + if (!$id) { unset($associations[$tag]); } @@ -1330,7 +1333,7 @@ public function save($data) foreach ($associations as $id) { - $query->values($id . ',' . $db->quote($this->associationsContext) . ',' . $db->quote($key)); + $query->values(((int) $id) . ',' . $db->quote($this->associationsContext) . ',' . $db->quote($key)); } $db->setQuery($query); diff --git a/administrator/components/com_menus/models/items.php b/administrator/components/com_menus/models/items.php index 2fb817aa0b9f8..7012284903268 100644 --- a/administrator/components/com_menus/models/items.php +++ b/administrator/components/com_menus/models/items.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -115,6 +115,16 @@ protected function populateState($ordering = null, $direction = null) $this->setState('filter.menutype', $menuType); + // Get menutype title + $db = JFactory::getDbo(); + $query = $db->getQuery(true) + ->select('title') + ->from($db->quoteName('#__menu_types')) + ->where($db->quoteName('menutype') . " = " . $db->quote($menuType)); + $db->setQuery($query); + $menuTypeTitle = $db->loadResult(); + $this->setState('menutypetitle', $menuTypeTitle); + $language = $this->getUserStateFromRequest($this->context . '.filter.language', 'filter_language', ''); $this->setState('filter.language', $language); @@ -224,7 +234,7 @@ protected function getListQuery() $query->from($db->quoteName('#__menu') . ' AS a'); // Join over the language - $query->select('l.title AS language_title, l.image as image') + $query->select('l.title AS language_title, l.image AS language_image') ->join('LEFT', $db->quoteName('#__languages') . ' AS l ON l.lang_code = a.language'); // Join over the users. diff --git a/administrator/components/com_menus/models/menu.php b/administrator/components/com_menus/models/menu.php index 88aab13600945..7634dacf56ae3 100644 --- a/administrator/components/com_menus/models/menu.php +++ b/administrator/components/com_menus/models/menu.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/models/menus.php b/administrator/components/com_menus/models/menus.php index 63a754e988fbe..62d0b913c91d8 100644 --- a/administrator/components/com_menus/models/menus.php +++ b/administrator/components/com_menus/models/menus.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/models/menutypes.php b/administrator/components/com_menus/models/menutypes.php index 85a6306875a5b..bdf5df647271d 100644 --- a/administrator/components/com_menus/models/menutypes.php +++ b/administrator/components/com_menus/models/menutypes.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/tables/menu.php b/administrator/components/com_menus/tables/menu.php index b192ba7d00f5e..96f536878cecd 100644 --- a/administrator/components/com_menus/tables/menu.php +++ b/administrator/components/com_menus/tables/menu.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/views/item/tmpl/edit.php b/administrator/components/com_menus/views/item/tmpl/edit.php index 07f6c93333cd7..79ac6a21da8a1 100644 --- a/administrator/components/com_menus/views/item/tmpl/edit.php +++ b/administrator/components/com_menus/views/item/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -80,7 +80,7 @@ ?> -
    + diff --git a/administrator/components/com_menus/views/item/tmpl/edit_associations.php b/administrator/components/com_menus/views/item/tmpl/edit_associations.php index 5452851ec8211..2d249134c3e99 100644 --- a/administrator/components/com_menus/views/item/tmpl/edit_associations.php +++ b/administrator/components/com_menus/views/item/tmpl/edit_associations.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/views/item/tmpl/edit_modules.php b/administrator/components/com_menus/views/item/tmpl/edit_modules.php index ed1bb489f566c..1ae4fd72ea955 100644 --- a/administrator/components/com_menus/views/item/tmpl/edit_modules.php +++ b/administrator/components/com_menus/views/item/tmpl/edit_modules.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -107,9 +107,9 @@ 'title' => JText::_('COM_MENUS_EDIT_MODULE_SETTINGS'), 'height' => '300px', 'width' => '800px', - 'footer' => '' - . '' ) ); ?> diff --git a/administrator/components/com_menus/views/item/tmpl/edit_options.php b/administrator/components/com_menus/views/item/tmpl/edit_options.php index 4cebebbf2e41d..3a16b03c5a2de 100644 --- a/administrator/components/com_menus/views/item/tmpl/edit_options.php +++ b/administrator/components/com_menus/views/item/tmpl/edit_options.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/views/item/view.html.php b/administrator/components/com_menus/views/item/view.html.php index dfec5023d5fb9..bc80dee27481a 100644 --- a/administrator/components/com_menus/views/item/view.html.php +++ b/administrator/components/com_menus/views/item/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/views/items/tmpl/default.php b/administrator/components/com_menus/views/items/tmpl/default.php index 48f0d9076dbee..b418fdaaaa556 100644 --- a/administrator/components/com_menus/views/items/tmpl/default.php +++ b/administrator/components/com_menus/views/items/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -79,7 +79,7 @@ -     @@ -133,34 +108,35 @@ id); ?>
    published, $i, 'index.', $canChange, 'cb'); ?> + +
    + _tmp_video->icon_16, $this->_tmp_video->title, null, true); ?> + + + _tmp_video->name, 10, false); ?> + + + + + _tmp_video->size); ?> + + + +
    + state->get('list.direction'), $this->state->get('list.ordering')); ?> @@ -193,10 +193,10 @@ home, $i, 'items.', ($item->language != '*' || !$item->home) && $canChange); ?> - image . '.gif', $item->language_title, array('title' => JText::sprintf('COM_MENUS_GRID_UNSET_LANGUAGE', $item->language_title)), true); ?> + language_image . '.gif', $item->language_title, array('title' => JText::sprintf('COM_MENUS_GRID_UNSET_LANGUAGE', $item->language_title)), true); ?> - image . '.gif', $item->language_title, array('title' => $item->language_title), true); ?> + language_image . '.gif', $item->language_title, array('title' => $item->language_title), true); ?> @@ -216,7 +216,7 @@ language == '*') : ?> - language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> + language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . ' ' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> diff --git a/administrator/components/com_menus/views/items/tmpl/default_batch.php b/administrator/components/com_menus/views/items/tmpl/default_batch.php index 22fdeac8f54b9..438efaa8b7047 100644 --- a/administrator/components/com_menus/views/items/tmpl/default_batch.php +++ b/administrator/components/com_menus/views/items/tmpl/default_batch.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * * @deprecated 3.4 Use default_batch_body and default_batch_footer diff --git a/administrator/components/com_menus/views/items/tmpl/default_batch_body.php b/administrator/components/com_menus/views/items/tmpl/default_batch_body.php index ee54115349e77..d049812194527 100644 --- a/administrator/components/com_menus/views/items/tmpl/default_batch_body.php +++ b/administrator/components/com_menus/views/items/tmpl/default_batch_body.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_menus/views/items/tmpl/default_batch_footer.php b/administrator/components/com_menus/views/items/tmpl/default_batch_footer.php index f5f004c133320..b891924f71289 100644 --- a/administrator/components/com_menus/views/items/tmpl/default_batch_footer.php +++ b/administrator/components/com_menus/views/items/tmpl/default_batch_footer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_menus/views/items/view.html.php b/administrator/components/com_menus/views/items/view.html.php index 59b594104bbb2..f13fc5ac9d77f 100644 --- a/administrator/components/com_menus/views/items/view.html.php +++ b/administrator/components/com_menus/views/items/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -239,10 +239,13 @@ protected function addToolbar() $canDo = JHelperContent::getActions('com_menus'); $user = JFactory::getUser(); + // Get the menu title + $menuTypeTitle = $this->get('State')->get('menutypetitle'); + // Get the toolbar object instance $bar = JToolbar::getInstance('toolbar'); - JToolbarHelper::title(JText::_('COM_MENUS_VIEW_ITEMS_TITLE'), 'list menumgr'); + JToolbarHelper::title(JText::sprintf('COM_MENUS_VIEW_ITEMS_MENU_TITLE', $menuTypeTitle), 'list menumgr'); if ($canDo->get('core.create')) { @@ -291,7 +294,7 @@ protected function addToolbar() if ($this->state->get('filter.published') == -2 && $canDo->get('core.delete')) { - JToolbarHelper::deleteList('', 'items.delete', 'JTOOLBAR_EMPTY_TRASH'); + JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'items.delete', 'JTOOLBAR_EMPTY_TRASH'); } elseif ($canDo->get('core.edit.state')) { diff --git a/administrator/components/com_menus/views/menu/tmpl/edit.php b/administrator/components/com_menus/views/menu/tmpl/edit.php index 9044c579b650c..5d9d391ebf5de 100644 --- a/administrator/components/com_menus/views/menu/tmpl/edit.php +++ b/administrator/components/com_menus/views/menu/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/views/menu/view.html.php b/administrator/components/com_menus/views/menu/view.html.php index a4a2b704e5e00..d51925a3e9970 100644 --- a/administrator/components/com_menus/views/menu/view.html.php +++ b/administrator/components/com_menus/views/menu/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/views/menus/tmpl/default.php b/administrator/components/com_menus/views/menus/tmpl/default.php index b992dacf62f93..1869404c99500 100644 --- a/administrator/components/com_menus/views/menus/tmpl/default.php +++ b/administrator/components/com_menus/views/menus/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -16,24 +16,13 @@ JHtml::_('behavior.multiselect'); JHtml::_('formbehavior.chosen', 'select'); -$uri = JUri::getInstance(); -$return = base64_encode($uri); -$user = JFactory::getUser(); -$userId = $user->get('id'); +$uri = JUri::getInstance(); +$return = base64_encode($uri); +$user = JFactory::getUser(); $listOrder = $this->escape($this->state->get('list.ordering')); -$listDirn = $this->escape($this->state->get('list.direction')); +$listDirn = $this->escape($this->state->get('list.direction')); $modMenuId = (int) $this->get('ModMenuId'); -JFactory::getDocument()->addScriptDeclaration(" - Joomla.submitbutton = function(task) - { - if (task != 'menus.delete' || confirm('" . JText::_('COM_MENUS_MENU_CONFIRM_DELETE', true) . "')) - { - Joomla.submitform(task); - } - }; -"); - $script = array(); $script[] = "jQuery(document).ready(function() {"; @@ -55,7 +44,7 @@ JFactory::getDocument()->addScriptDeclaration(implode("\n", $script)); ?> - + sidebar)) : ?>
    sidebar; ?> @@ -64,20 +53,7 @@
    -
    -
    - - -
    -
    - - -
    -
    - - pagination->getLimitBox(); ?> -
    -
    + $this, 'options' => array('filterButton' => false))); ?>
    items)) : ?>
    @@ -91,7 +67,7 @@
    		- + @@ -108,10 +84,9 @@ - - +
    - + escape($item->title); ?> -

    ( +

    + : - id) . ' title=' . $this->escape($item->description) . '">' . - $this->escape($item->menutype) . ''; ?>) + + escape($item->menutype); ?> - escape($item->menutype)?>) + escape($item->menutype); ?> -

    +
    		- + count_published; ?> - + count_unpublished; ?> - + count_trashed; ?> modules[$item->menutype])) : ?>
    - +
      @@ -168,9 +144,9 @@
    • id . '&return=' . $return . '&tmpl=component&layout=modal'); ?> - + escape($module->title), $this->escape($module->access_title), $this->escape($module->position)); ?> - + escape($module->title), $this->escape($module->access_title), $this->escape($module->position)); ?>
      • @@ -188,7 +164,7 @@ 'title' => JText::_('COM_MENUS_EDIT_MODULE_SETTINGS'), 'height' => '300px', 'width' => '800px', - 'footer' => '' . '' ) ); ?> @@ -225,8 +201,6 @@ - -
    diff --git a/administrator/components/com_menus/views/menus/view.html.php b/administrator/components/com_menus/views/menus/view.html.php index b495b295da5b2..b274b6996f366 100644 --- a/administrator/components/com_menus/views/menus/view.html.php +++ b/administrator/components/com_menus/views/menus/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -52,6 +52,12 @@ public function display($tpl = null) $this->pagination = $this->get('Pagination'); $this->state = $this->get('State'); + if ($this->getLayout() == 'default') + { + $this->filterForm = $this->get('FilterForm'); + $this->activeFilters = $this->get('ActiveFilters'); + } + MenusHelper::addSubmenu('menus'); // Check for errors. @@ -93,7 +99,7 @@ protected function addToolbar() if ($canDo->get('core.delete')) { JToolbarHelper::divider(); - JToolbarHelper::deleteList('', 'menus.delete'); + JToolbarHelper::deleteList('COM_MENUS_MENU_CONFIRM_DELETE', 'menus.delete', 'JTOOLBAR_DELETE'); } JToolbarHelper::custom('menus.rebuild', 'refresh.png', 'refresh_f2.png', 'JTOOLBAR_REBUILD', false); diff --git a/administrator/components/com_menus/views/menutypes/tmpl/default.php b/administrator/components/com_menus/views/menutypes/tmpl/default.php index 656648e254b52..553b26a02525c 100644 --- a/administrator/components/com_menus/views/menutypes/tmpl/default.php +++ b/administrator/components/com_menus/views/menutypes/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_menus/views/menutypes/view.html.php b/administrator/components/com_menus/views/menutypes/view.html.php index 9a30fe7923486..c0707ccb7908d 100644 --- a/administrator/components/com_menus/views/menutypes/view.html.php +++ b/administrator/components/com_menus/views/menutypes/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_menus * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/controller.php b/administrator/components/com_messages/controller.php index 589ade827dd3c..447aab4285f9f 100644 --- a/administrator/components/com_messages/controller.php +++ b/administrator/components/com_messages/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/controllers/config.php b/administrator/components/com_messages/controllers/config.php index eeaf7db23e5d7..622dd173dca07 100644 --- a/administrator/components/com_messages/controllers/config.php +++ b/administrator/components/com_messages/controllers/config.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/controllers/message.php b/administrator/components/com_messages/controllers/message.php index c61cc18879bd6..855ce4b5da354 100644 --- a/administrator/components/com_messages/controllers/message.php +++ b/administrator/components/com_messages/controllers/message.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/controllers/messages.php b/administrator/components/com_messages/controllers/messages.php index d2e1d3b713f37..94f2813d94724 100644 --- a/administrator/components/com_messages/controllers/messages.php +++ b/administrator/components/com_messages/controllers/messages.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/helpers/html/messages.php b/administrator/components/com_messages/helpers/html/messages.php index 18ab0a8ac4038..eb0650a295ed5 100644 --- a/administrator/components/com_messages/helpers/html/messages.php +++ b/administrator/components/com_messages/helpers/html/messages.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/helpers/messages.php b/administrator/components/com_messages/helpers/messages.php index 7a4ec2c49b0b5..40f70bc08a4fa 100644 --- a/administrator/components/com_messages/helpers/messages.php +++ b/administrator/components/com_messages/helpers/messages.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/layouts/toolbar/mysettings.php b/administrator/components/com_messages/layouts/toolbar/mysettings.php index 3bc37684b6991..f16fc9ce938e4 100644 --- a/administrator/components/com_messages/layouts/toolbar/mysettings.php +++ b/administrator/components/com_messages/layouts/toolbar/mysettings.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/messages.php b/administrator/components/com_messages/messages.php index bb602a68ff5fb..fb1f846665b88 100644 --- a/administrator/components/com_messages/messages.php +++ b/administrator/components/com_messages/messages.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/messages.xml b/administrator/components/com_messages/messages.xml index 278d6fedf7e99..1c5a905b42181 100644 --- a/administrator/components/com_messages/messages.xml +++ b/administrator/components/com_messages/messages.xml @@ -3,7 +3,7 @@ com_messages Joomla! Project April 2006 - (C) 2005 - 2015 Open Source Matters. All rights reserved. + (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/components/com_messages/models/config.php b/administrator/components/com_messages/models/config.php index bc20a3db738d1..716dbfaccf0b7 100644 --- a/administrator/components/com_messages/models/config.php +++ b/administrator/components/com_messages/models/config.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/models/fields/usermessages.php b/administrator/components/com_messages/models/fields/usermessages.php index fbcddad5b2a5c..bd5805f173d29 100644 --- a/administrator/components/com_messages/models/fields/usermessages.php +++ b/administrator/components/com_messages/models/fields/usermessages.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/models/message.php b/administrator/components/com_messages/models/message.php index 845a2ec1c6e60..6bb43165e2421 100644 --- a/administrator/components/com_messages/models/message.php +++ b/administrator/components/com_messages/models/message.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/models/messages.php b/administrator/components/com_messages/models/messages.php index f2e80a9ff0828..56a22b7c4eb7a 100644 --- a/administrator/components/com_messages/models/messages.php +++ b/administrator/components/com_messages/models/messages.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/tables/message.php b/administrator/components/com_messages/tables/message.php index 6a95e2490f127..3fdd1b1ed5d87 100644 --- a/administrator/components/com_messages/tables/message.php +++ b/administrator/components/com_messages/tables/message.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/views/config/tmpl/default.php b/administrator/components/com_messages/views/config/tmpl/default.php index 6bdf386b4f029..cb11465e5cdca 100644 --- a/administrator/components/com_messages/views/config/tmpl/default.php +++ b/administrator/components/com_messages/views/config/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -14,9 +14,9 @@ JHtml::_('behavior.formvalidator'); JHtml::_('behavior.keepalive'); -JHtml::_('behavior.modal'); -JFactory::getDocument()->addScriptDeclaration(" +JFactory::getDocument()->addScriptDeclaration( + " Joomla.submitbutton = function(task) { if (task == 'config.cancel' || document.formvalidator.isValid(document.getElementById('config-form'))) @@ -24,49 +24,17 @@ Joomla.submitform(task, document.getElementById('config-form')); } }; -"); + " +); ?> -
    +
    -
    -
    -

    -
    -
    - - -
    -
    -
    - form->getLabel('lock'); ?> -
    -
    - form->getInput('lock'); ?> -
    -
    -
    -
    - form->getLabel('mail_on_new'); ?> -
    -
    - form->getInput('mail_on_new'); ?> -
    -
    -
    -
    - form->getLabel('auto_purge'); ?> -
    -
    - form->getInput('auto_purge'); ?> -
    -
    - -
    -
    -
    - - + form->renderField('lock'); ?> + form->renderField('mail_on_new'); ?> + form->renderField('auto_purge'); ?> + + + +
    diff --git a/administrator/components/com_messages/views/config/view.html.php b/administrator/components/com_messages/views/config/view.html.php index 86eb2f8e5c97f..b80d054fb6580 100644 --- a/administrator/components/com_messages/views/config/view.html.php +++ b/administrator/components/com_messages/views/config/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/views/message/tmpl/default.php b/administrator/components/com_messages/views/message/tmpl/default.php index 7d06848920986..3cd617de8f13f 100644 --- a/administrator/components/com_messages/views/message/tmpl/default.php +++ b/administrator/components/com_messages/views/message/tmpl/default.php @@ -3,12 +3,13 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; -JHtml::_('behavior.framework'); + +JHtml::_('behavior.core'); JHtml::_('formbehavior.chosen', 'select'); ?>
    diff --git a/administrator/components/com_messages/views/message/tmpl/edit.php b/administrator/components/com_messages/views/message/tmpl/edit.php index 54e9abd4e697c..64de499325737 100644 --- a/administrator/components/com_messages/views/message/tmpl/edit.php +++ b/administrator/components/com_messages/views/message/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/views/message/view.html.php b/administrator/components/com_messages/views/message/view.html.php index 7bb4b017f39af..a35bb3c6d34bd 100644 --- a/administrator/components/com_messages/views/message/view.html.php +++ b/administrator/components/com_messages/views/message/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_messages/views/messages/tmpl/default.php b/administrator/components/com_messages/views/messages/tmpl/default.php index 40ac3e5ba5bb4..71d503b3fe178 100644 --- a/administrator/components/com_messages/views/messages/tmpl/default.php +++ b/administrator/components/com_messages/views/messages/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -19,33 +19,44 @@ $user = JFactory::getUser(); $listOrder = $this->escape($this->state->get('list.ordering')); $listDirn = $this->escape($this->state->get('list.direction')); -?> +JFactory::getDocument()->addStyleDeclaration( + " + @media (min-width: 768px) { + div.modal { + left: none; + width: 500px; + margin-left: -250px; + } + } + " +); +?> -sidebar)) : ?> + sidebar)) : ?>
    sidebar; ?>
    - -
    - -
    -
    - -
    -
    - - -
    -
    - + +
    + +
    +
    + +
    +
    + + +
    +
    + +
    -
    -
    +
    items)) : ?>
    @@ -104,7 +115,6 @@
    -
    diff --git a/administrator/components/com_messages/views/messages/view.html.php b/administrator/components/com_messages/views/messages/view.html.php index 26d78d364b05d..9ff87f4dca158 100644 --- a/administrator/components/com_messages/views/messages/view.html.php +++ b/administrator/components/com_messages/views/messages/view.html.php @@ -3,12 +3,11 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; -JHtml::_('behavior.modal'); /** * View class for a list of messages. @@ -42,7 +41,6 @@ public function display($tpl = null) if (count($errors = $this->get('Errors'))) { JError::raiseError(500, implode("\n", $errors)); - return false; } @@ -62,7 +60,6 @@ protected function addToolbar() { $state = $this->get('State'); $canDo = JHelperContent::getActions('com_messages'); - JToolbarHelper::title(JText::_('COM_MESSAGES_MANAGER_MESSAGES'), 'envelope inbox'); if ($canDo->get('core.create')) @@ -78,18 +75,31 @@ protected function addToolbar() } JToolbarHelper::divider(); - $bar = JToolbar::getInstance('toolbar'); - - // Instantiate a new JLayoutFile instance and render the layout - JHtml::_('behavior.modal', 'a.messagesSettings'); - $layout = new JLayoutFile('toolbar.mysettings'); - - $bar->appendButton('Custom', $layout->render(array()), 'upload'); + $bar = JToolBar::getInstance('toolbar'); + $bar->appendButton( + 'Popup', + 'cog', + 'COM_MESSAGES_TOOLBAR_MY_SETTINGS', + 'index.php?option=com_messages&view=config&tmpl=component', + 500, + 250, + 0, + 0, + '', + '', + '' + . '' + ); if ($state->get('filter.state') == -2 && $canDo->get('core.delete')) { JToolbarHelper::divider(); - JToolbarHelper::deleteList('', 'messages.delete', 'JTOOLBAR_EMPTY_TRASH'); + JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'messages.delete', 'JTOOLBAR_EMPTY_TRASH'); } elseif ($canDo->get('core.edit.state')) { diff --git a/administrator/components/com_modules/controller.php b/administrator/components/com_modules/controller.php index 487d19cad969f..7f277519ba48e 100644 --- a/administrator/components/com_modules/controller.php +++ b/administrator/components/com_modules/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -59,6 +59,20 @@ public function display($cachable = false, $urlparams = false) require_once JPATH_COMPONENT . '/helpers/modules.php'; + $layout = $this->input->get('layout', 'edit'); + $id = $this->input->getInt('id'); + + // Check for edit form. + if ($layout == 'edit' && !$this->checkEditId('com_modules.edit.module', $id)) + { + // Somehow the person just went to the form - we don't allow that. + $this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id)); + $this->setMessage($this->getError(), 'error'); + $this->setRedirect(JRoute::_('index.php?option=com_modules&view=modules', false)); + + return false; + } + // Load the submenu. ModulesHelper::addSubmenu($this->input->get('view', 'modules')); diff --git a/administrator/components/com_modules/controllers/module.php b/administrator/components/com_modules/controllers/module.php index e45fade99e3ea..84524f9d76ad3 100644 --- a/administrator/components/com_modules/controllers/module.php +++ b/administrator/components/com_modules/controllers/module.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/controllers/modules.php b/administrator/components/com_modules/controllers/modules.php index 02c4a0d633a1a..bafb6c2dff3ac 100644 --- a/administrator/components/com_modules/controllers/modules.php +++ b/administrator/components/com_modules/controllers/modules.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/helpers/html/modules.php b/administrator/components/com_modules/helpers/html/modules.php index 55beda2463699..14e68d8185d2f 100644 --- a/administrator/components/com_modules/helpers/html/modules.php +++ b/administrator/components/com_modules/helpers/html/modules.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/helpers/modules.php b/administrator/components/com_modules/helpers/modules.php index 642df2dece61c..a7bb33ea497e2 100644 --- a/administrator/components/com_modules/helpers/modules.php +++ b/administrator/components/com_modules/helpers/modules.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -252,10 +252,16 @@ public static function getTranslatedModulePosition($clientId, $template, $positi $lang = JFactory::getLanguage(); $path = $clientId ? JPATH_ADMINISTRATOR : JPATH_SITE; - $lang->load('tpl_' . $template . '.sys', $path, null, false, false) - || $lang->load('tpl_' . $template . '.sys', $path . '/templates/' . $template, null, false, false) - || $lang->load('tpl_' . $template . '.sys', $path, $lang->getDefault(), false, false) - || $lang->load('tpl_' . $template . '.sys', $path . '/templates/' . $template, $lang->getDefault(), false, false); + $loaded = $lang->getPaths('tpl_' . $template . '.sys'); + + // Only load the template's language file if it hasn't been already + if (!$loaded) + { + $lang->load('tpl_' . $template . '.sys', $path, null, false, false) + || $lang->load('tpl_' . $template . '.sys', $path . '/templates/' . $template, null, false, false) + || $lang->load('tpl_' . $template . '.sys', $path, $lang->getDefault(), false, false) + || $lang->load('tpl_' . $template . '.sys', $path . '/templates/' . $template, $lang->getDefault(), false, false); + } $langKey = strtoupper('TPL_' . $template . '_POSITION_' . $position); $text = JText::_($langKey); diff --git a/administrator/components/com_modules/helpers/xml.php b/administrator/components/com_modules/helpers/xml.php index f0667c8b5cfd9..6cb285495e263 100644 --- a/administrator/components/com_modules/helpers/xml.php +++ b/administrator/components/com_modules/helpers/xml.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/layouts/joomla/searchtools/default.php b/administrator/components/com_modules/layouts/joomla/searchtools/default.php index b1877e93dac0e..cfffbb48f7f1d 100644 --- a/administrator/components/com_modules/layouts/joomla/searchtools/default.php +++ b/administrator/components/com_modules/layouts/joomla/searchtools/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -21,6 +21,7 @@ .js-stools .js-stools-client_id { float: left; margin-right: 10px; + min-width: 220px; } html[dir=rtl] .js-stools .js-stools-client_id { float: right; diff --git a/administrator/components/com_modules/layouts/joomla/searchtools/default/bar.php b/administrator/components/com_modules/layouts/joomla/searchtools/default/bar.php index b04a04e0de345..cf1ccac194b36 100644 --- a/administrator/components/com_modules/layouts/joomla/searchtools/default/bar.php +++ b/administrator/components/com_modules/layouts/joomla/searchtools/default/bar.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -11,16 +11,16 @@ $data = $displayData; -$clientIdField = $data['view']->filterForm->getField('client_id'); +if ($data['view'] instanceof ModulesViewModules) +{ + // We will get the client filter & remove it from the form filters + $clientIdField = $data['view']->filterForm->getField('client_id'); ?> - -
    - input; ?> -
    +
    + input; ?> +
    'none')); diff --git a/administrator/components/com_modules/layouts/toolbar/cancelselect.php b/administrator/components/com_modules/layouts/toolbar/cancelselect.php index 730f437801b60..89809b86420c6 100644 --- a/administrator/components/com_modules/layouts/toolbar/cancelselect.php +++ b/administrator/components/com_modules/layouts/toolbar/cancelselect.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/layouts/toolbar/newmodule.php b/administrator/components/com_modules/layouts/toolbar/newmodule.php index 7026c7d144d6d..813b775247049 100644 --- a/administrator/components/com_modules/layouts/toolbar/newmodule.php +++ b/administrator/components/com_modules/layouts/toolbar/newmodule.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/models/fields/modulesmodule.php b/administrator/components/com_modules/models/fields/modulesmodule.php index 8ae40603f574a..05727c2f13a08 100644 --- a/administrator/components/com_modules/models/fields/modulesmodule.php +++ b/administrator/components/com_modules/models/fields/modulesmodule.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/models/fields/modulesposition.php b/administrator/components/com_modules/models/fields/modulesposition.php index eb221f3e39a84..fd00ef4e787a2 100644 --- a/administrator/components/com_modules/models/fields/modulesposition.php +++ b/administrator/components/com_modules/models/fields/modulesposition.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/models/forms/filter_modules.xml b/administrator/components/com_modules/models/forms/filter_modules.xml index 8e76476b2e1ab..494c6a4679b84 100644 --- a/administrator/components/com_modules/models/forms/filter_modules.xml +++ b/administrator/components/com_modules/models/forms/filter_modules.xml @@ -1,18 +1,17 @@ +
    + onchange="jQuery('#filter_position, #filter_module, #filter_language').val('');this.form.submit();" + > - - - + - + > - + > - + > - + > - + > - - - + default="position ASC" + > @@ -103,17 +94,14 @@ - - - diff --git a/administrator/components/com_modules/models/module.php b/administrator/components/com_modules/models/module.php index a594fdbbabbd5..06d3f152be9b0 100644 --- a/administrator/components/com_modules/models/module.php +++ b/administrator/components/com_modules/models/module.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -602,12 +602,17 @@ protected function loadFormData() $data->set('access', $app->input->getInt('access', (!empty($filters['access']) ? $filters['access'] : JFactory::getConfig()->get('access')))); } - // This allows us to inject parameter settings into a new module. - $params = $app->getUserState('com_modules.add.module.params'); - - if (is_array($params)) + // Avoid to delete params of a second module opened in a new browser tab while new one is not saved yet. + if (empty($data->params)) { - $data->set('params', $params); + + // This allows us to inject parameter settings into a new module. + $params = $app->getUserState('com_modules.add.module.params'); + + if (is_array($params)) + { + $data->set('params', $params); + } } } diff --git a/administrator/components/com_modules/models/modules.php b/administrator/components/com_modules/models/modules.php index dad397a6729ef..af8613f98e5e5 100644 --- a/administrator/components/com_modules/models/modules.php +++ b/administrator/components/com_modules/models/modules.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -276,7 +276,7 @@ protected function getListQuery() $query->from($db->quoteName('#__modules') . ' AS a'); // Join over the language - $query->select('l.title AS language_title') + $query->select('l.title AS language_title, l.image AS language_image') ->join('LEFT', $db->quoteName('#__languages') . ' AS l ON l.lang_code = a.language'); // Join over the users for the checked out user. @@ -296,7 +296,7 @@ protected function getListQuery() ->join('LEFT', '#__extensions AS e ON e.element = a.module') ->group( 'a.id, a.title, a.note, a.position, a.module, a.language,a.checked_out,' . - 'a.checked_out_time, a.published, a.access, a.ordering,l.title, uc.name, ag.title, e.name,' . + 'a.checked_out_time, a.published, a.access, a.ordering, l.title, l.image, uc.name, ag.title, e.name,' . 'l.lang_code, uc.id, ag.id, mm.moduleid, e.element, a.publish_up, a.publish_down,e.enabled' ); diff --git a/administrator/components/com_modules/models/positions.php b/administrator/components/com_modules/models/positions.php index 12801fb935b64..4f247cb86f5fa 100644 --- a/administrator/components/com_modules/models/positions.php +++ b/administrator/components/com_modules/models/positions.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/models/select.php b/administrator/components/com_modules/models/select.php index a2cd220b3174a..f8633ed404a2c 100644 --- a/administrator/components/com_modules/models/select.php +++ b/administrator/components/com_modules/models/select.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -33,7 +33,7 @@ protected function populateState($ordering = null, $direction = null) $app = JFactory::getApplication('administrator'); // Load the filter state. - $clientId = $app->getUserState('com_modules.modules.filter.client_id', 0); + $clientId = $app->getUserState('com_modules.modules.client_id', 0); $this->setState('filter.client_id', (int) $clientId); // Load the parameters. diff --git a/administrator/components/com_modules/modules.php b/administrator/components/com_modules/modules.php index ca03b74effbde..759313fc8ebd2 100644 --- a/administrator/components/com_modules/modules.php +++ b/administrator/components/com_modules/modules.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/modules.xml b/administrator/components/com_modules/modules.xml index 3a88f0475f049..b1090e7bd7c22 100644 --- a/administrator/components/com_modules/modules.xml +++ b/administrator/components/com_modules/modules.xml @@ -3,7 +3,7 @@ com_modules Joomla! Project April 2006 - (C) 2005 - 2015 Open Source Matters. All rights reserved. + (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/components/com_modules/views/module/tmpl/edit.php b/administrator/components/com_modules/views/module/tmpl/edit.php index 905b13ddbe6c2..f035b20ce44c6 100644 --- a/administrator/components/com_modules/views/module/tmpl/edit.php +++ b/administrator/components/com_modules/views/module/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -13,7 +13,7 @@ JHtml::_('behavior.formvalidator'); JHtml::_('behavior.combobox'); -JHtml::_('formbehavior.chosen', 'select'); +JHtml::_('formbehavior.chosen', 'select', null, array('disable_search_threshold' => 0)); $hasContent = empty($this->item->module) || isset($this->item->xml->customContent); $hasContentFieldName = "content"; @@ -38,6 +38,9 @@ } $script .= " Joomla.submitform(task, document.getElementById('module-form')); + + jQuery('#permissions-sliders select').attr('disabled', 'disabled'); + if (self != top) { if (parent.viewLevels) diff --git a/administrator/components/com_modules/views/module/tmpl/edit_assignment.php b/administrator/components/com_modules/views/module/tmpl/edit_assignment.php index 95c3227330240..1f025df9cf760 100644 --- a/administrator/components/com_modules/views/module/tmpl/edit_assignment.php +++ b/administrator/components/com_modules/views/module/tmpl/edit_assignment.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/views/module/tmpl/edit_options.php b/administrator/components/com_modules/views/module/tmpl/edit_options.php index 776c30c864bb7..84fae8f597216 100644 --- a/administrator/components/com_modules/views/module/tmpl/edit_options.php +++ b/administrator/components/com_modules/views/module/tmpl/edit_options.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/views/module/tmpl/edit_positions.php b/administrator/components/com_modules/views/module/tmpl/edit_positions.php index f568ab1d3cc96..eaf28009a72fb 100644 --- a/administrator/components/com_modules/views/module/tmpl/edit_positions.php +++ b/administrator/components/com_modules/views/module/tmpl/edit_positions.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/views/module/tmpl/modal.php b/administrator/components/com_modules/views/module/tmpl/modal.php index 3e06913364c5a..162eaeaf80041 100644 --- a/administrator/components/com_modules/views/module/tmpl/modal.php +++ b/administrator/components/com_modules/views/module/tmpl/modal.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/views/module/view.html.php b/administrator/components/com_modules/views/module/view.html.php index 462c94eabdb76..e46468ade7801 100644 --- a/administrator/components/com_modules/views/module/view.html.php +++ b/administrator/components/com_modules/views/module/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/views/module/view.json.php b/administrator/components/com_modules/views/module/view.json.php index e2e3a51019c8a..30e48e9d29686 100644 --- a/administrator/components/com_modules/views/module/view.json.php +++ b/administrator/components/com_modules/views/module/view.json.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/views/modules/tmpl/default.php b/administrator/components/com_modules/views/modules/tmpl/default.php index e01d2623811be..6b9a607732796 100644 --- a/administrator/components/com_modules/views/modules/tmpl/default.php +++ b/administrator/components/com_modules/views/modules/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -46,10 +46,10 @@ - - - + - - @@ -179,7 +160,7 @@ escape($item->alias));?>
    - escape($item->category_title); ?> + escape($item->category_title); ?>
    @@ -203,7 +184,7 @@ language == '*'):?> - language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> + language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . ' ' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> - ",r=0;e>r;r++)i+="";i+=""}return i+="
    + + @@ -70,7 +70,7 @@ + @@ -93,7 +93,7 @@ $canCheckin = $user->authorise('core.manage', 'com_checkin') || $item->checked_out == $user->get('id')|| $item->checked_out == 0; $canChange = $user->authorise('core.edit.state', 'com_modules.module.' . $item->id) && $canCheckin; ?> -
    language == '*'):?> - language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> + language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . ' ' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> diff --git a/administrator/components/com_modules/views/modules/tmpl/default_batch.php b/administrator/components/com_modules/views/modules/tmpl/default_batch.php index 5964813475cc0..d584214e318be 100644 --- a/administrator/components/com_modules/views/modules/tmpl/default_batch.php +++ b/administrator/components/com_modules/views/modules/tmpl/default_batch.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * * @deprecated 3.4 Use default_batch_body and default_batch_footer diff --git a/administrator/components/com_modules/views/modules/tmpl/default_batch_body.php b/administrator/components/com_modules/views/modules/tmpl/default_batch_body.php index 1abfeddbb5b69..4d0fee6bc231f 100644 --- a/administrator/components/com_modules/views/modules/tmpl/default_batch_body.php +++ b/administrator/components/com_modules/views/modules/tmpl/default_batch_body.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/views/modules/tmpl/default_batch_footer.php b/administrator/components/com_modules/views/modules/tmpl/default_batch_footer.php index 6dbf6274c37d2..5cb1859b7236c 100644 --- a/administrator/components/com_modules/views/modules/tmpl/default_batch_footer.php +++ b/administrator/components/com_modules/views/modules/tmpl/default_batch_footer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_modules/views/modules/tmpl/modal.php b/administrator/components/com_modules/views/modules/tmpl/modal.php index 04833fdd75189..b4144b95be848 100644 --- a/administrator/components/com_modules/views/modules/tmpl/modal.php +++ b/administrator/components/com_modules/views/modules/tmpl/modal.php @@ -3,12 +3,17 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; +if (JFactory::getApplication()->isSite()) +{ + JSession::checkToken('get') or die(JText::_('JINVALID_TOKEN')); +} + JHtml::_('bootstrap.tooltip'); JHtml::_('formbehavior.chosen', 'select'); @@ -19,6 +24,7 @@ $trashed = $this->state->get('filter.state') == -2 ? true : false; $canOrder = $user->authorise('core.edit.state', 'com_modules'); $saveOrder = $listOrder == 'ordering'; +$editor = JFactory::getApplication()->input->get('editor', '', 'cmd'); if ($saveOrder) { @@ -45,15 +51,18 @@ Joomla.tableOrdering(order, dirn, ""); }; - moduleIns = function(type, name) { - parent.window.jInsertEditorText("{loadmodule " + type + "," + name + "," + jQuery("#extra_class").val() + "}"); - parent.window.jModalClose(); - } - - modulePosIns = function(position) { - parent.window.jInsertEditorText("{loadposition " + position + "," + jQuery("#extra_class").val() + "}"); - parent.window.jModalClose(); - } + moduleIns = function(type, name) { + var extraVal ,fieldExtra = jQuery("#extra_class"); + extraVal = (fieldExtra.length && fieldExtra.val().length) ? "," + fieldExtra.val() : ""; + parent.window.jInsertEditorText("{loadmodule " + type + "," + name + extraVal + "}", "' . $editor . '"); + parent.window.jModalClose(); + } + modulePosIns = function(position) { + var extraVal ,fieldExtra = jQuery("#extra_class"); + extraVal = (fieldExtra.length && fieldExtra.val().length) ? "," + fieldExtra.val() : ""; + parent.window.jInsertEditorText("{loadposition " + position + extraVal + "}", "' . $editor . '"); + parent.window.jModalClose(); + } '); ?>
    @@ -71,7 +80,6 @@
    -
    @@ -126,7 +134,7 @@
    		+ @@ -177,7 +185,7 @@ language == '*'):?> - language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> + language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . ' ' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> diff --git a/administrator/components/com_modules/views/modules/view.html.php b/administrator/components/com_modules/views/modules/view.html.php index 6425ef94064a6..99642a752aa9f 100644 --- a/administrator/components/com_modules/views/modules/view.html.php +++ b/administrator/components/com_modules/views/modules/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -27,15 +27,21 @@ class ModulesViewModules extends JViewLegacy * * @param string $tpl The name of the template file to parse; automatically searches through the template paths. * - * @return void + * @return mixed A string if successful, otherwise a Error object. + * + * @since 1.6 */ public function display($tpl = null) { $this->items = $this->get('Items'); $this->pagination = $this->get('Pagination'); $this->state = $this->get('State'); - $this->filterForm = $this->get('FilterForm'); - $this->activeFilters = $this->get('ActiveFilters'); + + if ($this->getLayout() == 'default') + { + $this->filterForm = $this->get('FilterForm'); + $this->activeFilters = $this->get('ActiveFilters'); + } // Check for errors. if (count($errors = $this->get('Errors'))) @@ -45,14 +51,16 @@ public function display($tpl = null) return false; } - if ($this->getLayout() == 'default') + // We don't need the toolbar in the modal window. + if ($this->getLayout() !== 'modal') { $this->addToolbar(); } // Include the component HTML helpers. JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); - parent::display($tpl); + + return parent::display($tpl); } /** @@ -71,7 +79,14 @@ protected function addToolbar() // Get the toolbar object instance $bar = JToolbar::getInstance('toolbar'); - JToolbarHelper::title(JText::_('COM_MODULES_MANAGER_MODULES'), 'cube module'); + if ($state->get('filter.client_id') == 1) + { + JToolbarHelper::title(JText::_('COM_MODULES_MANAGER_MODULES_ADMIN'), 'cube module'); + } + else + { + JToolbarHelper::title(JText::_('COM_MODULES_MANAGER_MODULES_SITE'), 'cube module'); + } if ($canDo->get('core.create')) { @@ -114,7 +129,7 @@ protected function addToolbar() if ($state->get('filter.state') == -2 && $canDo->get('core.delete')) { - JToolbarHelper::deleteList('', 'modules.delete', 'JTOOLBAR_EMPTY_TRASH'); + JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'modules.delete', 'JTOOLBAR_EMPTY_TRASH'); } elseif ($canDo->get('core.edit.state')) { diff --git a/administrator/components/com_modules/views/positions/tmpl/modal.php b/administrator/components/com_modules/views/positions/tmpl/modal.php index 30f4b49ff2ac0..e0b013860b573 100644 --- a/administrator/components/com_modules/views/positions/tmpl/modal.php +++ b/administrator/components/com_modules/views/positions/tmpl/modal.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/views/positions/view.html.php b/administrator/components/com_modules/views/positions/view.html.php index 98027bd5cc6b1..29b5c847bba56 100644 --- a/administrator/components/com_modules/views/positions/view.html.php +++ b/administrator/components/com_modules/views/positions/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/views/preview/tmpl/default.php b/administrator/components/com_modules/views/preview/tmpl/default.php index 772c6bc19734e..cd2c7e72cb08f 100644 --- a/administrator/components/com_modules/views/preview/tmpl/default.php +++ b/administrator/components/com_modules/views/preview/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/views/preview/view.html.php b/administrator/components/com_modules/views/preview/view.html.php index a1be3fad146b0..63e482b15452d 100644 --- a/administrator/components/com_modules/views/preview/view.html.php +++ b/administrator/components/com_modules/views/preview/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/views/select/tmpl/default.php b/administrator/components/com_modules/views/select/tmpl/default.php index 60ca2fa19a06a..f1099e8eb737b 100644 --- a/administrator/components/com_modules/views/select/tmpl/default.php +++ b/administrator/components/com_modules/views/select/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_modules/views/select/view.html.php b/administrator/components/com_modules/views/select/view.html.php index 3d7968f0ae7bf..c20e02d9902e8 100644 --- a/administrator/components/com_modules/views/select/view.html.php +++ b/administrator/components/com_modules/views/select/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/controller.php b/administrator/components/com_newsfeeds/controller.php index 5db3e63845900..cda85773ddd0f 100644 --- a/administrator/components/com_newsfeeds/controller.php +++ b/administrator/components/com_newsfeeds/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/controllers/newsfeed.php b/administrator/components/com_newsfeeds/controllers/newsfeed.php index e95fff8dbcdec..f5d5d86adf59d 100644 --- a/administrator/components/com_newsfeeds/controllers/newsfeed.php +++ b/administrator/components/com_newsfeeds/controllers/newsfeed.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/controllers/newsfeeds.php b/administrator/components/com_newsfeeds/controllers/newsfeeds.php index c054f7ea11aef..b5d1042af7a8f 100644 --- a/administrator/components/com_newsfeeds/controllers/newsfeeds.php +++ b/administrator/components/com_newsfeeds/controllers/newsfeeds.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/helpers/html/newsfeed.php b/administrator/components/com_newsfeeds/helpers/html/newsfeed.php index 5f7de10ddda3d..5d0720003e47e 100644 --- a/administrator/components/com_newsfeeds/helpers/html/newsfeed.php +++ b/administrator/components/com_newsfeeds/helpers/html/newsfeed.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/helpers/newsfeeds.php b/administrator/components/com_newsfeeds/helpers/newsfeeds.php index 08aae3b38ab66..897800e9e4122 100644 --- a/administrator/components/com_newsfeeds/helpers/newsfeeds.php +++ b/administrator/components/com_newsfeeds/helpers/newsfeeds.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -43,31 +43,54 @@ public static function addSubmenu($vName) /** * Adds Count Items for Category Manager. * - * @param JDatabaseQuery $query The query object of com_categories + * @param stdClass[] &$items The banner category objects * - * @return JDatabaseQuery + * @return stdClass[] * - * @since 3.4 + * @since 3.5 */ - public static function countItems($query) + public static function countItems(&$items) { - // Join articles to categories and count published items - $query->select('COUNT(DISTINCT cp.id) AS count_published'); - $query->join('LEFT', '#__newsfeeds AS cp ON cp.catid = a.id AND cp.published = 1'); + $db = JFactory::getDbo(); - // Count unpublished items - $query->select('COUNT(DISTINCT cu.id) AS count_unpublished'); - $query->join('LEFT', '#__newsfeeds AS cu ON cu.catid = a.id AND cu.published = 0'); + foreach ($items as $item) + { + $item->count_trashed = 0; + $item->count_archived = 0; + $item->count_unpublished = 0; + $item->count_published = 0; + $query = $db->getQuery(true); + $query->select('published AS state, count(*) AS count') + ->from($db->qn('#__newsfeeds')) + ->where('catid = ' . (int) $item->id) + ->group('state'); + $db->setQuery($query); + $newfeeds = $db->loadObjectList(); - // Count archived items - $query->select('COUNT(DISTINCT ca.id) AS count_archived'); - $query->join('LEFT', '#__newsfeeds AS ca ON ca.catid = a.id AND ca.published = 2'); + foreach ($newfeeds as $newsfeed) + { + if ($newsfeed->state == 1) + { + $item->count_published = $newsfeed->count; + } - // Count trashed items - $query->select('COUNT(DISTINCT ct.id) AS count_trashed'); - $query->join('LEFT', '#__newsfeeds AS ct ON ct.catid = a.id AND ct.published = -2'); + if ($newsfeed->state == 0) + { + $item->count_unpublished = $newsfeed->count; + } - return $query; - } + if ($newsfeed->state == 2) + { + $item->count_archived = $newsfeed->count; + } + + if ($newsfeed->state == -2) + { + $item->count_trashed = $newsfeed->count; + } + } + } + return $items; + } } diff --git a/administrator/components/com_newsfeeds/models/fields/modal/newsfeed.php b/administrator/components/com_newsfeeds/models/fields/modal/newsfeed.php index bea2f6c7d4430..388eae05cb690 100644 --- a/administrator/components/com_newsfeeds/models/fields/modal/newsfeed.php +++ b/administrator/components/com_newsfeeds/models/fields/modal/newsfeed.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -155,7 +155,7 @@ protected function getInput() 'title' => JText::_('COM_NEWSFEEDS_CHANGE_FEED_BUTTON'), 'width' => '800px', 'height' => '300px', - 'footer' => '' ) ); diff --git a/administrator/components/com_newsfeeds/models/fields/newsfeeds.php b/administrator/components/com_newsfeeds/models/fields/newsfeeds.php index fa4b801508183..53f65997dfedb 100644 --- a/administrator/components/com_newsfeeds/models/fields/newsfeeds.php +++ b/administrator/components/com_newsfeeds/models/fields/newsfeeds.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/models/forms/filter_newsfeeds.xml b/administrator/components/com_newsfeeds/models/forms/filter_newsfeeds.xml index 36a772ff25609..3560e9fc1449e 100644 --- a/administrator/components/com_newsfeeds/models/forms/filter_newsfeeds.xml +++ b/administrator/components/com_newsfeeds/models/forms/filter_newsfeeds.xml @@ -63,7 +63,7 @@ label="COM_NEWSFEEDS_LIST_FULL_ORDERING" description="COM_NEWSFEEDS_LIST_FULL_ORDERING_DESC" onchange="this.form.submit();" - default="a.id DESC" + default="a.name ASC" > @@ -78,10 +78,10 @@ - - - - + + + + diff --git a/administrator/components/com_newsfeeds/models/newsfeed.php b/administrator/components/com_newsfeeds/models/newsfeed.php index 006adadc79c30..73ab821ad55df 100644 --- a/administrator/components/com_newsfeeds/models/newsfeed.php +++ b/administrator/components/com_newsfeeds/models/newsfeed.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/models/newsfeeds.php b/administrator/components/com_newsfeeds/models/newsfeeds.php index 4e6f3552c0e64..4a2733914e4f1 100644 --- a/administrator/components/com_newsfeeds/models/newsfeeds.php +++ b/administrator/components/com_newsfeeds/models/newsfeeds.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -158,7 +158,7 @@ protected function getListQuery() $query->from($db->quoteName('#__newsfeeds') . ' AS a'); // Join over the language - $query->select('l.title AS language_title') + $query->select('l.title AS language_title, l.image AS language_image') ->join('LEFT', $db->quoteName('#__languages') . ' AS l ON l.lang_code = a.language'); // Join over the users for the checked out user. @@ -181,7 +181,7 @@ protected function getListQuery() $query->select('COUNT(asso2.id)>1 as association') ->join('LEFT', '#__associations AS asso ON asso.id = a.id AND asso.context=' . $db->quote('com_newsfeeds.item')) ->join('LEFT', '#__associations AS asso2 ON asso2.key = asso.key') - ->group('a.id, l.title, uc.name, ag.title, c.title'); + ->group('a.id, l.title, l.image, uc.name, ag.title, c.title'); } // Filter by access level. diff --git a/administrator/components/com_newsfeeds/newsfeeds.php b/administrator/components/com_newsfeeds/newsfeeds.php index d1f1ab8f51064..d7b025bff0fe7 100644 --- a/administrator/components/com_newsfeeds/newsfeeds.php +++ b/administrator/components/com_newsfeeds/newsfeeds.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/newsfeeds.xml b/administrator/components/com_newsfeeds/newsfeeds.xml index b381e0e83324c..a071a841fde6e 100644 --- a/administrator/components/com_newsfeeds/newsfeeds.xml +++ b/administrator/components/com_newsfeeds/newsfeeds.xml @@ -3,7 +3,7 @@ com_newsfeeds Joomla! Project April 2006 - (C) 2005 - 2015 Open Source Matters. All rights reserved. + (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/components/com_newsfeeds/tables/newsfeed.php b/administrator/components/com_newsfeeds/tables/newsfeed.php index df783c3a137d0..4f6fea867fb9b 100644 --- a/administrator/components/com_newsfeeds/tables/newsfeed.php +++ b/administrator/components/com_newsfeeds/tables/newsfeed.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php index 179fe6ae80569..be8755566f4cb 100644 --- a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php +++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_associations.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_associations.php index 563e9ce6bd5e1..0a8f9093adf80 100644 --- a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_associations.php +++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_associations.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_display.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_display.php index 0966c5511d517..0d11b1a2d5670 100644 --- a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_display.php +++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_display.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_metadata.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_metadata.php index cf87dc21f55bd..8bf99cf812734 100644 --- a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_metadata.php +++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_metadata.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_params.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_params.php index 149d45fd220ec..af987e3ebcb3b 100644 --- a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_params.php +++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_params.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal.php index d96ec7b339eae..5760f03748641 100644 --- a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal.php +++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_associations.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_associations.php index 563e9ce6bd5e1..0a8f9093adf80 100644 --- a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_associations.php +++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_associations.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_display.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_display.php index 0966c5511d517..0d11b1a2d5670 100644 --- a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_display.php +++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_display.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_metadata.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_metadata.php index cf87dc21f55bd..8bf99cf812734 100644 --- a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_metadata.php +++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_metadata.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_params.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_params.php index 149d45fd220ec..af987e3ebcb3b 100644 --- a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_params.php +++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_params.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/views/newsfeed/view.html.php b/administrator/components/com_newsfeeds/views/newsfeed/view.html.php index 7d0a7a8704108..a7346b64f1ee4 100644 --- a/administrator/components/com_newsfeeds/views/newsfeed/view.html.php +++ b/administrator/components/com_newsfeeds/views/newsfeed/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php index f1a0b5feaf5eb..07f40a0fa47ea 100644 --- a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php +++ b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -32,26 +32,7 @@ JHtml::_('sortablelist.sortable', 'newsfeedList', 'adminForm', strtolower($listDirn), $saveOrderingUrl); } -$sortFields = $this->getSortFields(); $assoc = JLanguageAssociations::isEnabled(); - -JFactory::getDocument()->addScriptDeclaration(' - Joomla.orderTable = function() - { - table = document.getElementById("sortTable"); - direction = document.getElementById("directionTable"); - order = table.options[table.selectedIndex].value; - if (order != "' . $listOrder . '") - { - dirn = "asc"; - } - else - { - dirn = direction.options[direction.selectedIndex].value; - } - Joomla.tableOrdering(order, dirn, ""); - }; -'); ?> @@ -77,36 +58,36 @@
    - ', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?> + - + - + - + - + - + - + - + + - +
    @@ -231,8 +212,6 @@ - - diff --git a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch.php b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch.php index e4930dc2da6e1..ba9a12a7ef085 100644 --- a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch.php +++ b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * * @deprecated 3.4 Use default_batch_body and default_batch_footer diff --git a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch_body.php b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch_body.php index e0c3ae2cad6bf..5f583c1c656cc 100644 --- a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch_body.php +++ b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch_body.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeed * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch_footer.php b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch_footer.php index 920d2f1236c15..c8b3cc288d24d 100644 --- a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch_footer.php +++ b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch_footer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeed * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php index 60ea571ff5d23..7ce5980be38ea 100644 --- a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php +++ b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -14,7 +14,6 @@ JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); JHtml::_('bootstrap.tooltip'); -JHtml::_('behavior.framework', true); $input = JFactory::getApplication()->input; $function = JFactory::getApplication()->input->getCmd('function', 'jSelectNewsfeed'); @@ -89,7 +88,7 @@ + @@ -141,7 +140,7 @@ language == '*'):?> - language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> + language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . ' ' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> diff --git a/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php b/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php index 4492919fbefe2..2940aea7753dc 100644 --- a/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php +++ b/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -126,7 +126,7 @@ protected function addToolbar() if ($state->get('filter.published') == -2 && $canDo->get('core.delete')) { - JToolbarHelper::deleteList('', 'newsfeeds.delete', 'JTOOLBAR_EMPTY_TRASH'); + JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'newsfeeds.delete', 'JTOOLBAR_EMPTY_TRASH'); } elseif ($canDo->get('core.edit.state')) { diff --git a/administrator/components/com_plugins/controller.php b/administrator/components/com_plugins/controller.php index 59f2b1a412571..725b064e86c7c 100644 --- a/administrator/components/com_plugins/controller.php +++ b/administrator/components/com_plugins/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_plugins * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_plugins/controllers/plugin.php b/administrator/components/com_plugins/controllers/plugin.php index 04038896085be..a0d7bd45df865 100644 --- a/administrator/components/com_plugins/controllers/plugin.php +++ b/administrator/components/com_plugins/controllers/plugin.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_plugins * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_plugins/controllers/plugins.php b/administrator/components/com_plugins/controllers/plugins.php index 63cb8a844cba3..4615766b2c75d 100644 --- a/administrator/components/com_plugins/controllers/plugins.php +++ b/administrator/components/com_plugins/controllers/plugins.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_plugins * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_plugins/helpers/plugins.php b/administrator/components/com_plugins/helpers/plugins.php index 99c67dcc1845e..362350ecbd5eb 100644 --- a/administrator/components/com_plugins/helpers/plugins.php +++ b/administrator/components/com_plugins/helpers/plugins.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_plugins * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_plugins/models/fields/pluginordering.php b/administrator/components/com_plugins/models/fields/pluginordering.php index 28e4675160e05..59dd4b9e74e5b 100644 --- a/administrator/components/com_plugins/models/fields/pluginordering.php +++ b/administrator/components/com_plugins/models/fields/pluginordering.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_plugins * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_plugins/models/fields/plugintype.php b/administrator/components/com_plugins/models/fields/plugintype.php new file mode 100644 index 0000000000000..abfc25a69ab69 --- /dev/null +++ b/administrator/components/com_plugins/models/fields/plugintype.php @@ -0,0 +1,44 @@ + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/administrator/components/com_plugins/models/plugin.php b/administrator/components/com_plugins/models/plugin.php index ccc3a3dd631ea..e1d76df586ed9 100644 --- a/administrator/components/com_plugins/models/plugin.php +++ b/administrator/components/com_plugins/models/plugin.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_plugins * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_plugins/models/plugins.php b/administrator/components/com_plugins/models/plugins.php index 6ccc1bea1adc0..979a707654f94 100644 --- a/administrator/components/com_plugins/models/plugins.php +++ b/administrator/components/com_plugins/models/plugins.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_plugins * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -121,6 +121,12 @@ protected function _getList($query, $limitstart = 0, $limit = 0) $search = $this->getState('filter.search'); $ordering = $this->getState('list.ordering', 'ordering'); + // If "Sort Table By:" is not set, set ordering to name + if ($ordering == '') + { + $ordering = "name"; + } + if ($ordering == 'name' || (!empty($search) && stripos($search, 'id:') !== 0)) { $this->_db->setQuery($query); @@ -267,4 +273,22 @@ protected function getListQuery() return $query; } + + /** + * Method to get the data that should be injected in the form. + * + * @return mixed The data for the form. + * + * @since 3.5 + */ + protected function loadFormData() + { + $data = parent::loadFormData(); + + // Set the selected filter values for pages that use the JLayouts for filtering + $data->list['sortTable'] = $this->state->get('list.ordering'); + $data->list['directionTable'] = $this->state->get('list.direction'); + + return $data; + } } diff --git a/administrator/components/com_plugins/plugins.php b/administrator/components/com_plugins/plugins.php index 6016be21f94b0..c156f89929700 100644 --- a/administrator/components/com_plugins/plugins.php +++ b/administrator/components/com_plugins/plugins.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_plugins * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_plugins/plugins.xml b/administrator/components/com_plugins/plugins.xml index b59f9734117cd..5ec41ed5e01df 100644 --- a/administrator/components/com_plugins/plugins.xml +++ b/administrator/components/com_plugins/plugins.xml @@ -3,7 +3,7 @@ com_plugins Joomla! Project April 2006 - (C) 2005 - 2015 Open Source Matters. All rights reserved. + (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/components/com_plugins/views/plugin/tmpl/edit.php b/administrator/components/com_plugins/views/plugin/tmpl/edit.php index e7e1d11f2ed5f..f74ca0bb6de5b 100644 --- a/administrator/components/com_plugins/views/plugin/tmpl/edit.php +++ b/administrator/components/com_plugins/views/plugin/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_plugins * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_plugins/views/plugin/tmpl/edit_options.php b/administrator/components/com_plugins/views/plugin/tmpl/edit_options.php index b7681d926ca40..9b51e06571682 100644 --- a/administrator/components/com_plugins/views/plugin/tmpl/edit_options.php +++ b/administrator/components/com_plugins/views/plugin/tmpl/edit_options.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_plugins * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_plugins/views/plugin/view.html.php b/administrator/components/com_plugins/views/plugin/view.html.php index f771c6be66d5c..4d146d18b4d57 100644 --- a/administrator/components/com_plugins/views/plugin/view.html.php +++ b/administrator/components/com_plugins/views/plugin/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_plugins * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_plugins/views/plugins/tmpl/default.php b/administrator/components/com_plugins/views/plugins/tmpl/default.php index 21701d8cfc73d..684a05d242df8 100644 --- a/administrator/components/com_plugins/views/plugins/tmpl/default.php +++ b/administrator/components/com_plugins/views/plugins/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_plugins * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -33,8 +33,8 @@ JFactory::getDocument()->addScriptDeclaration(' Joomla.orderTable = function() { - table = document.getElementById("sortTable"); - direction = document.getElementById("directionTable"); + table = document.getElementById("list_sortTable"); + direction = document.getElementById("list_directionTable"); order = table.options[table.selectedIndex].value; if (order != "' . $listOrder . '") { @@ -58,35 +58,7 @@
    -
    -
    - - -
    -
    - - -
    -
    - - pagination->getLimitBox(); ?> -
    -
    - - -
    -
    - - -
    -
    + $this)); ?>
    items)) : ?>
    @@ -96,29 +68,29 @@ - - @@ -156,7 +128,7 @@ - @@ -165,8 +120,6 @@
    - -
    diff --git a/administrator/components/com_users/views/notes/tmpl/modal.php b/administrator/components/com_users/views/notes/tmpl/modal.php index d0971130a40a6..edcfed284288f 100644 --- a/administrator/components/com_users/views/notes/tmpl/modal.php +++ b/administrator/components/com_users/views/notes/tmpl/modal.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -16,7 +16,7 @@ items)) : ?> -
      +
        items as $item) : ?>
      • @@ -45,10 +45,10 @@
        - body); ?> + body) ? JHtml::_('content.prepare', $item->body) : ''); ?>
        • -
    + diff --git a/administrator/components/com_users/views/notes/view.html.php b/administrator/components/com_users/views/notes/view.html.php index af3a62ca7a614..85683edd9805f 100644 --- a/administrator/components/com_users/views/notes/view.html.php +++ b/administrator/components/com_users/views/notes/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ @@ -62,10 +62,12 @@ class UsersViewNotes extends JViewLegacy public function display($tpl = null) { // Initialise view variables. - $this->items = $this->get('Items'); - $this->pagination = $this->get('Pagination'); - $this->state = $this->get('State'); - $this->user = $this->get('User'); + $this->items = $this->get('Items'); + $this->pagination = $this->get('Pagination'); + $this->state = $this->get('State'); + $this->user = $this->get('User'); + $this->filterForm = $this->get('FilterForm'); + $this->activeFilters = $this->get('ActiveFilters'); UsersHelper::addSubmenu('notes'); @@ -126,7 +128,7 @@ protected function addToolbar() if ($this->state->get('filter.state') == -2 && $canDo->get('core.delete')) { - JToolbarHelper::deleteList('', 'notes.delete', 'JTOOLBAR_EMPTY_TRASH'); + JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'notes.delete', 'JTOOLBAR_EMPTY_TRASH'); JToolbarHelper::divider(); } elseif ($canDo->get('core.edit.state')) @@ -144,18 +146,6 @@ protected function addToolbar() JToolbarHelper::help('JHELP_USERS_USER_NOTES'); JHtmlSidebar::setAction('index.php?option=com_users&view=notes'); - - JHtmlSidebar::addFilter( - JText::_('JOPTION_SELECT_PUBLISHED'), - 'filter_published', - JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.state'), true) - ); - - JHtmlSidebar::addFilter( - JText::_('JOPTION_SELECT_CATEGORY'), - 'filter_category_id', - JHtml::_('select.options', JHtml::_('category.options', 'com_users'), 'value', 'text', $this->state->get('filter.category_id')) - ); } /** @@ -168,12 +158,12 @@ protected function addToolbar() protected function getSortFields() { return array( - 'u.name' => JText::_('COM_USERS_USER_HEADING'), - 'a.subject' => JText::_('COM_USERS_SUBJECT_HEADING'), - 'c.title' => JText::_('COM_USERS_CATEGORY_HEADING'), - 'a.state' => JText::_('JSTATUS'), + 'u.name' => JText::_('COM_USERS_USER_HEADING'), + 'a.subject' => JText::_('COM_USERS_SUBJECT_HEADING'), + 'c.title' => JText::_('COM_USERS_CATEGORY_HEADING'), + 'a.state' => JText::_('JSTATUS'), 'a.review_time' => JText::_('COM_USERS_REVIEW_HEADING'), - 'a.id' => JText::_('JGRID_HEADING_ID') + 'a.id' => JText::_('JGRID_HEADING_ID') ); } } diff --git a/administrator/components/com_users/views/user/tmpl/edit.php b/administrator/components/com_users/views/user/tmpl/edit.php index 678ddf771d638..68f35cd837762 100644 --- a/administrator/components/com_users/views/user/tmpl/edit.php +++ b/administrator/components/com_users/views/user/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -60,7 +60,7 @@
    fieldname == 'password') : ?> - + input; ?>
    diff --git a/administrator/components/com_users/views/user/tmpl/edit_groups.php b/administrator/components/com_users/views/user/tmpl/edit_groups.php index ba2edfca8fa84..57e4394cadf3d 100644 --- a/administrator/components/com_users/views/user/tmpl/edit_groups.php +++ b/administrator/components/com_users/views/user/tmpl/edit_groups.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/user/view.html.php b/administrator/components/com_users/views/user/view.html.php index de4b36c76fba0..97666917e6f1a 100644 --- a/administrator/components/com_users/views/user/view.html.php +++ b/administrator/components/com_users/views/user/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/users/tmpl/default.php b/administrator/components/com_users/views/users/tmpl/default.php index 13c2e3a0560a4..cf72836de3044 100644 --- a/administrator/components/com_users/views/users/tmpl/default.php +++ b/administrator/components/com_users/views/users/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -96,7 +96,7 @@ - - diff --git a/administrator/components/com_users/views/users/view.html.php b/administrator/components/com_users/views/users/view.html.php index 286aee84407fe..24b148a156719 100644 --- a/administrator/components/com_users/views/users/view.html.php +++ b/administrator/components/com_users/views/users/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -113,7 +113,7 @@ protected function addToolbar() if ($canDo->get('core.delete')) { - JToolbarHelper::deleteList('', 'users.delete'); + JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'users.delete', 'JTOOLBAR_DELETE'); JToolbarHelper::divider(); } diff --git a/administrator/help/helpsites.xml b/administrator/help/helpsites.xml index 6c2cfceff93a3..70e6964388da0 100644 --- a/administrator/help/helpsites.xml +++ b/administrator/help/helpsites.xml @@ -1,11 +1,7 @@ - English (GB) - Joomla help wiki - Franais (FR) - Aide de Joomla! + English (GB) - Joomla help wiki + Franais (FR) - Aide de Joomla! diff --git a/administrator/includes/defines.php b/administrator/includes/defines.php index 39fa7cba46ff4..501deaf3918c9 100644 --- a/administrator/includes/defines.php +++ b/administrator/includes/defines.php @@ -2,7 +2,7 @@ /** * @package Joomla.Administrator * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/includes/framework.php b/administrator/includes/framework.php index 9180ba5764f58..6227ccd661f02 100644 --- a/administrator/includes/framework.php +++ b/administrator/includes/framework.php @@ -2,7 +2,7 @@ /** * @package Joomla.Administrator * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/includes/helper.php b/administrator/includes/helper.php index dbf24f940a5f9..99f5ae798a082 100644 --- a/administrator/includes/helper.php +++ b/administrator/includes/helper.php @@ -2,7 +2,7 @@ /** * @package Joomla.Administrator * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -12,7 +12,9 @@ * Joomla! Administrator Application helper class. * Provide many supporting API functions. * - * @since 1.5 + * @since 1.5 + * + * @deprecated 4.0 Deprecated without replacement */ class JAdministratorHelper { diff --git a/administrator/includes/subtoolbar.php b/administrator/includes/subtoolbar.php index bc44ccd2db55c..eabdb4c62eac8 100644 --- a/administrator/includes/subtoolbar.php +++ b/administrator/includes/subtoolbar.php @@ -2,7 +2,7 @@ /** * @package Joomla.Administrator * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/includes/toolbar.php b/administrator/includes/toolbar.php index cba3e1c7a0870..f6ab222441d46 100644 --- a/administrator/includes/toolbar.php +++ b/administrator/includes/toolbar.php @@ -2,7 +2,7 @@ /** * @package Joomla.Administrator * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -153,6 +153,24 @@ public static function back($alt = 'JTOOLBAR_BACK', $href = 'javascript:history. $bar->appendButton('Link', 'back', $alt, $href); } + /** + * Creates a button to redirect to a link + * + * @param string $url The link url + * @param string $text Button text + * @param string $name Name to be used as apart of the id + * + * @return void + * + * @since 3.5 + */ + public static function link($url, $text, $name = 'link') + { + $bar = JToolbar::getInstance('toolbar'); + + $bar->appendButton('Link', $name, $text, $url); + } + /** * Writes a media_manager button. * @@ -595,8 +613,8 @@ public static function preferences($component, $height = '550', $width = '875', */ public static function versions($typeAlias, $itemId, $height = 800, $width = 500, $alt = 'JTOOLBAR_VERSIONS') { - JHtml::_('behavior.modal', 'a.modal_jform_contenthistory'); - + $lang = JFactory::getLanguage(); + $lang->load('com_contenthistory', JPATH_ADMINISTRATOR, $lang->getTag(), true); $contentTypeTable = JTable::getInstance('Contenttype'); $typeId = $contentTypeTable->getTypeId($typeAlias); @@ -627,8 +645,6 @@ public static function versions($typeAlias, $itemId, $height = 800, $width = 500 */ public static function modal($targetModalId, $icon, $alt) { - JHtml::_('bootstrap.framework'); - $title = JText::_($alt); $dhtml = ""; diff --git a/administrator/index.php b/administrator/index.php index d99d82b2321fb..765bcf2ced3cc 100644 --- a/administrator/index.php +++ b/administrator/index.php @@ -2,7 +2,7 @@ /** * @package Joomla.Administrator * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -16,6 +16,10 @@ die('Your host needs to use PHP ' . JOOMLA_MINIMUM_PHP . ' or higher to run this version of Joomla!'); } +// Saves the start time and memory usage. +$startTime = microtime(1); +$startMem = memory_get_usage(); + /** * Constant that is checked in included files to prevent direct access. * define() is used in the installation folder rather than "const" to not error for PHP 5.2 and lower @@ -37,8 +41,8 @@ require_once JPATH_BASE . '/includes/helper.php'; require_once JPATH_BASE . '/includes/toolbar.php'; -// Mark afterLoad in the profiler. -JDEBUG ? $_PROFILER->mark('afterLoad') : null; +// Set profiler start time and memory usage and mark afterLoad in the profiler. +JDEBUG ? $_PROFILER->setStart($startTime, $startMem)->mark('afterLoad') : null; // Instantiate the application. $app = JFactory::getApplication('administrator'); diff --git a/administrator/language/en-GB/en-GB.com_admin.ini b/administrator/language/en-GB/en-GB.com_admin.ini index d41769caf7db5..da16992f8ffc7 100644 --- a/administrator/language/en-GB/en-GB.com_admin.ini +++ b/administrator/language/en-GB/en-GB.com_admin.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -15,6 +15,9 @@ COM_ADMIN_DIRECTORY="Folder" COM_ADMIN_DIRECTORY_PERMISSIONS="Folder Permissions" COM_ADMIN_DISABLED_FUNCTIONS="Disabled Functions" COM_ADMIN_DISPLAY_ERRORS="Display Errors" +COM_ADMIN_DOWNLOAD_SYSTEM_INFORMATION_TEXT="Download as text" +COM_ADMIN_DOWNLOAD_SYSTEM_INFORMATION_JSON="Download as JSON" +COM_ADMIN_EXTENSIONS="Extensions" COM_ADMIN_FILE_UPLOADS="File Uploads" COM_ADMIN_GLOSSARY="Glossary" COM_ADMIN_GO="Go" @@ -107,6 +110,7 @@ COM_ADMIN_LATEST_VERSION_CHECK="Latest Version Check" COM_ADMIN_LICENSE="License" COM_ADMIN_LOG_DIRECTORY="(Log folder)" COM_ADMIN_MAGIC_QUOTES="Magic Quotes" +COM_ADMIN_MAX_INPUT_VARS="Maximum Input Variables" COM_ADMIN_MBSTRING_ENABLED="Multibyte String (mbstring) Enabled" COM_ADMIN_NA="n/a" COM_ADMIN_OPEN_BASEDIR="Open basedir" diff --git a/administrator/language/en-GB/en-GB.com_admin.sys.ini b/administrator/language/en-GB/en-GB.com_admin.sys.ini index 1f054fe924af4..58f4801c4530b 100644 --- a/administrator/language/en-GB/en-GB.com_admin.sys.ini +++ b/administrator/language/en-GB/en-GB.com_admin.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_ajax.ini b/administrator/language/en-GB/en-GB.com_ajax.ini index a45d05e383171..59fe55dbff085 100644 --- a/administrator/language/en-GB/en-GB.com_ajax.ini +++ b/administrator/language/en-GB/en-GB.com_ajax.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_ajax.sys.ini b/administrator/language/en-GB/en-GB.com_ajax.sys.ini index 8ea9db17e8454..d973c5af6c0f0 100644 --- a/administrator/language/en-GB/en-GB.com_ajax.sys.ini +++ b/administrator/language/en-GB/en-GB.com_ajax.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_banners.ini b/administrator/language/en-GB/en-GB.com_banners.ini index a3159527014e1..b85f06aab3aa1 100644 --- a/administrator/language/en-GB/en-GB.com_banners.ini +++ b/administrator/language/en-GB/en-GB.com_banners.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -126,11 +126,17 @@ COM_BANNERS_FIELD_TRACKIMPRESSION_DESC="Record the impressions (views) of the ba COM_BANNERS_FIELD_TRACKIMPRESSION_LABEL="Track Impressions" COM_BANNERS_FIELD_TYPE_DESC="Choose the type of banner. Select Image to display an image from /images/banners/ folder. Select Custom to enter your custom code." COM_BANNERS_FIELD_TYPE_LABEL="Type" +; The following five strings are deprecated and will be removed with 4.0. They generate wrong plural detection in Crowdin. COM_BANNERS_FIELD_VALUE_1="Unlimited" COM_BANNERS_FIELD_VALUE_2="Yearly" COM_BANNERS_FIELD_VALUE_3="Monthly" COM_BANNERS_FIELD_VALUE_4="Weekly" COM_BANNERS_FIELD_VALUE_5="Daily" +COM_BANNERS_FIELD_VALUE_UNLIMITED="Unlimited" +COM_BANNERS_FIELD_VALUE_YEARLY="Yearly" +COM_BANNERS_FIELD_VALUE_MONTHLY="Monthly" +COM_BANNERS_FIELD_VALUE_WEEKLY="Weekly" +COM_BANNERS_FIELD_VALUE_DAILY="Daily" COM_BANNERS_FIELD_VALUE_CUSTOM="Custom" COM_BANNERS_FIELD_VALUE_IMAGE="Image" COM_BANNERS_FIELD_VALUE_USECLIENTDEFAULT="-- Use Client Default --" diff --git a/administrator/language/en-GB/en-GB.com_banners.sys.ini b/administrator/language/en-GB/en-GB.com_banners.sys.ini index 96a8d0cccd0f8..6f2af863b976f 100644 --- a/administrator/language/en-GB/en-GB.com_banners.sys.ini +++ b/administrator/language/en-GB/en-GB.com_banners.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_cache.ini b/administrator/language/en-GB/en-GB.com_cache.ini index 3925a2fcf8369..8090057c56a07 100644 --- a/administrator/language/en-GB/en-GB.com_cache.ini +++ b/administrator/language/en-GB/en-GB.com_cache.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -7,11 +7,19 @@ COM_CACHE="Cache" COM_CACHE_BACK_CACHE_MANAGER="Return to Cache" COM_CACHE_CLEAR_CACHE_ADMIN="Clear Cache Administrator" COM_CACHE_CLEAR_CACHE="Maintenance: Clear Cache" +COM_CACHE_CLEAR_CACHE_ADMIN_TITLE="Maintenance: Clear Cache (Administrator)" +COM_CACHE_CLEAR_CACHE_SITE_TITLE="Maintenance: Clear Cache (Site)" COM_CACHE_PURGE_EXPIRED_CACHE="Maintenance: Clear Expired Cache" COM_CACHE_CONFIGURATION="Cache: Options" COM_CACHE_EXPIRED_ITEMS_HAVE_BEEN_PURGED="Expired items have been cleared." COM_CACHE_EXPIRED_ITEMS_PURGING_ERROR="Error clearing expired items." COM_CACHE_GROUP="Cache Group" +COM_CACHE_HEADING_GROUP_ASC="Cache Group ascending" +COM_CACHE_HEADING_GROUP_DESC="Cache Group descending" +COM_CACHE_HEADING_COUNT_ASC="Number of Files ascending" +COM_CACHE_HEADING_COUNT_DESC="Number of Files descending" +COM_CACHE_HEADING_SIZE_ASC="Size ascending" +COM_CACHE_HEADING_SIZE_DESC="Size descending" COM_CACHE_MANAGER="Cache" COM_CACHE_NUMBER_OF_FILES="Number of Files" COM_CACHE_PURGE_CACHE_ADMIN="Clear Cache Administrator" diff --git a/administrator/language/en-GB/en-GB.com_cache.sys.ini b/administrator/language/en-GB/en-GB.com_cache.sys.ini index 52d4a487c4dfd..0495a3e803857 100644 --- a/administrator/language/en-GB/en-GB.com_cache.sys.ini +++ b/administrator/language/en-GB/en-GB.com_cache.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_categories.ini b/administrator/language/en-GB/en-GB.com_categories.ini index 0c3db8b43484d..55794ea1b6030 100644 --- a/administrator/language/en-GB/en-GB.com_categories.ini +++ b/administrator/language/en-GB/en-GB.com_categories.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_categories.sys.ini b/administrator/language/en-GB/en-GB.com_categories.sys.ini index ee2f2a1875b50..28120666e5e58 100644 --- a/administrator/language/en-GB/en-GB.com_categories.sys.ini +++ b/administrator/language/en-GB/en-GB.com_categories.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_checkin.ini b/administrator/language/en-GB/en-GB.com_checkin.ini index ec7b0676edaac..a66ff22fa36d2 100644 --- a/administrator/language/en-GB/en-GB.com_checkin.ini +++ b/administrator/language/en-GB/en-GB.com_checkin.ini @@ -1,14 +1,18 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 COM_CHECKIN="Check-in" COM_CHECKIN_CONFIGURATION="Check-in: Options" COM_CHECKIN_DATABASE_TABLE="Database Table" +COM_CHECKIN_DATABASE_TABLE_ASC="Database Table ascending" +COM_CHECKIN_DATABASE_TABLE_DESC="Database Table descending" COM_CHECKIN_FILTER_SEARCH_DESC="Search table." COM_CHECKIN_GLOBAL_CHECK_IN="Maintenance: Global Check-in" COM_CHECKIN_ITEMS_TO_CHECK_IN="Items to check-in" +COM_CHECKIN_ITEMS_TO_CHECK_IN_ASC="Items to check-in ascending" +COM_CHECKIN_ITEMS_TO_CHECK_IN_DESC="Items to check-in descending" COM_CHECKIN_N_ITEMS_CHECKED_IN_0="No item checked in." COM_CHECKIN_N_ITEMS_CHECKED_IN_1="1 item checked in." COM_CHECKIN_N_ITEMS_CHECKED_IN_MORE="%s items checked in." diff --git a/administrator/language/en-GB/en-GB.com_checkin.sys.ini b/administrator/language/en-GB/en-GB.com_checkin.sys.ini index d2c6271ab69f2..63639344c091d 100644 --- a/administrator/language/en-GB/en-GB.com_checkin.sys.ini +++ b/administrator/language/en-GB/en-GB.com_checkin.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_config.ini b/administrator/language/en-GB/en-GB.com_config.ini index 234e43971f1ec..0bdc95f6c96b4 100644 --- a/administrator/language/en-GB/en-GB.com_config.ini +++ b/administrator/language/en-GB/en-GB.com_config.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -176,7 +176,7 @@ COM_CONFIG_FIELD_SEF_URL_DESC="Select whether or not the URLs are optimised for COM_CONFIG_FIELD_SEF_URL_LABEL="Search Engine Friendly URLs" COM_CONFIG_FIELD_SERVER_TIMEZONE_DESC="Choose a city in the list to configure the date and time for display." COM_CONFIG_FIELD_SERVER_TIMEZONE_LABEL="Server Time Zone" -COM_CONFIG_FIELD_SESSION_HANDLER_DESC="The mechanism by which Joomla identifies a User once they are connected to the website using non-persistent cookies." +COM_CONFIG_FIELD_SESSION_HANDLER_DESC="The mechanism by which Joomla identifies a User once they are connected to the website using non-persistent cookies.
    If 'PHP' is selected, the session.save_handler value from the PHP configuration will be used." COM_CONFIG_FIELD_SESSION_HANDLER_LABEL="Session Handler" COM_CONFIG_FIELD_SESSION_TIME_DESC="Auto log out a User after they have been inactive for the entered number of minutes. Do not set too high." COM_CONFIG_FIELD_SESSION_TIME_LABEL="Session Lifetime" @@ -226,6 +226,14 @@ COM_CONFIG_PERMISSION_SETTINGS="Permission Settings" COM_CONFIG_PERMISSIONS="Permissions" COM_CONFIG_PROXY_SETTINGS="Proxy Settings" COM_CONFIG_SAVE_SUCCESS="Configuration successfully saved." +COM_CONFIG_SENDMAIL_ACTION_BUTTON="Send Test Mail" +COM_CONFIG_SENDMAIL_BODY="This is a test mail sent using "_QQ_"%s"_QQ_". If you receive it, then your email settings are correct!" +COM_CONFIG_SENDMAIL_ERROR="Test mail could not be sent." +COM_CONFIG_SENDMAIL_METHOD_MAIL="PHP Mail" +COM_CONFIG_SENDMAIL_METHOD_SENDMAIL="Sendmail" +COM_CONFIG_SENDMAIL_METHOD_SMTP="SMTP" +COM_CONFIG_SENDMAIL_SUBJECT="Test mail from %s" +COM_CONFIG_SENDMAIL_SUCCESS="The email was sent successfully to %s using %s. You should check that you've received the test email." COM_CONFIG_SEO_SETTINGS="SEO Settings" COM_CONFIG_SERVER="Server" COM_CONFIG_SERVER_SETTINGS="Server Settings" diff --git a/administrator/language/en-GB/en-GB.com_config.sys.ini b/administrator/language/en-GB/en-GB.com_config.sys.ini index 23513013b68d1..c4d6fe01affbe 100644 --- a/administrator/language/en-GB/en-GB.com_config.sys.ini +++ b/administrator/language/en-GB/en-GB.com_config.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_contact.ini b/administrator/language/en-GB/en-GB.com_contact.ini index 2745507491bf8..c7ee1a7a4429d 100644 --- a/administrator/language/en-GB/en-GB.com_contact.ini +++ b/administrator/language/en-GB/en-GB.com_contact.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_contact.sys.ini b/administrator/language/en-GB/en-GB.com_contact.sys.ini index f4ff93d94c7c2..6651282393085 100644 --- a/administrator/language/en-GB/en-GB.com_contact.sys.ini +++ b/administrator/language/en-GB/en-GB.com_contact.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_content.ini b/administrator/language/en-GB/en-GB.com_content.ini index 7fd35d52a0a2b..4b3f6dd227fc3 100644 --- a/administrator/language/en-GB/en-GB.com_content.ini +++ b/administrator/language/en-GB/en-GB.com_content.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_content.sys.ini b/administrator/language/en-GB/en-GB.com_content.sys.ini index b82bb3ca0dc19..a2ce20275dce3 100644 --- a/administrator/language/en-GB/en-GB.com_content.sys.ini +++ b/administrator/language/en-GB/en-GB.com_content.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_contenthistory.ini b/administrator/language/en-GB/en-GB.com_contenthistory.ini index eea46207bc95a..cc22054e60568 100644 --- a/administrator/language/en-GB/en-GB.com_contenthistory.ini +++ b/administrator/language/en-GB/en-GB.com_contenthistory.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_contenthistory.sys.ini b/administrator/language/en-GB/en-GB.com_contenthistory.sys.ini index 3b0b761c63eb2..689c103f51408 100644 --- a/administrator/language/en-GB/en-GB.com_contenthistory.sys.ini +++ b/administrator/language/en-GB/en-GB.com_contenthistory.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_cpanel.ini b/administrator/language/en-GB/en-GB.com_cpanel.ini index f5542e76d0d86..ac51480c16435 100644 --- a/administrator/language/en-GB/en-GB.com_cpanel.ini +++ b/administrator/language/en-GB/en-GB.com_cpanel.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -27,6 +27,8 @@ COM_CPANEL_MSG_PHPVERSION_BODY="Beginning with Joomla! 3.3, the version of PHP t COM_CPANEL_MSG_PHPVERSION_TITLE="Your PHP Version Will Be Unsupported in Joomla! 3.3" COM_CPANEL_MSG_ROBOTS_TITLE="robots.txt Update" COM_CPANEL_MSG_ROBOTS_BODY="A change to the default robots.txt files was made in Joomla! 3.3 to allow Google to access templates and media files by default to improve SEO. This change is not applied automatically on upgrades and users are recommended to review the changes in the robots.txt.dist file and implement these change in their own robots.txt file." -COM_CPANEL_WELCOME_BEGINNERS_MESSAGE="

    Community resources are available for new users

    • Joomla! Beginners Guide
    • New to Joomla! Forum
        • " +COM_CPANEL_MSG_STATS_COLLECTION_BODY="Since Joomla! 3.5 a statistics plugin will submit anonymous data to the Joomla Project. This will only submit the Joomla version, PHP version, database engine and version, and server operating system.

        This data is collected to ensure that future versions of Joomla can take advantage of the latest database and PHP features without effecting significant numbers of users. The need for this became clear when a minimum of PHP 5.3.10 was required when Joomla! 3.3 implemented the more secure Bcrypt passwords.

        In the interest of full transparency and to help developers this data is publicly available. An API and graphs will show the Joomla version, PHP versions and database engines in use.

        If you do not wish to provide the Joomla Project with this information you can disable the plugin called System - Joomla Statistics." +COM_CPANEL_MSG_STATS_COLLECTION_TITLE="Stats Collection in Joomla" +COM_CPANEL_WELCOME_BEGINNERS_MESSAGE="

        Community resources are available for new users

        " COM_CPANEL_WELCOME_BEGINNERS_TITLE="Welcome to Joomla!" COM_CPANEL_XML_DESCRIPTION="Control Panel component" diff --git a/administrator/language/en-GB/en-GB.com_cpanel.sys.ini b/administrator/language/en-GB/en-GB.com_cpanel.sys.ini index b6aac869c6d67..cec82acfc980b 100644 --- a/administrator/language/en-GB/en-GB.com_cpanel.sys.ini +++ b/administrator/language/en-GB/en-GB.com_cpanel.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_finder.ini b/administrator/language/en-GB/en-GB.com_finder.ini index ce7f21772918f..d3580a2ed99d8 100644 --- a/administrator/language/en-GB/en-GB.com_finder.ini +++ b/administrator/language/en-GB/en-GB.com_finder.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -171,6 +171,8 @@ COM_FINDER_MAPS_CONFIRM_DELETE_PROMPT="Are you sure you want to delete the selec COM_FINDER_MAPS_MULTILANG="Note: Language filter system plugin has been enabled, so this branch will not be used." COM_FINDER_MAPS_NO_CONTENT="No results to display. Either no content has been indexed or no content meets your filter criteria." COM_FINDER_MAPS_RETURN_TO_BRANCHES="Return to Branches" +COM_FINDER_MAPS_SELECT_BRANCH="- Select Branch -" +COM_FINDER_MAPS_SELECT_TYPE="- Select Type of Content -" COM_FINDER_MAPS_TOOLBAR_TITLE="Smart Search: Content Maps" COM_FINDER_MESSAGE_RETURNED="The following message was returned by the server:" COM_FINDER_N_ITEMS_CHECKED_IN_0="No item successfully checked in." diff --git a/administrator/language/en-GB/en-GB.com_finder.sys.ini b/administrator/language/en-GB/en-GB.com_finder.sys.ini index 01a49a1195a7a..cdf24135e6361 100644 --- a/administrator/language/en-GB/en-GB.com_finder.sys.ini +++ b/administrator/language/en-GB/en-GB.com_finder.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_installer.ini b/administrator/language/en-GB/en-GB.com_installer.ini index a8ad91322704c..896ea932b2e14 100644 --- a/administrator/language/en-GB/en-GB.com_installer.ini +++ b/administrator/language/en-GB/en-GB.com_installer.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -8,6 +8,8 @@ COM_INSTALLER_AUTHOR_INFORMATION="Author Information" COM_INSTALLER_CACHETIMEOUT_DESC="For how many hours should Joomla cache extension update information." COM_INSTALLER_CACHETIMEOUT_LABEL="Updates Caching (in hours)" COM_INSTALLER_CONFIGURATION="Installer: Options" +COM_INSTALLER_CONFIRM_UNINSTALL="Are you sure you want to uninstall? Confirming will permanently delete the selected item(s)!" +COM_INSTALLER_CURRENT_VERSION="Installed" COM_INSTALLER_ENABLED_UPDATES_1=", 1 disabled site was enabled." COM_INSTALLER_ENABLED_UPDATES_MORE=", %s disabled sites were enabled." COM_INSTALLER_ERROR_DISABLE_DEFAULT_TEMPLATE_NOT_PERMITTED="Disable default template is not permitted." @@ -36,12 +38,22 @@ COM_INSTALLER_HEADING_CLIENT="Client" COM_INSTALLER_HEADING_DETAILS_URL="Details URL" COM_INSTALLER_HEADING_DETAILSURL="URL Details" COM_INSTALLER_HEADING_FOLDER="Folder" +COM_INSTALLER_HEADING_FOLDER_ASC="Folder ascending" +COM_INSTALLER_HEADING_FOLDER_DESC="Folder descending" COM_INSTALLER_HEADING_ID="ID" COM_INSTALLER_HEADING_INSTALLTYPE="Install Type" COM_INSTALLER_HEADING_LOCATION="Location" +COM_INSTALLER_HEADING_LOCATION_ASC="Location ascending" +COM_INSTALLER_HEADING_LOCATION_DESC="Location descending" COM_INSTALLER_HEADING_NAME="Name" +COM_INSTALLER_HEADING_NAME_ASC="Name ascending" +COM_INSTALLER_HEADING_NAME_DESC="Name descending" COM_INSTALLER_HEADING_TYPE="Type" +COM_INSTALLER_HEADING_TYPE_ASC="Type ascending" +COM_INSTALLER_HEADING_TYPE_DESC="Type descending" COM_INSTALLER_HEADING_UPDATESITE_NAME="Update Site" +COM_INSTALLER_HEADING_UPDATESITE_NAME_ASC="Update Site ascending" +COM_INSTALLER_HEADING_UPDATESITE_NAME_DESC="Update Site descending" COM_INSTALLER_HEADING_UPDATESITEID="ID" COM_INSTALLER_INSTALL_BUTTON="Install" COM_INSTALLER_INSTALL_DIRECTORY="Install Folder" @@ -84,6 +96,8 @@ COM_INSTALLER_MSG_DATABASE_SCHEMA_VERSION="Database schema version (in #__schema COM_INSTALLER_MSG_DATABASE_SKIPPED="%s database changes did not alter table structure and were skipped." COM_INSTALLER_MSG_DATABASE_UPDATE_VERSION="Update version (in #__extensions): %s." COM_INSTALLER_MSG_DATABASE_UPDATEVERSION_ERROR="Database update version (%s) does not match CMS version (%s)." +COM_INSTALLER_MSG_DATABASE_UTF8_CONVERSION_UTF8="The Joomla! Core database tables have not been converted yet to UTF-8." +COM_INSTALLER_MSG_DATABASE_UTF8_CONVERSION_UTF8MB4="The Joomla! Core database tables have not been converted yet to UTF-8 Multibyte (utf8mb4)." COM_INSTALLER_MSG_DESCFTP="For installing or uninstalling Extensions, Joomla will most likely need your FTP account details. Please enter them in the form fields below." COM_INSTALLER_MSG_DESCFTPTITLE="FTP Login Details" COM_INSTALLER_MSG_DISCOVER_DESCRIPTION="This screen allows you to discover extensions that have not gone through the normal installation process.
        For example, some extensions are too large in file size to upload using the web interface due to limitations of the web hosting environment. Using this feature you can upload extension files directly to your web server using some other means such as FTP or SFTP and place those extension files into the appropriate folder.
        You can then use the discover feature to find the newly uploaded extension and activate it in your Joomla installation.
        Using the discover operation you can also discover and install multiple extensions at the same time." @@ -151,6 +165,7 @@ COM_INSTALLER_N_UPDATESITES_PUBLISHED_1="%d update site successfully enabled." COM_INSTALLER_N_UPDATESITES_UNPUBLISHED="%d update sites successfully disabled." COM_INSTALLER_N_UPDATESITES_UNPUBLISHED_1="%d update site successfully disabled." COM_INSTALLER_NEW_INSTALL="New Install" +COM_INSTALLER_NEW_VERSION="Available" COM_INSTALLER_NO_INSTALL_TYPE_FOUND="No Install Type Found" COM_INSTALLER_PACKAGE_DOWNLOAD_FAILED="Failed to download package. Download it and install manually from %1$s." COM_INSTALLER_PACKAGE_FILE="Package File" diff --git a/administrator/language/en-GB/en-GB.com_installer.sys.ini b/administrator/language/en-GB/en-GB.com_installer.sys.ini index d789531874e19..88df901bd28c8 100644 --- a/administrator/language/en-GB/en-GB.com_installer.sys.ini +++ b/administrator/language/en-GB/en-GB.com_installer.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_joomlaupdate.ini b/administrator/language/en-GB/en-GB.com_joomlaupdate.ini index e1ac7f58a9df0..04ed6a114e8d4 100644 --- a/administrator/language/en-GB/en-GB.com_joomlaupdate.ini +++ b/administrator/language/en-GB/en-GB.com_joomlaupdate.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_joomlaupdate.sys.ini b/administrator/language/en-GB/en-GB.com_joomlaupdate.sys.ini index fc0820108eacd..88a8cc7761d4b 100644 --- a/administrator/language/en-GB/en-GB.com_joomlaupdate.sys.ini +++ b/administrator/language/en-GB/en-GB.com_joomlaupdate.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_languages.ini b/administrator/language/en-GB/en-GB.com_languages.ini index cd16dbc847283..ed2abb52e1aee 100644 --- a/administrator/language/en-GB/en-GB.com_languages.ini +++ b/administrator/language/en-GB/en-GB.com_languages.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -14,7 +14,7 @@ COM_LANGUAGES_FIELD_IMAGE_DESC="Prefix of the image file for this language when COM_LANGUAGES_FIELD_IMAGE_LABEL="Image Prefix" COM_LANGUAGES_FIELD_LANG_TAG_DESC="Enter the language tag – example: en-GB for English (UK). This should be the exact prefix used for the language installed or to be installed." COM_LANGUAGES_FIELD_LANG_TAG_LABEL="Language Tag" -COM_LANGUAGES_INSTALL="Install Language" +COM_LANGUAGES_INSTALL="Install Languages" COM_LANGUAGES_OVERRIDE_ERROR_RESERVED_WORDS="YES, NO, NULL, FALSE, ON, OFF, NONE, TRUE are reserved words and can't be used as language constants." COM_LANGUAGES_OVERRIDE_FIELD_BOTH_LABEL="For both locations" COM_LANGUAGES_OVERRIDE_FIELD_BOTH_DESC="If this box is checked the override will be stored for both administrator (Backend) and site (Frontend). This is essential for creating language overrides for some plugins because their language files, while stored in backend, are also used in frontend (example: plg_content_vote).
        Please note that the two overrides will be completely independent from each other after storing them." @@ -46,13 +46,42 @@ COM_LANGUAGES_FIELD_TITLE_NATIVE_LABEL="Title Native" COM_LANGUAGES_FILTER_CLIENT_LABEL="Filter Location:" COM_LANGUAGES_FTP_DESC="For setting Languages as default, Joomla will most likely need your FTP account details. Please enter them in the form fields below." COM_LANGUAGES_FTP_TITLE="FTP Login Details" +COM_LANGUAGES_HEADING_AUTHOR="Author" +COM_LANGUAGES_HEADING_AUTHOR_ASC="Author ascending" +COM_LANGUAGES_HEADING_AUTHOR_DESC="Author descending" COM_LANGUAGES_HEADING_AUTHOR_EMAIL="Author Email" +COM_LANGUAGES_HEADING_AUTHOR_EMAIL_ASC="Author Email ascending" +COM_LANGUAGES_HEADING_AUTHOR_EMAIL_DESC="Author Email descending" +COM_LANGUAGES_HEADING_DATE="Date" +COM_LANGUAGES_HEADING_DATE_ASC="Date ascending" +COM_LANGUAGES_HEADING_DATE_DESC="Date descending" COM_LANGUAGES_HEADING_DEFAULT="Default" -COM_LANGUAGES_HEADING_LANG_IMAGE="Image Prefix" +COM_LANGUAGES_HEADING_DEFAULT_ASC="Default ascending" +COM_LANGUAGES_HEADING_DEFAULT_DESC="Default descending" +COM_LANGUAGES_HEADING_HOMEPAGE="Home" +COM_LANGUAGES_HEADING_HOMEPAGE_ASC="Home ascending" +COM_LANGUAGES_HEADING_HOMEPAGE_DESC="Home descending" COM_LANGUAGES_HEADING_LANGUAGE="Language" +COM_LANGUAGES_HEADING_LANGUAGE_ASC="Language ascending" +COM_LANGUAGES_HEADING_LANGUAGE_DESC="Language descending" +COM_LANGUAGES_HEADING_LANG_CODE="URL Language Code" +COM_LANGUAGES_HEADING_LANG_CODE_ASC="URL Language Code ascending" +COM_LANGUAGES_HEADING_LANG_CODE_DESC="URL Language Code descending" +COM_LANGUAGES_HEADING_LANG_IMAGE="Image Prefix" +COM_LANGUAGES_HEADING_LANG_IMAGE_ASC="Image Prefix ascending" +COM_LANGUAGES_HEADING_LANG_IMAGE_DESC="Image Prefix descending" +COM_LANGUAGES_HEADING_LANG_TAG="Language Tag" +COM_LANGUAGES_HEADING_LANG_TAG_ASC="Language Tag ascending" +COM_LANGUAGES_HEADING_LANG_TAG_DESC="Language Tag descending" +COM_LANGUAGES_HEADING_VERSION="Version" +COM_LANGUAGES_HEADING_VERSION_ASC="Version ascending" +COM_LANGUAGES_HEADING_VERSION_DESC="Version descending" COM_LANGUAGES_HEADING_TITLE_NATIVE="Native Title" +COM_LANGUAGES_HEADING_TITLE_NATIVE_ASC="Native Title ascending" +COM_LANGUAGES_HEADING_TITLE_NATIVE_DESC="Native Title descending" COM_LANGUAGES_HOMEPAGE="Home" COM_LANGUAGES_MSG_DEFAULT_LANGUAGE_SAVED="Default Language Saved. This does not affect users that have chosen a specific language on their profile or on the login page.
        Warning! When using the multilingual functionality (ie when the plugin System - Languagefilter is enabled) the Site Default Language has to also be a published Content language." +COM_LANGUAGES_MSG_SWITCH_ADMIN_LANGUAGE_SUCCESS="The Administrator Language has been successfully switched to "%s"." COM_LANGUAGES_MULTILANGSTATUS_CONTACTS_ERROR="Some of the contacts linked to the user %s are incorrect." COM_LANGUAGES_MULTILANGSTATUS_CONTACTS_ERROR_TIP="Warning! A user/author should have only one contact to which is assigned language 'All' OR one contact for each published Content Language." COM_LANGUAGES_MULTILANGSTATUS_CONTENT_LANGUAGE_PUBLISHED="Published Content Languages" @@ -81,9 +110,13 @@ COM_LANGUAGES_NO_ITEM_SELECTED="No languages selected." COM_LANGUAGES_SAVE_SUCCESS="Content Language successfully saved." COM_LANGUAGES_SEARCH_IN_TITLE="Search in title" COM_LANGUAGES_SUBMENU_CONTENT="Content Languages" +COM_LANGUAGES_SUBMENU_INSTALLED="Installed" COM_LANGUAGES_SUBMENU_INSTALLED_ADMINISTRATOR="Installed - Administrator" COM_LANGUAGES_SUBMENU_INSTALLED_SITE="Installed - Site" COM_LANGUAGES_SUBMENU_OVERRIDES="Overrides" +COM_LANGUAGES_SWITCH_ADMIN="Switch Language" +COM_LANGUAGES_VIEW_INSTALLED_ADMIN_TITLE="Languages: Installed (Administrator)" +COM_LANGUAGES_VIEW_INSTALLED_SITE_TITLE="Languages: Installed (Site)" COM_LANGUAGES_VIEW_INSTALLED_TITLE="Languages: Installed" COM_LANGUAGES_VIEW_LANGUAGE_EDIT_EDIT_TITLE="Languages: Edit Content Language" COM_LANGUAGES_VIEW_LANGUAGE_EDIT_NEW_TITLE="Languages: New Content Language" diff --git a/administrator/language/en-GB/en-GB.com_languages.sys.ini b/administrator/language/en-GB/en-GB.com_languages.sys.ini index c435c690b4a22..d2de03873a303 100644 --- a/administrator/language/en-GB/en-GB.com_languages.sys.ini +++ b/administrator/language/en-GB/en-GB.com_languages.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_login.ini b/administrator/language/en-GB/en-GB.com_login.ini index d831418f90421..ef35f518ff355 100644 --- a/administrator/language/en-GB/en-GB.com_login.ini +++ b/administrator/language/en-GB/en-GB.com_login.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_login.sys.ini b/administrator/language/en-GB/en-GB.com_login.sys.ini index aef4c24332857..a4597fb975aa1 100644 --- a/administrator/language/en-GB/en-GB.com_login.sys.ini +++ b/administrator/language/en-GB/en-GB.com_login.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_mailto.sys.ini b/administrator/language/en-GB/en-GB.com_mailto.sys.ini index 3a6b3f33e92fa..f13d379443235 100644 --- a/administrator/language/en-GB/en-GB.com_mailto.sys.ini +++ b/administrator/language/en-GB/en-GB.com_mailto.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_media.ini b/administrator/language/en-GB/en-GB.com_media.ini index fd49812a2e9c9..68488ac3fe1ea 100644 --- a/administrator/language/en-GB/en-GB.com_media.ini +++ b/administrator/language/en-GB/en-GB.com_media.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -72,7 +72,7 @@ COM_MEDIA_FILES="Files" COM_MEDIA_FILESIZE="File size" COM_MEDIA_FOLDER="Folder" COM_MEDIA_FOLDERS="Media Folders" -COM_MEDIA_FOLDERS_PATH_LABEL="Warning! Path Folder
        Changing the default 'Path to files folder' to another folder other than default 'images' may break your links.
        The 'Path to images' folder has to be the same or a subfolder of 'Path to files'." +COM_MEDIA_FOLDERS_PATH_LABEL="Warning! Path Folder
        Changing the 'Path to files folder' from the default of 'images' may break your links.
        The 'Path to images' folder has to be the same or a subfolder of 'Path to files'." COM_MEDIA_IMAGE_DESCRIPTION="Image Description" COM_MEDIA_IMAGE_DIMENSIONS="%1$s x %2$s" COM_MEDIA_IMAGE_TITLE="%1$s - %2$s" @@ -98,4 +98,4 @@ COM_MEDIA_UPLOAD_SUCCESSFUL="Upload Successful" COM_MEDIA_UPLOAD="Upload" COM_MEDIA_UP="Up" COM_MEDIA_XML_DESCRIPTION="Component for managing site media" -JLIB_RULES_SETTING_NOTES="1. Changes apply to this component only.
        Inherited - a Global Configuration setting or higher level setting is applied.
        Denied always wins - whatever is set at the Global or higher level and applies to all child elements.
        Allowed will enable the action for this component unless it is overruled by a Global Configuration setting.

        2. Select Save to refresh the calculated settings." \ No newline at end of file +JLIB_RULES_SETTING_NOTES="1. Changes apply to this component only.
        Inherited - a Global Configuration setting or higher level setting is applied.
        Denied always wins - whatever is set at the Global or higher level and applies to all child elements.
        Allowed will enable the action for this component unless it is overruled by a Global Configuration setting.

        2. Select Save to refresh the calculated settings." diff --git a/administrator/language/en-GB/en-GB.com_media.sys.ini b/administrator/language/en-GB/en-GB.com_media.sys.ini index 2baf9695da10d..a8ad452f3b3ab 100644 --- a/administrator/language/en-GB/en-GB.com_media.sys.ini +++ b/administrator/language/en-GB/en-GB.com_media.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_menus.ini b/administrator/language/en-GB/en-GB.com_menus.ini index 99e63b6aee29e..331f4e414a0c8 100644 --- a/administrator/language/en-GB/en-GB.com_menus.ini +++ b/administrator/language/en-GB/en-GB.com_menus.ini @@ -1,10 +1,10 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 COM_MENUS="Menus" -COM_MENUS_ADD_MENU_MODULE="Add a module for this menu type." +COM_MENUS_ADD_MENU_MODULE="Add a module for this menu." COM_MENUS_ADVANCED_FIELDSET_LABEL="Advanced" COM_MENUS_BASIC_FIELDSET_LABEL="Options" COM_MENUS_BATCH_MENU_ITEM_CANNOT_CREATE="You are not allowed to create new menu items." @@ -66,13 +66,15 @@ COM_MENUS_ITEM_FIELD_ANCHOR_CSS_DESC="An optional, custom style to apply to the COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL="Link CSS Style" COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_DESC="An optional, custom description for the title attribute of the menu hyperlink." COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_LABEL="Link Title Attribute" +COM_MENUS_ITEM_FIELD_ANCHOR_REL_DESC="An optional, custom rel attribute to get more information about the menu hyperlink (search engines purpose)." +COM_MENUS_ITEM_FIELD_ANCHOR_REL_LABEL="Link Rel Attribute" COM_MENUS_ITEM_FIELD_ASSIGNED_DESC="Shows which menu the link will appear in." -COM_MENUS_ITEM_FIELD_ASSIGNED_LABEL=" Menu Location" +COM_MENUS_ITEM_FIELD_ASSIGNED_LABEL=" Menu" COM_MENUS_ITEM_FIELD_ASSOCIATION_NO_VALUE="- No association -" COM_MENUS_ITEM_FIELD_BROWSERNAV_DESC="Target browser window when the menu item is selected." COM_MENUS_ITEM_FIELD_BROWSERNAV_LABEL="Target Window" COM_MENUS_ITEM_FIELD_HIDE_UNASSIGNED="Hide Unassigned Modules" -COM_MENUS_ITEM_FIELD_HIDE_UNASSIGNED_DESC="Shows or hide modules unassigned to this menu item." +COM_MENUS_ITEM_FIELD_HIDE_UNASSIGNED_DESC="Show or hide modules unassigned to this menu item." COM_MENUS_ITEM_FIELD_HIDE_UNASSIGNED_LABEL="Unassigned Modules" COM_MENUS_ITEM_FIELD_HOME_DESC="Sets this menu item as the default or home page of the site. You must have a default page set at all times." COM_MENUS_ITEM_FIELD_HOME_LABEL="Default Page" @@ -81,6 +83,8 @@ COM_MENUS_ITEM_FIELD_LINK_DESC="Link for this menu." COM_MENUS_ITEM_FIELD_LINK_LABEL="Link" COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC="Select or upload an optional image to be used with the menu hyperlink." COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL="Link Image" +COM_MENUS_ITEM_FIELD_MENU_SHOW_DESC="Select 'No' if you want to exclude this menu item from displaying in the menu. Note any submenu items will also be hidden." +COM_MENUS_ITEM_FIELD_MENU_SHOW_LABEL="Display in Menu" COM_MENUS_ITEM_FIELD_MENU_TEXT_DESC="If the optional image is added, adds the menu title next to the image. Default is 'Yes'." COM_MENUS_ITEM_FIELD_MENU_TEXT_LABEL="Add Menu Title" COM_MENUS_ITEM_FIELD_NOTE_DESC="An optional note to display in the Menu Manager." @@ -179,6 +183,7 @@ COM_MENUS_TYPE_UNEXISTING="Component '%s' does not exist." COM_MENUS_TYPE_UNKNOWN="Unknown" COM_MENUS_VIEW_EDIT_ITEM_TITLE="Menus: Edit Item" COM_MENUS_VIEW_EDIT_MENU_TITLE="Menus: Edit" +COM_MENUS_VIEW_ITEMS_MENU_TITLE="Menus: Items (%s)" COM_MENUS_VIEW_ITEMS_TITLE="Menus: Items" COM_MENUS_VIEW_MENUS_TITLE="Menus" COM_MENUS_VIEW_NEW_ITEM_TITLE="Menus: New Item" diff --git a/administrator/language/en-GB/en-GB.com_menus.sys.ini b/administrator/language/en-GB/en-GB.com_menus.sys.ini index 8a2751803109b..30e294c8e7fba 100644 --- a/administrator/language/en-GB/en-GB.com_menus.sys.ini +++ b/administrator/language/en-GB/en-GB.com_menus.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_messages.ini b/administrator/language/en-GB/en-GB.com_messages.ini index 25c112fdeb0a8..256189ec90ad6 100644 --- a/administrator/language/en-GB/en-GB.com_messages.ini +++ b/administrator/language/en-GB/en-GB.com_messages.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_messages.sys.ini b/administrator/language/en-GB/en-GB.com_messages.sys.ini index 3212de91b3fb5..00c98d70f914c 100644 --- a/administrator/language/en-GB/en-GB.com_messages.sys.ini +++ b/administrator/language/en-GB/en-GB.com_messages.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_modules.ini b/administrator/language/en-GB/en-GB.com_modules.ini index 15a63af8b625c..e93047666be78 100644 --- a/administrator/language/en-GB/en-GB.com_modules.ini +++ b/administrator/language/en-GB/en-GB.com_modules.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -28,7 +28,7 @@ COM_MODULES_EXTENSION_PUBLISHED_DISABLED="Module disabled and published." COM_MODULES_EXTENSION_PUBLISHED_ENABLED="Module enabled and published." COM_MODULES_EXTENSION_UNPUBLISHED_DISABLED="Module disabled and unpublished." COM_MODULES_EXTENSION_UNPUBLISHED_ENABLED="Module enabled and unpublished." -COM_MODULES_EXTRA_STYLE_DESC="Specify the style for the module or the modules in the possiton selected" +COM_MODULES_EXTRA_STYLE_DESC="Specify the style for the module or the modules in the position selected." COM_MODULES_EXTRA_STYLE_TITLE="Module(s) style" COM_MODULES_FIELD_AUTOMATIC_TITLE_LABEL="Automatic Title" COM_MODULES_FIELD_AUTOMATIC_TITLE_DESC="Set yes if you want an automatic translated title. Its use depends on the Administrator template." @@ -87,6 +87,8 @@ COM_MODULES_MANAGER_MODULE="Modules: %s" COM_MODULES_MANAGER_MODULE_ADD="Modules: Add New Module" COM_MODULES_MANAGER_MODULE_EDIT="Modules: Edit Module" COM_MODULES_MANAGER_MODULES="Modules" +COM_MODULES_MANAGER_MODULES_ADMIN="Modules (Administrator)" +COM_MODULES_MANAGER_MODULES_SITE="Modules (Site)" COM_MODULES_MENU_ASSIGNMENT="Menu Assignment" COM_MODULES_MODULE_ASSIGN="Module Assignment" COM_MODULES_MODULE="Module" diff --git a/administrator/language/en-GB/en-GB.com_modules.sys.ini b/administrator/language/en-GB/en-GB.com_modules.sys.ini index 0c8482e707f8f..108ccf04c7a5e 100644 --- a/administrator/language/en-GB/en-GB.com_modules.sys.ini +++ b/administrator/language/en-GB/en-GB.com_modules.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_newsfeeds.ini b/administrator/language/en-GB/en-GB.com_newsfeeds.ini index 86709a5d47c94..c120634c3adb1 100644 --- a/administrator/language/en-GB/en-GB.com_newsfeeds.ini +++ b/administrator/language/en-GB/en-GB.com_newsfeeds.ini @@ -1,4 +1,4 @@ -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; Joomla! Project ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_newsfeeds.sys.ini b/administrator/language/en-GB/en-GB.com_newsfeeds.sys.ini index cf05569175d4c..fa06b078d9e87 100644 --- a/administrator/language/en-GB/en-GB.com_newsfeeds.sys.ini +++ b/administrator/language/en-GB/en-GB.com_newsfeeds.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_plugins.ini b/administrator/language/en-GB/en-GB.com_plugins.ini index 3465198601679..58dfd81085a8a 100644 --- a/administrator/language/en-GB/en-GB.com_plugins.ini +++ b/administrator/language/en-GB/en-GB.com_plugins.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -17,6 +17,10 @@ COM_PLUGINS_FIELD_FOLDER_LABEL="Plugin Type" COM_PLUGINS_FIELD_NAME_DESC="The name of the plugin as defined in its xml." COM_PLUGINS_FIELD_NAME_LABEL="Plugin Name" COM_PLUGINS_FOLDER_HEADING="Type" +COM_PLUGINS_HEADING_ELEMENT_ASC="Element ascending" +COM_PLUGINS_HEADING_ELEMENT_DESC="Element descending" +COM_PLUGINS_HEADING_FOLDER_ASC="Type ascending" +COM_PLUGINS_HEADING_FOLDER_DESC="Type descending" COM_PLUGINS_MANAGER_PLUGIN="Plugins: %s" COM_PLUGINS_MANAGER_PLUGINS="Plugins" COM_PLUGINS_MSG_MANAGE_NO_PLUGINS="There are no plugins installed matching your query." diff --git a/administrator/language/en-GB/en-GB.com_plugins.sys.ini b/administrator/language/en-GB/en-GB.com_plugins.sys.ini index a810b0cd5c344..f4683c26c955e 100644 --- a/administrator/language/en-GB/en-GB.com_plugins.sys.ini +++ b/administrator/language/en-GB/en-GB.com_plugins.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_postinstall.ini b/administrator/language/en-GB/en-GB.com_postinstall.ini index 4a9321801f9a1..6cec2bddf16e1 100644 --- a/administrator/language/en-GB/en-GB.com_postinstall.ini +++ b/administrator/language/en-GB/en-GB.com_postinstall.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_postinstall.sys.ini b/administrator/language/en-GB/en-GB.com_postinstall.sys.ini index 15b19ee835bfa..d1c5a76bad357 100644 --- a/administrator/language/en-GB/en-GB.com_postinstall.sys.ini +++ b/administrator/language/en-GB/en-GB.com_postinstall.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_redirect.ini b/administrator/language/en-GB/en-GB.com_redirect.ini index 6f222fc487354..641211fe920f1 100644 --- a/administrator/language/en-GB/en-GB.com_redirect.ini +++ b/administrator/language/en-GB/en-GB.com_redirect.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_redirect.sys.ini b/administrator/language/en-GB/en-GB.com_redirect.sys.ini index 0630bf1d5c033..db1e189efb421 100644 --- a/administrator/language/en-GB/en-GB.com_redirect.sys.ini +++ b/administrator/language/en-GB/en-GB.com_redirect.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_search.ini b/administrator/language/en-GB/en-GB.com_search.ini index 967ef70c041ad..7566707c17434 100644 --- a/administrator/language/en-GB/en-GB.com_search.ini +++ b/administrator/language/en-GB/en-GB.com_search.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_search.sys.ini b/administrator/language/en-GB/en-GB.com_search.sys.ini index d2e6e803b42e8..c991dc443a3b5 100644 --- a/administrator/language/en-GB/en-GB.com_search.sys.ini +++ b/administrator/language/en-GB/en-GB.com_search.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_tags.ini b/administrator/language/en-GB/en-GB.com_tags.ini index 36923e763d4ca..05691ff85ea73 100644 --- a/administrator/language/en-GB/en-GB.com_tags.ini +++ b/administrator/language/en-GB/en-GB.com_tags.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -134,7 +134,7 @@ COM_TAGS_SHOW_ALL_TAGS_IMAGE_LABEL="Show Heading Image" COM_TAGS_SHOW_EMPTY_TAG_DESC="Show empty tags." COM_TAGS_SHOW_ITEM_BODY_DESC="Show or hide the body text for the tagged items." COM_TAGS_SHOW_ITEM_BODY_LABEL="Item Body" -COM_TAGS_SHOW_ITEM_DESCRIPTION_DESC="Shows or hides the description for each tag listed." +COM_TAGS_SHOW_ITEM_DESCRIPTION_DESC="Show or hide the description for each tag listed." COM_TAGS_SHOW_ITEM_DESCRIPTION_LABEL="Tag Descriptions" COM_TAGS_SHOW_ITEM_IMAGE_DESC="Shows the first image for each item in the list." COM_TAGS_SHOW_ITEM_IMAGE_LABEL="Item Images" diff --git a/administrator/language/en-GB/en-GB.com_tags.sys.ini b/administrator/language/en-GB/en-GB.com_tags.sys.ini index 772063a150a3a..ce5545ab88bc6 100644 --- a/administrator/language/en-GB/en-GB.com_tags.sys.ini +++ b/administrator/language/en-GB/en-GB.com_tags.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_templates.ini b/administrator/language/en-GB/en-GB.com_templates.ini index e64f192733b81..70262d6168ccb 100644 --- a/administrator/language/en-GB/en-GB.com_templates.ini +++ b/administrator/language/en-GB/en-GB.com_templates.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -141,9 +141,17 @@ COM_TEMPLATES_HOME_BUTTON="Documentation" COM_TEMPLATES_HOME_HEADING="Select a File" COM_TEMPLATES_HOME_TEXT="You can select from a number of options for customising the look of your templates. The Template Manager supports Source files, Image files, Font files, Zip archives and most of the operations that can be performed on those files. Just select a file and you are good to go. Check the documentation if you want to know more." COM_TEMPLATES_HEADING_ASSIGNED="Assigned" +COM_TEMPLATES_HEADING_LOCATION_ASC="Location ascending" +COM_TEMPLATES_HEADING_LOCATION_DESC="Location descending" COM_TEMPLATES_HEADING_DEFAULT="Default" +COM_TEMPLATES_HEADING_DEFAULT_ASC="Default ascending" +COM_TEMPLATES_HEADING_DEFAULT_DESC="Default descending" COM_TEMPLATES_HEADING_STYLE="Style" +COM_TEMPLATES_HEADING_STYLE_ASC="Style ascending" +COM_TEMPLATES_HEADING_STYLE_DESC="Style descending" COM_TEMPLATES_HEADING_TEMPLATE="Template" +COM_TEMPLATES_HEADING_TEMPLATE_ASC="Template ascending" +COM_TEMPLATES_HEADING_TEMPLATE_DESC="Template descending" COM_TEMPLATES_IMAGE_HEIGHT="Height" COM_TEMPLATES_IMAGE_WIDTH="Width" COM_TEMPLATES_INVALID_FILE_NAME="Invalid file name. Please choose a file name containing a-z, A-Z, 0-9, - and _." diff --git a/administrator/language/en-GB/en-GB.com_templates.sys.ini b/administrator/language/en-GB/en-GB.com_templates.sys.ini index 8ad480ae86e06..6462afa6c27d8 100644 --- a/administrator/language/en-GB/en-GB.com_templates.sys.ini +++ b/administrator/language/en-GB/en-GB.com_templates.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_users.ini b/administrator/language/en-GB/en-GB.com_users.ini index 2a89adb4d15d8..9701cecf6aaef 100644 --- a/administrator/language/en-GB/en-GB.com_users.ini +++ b/administrator/language/en-GB/en-GB.com_users.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -116,26 +116,42 @@ COM_USERS_HEADING_ACTIVATED_ASC="Activated ascending" COM_USERS_HEADING_ACTIVATED_DESC="Activated descending" COM_USERS_HEADING_ASSET_NAME="Asset Name" COM_USERS_HEADING_ASSET_TITLE="Asset Title" +COM_USERS_HEADING_CATEGORY="Category" +COM_USERS_HEADING_CATEGORY_ASC="Category ascending" +COM_USERS_HEADING_CATEGORY_DESC="Category descending" COM_USERS_HEADING_EMAIL_ASC="Email ascending" COM_USERS_HEADING_EMAIL_DESC="Email descending" COM_USERS_HEADING_ENABLED="Enabled" COM_USERS_HEADING_ENABLED_ASC="Enabled ascending" COM_USERS_HEADING_ENABLED_DESC="Enabled descending" COM_USERS_HEADING_GROUP_TITLE="Group Title" +COM_USERS_HEADING_GROUP_TITLE_ASC="Group Title ascending" +COM_USERS_HEADING_GROUP_TITLE_DESC="Group Title descending" COM_USERS_HEADING_GROUPS="User Groups" COM_USERS_HEADING_LAST_VISIT_DATE="Last Visit Date" COM_USERS_HEADING_LAST_VISIT_DATE_ASC="Last visit date ascending" COM_USERS_HEADING_LAST_VISIT_DATE_DESC="Last visit date descending" COM_USERS_HEADING_LEVEL_NAME="Level Name" +COM_USERS_HEADING_LEVEL_NAME_ASC="Level Name ascending" +COM_USERS_HEADING_LEVEL_NAME_DESC="Level Name descending" COM_USERS_HEADING_LFT="LFT" COM_USERS_HEADING_NAME="Name" COM_USERS_HEADING_NAME_ASC="Name ascending" COM_USERS_HEADING_NAME_DESC="Name descending" -COM_USERS_HEADING_USERNAME_ASC="Username ascending" -COM_USERS_HEADING_USERNAME_DESC="Username descending" COM_USERS_HEADING_REGISTRATION_DATE="Registration Date" COM_USERS_HEADING_REGISTRATION_DATE_ASC="Registration date ascending" COM_USERS_HEADING_REGISTRATION_DATE_DESC="Registration date descending" +COM_USERS_HEADING_REVIEW="Review Date" +COM_USERS_HEADING_REVIEW_ASC="Review Date ascending" +COM_USERS_HEADING_REVIEW_DESC="Review Date descending" +COM_USERS_HEADING_SUBJECT="Subject" +COM_USERS_HEADING_SUBJECT_ASC="Subject ascending" +COM_USERS_HEADING_SUBJECT_DESC="Subject descending" +COM_USERS_HEADING_USER="User" +COM_USERS_HEADING_USER_ASC="User ascending" +COM_USERS_HEADING_USER_DESC="User descending" +COM_USERS_HEADING_USERNAME_ASC="Username ascending" +COM_USERS_HEADING_USERNAME_DESC="Username descending" COM_USERS_HEADING_USERS_IN_GROUP="Users in group" COM_USERS_LEVEL_DETAILS="Level Details" COM_USERS_LEVEL_FIELD_TITLE_DESC="Enter a Title for this Access level." @@ -155,7 +171,7 @@ COM_USERS_MAIL_FIELD_MESSAGE_DESC="Enter a default message." COM_USERS_MAIL_FIELD_MESSAGE_LABEL="Message" COM_USERS_MAIL_FIELD_RECURSE_DESC="If checked, the email will also be sent to users who are members of any child groups of the selected groups." COM_USERS_MAIL_FIELD_RECURSE_LABEL="Mail to Child User Groups" -COM_USERS_MAIL_FIELD_SEND_AS_BLIND_CARBON_COPY_DESC="Hides recipient list and adds copy to site email." +COM_USERS_MAIL_FIELD_SEND_AS_BLIND_CARBON_COPY_DESC="Hide the recipient list and use the site email address for the To: field." COM_USERS_MAIL_FIELD_SEND_AS_BLIND_CARBON_COPY_LABEL="Recipients as BCC" COM_USERS_MAIL_FIELD_SEND_IN_HTML_MODE_DESC="If checked, the email will be sent with HTML tags. If not checked, email will be sent in plain text." COM_USERS_MAIL_FIELD_SEND_IN_HTML_MODE_LABEL="Send in HTML Mode" @@ -296,6 +312,7 @@ COM_USERS_USERGROUP_DETAILS="User Group Details" COM_USERS_USERS_ERROR_CANNOT_BLOCK_SELF="You can't block yourself." COM_USERS_USERS_ERROR_CANNOT_DELETE_SELF="You can't delete yourself." COM_USERS_USERS_ERROR_CANNOT_DEMOTE_SELF="You can't remove your own Super User permissions." +COM_USERS_USERS_ERROR_CANNOT_REQUIRERESET_SELF="You can't require a Password reset for yourself." COM_USERS_USERS_MULTIPLE_GROUPS="Multiple groups" COM_USERS_USERS_N_ITEMS_DELETED="%d users successfully deleted." COM_USERS_USERS_N_ITEMS_DELETED_1="1 user successfully deleted." diff --git a/administrator/language/en-GB/en-GB.com_users.sys.ini b/administrator/language/en-GB/en-GB.com_users.sys.ini index 68a52714ef98b..7dd47064a906c 100644 --- a/administrator/language/en-GB/en-GB.com_users.sys.ini +++ b/administrator/language/en-GB/en-GB.com_users.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_weblinks.ini b/administrator/language/en-GB/en-GB.com_weblinks.ini index 5fdf66b7ae53e..f872874ff8e61 100644 --- a/administrator/language/en-GB/en-GB.com_weblinks.ini +++ b/administrator/language/en-GB/en-GB.com_weblinks.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_weblinks.sys.ini b/administrator/language/en-GB/en-GB.com_weblinks.sys.ini index 422a292161a8d..734e09d26d0c7 100644 --- a/administrator/language/en-GB/en-GB.com_weblinks.sys.ini +++ b/administrator/language/en-GB/en-GB.com_weblinks.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_wrapper.ini b/administrator/language/en-GB/en-GB.com_wrapper.ini index 9c714a23dda49..e96db3eb0b0de 100644 --- a/administrator/language/en-GB/en-GB.com_wrapper.ini +++ b/administrator/language/en-GB/en-GB.com_wrapper.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.com_wrapper.sys.ini b/administrator/language/en-GB/en-GB.com_wrapper.sys.ini index 2c4bc0cc92ed3..c3b3b69cbcd72 100644 --- a/administrator/language/en-GB/en-GB.com_wrapper.sys.ini +++ b/administrator/language/en-GB/en-GB.com_wrapper.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini index 49c527a4c3005..acdceb6bb2927 100644 --- a/administrator/language/en-GB/en-GB.ini +++ b/administrator/language/en-GB/en-GB.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -111,7 +111,7 @@ JSHOW="Show" JSITE="Site" JSUBMIT="Submit" JTAG="Tags" -JTAG_DESC="Assign tags to content items. You may select a tag from the pre-defined list or enter your own by typing the name in the field and pressing enter." +JTAG_DESC="Assign tags to content items. You may select a tag from the pre-defined list or enter a new tag by typing the name in the field and pressing enter." JTRASH="Trash" JTRASHED="Trashed" JTRUE="True" @@ -298,6 +298,7 @@ JGLOBAL_CHOOSE_CATEGORY_DESC="Choose a category from the list." JGLOBAL_CHOOSE_CATEGORY_LABEL="Choose a Category" JGLOBAL_CLICK_TO_SORT_THIS_COLUMN="Select to sort by this column" JGLOBAL_CLICK_TO_TOGGLE_STATE="Select icon to toggle state." +JGLOBAL_CONFIRM_DELETE="Are you sure you want to delete? Confirming will permanently delete the selected item(s)!" JGLOBAL_COPY="(copy)" JGLOBAL_CREATED="Created" JGLOBAL_CREATED_DATE="Created Date" diff --git a/administrator/language/en-GB/en-GB.lib_joomla.ini b/administrator/language/en-GB/en-GB.lib_joomla.ini index 5301ad0994980..90e6b570ce6e8 100644 --- a/administrator/language/en-GB/en-GB.lib_joomla.ini +++ b/administrator/language/en-GB/en-GB.lib_joomla.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -153,6 +153,7 @@ JLIB_DATABASE_ERROR_CLASS_NOT_FOUND_IN_FILE="Table class %s not found in file." JLIB_DATABASE_ERROR_CONNECT_DATABASE="Unable to connect to the Database: %s" JLIB_DATABASE_ERROR_CONNECT_MYSQL="Could not connect to MySQL." JLIB_DATABASE_ERROR_DATABASE_CONNECT="Could not connect to database." +JLIB_DATABASE_ERROR_DATABASE_UPGRADE_FAILED="MySQL Database Upgrade failed. Please check the Database Fixer." JLIB_DATABASE_ERROR_DELETE_CATEGORY="Left-Right data inconsistency. Can't delete category." JLIB_DATABASE_ERROR_DELETE_FAILED="%s: :delete failed - %s" JLIB_DATABASE_ERROR_DELETE_ROOT_CATEGORIES="Root categories can't be deleted." @@ -304,6 +305,7 @@ JLIB_FORM_VALIDATE_FIELD_INVALID="Invalid field: %s" JLIB_FORM_VALIDATE_FIELD_REQUIRED="Field required: %s" JLIB_FORM_VALIDATE_FIELD_RULE_MISSING="Validation Rule missing: %s" JLIB_FORM_VALUE_CACHE_APC="Alternative PHP Cache" +JLIB_FORM_VALUE_CACHE_APCU="APC User Cache" JLIB_FORM_VALUE_CACHE_CACHELITE="Cache_Lite" JLIB_FORM_VALUE_CACHE_EACCELERATOR="eAccelerator" JLIB_FORM_VALUE_CACHE_FILE="File" @@ -317,7 +319,7 @@ JLIB_FORM_VALUE_SESSION_DATABASE="Database" JLIB_FORM_VALUE_SESSION_EACCELERATOR="eAccelerator" JLIB_FORM_VALUE_SESSION_MEMCACHE="Memcache" JLIB_FORM_VALUE_SESSION_MEMCACHED="Memcached (Experimental)" -JLIB_FORM_VALUE_SESSION_NONE="None" +JLIB_FORM_VALUE_SESSION_NONE="PHP" JLIB_FORM_VALUE_SESSION_WINCACHE="Windows Cache" JLIB_FORM_VALUE_SESSION_XCACHE="XCache" JLIB_FORM_VALUE_TIMEZONE_UTC="Universal Time, Coordinated (UTC)" @@ -625,7 +627,7 @@ JLIB_MEDIA_ERROR_WARNINVALID_IMG="Not a valid image." JLIB_MEDIA_ERROR_WARNINVALID_MIME="Illegal or invalid mime type detected." JLIB_MEDIA_ERROR_WARNNOTADMIN="Uploaded file is not an image file and you do not have permission." -JLIB_NO_EDITOR_PLUGIN_PUBLISHED="We can't show an editor because no editor plugin is published." +JLIB_NO_EDITOR_PLUGIN_PUBLISHED="Unable to display an editor because no editor plugin is published." JLIB_PLUGIN_ERROR_LOADING_PLUGINS="Error loading Plugins: %s" JLIB_REGISTRY_EXCEPTION_LOAD_FORMAT_CLASS="Unable to load format class." @@ -635,6 +637,7 @@ JLIB_RULES_ALLOWED="Allowed" JLIB_RULES_ALLOWED_ADMIN="Allowed (Super User)" JLIB_RULES_CALCULATED_SETTING="Calculated Setting 2" JLIB_RULES_CONFLICT="Conflict" +JLIB_RULES_DATABASE_FAILURE="Failed storing the data to the database." JLIB_RULES_DENIED="Denied" JLIB_RULES_GROUP="%s" JLIB_RULES_GROUPS="Groups" @@ -644,6 +647,8 @@ JLIB_RULES_NOT_ALLOWED="Not Allowed." JLIB_RULES_NOT_ALLOWED_ADMIN_CONFLICT="Conflict" JLIB_RULES_NOT_ALLOWED_LOCKED="Not Allowed (Locked)" JLIB_RULES_NOT_SET="Not Set" +JLIB_RULES_REQUEST_FAILURE="Failed sending the data to server." +JLIB_RULES_SAVE_BEFORE_CHANGE_PERMISSIONS="Please save before changing permissions." JLIB_RULES_SELECT_ALLOW_DENY_GROUP="Allow or deny %s for users in the %s group." JLIB_RULES_SELECT_SETTING="Select New Setting 1" JLIB_RULES_SETTING_NOTES="1. If you change the setting, it will apply to this and all child groups, components and content. Note that Denied will overrule any inherited setting and also the setting in any child group, component or content. In the case of a setting conflict, Deny will take precedence. Not Set is equivalent to Denied but can be changed in child groups, components and content.
        2. If you select a new setting, select Save to refresh the calculated settings." diff --git a/administrator/language/en-GB/en-GB.localise.php b/administrator/language/en-GB/en-GB.localise.php index 449b10253628b..44a7c8cc52c78 100644 --- a/administrator/language/en-GB/en-GB.localise.php +++ b/administrator/language/en-GB/en-GB.localise.php @@ -2,7 +2,7 @@ /** * @package Joomla.Language * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/language/en-GB/en-GB.mod_custom.ini b/administrator/language/en-GB/en-GB.mod_custom.ini index 1e8b2457c641a..092987a9b247c 100644 --- a/administrator/language/en-GB/en-GB.mod_custom.ini +++ b/administrator/language/en-GB/en-GB.mod_custom.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_custom.sys.ini b/administrator/language/en-GB/en-GB.mod_custom.sys.ini index fe595fcc0a06e..8166663b9352a 100644 --- a/administrator/language/en-GB/en-GB.mod_custom.sys.ini +++ b/administrator/language/en-GB/en-GB.mod_custom.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_feed.ini b/administrator/language/en-GB/en-GB.mod_feed.ini index e80f7ff875fc2..98899527b72e6 100644 --- a/administrator/language/en-GB/en-GB.mod_feed.ini +++ b/administrator/language/en-GB/en-GB.mod_feed.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_feed.sys.ini b/administrator/language/en-GB/en-GB.mod_feed.sys.ini index 45f2355934204..8787cca723610 100644 --- a/administrator/language/en-GB/en-GB.mod_feed.sys.ini +++ b/administrator/language/en-GB/en-GB.mod_feed.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_latest.ini b/administrator/language/en-GB/en-GB.mod_latest.ini index eaa1823780e00..a4d5b3dafbd2d 100644 --- a/administrator/language/en-GB/en-GB.mod_latest.ini +++ b/administrator/language/en-GB/en-GB.mod_latest.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_latest.sys.ini b/administrator/language/en-GB/en-GB.mod_latest.sys.ini index 125d56d5e3bdd..5cecb842d6298 100644 --- a/administrator/language/en-GB/en-GB.mod_latest.sys.ini +++ b/administrator/language/en-GB/en-GB.mod_latest.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_logged.ini b/administrator/language/en-GB/en-GB.mod_logged.ini index c4996f495cebf..c6728e8600c69 100644 --- a/administrator/language/en-GB/en-GB.mod_logged.ini +++ b/administrator/language/en-GB/en-GB.mod_logged.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_logged.sys.ini b/administrator/language/en-GB/en-GB.mod_logged.sys.ini index e4033c285d833..bd0ccfc5b79bb 100644 --- a/administrator/language/en-GB/en-GB.mod_logged.sys.ini +++ b/administrator/language/en-GB/en-GB.mod_logged.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_login.ini b/administrator/language/en-GB/en-GB.mod_login.ini index c068a0c959d9b..ed65673ec26d7 100644 --- a/administrator/language/en-GB/en-GB.mod_login.ini +++ b/administrator/language/en-GB/en-GB.mod_login.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_login.sys.ini b/administrator/language/en-GB/en-GB.mod_login.sys.ini index de71419237142..73fce55e704ac 100644 --- a/administrator/language/en-GB/en-GB.mod_login.sys.ini +++ b/administrator/language/en-GB/en-GB.mod_login.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_menu.ini b/administrator/language/en-GB/en-GB.mod_menu.ini index a11697888da71..a769f3ca1f8f8 100644 --- a/administrator/language/en-GB/en-GB.mod_menu.ini +++ b/administrator/language/en-GB/en-GB.mod_menu.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -12,6 +12,9 @@ MOD_MENU_COM_CONTENT_CATEGORY_MANAGER="Categories" MOD_MENU_COM_CONTENT_FEATURED="Featured Articles" MOD_MENU_COM_CONTENT_NEW_ARTICLE="Add New Article" MOD_MENU_COM_CONTENT_NEW_CATEGORY="Add New Category" +MOD_MENU_COM_LANGUAGES_SUBMENU_CONTENT="Content Languages" +MOD_MENU_COM_LANGUAGES_SUBMENU_INSTALLED="Installed" +MOD_MENU_COM_LANGUAGES_SUBMENU_OVERRIDES="Overrides" MOD_MENU_COM_USERS="Users" MOD_MENU_COM_USERS_ADD_GROUP="Add New Group" MOD_MENU_COM_USERS_ADD_LEVEL="Add New Access Level" @@ -52,9 +55,9 @@ MOD_MENU_HELP_SHOP="Joomla! Shop" MOD_MENU_HELP_SUPPORT_OFFICIAL_FORUM="Official Support Forum" ; the string below will be used if the localised sample data contains a URL for the desired community forum or if the 'Custom Support Forum' field parameter in the Administrator Menu module contains a URL MOD_MENU_HELP_SUPPORT_CUSTOM_FORUM="Custom Support Forum" -; the string below will be used if MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM_VALUE has a value, i.e the # of the specific language forum in forum.joomla.org -MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM="Official [language] forum" -MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM_VALUE="" +; The string below will be used if MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM_VALUE has a value, i.e the # of the specific language forum in forum.joomla.org. Use something like 'Official english forum'. +MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM="Official Language Forums" +MOD_MENU_HELP_SUPPORT_OFFICIAL_LANGUAGE_FORUM_VALUE="511" MOD_MENU_HELP_TRANSLATIONS="Joomla! Translations" MOD_MENU_HELP_XCHANGE="Stack Exchange" MOD_MENU_HOME_DEFAULT="Home" diff --git a/administrator/language/en-GB/en-GB.mod_menu.sys.ini b/administrator/language/en-GB/en-GB.mod_menu.sys.ini index 9620261d6a2c3..43d0782e51663 100644 --- a/administrator/language/en-GB/en-GB.mod_menu.sys.ini +++ b/administrator/language/en-GB/en-GB.mod_menu.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_multilangstatus.ini b/administrator/language/en-GB/en-GB.mod_multilangstatus.ini index 8a07ebc02a475..c31fd3d36ef9f 100644 --- a/administrator/language/en-GB/en-GB.mod_multilangstatus.ini +++ b/administrator/language/en-GB/en-GB.mod_multilangstatus.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_multilangstatus.sys.ini b/administrator/language/en-GB/en-GB.mod_multilangstatus.sys.ini index 3f37936f11b62..51f5487d6d5da 100644 --- a/administrator/language/en-GB/en-GB.mod_multilangstatus.sys.ini +++ b/administrator/language/en-GB/en-GB.mod_multilangstatus.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_popular.ini b/administrator/language/en-GB/en-GB.mod_popular.ini index 4b465eec9c395..0f283c78270d9 100644 --- a/administrator/language/en-GB/en-GB.mod_popular.ini +++ b/administrator/language/en-GB/en-GB.mod_popular.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_popular.sys.ini b/administrator/language/en-GB/en-GB.mod_popular.sys.ini index f90311452a729..ecfc06fe5b150 100644 --- a/administrator/language/en-GB/en-GB.mod_popular.sys.ini +++ b/administrator/language/en-GB/en-GB.mod_popular.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_quickicon.ini b/administrator/language/en-GB/en-GB.mod_quickicon.ini index f5f46d2b82a97..37d8bfc0e5a47 100644 --- a/administrator/language/en-GB/en-GB.mod_quickicon.ini +++ b/administrator/language/en-GB/en-GB.mod_quickicon.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_quickicon.sys.ini b/administrator/language/en-GB/en-GB.mod_quickicon.sys.ini index 87985c68ebb3e..fd6002fe69dec 100644 --- a/administrator/language/en-GB/en-GB.mod_quickicon.sys.ini +++ b/administrator/language/en-GB/en-GB.mod_quickicon.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_stats_admin.ini b/administrator/language/en-GB/en-GB.mod_stats_admin.ini index 2cc8a480ceed0..f0081a3d60862 100644 --- a/administrator/language/en-GB/en-GB.mod_stats_admin.ini +++ b/administrator/language/en-GB/en-GB.mod_stats_admin.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_stats_admin.sys.ini b/administrator/language/en-GB/en-GB.mod_stats_admin.sys.ini index 2b7dde2e21b64..e81b28be5ade9 100644 --- a/administrator/language/en-GB/en-GB.mod_stats_admin.sys.ini +++ b/administrator/language/en-GB/en-GB.mod_stats_admin.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_status.ini b/administrator/language/en-GB/en-GB.mod_status.ini index 1ec74eefecfe2..6fba34e42cefa 100644 --- a/administrator/language/en-GB/en-GB.mod_status.ini +++ b/administrator/language/en-GB/en-GB.mod_status.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_status.sys.ini b/administrator/language/en-GB/en-GB.mod_status.sys.ini index 2cf5f2e4e2dca..7a661e2b00397 100644 --- a/administrator/language/en-GB/en-GB.mod_status.sys.ini +++ b/administrator/language/en-GB/en-GB.mod_status.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_submenu.ini b/administrator/language/en-GB/en-GB.mod_submenu.ini index 18606b44a2ecb..2ee193e214db5 100644 --- a/administrator/language/en-GB/en-GB.mod_submenu.ini +++ b/administrator/language/en-GB/en-GB.mod_submenu.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_submenu.sys.ini b/administrator/language/en-GB/en-GB.mod_submenu.sys.ini index dd8d9f7e97ba9..961481dd8511e 100644 --- a/administrator/language/en-GB/en-GB.mod_submenu.sys.ini +++ b/administrator/language/en-GB/en-GB.mod_submenu.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_title.ini b/administrator/language/en-GB/en-GB.mod_title.ini index 564070137b1f0..caf8a00486783 100644 --- a/administrator/language/en-GB/en-GB.mod_title.ini +++ b/administrator/language/en-GB/en-GB.mod_title.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_title.sys.ini b/administrator/language/en-GB/en-GB.mod_title.sys.ini index ad22a6a9a52b7..8ea4165f7d735 100644 --- a/administrator/language/en-GB/en-GB.mod_title.sys.ini +++ b/administrator/language/en-GB/en-GB.mod_title.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_toolbar.ini b/administrator/language/en-GB/en-GB.mod_toolbar.ini index 8151d015fb6e0..d1bd5bcffd382 100644 --- a/administrator/language/en-GB/en-GB.mod_toolbar.ini +++ b/administrator/language/en-GB/en-GB.mod_toolbar.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_toolbar.sys.ini b/administrator/language/en-GB/en-GB.mod_toolbar.sys.ini index d6e807cc8c418..7d62ef327641b 100644 --- a/administrator/language/en-GB/en-GB.mod_toolbar.sys.ini +++ b/administrator/language/en-GB/en-GB.mod_toolbar.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_version.ini b/administrator/language/en-GB/en-GB.mod_version.ini index 46b53abb16660..55395839363de 100644 --- a/administrator/language/en-GB/en-GB.mod_version.ini +++ b/administrator/language/en-GB/en-GB.mod_version.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.mod_version.sys.ini b/administrator/language/en-GB/en-GB.mod_version.sys.ini index 328d0f8b075d1..305ddeb31daf4 100644 --- a/administrator/language/en-GB/en-GB.mod_version.sys.ini +++ b/administrator/language/en-GB/en-GB.mod_version.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_authentication_cookie.ini b/administrator/language/en-GB/en-GB.plg_authentication_cookie.ini index 082a64a5ccdeb..bb05042d9012c 100644 --- a/administrator/language/en-GB/en-GB.plg_authentication_cookie.ini +++ b/administrator/language/en-GB/en-GB.plg_authentication_cookie.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_authentication_cookie.sys.ini b/administrator/language/en-GB/en-GB.plg_authentication_cookie.sys.ini index 617f30c76e65c..a1f7042d89702 100644 --- a/administrator/language/en-GB/en-GB.plg_authentication_cookie.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_authentication_cookie.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_authentication_gmail.ini b/administrator/language/en-GB/en-GB.plg_authentication_gmail.ini index 107a85e7bc16b..7d864b8f447f1 100644 --- a/administrator/language/en-GB/en-GB.plg_authentication_gmail.ini +++ b/administrator/language/en-GB/en-GB.plg_authentication_gmail.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_authentication_gmail.sys.ini b/administrator/language/en-GB/en-GB.plg_authentication_gmail.sys.ini index 0509ca9386e59..58d3e0e3d589a 100644 --- a/administrator/language/en-GB/en-GB.plg_authentication_gmail.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_authentication_gmail.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_authentication_joomla.ini b/administrator/language/en-GB/en-GB.plg_authentication_joomla.ini index 779b181c7acb9..3a2e490beb011 100644 --- a/administrator/language/en-GB/en-GB.plg_authentication_joomla.ini +++ b/administrator/language/en-GB/en-GB.plg_authentication_joomla.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_authentication_joomla.sys.ini b/administrator/language/en-GB/en-GB.plg_authentication_joomla.sys.ini index 70fffc5662773..16b95834b491f 100644 --- a/administrator/language/en-GB/en-GB.plg_authentication_joomla.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_authentication_joomla.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini b/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini index 86c33ba1fee56..8fa3f5551110a 100644 --- a/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini +++ b/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_authentication_ldap.sys.ini b/administrator/language/en-GB/en-GB.plg_authentication_ldap.sys.ini index 4c8094e08350f..92121fd20e554 100644 --- a/administrator/language/en-GB/en-GB.plg_authentication_ldap.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_authentication_ldap.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini b/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini index dc1c62c731826..0370d3570e870 100644 --- a/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini +++ b/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -10,8 +10,11 @@ PLG_CAPTCHA_RECAPTCHA="CAPTCHA - reCAPTCHA" PLG_RECAPTCHA_VERSION_1_WARNING_LABEL="You have selected Version 1.0. All new sites should be using Version 2.0. Version 1.0 is only maintained to provide support for Global Site keys which are no longer available from Google." PLG_RECAPTCHA_VERSION_LABEL="Version" PLG_RECAPTCHA_VERSION_DESC="Version 2.0 is the recommended version. Version 1.0 is required if using deprecated Global reCAPTCHA keys." +; The following two strings are deprecated and will be removed with 4.0. They generate wrong plural detection in Crowdin. PLG_RECAPTCHA_VERSION_1="1.0" PLG_RECAPTCHA_VERSION_2="2.0" +PLG_RECAPTCHA_VERSION_V1="1.0" +PLG_RECAPTCHA_VERSION_V2="2.0" PLG_RECAPTCHA_PUBLIC_KEY_LABEL="Site key" PLG_RECAPTCHA_PUBLIC_KEY_DESC="Used in the JavaScript code that is served to your users. See the plugin description for instructions on getting a site key." PLG_RECAPTCHA_PRIVATE_KEY_LABEL="Secret key" @@ -26,6 +29,10 @@ PLG_RECAPTCHA_THEME_LIGHT="Light" PLG_RECAPTCHA_THEME_DARK="Dark" PLG_RECAPTCHA_LANG_LABEL="Language" PLG_RECAPTCHA_LANG_DESC="Select the language for the reCAPTCHA. If default is set and the language file has a custom translation, it will be used." +PLG_RECAPTCHA_SIZE_LABEL="Size" +PLG_RECAPTCHA_SIZE_DESC="Select the size for the reCAPTCHA field." +PLG_RECAPTCHA_THEME_NORMAL="Normal" +PLG_RECAPTCHA_THEME_COMPACT="Compact" ; Error messages PLG_RECAPTCHA_ERROR_NO_PRIVATE_KEY="reCAPTCHA plugin needs a secret key to be set in its parameters. Please contact a site administrator." diff --git a/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.sys.ini b/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.sys.ini index 970f8ff91fafb..5c681eb793750 100644 --- a/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_content_contact.ini b/administrator/language/en-GB/en-GB.plg_content_contact.ini index dd052f7e3c125..3d96970f9d2fb 100644 --- a/administrator/language/en-GB/en-GB.plg_content_contact.ini +++ b/administrator/language/en-GB/en-GB.plg_content_contact.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_content_contact.sys.ini b/administrator/language/en-GB/en-GB.plg_content_contact.sys.ini index dd052f7e3c125..3d96970f9d2fb 100644 --- a/administrator/language/en-GB/en-GB.plg_content_contact.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_content_contact.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_content_emailcloak.ini b/administrator/language/en-GB/en-GB.plg_content_emailcloak.ini index f7110e97e873e..eb04a609749d5 100644 --- a/administrator/language/en-GB/en-GB.plg_content_emailcloak.ini +++ b/administrator/language/en-GB/en-GB.plg_content_emailcloak.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_content_emailcloak.sys.ini b/administrator/language/en-GB/en-GB.plg_content_emailcloak.sys.ini index 5adfdf34841d0..cf58172990f4f 100644 --- a/administrator/language/en-GB/en-GB.plg_content_emailcloak.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_content_emailcloak.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_content_finder.ini b/administrator/language/en-GB/en-GB.plg_content_finder.ini index 502ea75fe71cc..a6475578f20b7 100644 --- a/administrator/language/en-GB/en-GB.plg_content_finder.ini +++ b/administrator/language/en-GB/en-GB.plg_content_finder.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_content_finder.sys.ini b/administrator/language/en-GB/en-GB.plg_content_finder.sys.ini index a7e5e16ee86d4..21aa225155bf3 100644 --- a/administrator/language/en-GB/en-GB.plg_content_finder.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_content_finder.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_content_joomla.ini b/administrator/language/en-GB/en-GB.plg_content_joomla.ini index 5ed2302ebf7f8..3596d10b5d932 100644 --- a/administrator/language/en-GB/en-GB.plg_content_joomla.ini +++ b/administrator/language/en-GB/en-GB.plg_content_joomla.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_content_joomla.sys.ini b/administrator/language/en-GB/en-GB.plg_content_joomla.sys.ini index a85130de39119..1dd3c64c3b302 100644 --- a/administrator/language/en-GB/en-GB.plg_content_joomla.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_content_joomla.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_content_loadmodule.ini b/administrator/language/en-GB/en-GB.plg_content_loadmodule.ini index 68128173f66e3..4434914d98052 100644 --- a/administrator/language/en-GB/en-GB.plg_content_loadmodule.ini +++ b/administrator/language/en-GB/en-GB.plg_content_loadmodule.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_content_loadmodule.sys.ini b/administrator/language/en-GB/en-GB.plg_content_loadmodule.sys.ini index 71bf05f81b330..3e1c44ac3f11b 100644 --- a/administrator/language/en-GB/en-GB.plg_content_loadmodule.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_content_loadmodule.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_content_pagebreak.ini b/administrator/language/en-GB/en-GB.plg_content_pagebreak.ini index 86b0de008c909..0cafce1ad890e 100644 --- a/administrator/language/en-GB/en-GB.plg_content_pagebreak.ini +++ b/administrator/language/en-GB/en-GB.plg_content_pagebreak.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_content_pagebreak.sys.ini b/administrator/language/en-GB/en-GB.plg_content_pagebreak.sys.ini index 38eb580f811d7..9cc24afd1d916 100644 --- a/administrator/language/en-GB/en-GB.plg_content_pagebreak.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_content_pagebreak.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_content_pagenavigation.ini b/administrator/language/en-GB/en-GB.plg_content_pagenavigation.ini index 1649c5b1e1e0a..e180b973c9ff8 100644 --- a/administrator/language/en-GB/en-GB.plg_content_pagenavigation.ini +++ b/administrator/language/en-GB/en-GB.plg_content_pagenavigation.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_content_pagenavigation.sys.ini b/administrator/language/en-GB/en-GB.plg_content_pagenavigation.sys.ini index 91d814f9e3ab2..e54543ee50d9d 100644 --- a/administrator/language/en-GB/en-GB.plg_content_pagenavigation.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_content_pagenavigation.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_content_vote.ini b/administrator/language/en-GB/en-GB.plg_content_vote.ini index 58079c2ae2cbb..434f00780e871 100644 --- a/administrator/language/en-GB/en-GB.plg_content_vote.ini +++ b/administrator/language/en-GB/en-GB.plg_content_vote.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_content_vote.sys.ini b/administrator/language/en-GB/en-GB.plg_content_vote.sys.ini index 7c33ed420c6dc..5060efb9da537 100644 --- a/administrator/language/en-GB/en-GB.plg_content_vote.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_content_vote.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_article.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_article.ini index 2c242b2c6df98..dbe3585a9a104 100644 --- a/administrator/language/en-GB/en-GB.plg_editors-xtd_article.ini +++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_article.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_article.sys.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_article.sys.ini index a335f226bd076..90bbffe0704c9 100644 --- a/administrator/language/en-GB/en-GB.plg_editors-xtd_article.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_article.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_image.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_image.ini index 214e681e99390..b4c4198f19e22 100644 --- a/administrator/language/en-GB/en-GB.plg_editors-xtd_image.ini +++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_image.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_image.sys.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_image.sys.ini index faa91443d4edb..4777ee32e093a 100644 --- a/administrator/language/en-GB/en-GB.plg_editors-xtd_image.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_image.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_module.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_module.ini index b9cdfa3929d7b..8f9d66473f29d 100644 --- a/administrator/language/en-GB/en-GB.plg_editors-xtd_module.ini +++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_module.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_module.sys.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_module.sys.ini index 13d47ec055abb..b07aa1fdf66ab 100644 --- a/administrator/language/en-GB/en-GB.plg_editors-xtd_module.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_module.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.ini index 9c1cb65930fa6..ba1c4ffbe669f 100644 --- a/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.ini +++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.sys.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.sys.ini index 50f3f6fbb0209..2bb2ffe81f88d 100644 --- a/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.ini index a11665cd2e2a2..b8bb8d328db4c 100644 --- a/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.ini +++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.sys.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.sys.ini index 26cd6808c5b2b..67969346759dc 100644 --- a/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_editors_codemirror.ini b/administrator/language/en-GB/en-GB.plg_editors_codemirror.ini index bd9abce6495d0..a79224c0da8d8 100644 --- a/administrator/language/en-GB/en-GB.plg_editors_codemirror.ini +++ b/administrator/language/en-GB/en-GB.plg_editors_codemirror.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -22,9 +22,9 @@ PLG_CODEMIRROR_FIELD_FONT_SIZE_LABEL="Font Size (px)" PLG_CODEMIRROR_FIELD_FULLSCREEN_DESC="Select the function key to use to toggle fullscreen mode." PLG_CODEMIRROR_FIELD_FULLSCREEN_LABEL="Toggle Fullscreen" PLG_CODEMIRROR_FIELD_FULLSCREEN_MOD_DESC="Select any modifier keys to use with the fullscreen toggle key." -PLG_CODEMIRROR_FIELD_FULLSCREEN_MOD_LABEL="Use Modifiers" +PLG_CODEMIRROR_FIELD_FULLSCREEN_MOD_LABEL="Use modifiers" PLG_CODEMIRROR_FIELD_HIGHLIGHT_MATCH_COLOR_DESC="The background colour to use for highlighting matching tags. Will be displayed at 50% opacity." -PLG_CODEMIRROR_FIELD_HIGHLIGHT_MATCH_COLOR_LABEL="Matching Tag Colour" +PLG_CODEMIRROR_FIELD_HIGHLIGHT_MATCH_COLOR_LABEL="Matching tag colour" PLG_CODEMIRROR_FIELD_LINE_HEIGHT_DESC="The height of one line of text. This is in ems, meaning that 1.0 is equal to the font size and 2.0 is equal to 2x the font size." PLG_CODEMIRROR_FIELD_LINE_HEIGHT_LABEL="Line Height (em)" PLG_CODEMIRROR_FIELD_LINENUMBERS_DESC="Display line numbers." @@ -54,6 +54,7 @@ PLG_CODEMIRROR_FIELD_VALUE_THEME_LIGHT="Light" PLG_CODEMIRROR_FIELD_VIM_KEYBINDING_DESC="Select this option to make CodeMirror work in Vim mode." PLG_CODEMIRROR_FIELD_VIM_KEYBINDING_LABEL="Vim Keybinding" PLG_CODEMIRROR_FIELDSET_APPEARANCE_OPTIONS_LABEL="Appearance Options" +PLG_CODEMIRROR_FIELDSET_TOOLBAR_OPTIONS_LABEL="Toolbar Options" PLG_CODEMIRROR_TOGGLE_FULL_SCREEN="Press %1$s to toggle Full Screen editing." PLG_CODEMIRROR_XML_DESCRIPTION="This plugin loads the CodeMirror editor." PLG_EDITORS_CODEMIRROR="Editor - CodeMirror" diff --git a/administrator/language/en-GB/en-GB.plg_editors_codemirror.sys.ini b/administrator/language/en-GB/en-GB.plg_editors_codemirror.sys.ini index 99241352d02a1..4629ae2e329bd 100644 --- a/administrator/language/en-GB/en-GB.plg_editors_codemirror.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_editors_codemirror.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_editors_none.ini b/administrator/language/en-GB/en-GB.plg_editors_none.ini index 756d49b2917b9..5766732d0a494 100644 --- a/administrator/language/en-GB/en-GB.plg_editors_none.ini +++ b/administrator/language/en-GB/en-GB.plg_editors_none.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_editors_none.sys.ini b/administrator/language/en-GB/en-GB.plg_editors_none.sys.ini index 756d49b2917b9..5766732d0a494 100644 --- a/administrator/language/en-GB/en-GB.plg_editors_none.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_editors_none.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini b/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini index c1361ace6bf41..cdf1be4382285 100644 --- a/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini +++ b/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -7,16 +7,19 @@ PLG_EDITORS_TINYMCE="Editor - TinyMCE" PLG_TINY_BUTTON_TOGGLE_EDITOR="Toggle editor" PLG_TINY_ERR_CUSTOMCSSFILENOTPRESENT="The file name %s was entered in the TinyMCE Custom CSS field. This file could not be found in the default template folder. No styles are available." PLG_TINY_ERR_EDITORCSSFILENOTPRESENT="Could not find the file 'editor.css' in the template or templates/system folder. No styles are available." +PLG_TINY_ERR_UNSUPPORTEDBROWSER="Drag and drop image upload is not available for your browser. Please consider using a fully HTML5 compatible browser" PLG_TINY_FIELD_ADVIMAGE_DESC="Turn on/off a more advanced image dialog." PLG_TINY_FIELD_ADVIMAGE_LABEL="Advanced Image" PLG_TINY_FIELD_ADVLIST_DESC="Turn on/off to enable to set number formats and bullet types in ordered and unordered lists." PLG_TINY_FIELD_ADVLIST_LABEL="Advanced List" -PLG_TINY_FIELD_ALIGN_DESC="Turn on/off to enable the alignment of the text. Only works in Extended mode." +PLG_TINY_FIELD_ALIGN_DESC="Turn on/off to enable the alignment of the text." PLG_TINY_FIELD_ALIGN_LABEL="Text Alignment" PLG_TINY_FIELD_BLOCKQUOTE_DESC="Turn on/off blockquotes." PLG_TINY_FIELD_BLOCKQUOTE_LABEL="Blockquote" -PLG_TINY_FIELD_COLORS_DESC="Show or hide the Colours control buttons. Only works in Extended mode." -PLG_TINY_FIELD_COLORS_LABEL="Colours" +PLG_TINY_FIELD_CODESAMPLE_DESC="Turn on/off code highlighting" +PLG_TINY_FIELD_CODESAMPLE_LABEL="Code sample" +PLG_TINY_FIELD_COLORS_DESC="Show or hide the Colors control buttons." +PLG_TINY_FIELD_COLORS_LABEL="Colors" PLG_TINY_FIELD_CONTEXTMENU_DESC="Turn on/off Context Menu." PLG_TINY_FIELD_CONTEXTMENU_LABEL="Context Menu" PLG_TINY_FIELD_CSS_DESC="By default the Plugin looks for an editor.css file. If it can't find one in the default template CSS folder, it loads the editor.css file from the system template." @@ -27,17 +30,21 @@ PLG_TINY_FIELD_CUSTOMBUTTON_DESC="Add custom button(s)." PLG_TINY_FIELD_CUSTOMBUTTON_LABEL="Custom Button" PLG_TINY_FIELD_CUSTOMPLUGIN_DESC="Add custom plugin(s)." PLG_TINY_FIELD_CUSTOMPLUGIN_LABEL="Custom Plugin" -PLG_TINY_FIELD_DATE_DESC="Show or hide the Insert Date button. Only works in Extended mode." +PLG_TINY_FIELD_CUSTOM_PATH_DESC="Provide a directory for the images to be uploaded. If nothing provided images will be uploaded at /images." +PLG_TINY_FIELD_CUSTOM_PATH_LABEL="Images directory" +PLG_TINY_FIELD_DATE_DESC="Show or hide the Insert Date button." PLG_TINY_FIELD_DATE_LABEL="Insert Date" PLG_TINY_FIELD_DIRECTION_DESC="Choose default text direction." PLG_TINY_FIELD_DIRECTION_LABEL="Text Direction" +PLG_TINY_FIELD_DRAG_DROP_DESC="Enable drag and drop for uploading images" +PLG_TINY_FIELD_DRAG_DROP_LABEL="Images drag&drop" PLG_TINY_FIELD_ELEMENTS_DESC="Allows the addition of specific valid elements to the existing rule set." PLG_TINY_FIELD_ELEMENTS_LABEL="Extended Valid Elements" PLG_TINY_FIELD_ENCODING_DESC="Controls how HTML entities are encoded. Recommended setting is 'raw'. 'named' = used named entity encoding (for example, '<'). 'numeric' = use numeric HTML encoding (for example, '%03c'). raw = Do not encode HTML entities. Note that searching content may not work properly if setting is not 'raw'." PLG_TINY_FIELD_ENCODING_LABEL="Entity Encoding" -PLG_TINY_FIELD_FONTS_DESC="Show or hide the Font control selectors. Only applies in Extended mode." +PLG_TINY_FIELD_FONTS_DESC="Show or hide the Font control selectors." PLG_TINY_FIELD_FONTS_LABEL="Fonts" -PLG_TINY_FIELD_FULLSCREEN_DESC="Show or hide the Fullscreen button. Only applies in Extended mode." +PLG_TINY_FIELD_FULLSCREEN_DESC="Show or hide the Fullscreen button." PLG_TINY_FIELD_FULLSCREEN_LABEL="Fullscreen" PLG_TINY_FIELD_FUNCTIONALITY_DESC="Select level of functionality." PLG_TINY_FIELD_FUNCTIONALITY_LABEL="Functionality" @@ -54,22 +61,22 @@ PLG_TINY_FIELD_LANGCODE_DESC="Editor UI Language. The value will be used if Auto PLG_TINY_FIELD_LANGCODE_LABEL="Language Code" PLG_TINY_FIELD_LANGSELECT_DESC="If Yes, editor language will automatically match selected UI language. If the tiny language does not exist, the editor language will default to English." PLG_TINY_FIELD_LANGSELECT_LABEL="Automatic Language Selection" -PLG_TINY_FIELD_LINK_DESC="Select to enable the link icons. Only applies in Extended mode." +PLG_TINY_FIELD_LINK_DESC="Select to enable the Link icons." PLG_TINY_FIELD_LINK_LABEL="Links" -PLG_TINY_FIELD_MEDIA_DESC="Show or hide the Media button. Only applies in Extended mode." +PLG_TINY_FIELD_MEDIA_DESC="Show or hide the Media button." PLG_TINY_FIELD_MEDIA_LABEL="Media" PLG_TINY_FIELD_MOBILE_DESC="This mode puts any mobile devices into the simple functionality with enlarged buttons for easy access." PLG_TINY_FIELD_MOBILE_LABEL="Mobile Mode" -PLG_TINY_FIELD_NAME_EXTENDED_LABEL="Extended Mode Options
        These options only work in Extended mode." +PLG_TINY_FIELD_NAME_EXTENDED_LABEL="Extended Mode Options
        Below you can set the access level for each one of the fields individually.
        Please keep in mind that these options will only have an effect in Extended mode." PLG_TINY_FIELD_NEWLINES_DESC="New lines will be created using the selected option." PLG_TINY_FIELD_NEWLINES_LABEL="New Lines" PLG_TINY_FIELD_NONBREAKING_DESC="Insert non-breaking space entities." PLG_TINY_FIELD_NONBREAKING_LABEL="Non-breaking" -PLG_TINY_FIELD_PASTE_DESC="Show or hide the Paste buttons. Only applies in Extended mode." +PLG_TINY_FIELD_PASTE_DESC="Show or hide the Paste button." PLG_TINY_FIELD_PASTE_LABEL="Paste" PLG_TINY_FIELD_PATH_DESC="If set to ON, it displays the set classes for the marked text." PLG_TINY_FIELD_PATH_LABEL="Element Path" -PLG_TINY_FIELD_PRINT_DESC="Turn on/off the print and print preview icons in the editor. Only applies in Extended mode." +PLG_TINY_FIELD_PRINT_DESC="Turn on/off the print and print preview icons in the editor." PLG_TINY_FIELD_PRINT_LABEL="Print/Preview" PLG_TINY_FIELD_PROHIBITED_DESC="Elements that will be cleaned from the text. Do not leave empty - if you do not want to prohibit anything enter dummy text eg cms." PLG_TINY_FIELD_PROHIBITED_LABEL="Prohibited Elements" @@ -77,11 +84,11 @@ PLG_TINY_FIELD_RESIZE_HORIZONTAL_DESC="Enable/disable the horizontal resizing." PLG_TINY_FIELD_RESIZE_HORIZONTAL_LABEL="Horizontal resizing" PLG_TINY_FIELD_RESIZING_DESC="Enable/disable the resizing of the editor area (vertically and also horizontally if 'Horizontal Resizing' is enabled)." PLG_TINY_FIELD_RESIZING_LABEL="Resizing" -PLG_TINY_FIELD_RTL_DESC="Select whether to display the RTL button. Only applies in Extended mode." +PLG_TINY_FIELD_RTL_DESC="Select whether to display the RTL button." PLG_TINY_FIELD_RTL_LABEL="Directionality" PLG_TINY_FIELD_SAVEWARNING_DESC="Save Warning: gives warning if you cancel without saving changes." PLG_TINY_FIELD_SAVEWARNING_LABEL="Save Warning" -PLG_TINY_FIELD_SEARCH-REPLACE_DESC="Show or hide the Search & Replace button. Only applies in Extended mode." +PLG_TINY_FIELD_SEARCH-REPLACE_DESC="Show or hide the Search & Replace button." PLG_TINY_FIELD_SEARCH-REPLACE_LABEL="Search & Replace" PLG_TINY_FIELD_SKIN_ADMIN_DESC="Select skin for the Administrator Backend interface." PLG_TINY_FIELD_SKIN_ADMIN_LABEL="Administrator Skin" @@ -89,11 +96,11 @@ PLG_TINY_FIELD_SKIN_DESC="Select skin for the Frontend interface." PLG_TINY_FIELD_SKIN_INFO_DESC="Copy your new skins to: /media/editors/tinymce/skins." PLG_TINY_FIELD_SKIN_INFO_LABEL="For customised skins go to: Skin Creator" PLG_TINY_FIELD_SKIN_LABEL="Site Skin" -PLG_TINY_FIELD_SMILIES_DESC="Show or hide the smilies buttons. Only applies in Extended mode." +PLG_TINY_FIELD_SMILIES_DESC="Show or hide the Smilies buttons." PLG_TINY_FIELD_SMILIES_LABEL="Smilies" -PLG_TINY_FIELD_TABLE_DESC="Show or hide the table control buttons. Only applies in Extended mode." +PLG_TINY_FIELD_TABLE_DESC="Show or hide the Table control buttons." PLG_TINY_FIELD_TABLE_LABEL="Table" -PLG_TINY_FIELD_TEMPLATE_DESC="Show or hide the Insert predefined template content button. Only applies in Extended mode." +PLG_TINY_FIELD_TEMPLATE_DESC="Show or hide the Insert predefined template content button." PLG_TINY_FIELD_TEMPLATE_LABEL="Template" PLG_TINY_FIELD_URLS_DESC="URL behaviour." PLG_TINY_FIELD_URLS_LABEL="URLs" @@ -130,4 +137,4 @@ PLG_TINY_TEMPLATE_LAYOUT1_DESC="HTML layout." PLG_TINY_TEMPLATE_LAYOUT1_TITLE="Layout" PLG_TINY_TEMPLATE_SNIPPET1_DESC="Simple HTML snippet." PLG_TINY_TEMPLATE_SNIPPET1_TITLE="Simple Snippet" -PLG_TINY_XML_DESCRIPTION="TinyMCE is a platform independent web based JavaScript HTML WYSIWYG Editor." \ No newline at end of file +PLG_TINY_XML_DESCRIPTION="TinyMCE is a platform independent web based JavaScript HTML WYSIWYG Editor." diff --git a/administrator/language/en-GB/en-GB.plg_editors_tinymce.sys.ini b/administrator/language/en-GB/en-GB.plg_editors_tinymce.sys.ini index bf4cf707dc202..fd44e2375b66a 100644 --- a/administrator/language/en-GB/en-GB.plg_editors_tinymce.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_editors_tinymce.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_extension_joomla.ini b/administrator/language/en-GB/en-GB.plg_extension_joomla.ini index 0386c52d2439c..67a9b036a4ff1 100644 --- a/administrator/language/en-GB/en-GB.plg_extension_joomla.ini +++ b/administrator/language/en-GB/en-GB.plg_extension_joomla.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_extension_joomla.sys.ini b/administrator/language/en-GB/en-GB.plg_extension_joomla.sys.ini index 717e5a4dd282f..6b2f601ce3d28 100644 --- a/administrator/language/en-GB/en-GB.plg_extension_joomla.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_extension_joomla.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_finder_categories.ini b/administrator/language/en-GB/en-GB.plg_finder_categories.ini index 392919af7158c..805b9897c4708 100644 --- a/administrator/language/en-GB/en-GB.plg_finder_categories.ini +++ b/administrator/language/en-GB/en-GB.plg_finder_categories.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_finder_categories.sys.ini b/administrator/language/en-GB/en-GB.plg_finder_categories.sys.ini index 3322aa215e052..f01fcaffe8ef4 100644 --- a/administrator/language/en-GB/en-GB.plg_finder_categories.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_finder_categories.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_finder_contacts.ini b/administrator/language/en-GB/en-GB.plg_finder_contacts.ini index 309ced9d0efaa..c1e03236a3110 100644 --- a/administrator/language/en-GB/en-GB.plg_finder_contacts.ini +++ b/administrator/language/en-GB/en-GB.plg_finder_contacts.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_finder_contacts.sys.ini b/administrator/language/en-GB/en-GB.plg_finder_contacts.sys.ini index 50db3ab7d29ad..06ebc1789af2b 100644 --- a/administrator/language/en-GB/en-GB.plg_finder_contacts.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_finder_contacts.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_finder_content.ini b/administrator/language/en-GB/en-GB.plg_finder_content.ini index 941af5abf2f9a..bcc9246590bf1 100644 --- a/administrator/language/en-GB/en-GB.plg_finder_content.ini +++ b/administrator/language/en-GB/en-GB.plg_finder_content.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_finder_content.sys.ini b/administrator/language/en-GB/en-GB.plg_finder_content.sys.ini index fe7dcf32e8e2e..eed9e0ddbf63d 100644 --- a/administrator/language/en-GB/en-GB.plg_finder_content.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_finder_content.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.ini b/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.ini index e9fe0e20762fd..9c97a5441efd5 100644 --- a/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.ini +++ b/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.sys.ini b/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.sys.ini index 7b4c9c75de62f..7bbab94cf9370 100644 --- a/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_finder_tags.ini b/administrator/language/en-GB/en-GB.plg_finder_tags.ini index 88b5b2582bcb3..6dbc9700fb59b 100644 --- a/administrator/language/en-GB/en-GB.plg_finder_tags.ini +++ b/administrator/language/en-GB/en-GB.plg_finder_tags.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_finder_tags.sys.ini b/administrator/language/en-GB/en-GB.plg_finder_tags.sys.ini index 4f886cf7998ed..9dee49f76f22a 100644 --- a/administrator/language/en-GB/en-GB.plg_finder_tags.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_finder_tags.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_finder_weblinks.ini b/administrator/language/en-GB/en-GB.plg_finder_weblinks.ini index 833defdfb450f..f445e0c5ea16a 100644 --- a/administrator/language/en-GB/en-GB.plg_finder_weblinks.ini +++ b/administrator/language/en-GB/en-GB.plg_finder_weblinks.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_finder_weblinks.sys.ini b/administrator/language/en-GB/en-GB.plg_finder_weblinks.sys.ini index 40dedb93c1993..dfbd68a29a2fa 100644 --- a/administrator/language/en-GB/en-GB.plg_finder_weblinks.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_finder_weblinks.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_installer_webinstaller.ini b/administrator/language/en-GB/en-GB.plg_installer_webinstaller.ini index f88abe7904bd3..a87e44031ab82 100644 --- a/administrator/language/en-GB/en-GB.plg_installer_webinstaller.ini +++ b/administrator/language/en-GB/en-GB.plg_installer_webinstaller.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_installer_webinstaller.sys.ini b/administrator/language/en-GB/en-GB.plg_installer_webinstaller.sys.ini index 884a7ea3ce340..5697c4a235496 100644 --- a/administrator/language/en-GB/en-GB.plg_installer_webinstaller.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_installer_webinstaller.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.ini b/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.ini index 1c342a792b8f2..102b296db2baf 100644 --- a/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.ini +++ b/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -11,5 +11,5 @@ PLG_QUICKICON_EXTENSIONUPDATE_GROUP_LABEL="Group" PLG_QUICKICON_EXTENSIONUPDATE_UPDATEFOUND="Updates are available! %s" PLG_QUICKICON_EXTENSIONUPDATE_UPDATEFOUND_BUTTON="View Updates" PLG_QUICKICON_EXTENSIONUPDATE_UPDATEFOUND_MESSAGE="%s Extension Update(s) are available:" -PLG_QUICKICON_EXTENSIONUPDATE_UPTODATE="All extensions are up-to-date." +PLG_QUICKICON_EXTENSIONUPDATE_UPTODATE="All extensions are up to date." PLG_QUICKICON_EXTENSIONUPDATE_XML_DESCRIPTION="Checks for updates of your installed third-party extensions and notifies you when you visit the Control Panel page." diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.sys.ini b/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.sys.ini index 0a30ed23991db..cebf3833c08e4 100644 --- a/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini b/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini index d78aac6d5e2ba..1cd2639ee18c5 100644 --- a/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini +++ b/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -11,5 +11,5 @@ PLG_QUICKICON_JOOMLAUPDATE_GROUP_LABEL="Group" PLG_QUICKICON_JOOMLAUPDATE_UPDATEFOUND="Joomla! %s, Update now!" PLG_QUICKICON_JOOMLAUPDATE_UPDATEFOUND_BUTTON="Update Now" PLG_QUICKICON_JOOMLAUPDATE_UPDATEFOUND_MESSAGE="Joomla! %s is available:" -PLG_QUICKICON_JOOMLAUPDATE_UPTODATE="Joomla! is up-to-date." +PLG_QUICKICON_JOOMLAUPDATE_UPTODATE="Joomla is up to date." PLG_QUICKICON_JOOMLAUPDATE_XML_DESCRIPTION="Checks for Joomla! updates and notifies you when you visit the Control Panel page." diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.sys.ini b/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.sys.ini index 7ed7da89da643..3eb05e0150991 100644 --- a/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_search_categories.ini b/administrator/language/en-GB/en-GB.plg_search_categories.ini index 678dc487c0910..4376401fdcaba 100644 --- a/administrator/language/en-GB/en-GB.plg_search_categories.ini +++ b/administrator/language/en-GB/en-GB.plg_search_categories.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_search_categories.sys.ini b/administrator/language/en-GB/en-GB.plg_search_categories.sys.ini index 921122d9cc04d..4d0dfad9eae50 100644 --- a/administrator/language/en-GB/en-GB.plg_search_categories.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_search_categories.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_search_contacts.ini b/administrator/language/en-GB/en-GB.plg_search_contacts.ini index 28bb704fa3e49..b85882596963a 100644 --- a/administrator/language/en-GB/en-GB.plg_search_contacts.ini +++ b/administrator/language/en-GB/en-GB.plg_search_contacts.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_search_contacts.sys.ini b/administrator/language/en-GB/en-GB.plg_search_contacts.sys.ini index c7820e4cd0cae..989b5c7b3c6bf 100644 --- a/administrator/language/en-GB/en-GB.plg_search_contacts.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_search_contacts.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_search_content.ini b/administrator/language/en-GB/en-GB.plg_search_content.ini index 2e61c5a10283d..786665b3fd976 100644 --- a/administrator/language/en-GB/en-GB.plg_search_content.ini +++ b/administrator/language/en-GB/en-GB.plg_search_content.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_search_content.sys.ini b/administrator/language/en-GB/en-GB.plg_search_content.sys.ini index 9fddb33307e0f..0f153a94532fc 100644 --- a/administrator/language/en-GB/en-GB.plg_search_content.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_search_content.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_search_newsfeeds.ini b/administrator/language/en-GB/en-GB.plg_search_newsfeeds.ini index 96066e98c8c4c..1b9728d1550aa 100644 --- a/administrator/language/en-GB/en-GB.plg_search_newsfeeds.ini +++ b/administrator/language/en-GB/en-GB.plg_search_newsfeeds.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_search_newsfeeds.sys.ini b/administrator/language/en-GB/en-GB.plg_search_newsfeeds.sys.ini index 6cf93fc266938..23e8a65454285 100644 --- a/administrator/language/en-GB/en-GB.plg_search_newsfeeds.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_search_newsfeeds.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_search_tags.ini b/administrator/language/en-GB/en-GB.plg_search_tags.ini index f09a966374c40..c50ebe79fede2 100644 --- a/administrator/language/en-GB/en-GB.plg_search_tags.ini +++ b/administrator/language/en-GB/en-GB.plg_search_tags.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_search_tags.sys.ini b/administrator/language/en-GB/en-GB.plg_search_tags.sys.ini index 7bd1a25190156..e5330361af847 100644 --- a/administrator/language/en-GB/en-GB.plg_search_tags.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_search_tags.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_search_weblinks.ini b/administrator/language/en-GB/en-GB.plg_search_weblinks.ini index 14c0ed465675f..14a5623f365b8 100644 --- a/administrator/language/en-GB/en-GB.plg_search_weblinks.ini +++ b/administrator/language/en-GB/en-GB.plg_search_weblinks.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_search_weblinks.sys.ini b/administrator/language/en-GB/en-GB.plg_search_weblinks.sys.ini index 6a10f6875cf17..cab92523fcdc7 100644 --- a/administrator/language/en-GB/en-GB.plg_search_weblinks.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_search_weblinks.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_cache.ini b/administrator/language/en-GB/en-GB.plg_system_cache.ini index 665a51ab52898..99f7b83c24035 100644 --- a/administrator/language/en-GB/en-GB.plg_system_cache.ini +++ b/administrator/language/en-GB/en-GB.plg_system_cache.ini @@ -1,10 +1,14 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 PLG_CACHE_FIELD_BROWSERCACHE_DESC="If yes, use mechanism for storing page cache in the browser." PLG_CACHE_FIELD_BROWSERCACHE_LABEL="Use Browser Caching" +PLG_CACHE_FIELD_EXCLUDE_DESC="Specify which URLs you want to exclude from caching, each on a separate line. Regular expressions are supported, eg.
        about\-[a-z]+ - will exclude all URLs that contain 'about-', for example 'about-us', 'about-me', 'about-joomla' etc.
        \/component\/users\/ - will exclude all URLs that contain /component/users/" +PLG_CACHE_FIELD_EXCLUDE_LABEL="Exclude URLs" +PLG_CACHE_FIELD_EXCLUDE_MENU_ITEMS_DESC="Select which menu items you want to exclude from caching." +PLG_CACHE_FIELD_EXCLUDE_MENU_ITEMS_LABEL="Exclude Menu Items" PLG_CACHE_FIELD_LIFETIME_DESC="Page cache lifetime in minutes." PLG_CACHE_FIELD_LIFETIME_LABEL="Cache Lifetime" PLG_CACHE_XML_DESCRIPTION="Provides page caching." diff --git a/administrator/language/en-GB/en-GB.plg_system_cache.sys.ini b/administrator/language/en-GB/en-GB.plg_system_cache.sys.ini index 505028372e077..8d1f74cf91407 100644 --- a/administrator/language/en-GB/en-GB.plg_system_cache.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_system_cache.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_debug.ini b/administrator/language/en-GB/en-GB.plg_system_debug.ini index e13525b35b81b..1b1fcd3359fe6 100644 --- a/administrator/language/en-GB/en-GB.plg_system_debug.ini +++ b/administrator/language/en-GB/en-GB.plg_system_debug.ini @@ -1,10 +1,13 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 PLG_DEBUG_BYTES="Bytes" PLG_DEBUG_CALL_STACK="Call Stack" +PLG_DEBUG_CALL_STACK_CALLER="Caller" +PLG_DEBUG_CALL_STACK_FILE_AND_LINE="File and line number" +PLG_DEBUG_CALL_STACK_SAME_FILE="Same as call in the line below." PLG_DEBUG_ERRORS="Errors" PLG_DEBUG_EXPLAIN="Explain" PLG_DEBUG_FIELD_ALLOWED_GROUPS_DESC="Optionally restrict users that can see debug information to those in the selected user groups. If none selected, all users will see the debug information." @@ -62,6 +65,9 @@ PLG_DEBUG_LANG_NOT_LOADED="Not loaded" PLG_DEBUG_LINK_FORMAT="Add xdebug.file_link_format directive to your php.ini file to have links for files." PLG_DEBUG_LOGGING_FIELDSET_LABEL="Logging" PLG_DEBUG_LOGS="Log Messages" +PLG_DEBUG_LOGS_DEPRECATED_FOUND_TEXT="The code that is marked as deprecated will not work in upcoming Joomla versions, please review it." +PLG_DEBUG_LOGS_DEPRECATED_FOUND_TITLE="%s deprecated messages logged!" +PLG_DEBUG_LOGS_LOGGED="%s messages logged" PLG_DEBUG_MEMORY="Memory" PLG_DEBUG_MEMORY_USED_FOR_QUERY="Query memory: %s Memory before query: %s" PLG_DEBUG_MEMORY_USAGE="Memory Usage" diff --git a/administrator/language/en-GB/en-GB.plg_system_debug.sys.ini b/administrator/language/en-GB/en-GB.plg_system_debug.sys.ini index 230f110832033..3ba552850b155 100644 --- a/administrator/language/en-GB/en-GB.plg_system_debug.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_system_debug.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_highlight.ini b/administrator/language/en-GB/en-GB.plg_system_highlight.ini index a6df0e86a36c1..86deaab3a0181 100644 --- a/administrator/language/en-GB/en-GB.plg_system_highlight.ini +++ b/administrator/language/en-GB/en-GB.plg_system_highlight.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_highlight.sys.ini b/administrator/language/en-GB/en-GB.plg_system_highlight.sys.ini index db37ce04def4a..7cf4a28988edd 100644 --- a/administrator/language/en-GB/en-GB.plg_system_highlight.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_system_highlight.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_languagecode.ini b/administrator/language/en-GB/en-GB.plg_system_languagecode.ini index 05a1280d1b041..9aa8da151e654 100644 --- a/administrator/language/en-GB/en-GB.plg_system_languagecode.ini +++ b/administrator/language/en-GB/en-GB.plg_system_languagecode.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_languagecode.sys.ini b/administrator/language/en-GB/en-GB.plg_system_languagecode.sys.ini index d7c952c0815f9..f3ebf2f38f3b2 100644 --- a/administrator/language/en-GB/en-GB.plg_system_languagecode.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_system_languagecode.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_languagefilter.ini b/administrator/language/en-GB/en-GB.plg_system_languagefilter.ini index 02240791bea8a..6e1cf8ead6995 100644 --- a/administrator/language/en-GB/en-GB.plg_system_languagefilter.ini +++ b/administrator/language/en-GB/en-GB.plg_system_languagefilter.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -15,6 +15,11 @@ PLG_SYSTEM_LANGUAGEFILTER_FIELD_DETECT_BROWSER_DESC="Choose site default languag PLG_SYSTEM_LANGUAGEFILTER_FIELD_DETECT_BROWSER_LABEL="Language Selection for new Visitors." PLG_SYSTEM_LANGUAGEFILTER_FIELD_ITEM_ASSOCIATIONS_DESC="This option will allow item associations when switching from one language to another." PLG_SYSTEM_LANGUAGEFILTER_FIELD_ITEM_ASSOCIATIONS_LABEL="Item Associations" +PLG_SYSTEM_LANGUAGEFILTER_FIELD_XDEFAULT_DESC="This option will add x-default meta tag to improve SEO." +PLG_SYSTEM_LANGUAGEFILTER_FIELD_XDEFAULT_LABEL="Add x-default Meta Tag" +PLG_SYSTEM_LANGUAGEFILTER_FIELD_XDEFAULT_LANGUAGE_DESC="Choose the x-default language." +PLG_SYSTEM_LANGUAGEFILTER_FIELD_XDEFAULT_LANGUAGE_LABEL="x-default Language" +PLG_SYSTEM_LANGUAGEFILTER_OPTION_DEFAULT_LANGUAGE="Default frontend language" PLG_SYSTEM_LANGUAGEFILTER_FIELD_REMOVE_DEFAULT_PREFIX_DESC="Remove the defined URL Language Code of the Content Language that corresponds to the default site language when Search Engine Friendly URLs is set to 'Yes'." PLG_SYSTEM_LANGUAGEFILTER_FIELD_REMOVE_DEFAULT_PREFIX_LABEL="Remove URL Language Code" PLG_SYSTEM_LANGUAGEFILTER_OPTION_SESSION="Session" diff --git a/administrator/language/en-GB/en-GB.plg_system_languagefilter.sys.ini b/administrator/language/en-GB/en-GB.plg_system_languagefilter.sys.ini index f7ff66d022e16..9e454201cc6ce 100644 --- a/administrator/language/en-GB/en-GB.plg_system_languagefilter.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_system_languagefilter.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_log.ini b/administrator/language/en-GB/en-GB.plg_system_log.ini index 3032279c7f041..b357ab136530b 100644 --- a/administrator/language/en-GB/en-GB.plg_system_log.ini +++ b/administrator/language/en-GB/en-GB.plg_system_log.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_log.sys.ini b/administrator/language/en-GB/en-GB.plg_system_log.sys.ini index 93ee027ad215b..e348a831d1fe8 100644 --- a/administrator/language/en-GB/en-GB.plg_system_log.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_system_log.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_logout.ini b/administrator/language/en-GB/en-GB.plg_system_logout.ini index 008955901c083..7437d006b83fc 100644 --- a/administrator/language/en-GB/en-GB.plg_system_logout.ini +++ b/administrator/language/en-GB/en-GB.plg_system_logout.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_logout.sys.ini b/administrator/language/en-GB/en-GB.plg_system_logout.sys.ini index b2839da2c19d3..9a4604228e968 100644 --- a/administrator/language/en-GB/en-GB.plg_system_logout.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_system_logout.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_p3p.ini b/administrator/language/en-GB/en-GB.plg_system_p3p.ini index 8ee33b8120e07..9b7ee58fab8d6 100644 --- a/administrator/language/en-GB/en-GB.plg_system_p3p.ini +++ b/administrator/language/en-GB/en-GB.plg_system_p3p.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_p3p.sys.ini b/administrator/language/en-GB/en-GB.plg_system_p3p.sys.ini index c98d800d64a6c..5644ddc38d4cb 100644 --- a/administrator/language/en-GB/en-GB.plg_system_p3p.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_system_p3p.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_redirect.ini b/administrator/language/en-GB/en-GB.plg_system_redirect.ini index 041fcf3469d8f..7421298a4c857 100644 --- a/administrator/language/en-GB/en-GB.plg_system_redirect.ini +++ b/administrator/language/en-GB/en-GB.plg_system_redirect.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_redirect.sys.ini b/administrator/language/en-GB/en-GB.plg_system_redirect.sys.ini index 5bfe91eb6d25d..6e3c27b1e95e7 100644 --- a/administrator/language/en-GB/en-GB.plg_system_redirect.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_system_redirect.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_remember.ini b/administrator/language/en-GB/en-GB.plg_system_remember.ini index 735ba2ede0bea..3f78112bbff30 100644 --- a/administrator/language/en-GB/en-GB.plg_system_remember.ini +++ b/administrator/language/en-GB/en-GB.plg_system_remember.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_remember.sys.ini b/administrator/language/en-GB/en-GB.plg_system_remember.sys.ini index d224d9bfa6bba..0c7fc5f364c44 100644 --- a/administrator/language/en-GB/en-GB.plg_system_remember.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_system_remember.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_sef.ini b/administrator/language/en-GB/en-GB.plg_system_sef.ini index d6117d2314025..3ebd7be2fdc94 100644 --- a/administrator/language/en-GB/en-GB.plg_system_sef.ini +++ b/administrator/language/en-GB/en-GB.plg_system_sef.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_sef.sys.ini b/administrator/language/en-GB/en-GB.plg_system_sef.sys.ini index 4895af41605b0..a8b3fba37aeb0 100644 --- a/administrator/language/en-GB/en-GB.plg_system_sef.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_system_sef.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_system_stats.ini b/administrator/language/en-GB/en-GB.plg_system_stats.ini new file mode 100644 index 0000000000000..adada6fc72b23 --- /dev/null +++ b/administrator/language/en-GB/en-GB.plg_system_stats.ini @@ -0,0 +1,32 @@ +; Joomla! Project +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php +; Note : All ini files need to be saved as UTF-8 + +PLG_SYSTEM_STATS="System - Joomla! Statistics" +PLG_SYSTEM_STATS_BTN_NEVER_SEND="Never" +PLG_SYSTEM_STATS_BTN_SEND_ALWAYS="Always" +PLG_SYSTEM_STATS_BTN_SEND_NOW="Once" +PLG_SYSTEM_STATS_DEBUG_DESC="Enable debug for testing purposes. Statistics will be sent on every page load." +PLG_SYSTEM_STATS_DEBUG_LABEL="Debug" +PLG_SYSTEM_STATS_INTERVAL_DESC="Statistics will be sent every X hours. The default is 12." +PLG_SYSTEM_STATS_INTERVAL_LABEL="Interval (hours)" +PLG_SYSTEM_STATS_LABEL_CMS_VERSION="CMS Version" +PLG_SYSTEM_STATS_LABEL_DB_TYPE="DB Type" +PLG_SYSTEM_STATS_LABEL_DB_VERSION="DB Version" +PLG_SYSTEM_STATS_LABEL_MESSAGE_TITLE="Joomla! would like your permission to collect some basic statistics." +PLG_SYSTEM_STATS_LABEL_PHP_VERSION="PHP Version" +PLG_SYSTEM_STATS_LABEL_SERVER_OS="Server OS" +PLG_SYSTEM_STATS_LABEL_UNIQUE_ID="Unique ID" +PLG_SYSTEM_STATS_MODE_DESC="Select the way that you want the statistics to be sent." +PLG_SYSTEM_STATS_MODE_LABEL="Mode" +PLG_SYSTEM_STATS_MODE_OPTION_ALWAYS_SEND="Always send" +PLG_SYSTEM_STATS_MODE_OPTION_NEVER_SEND="Never send" +PLG_SYSTEM_STATS_MODE_OPTION_ON_DEMAND="On demand" +PLG_SYSTEM_STATS_MSG_ALLOW_SENDING_DATA="Enable Joomla Statistics?" +PLG_SYSTEM_STATS_MSG_JOOMLA_WANTS_TO_SEND_DATA="In order to better understand our install base and end user environments, this plugin has been created to send those statistics back to a Joomla! controlled central server. No identifying data is captured at any point. You can change these settings later from Plugins > System - Joomla! Statistics." +PLG_SYSTEM_STATS_MSG_WHAT_DATA_WILL_BE_SENT="Click here to see which information will be sent." +PLG_SYSTEM_STATS_RESET_UNIQUE_ID="Reset Unique Id" +PLG_SYSTEM_STATS_UNIQUE_ID_DESC="An identifier that allows the Joomla! project to count unique installs of the plugin. This is sent with the statistics back to the server." +PLG_SYSTEM_STATS_UNIQUE_ID_LABEL="Unique ID" +PLG_SYSTEM_STATS_XML_DESCRIPTION="System Plugin that sends environment statistics to a server controlled by the Joomla! project for statistical analysis. Statistics sent include PHP version, CMS version, Database type, Database version and Server type." diff --git a/administrator/language/en-GB/en-GB.plg_system_stats.sys.ini b/administrator/language/en-GB/en-GB.plg_system_stats.sys.ini new file mode 100644 index 0000000000000..55bcc9d9f416e --- /dev/null +++ b/administrator/language/en-GB/en-GB.plg_system_stats.sys.ini @@ -0,0 +1,7 @@ +; Joomla! Project +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php +; Note : All ini files need to be saved as UTF-8 + +PLG_SYSTEM_STATS="System - Joomla! Statistics" +PLG_SYSTEM_STATS_XML_DESCRIPTION="System Plugin that sends environment statistics to a server controlled by the Joomla! project for statistical analysis. Statistics sent include PHP version, CMS version, Database type, Database version and Server type." diff --git a/administrator/language/en-GB/en-GB.plg_system_updatenotification.ini b/administrator/language/en-GB/en-GB.plg_system_updatenotification.ini index bca688cb3049c..7243fc067b26d 100644 --- a/administrator/language/en-GB/en-GB.plg_system_updatenotification.ini +++ b/administrator/language/en-GB/en-GB.plg_system_updatenotification.ini @@ -1,23 +1,21 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 PLG_SYSTEM_UPDATENOTIFICATION="System - Joomla! Update Notification" -PLG_SYSTEM_UPDATENOTIFICATION_DESCRIPTION="This plugin periodically checks for the availability of new Joomla! versions. When one is found it will send you an email, reminding you to update Joomla!. Pro Tip: You can customise the email message by overriding the language string keys PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_SUBJECT and PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_BODY." - PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_LBL="Super User Emails" -PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_DESC="A comma separated list of the email addresses which will receive the update notification emails. The addresses in the list MUST belong to existing users of your site who have the Super User privilege. If none of the listed emails belogns to Super Users, or if it's left blank, all Super Users of this site will receive the update notification email." +PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_DESC="A comma separated list of the email addresses which will receive the update notification emails. The addresses in the list MUST belong to existing users of your site who have the Super User privilege. If none of the listed emails belongs to Super Users, or if it's left blank, all Super Users of this site will receive the update notification email." PLG_SYSTEM_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_LBL="Email language" -PLG_SYSTEM_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_DESC="If you choose Auto (default), the update notification email to Super Users will be in the logged in user's front-end language at the time the plugin is triggered. In multi-language sites this can create confusion: the user's language may be one the Super User receiving the email doesn't speak. By selecting a language here you are forcing the update notification emails to be sent in this specific language." +PLG_SYSTEM_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_DESC="If you choose Auto (default), the update notification email to Super Users will be in the site language at the time the plugin is triggered. By selecting a language here you are forcing the update notification emails to be sent in this specific language." PLG_SYSTEM_UPDATENOTIFICATION_LANGUAGE_OVERRIDE_NONE="Auto" - ; You can use the following merge codes: ; [NEWVERSION] New Joomla! version, e.g. 1.2.3 ; [CURVERSION] Currently installed Joomla! version, e.g. 1.2.0 ; [SITENAME] Site name, as set in Global Configuration. ; [URL] URL of the site's front-end page. ; [LINK] Update URL (link to com_joomlaupdate, will request login if the Super User isn't already logged in). -; \n Newline character. Use it to start a new line in the email. NO LINE SHOULD EXCEED 300 CHARACTERS! +; \n Newline character. Use it to start a new line in the email. PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_SUBJECT="Joomla! Update available for [SITENAME] – [URL]" -PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_BODY="This email IS NOT sent by Joomla.org It is sent automatically by your own site,\n[SITENAME]\n\n================================================================================\nUPDATE INFORMATION\n================================================================================\n\nYour site has discovered that there is an updated version of Joomla! available\nfor download.\n\nJoomla! version currently installed: [CURVERSION]\nJoomla! version available for installation: [NEWVERSION]\n\nThis email is sent to you by your site to remind you of this fact. The Joomla!\nproject will never contact you directly about available updates of Joomla! on\nyour site.\n\n================================================================================\nUPDATE INSTRUCTIONS\n================================================================================\n\nTo install the update on [SITENAME] please click the following link. (If the URL\nis not a link, simply copy & paste it to your browser).\n\nUpdate link: [LINK]\n\n================================================================================\nWHY AM I RECEIVING THIS EMAIL?\n================================================================================\n\nThis email has been automatically sent by a plugin provided by Joomla!, the\nsoftware which powers your site. This plugin looks for updated versions of\nJoomla! and sends an email notification to its administrators. You will receive\nseveral similar emails from your site until you either update the software or\ndisable these emails.\n\nTo disable these emails, please unpublish the 'System - Joomla! Update\nNotification' plugin in the Plugin Manager on your site.\n\nIf you do not understand what is Joomla! and what you need to do please do not\ncontact the Joomla! project. They are NOT sending you this email and they cannot\nhelp you. Instead, please contact the person who built or manages your site.\n\nIf you are the person who built or manages your website, please note that this\nplugin may have been activated automatically when you installed or updated Joomla!\non your site.\n\n================================================================================\nWHO SENT ME THIS EMAIL?\n================================================================================\n\nThis email is sent to you by your own site, [SITENAME]" \ No newline at end of file +PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_BODY="This email IS NOT sent by Joomla.org. It is sent automatically by your own site,\n[SITENAME]\n\n================================================================================\nUPDATE INFORMATION\n================================================================================\n\nYour site has discovered that there is an updated version of Joomla! available for download.\n\nJoomla! version currently installed: [CURVERSION]\nJoomla! version available for installation: [NEWVERSION]\n\nThis email is sent to you by your site to remind you of this fact.\nThe Joomla! project will never contact you directly about available updates of Joomla! on your site.\n\n================================================================================\nUPDATE INSTRUCTIONS\n================================================================================\n\nTo install the update on [SITENAME] please click the following link. (If the URL is not a link, simply copy & paste it to your browser).\n\nUpdate link: [LINK]\n\n================================================================================\nWHY AM I RECEIVING THIS EMAIL?\n================================================================================\n\nThis email has been automatically sent by a plugin provided by Joomla!, the software which powers your site.\nThis plugin looks for updated versions of Joomla! and sends an email notification to its administrators.\nYou will receive several similar emails from your site until you either update the software or disable these emails.\n\nTo disable these emails, please unpublish the 'System - Joomla! Update Notification' plugin in the Plugin Manager on your site.\n\nIf you do not understand what is Joomla! and what you need to do please do not contact the Joomla! project.\nThey are NOT sending you this email and they cannot help you. Instead, please contact the person who built or manages your site.\n\nIf you are the person who built or manages your website, please note that this plugin may have been activated automatically when you installed or updated Joomla! on your site.\n\n================================================================================\nWHO SENT ME THIS EMAIL?\n================================================================================\n\nThis email is sent to you by your own site, [SITENAME]" +PLG_SYSTEM_UPDATENOTIFICATION_XML_DESCRIPTION="This plugin periodically checks for the availability of new Joomla! versions. When one is found it will send you an email, reminding you to update Joomla!. Pro Tip: You can customise the email message by overriding the language string keys PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_SUBJECT and PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_BODY." diff --git a/administrator/language/en-GB/en-GB.plg_system_updatenotification.sys.ini b/administrator/language/en-GB/en-GB.plg_system_updatenotification.sys.ini index 894a51561a1ca..a454155a3f728 100644 --- a/administrator/language/en-GB/en-GB.plg_system_updatenotification.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_system_updatenotification.sys.ini @@ -1,7 +1,7 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 PLG_SYSTEM_UPDATENOTIFICATION="System - Joomla! Update Notification" -PLG_SYSTEM_UPDATENOTIFICATION_DESCRIPTION="This plugin periodically checks for the availability of new Joomla! versions. When one is found it will send you an email, reminding you to update Joomla!. Pro Tip: You can customise the email message by overriding the language string keys PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_SUBJECT and PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_BODY." \ No newline at end of file +PLG_SYSTEM_UPDATENOTIFICATION_XML_DESCRIPTION="This plugin periodically checks for the availability of new Joomla! versions. When one is found it will send you an email, reminding you to update Joomla!. Pro Tip: You can customise the email message by overriding the language string keys PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_SUBJECT and PLG_SYSTEM_UPDATENOTIFICATION_EMAIL_BODY." \ No newline at end of file diff --git a/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.ini b/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.ini index 333b0accef31c..fff3db4ce6536 100644 --- a/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.ini +++ b/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.sys.ini b/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.sys.ini index ab8e948812cc0..11c5186181b7d 100644 --- a/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.ini b/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.ini index 7c4729baa565c..11b6943154906 100644 --- a/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.ini +++ b/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.sys.ini b/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.sys.ini index 69024a9d5f985..d69dc419a4c9c 100644 --- a/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_user_contactcreator.ini b/administrator/language/en-GB/en-GB.plg_user_contactcreator.ini index 5011eb3828205..a162c17564277 100644 --- a/administrator/language/en-GB/en-GB.plg_user_contactcreator.ini +++ b/administrator/language/en-GB/en-GB.plg_user_contactcreator.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_user_contactcreator.sys.ini b/administrator/language/en-GB/en-GB.plg_user_contactcreator.sys.ini index aeae72b0bbf51..72dc34b5a64d4 100644 --- a/administrator/language/en-GB/en-GB.plg_user_contactcreator.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_user_contactcreator.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_user_joomla.ini b/administrator/language/en-GB/en-GB.plg_user_joomla.ini index ddca56b2c66be..2cb22aeac7ebf 100644 --- a/administrator/language/en-GB/en-GB.plg_user_joomla.ini +++ b/administrator/language/en-GB/en-GB.plg_user_joomla.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_user_joomla.sys.ini b/administrator/language/en-GB/en-GB.plg_user_joomla.sys.ini index 470e5e7a45437..72234e44c8365 100644 --- a/administrator/language/en-GB/en-GB.plg_user_joomla.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_user_joomla.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_user_profile.ini b/administrator/language/en-GB/en-GB.plg_user_profile.ini index 20b7d518fa9cf..b5f26d23ca14b 100644 --- a/administrator/language/en-GB/en-GB.plg_user_profile.ini +++ b/administrator/language/en-GB/en-GB.plg_user_profile.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.plg_user_profile.sys.ini b/administrator/language/en-GB/en-GB.plg_user_profile.sys.ini index 7270447436a0f..e2f06ecc0a115 100644 --- a/administrator/language/en-GB/en-GB.plg_user_profile.sys.ini +++ b/administrator/language/en-GB/en-GB.plg_user_profile.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.tpl_hathor.ini b/administrator/language/en-GB/en-GB.tpl_hathor.ini index e4ce2a8feb3a6..7a574d3ea6dac 100644 --- a/administrator/language/en-GB/en-GB.tpl_hathor.ini +++ b/administrator/language/en-GB/en-GB.tpl_hathor.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.tpl_hathor.sys.ini b/administrator/language/en-GB/en-GB.tpl_hathor.sys.ini index 232dd0d901232..b4903b4c52f5d 100644 --- a/administrator/language/en-GB/en-GB.tpl_hathor.sys.ini +++ b/administrator/language/en-GB/en-GB.tpl_hathor.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/language/en-GB/en-GB.tpl_isis.ini b/administrator/language/en-GB/en-GB.tpl_isis.ini index df123e1784b2c..947b399303655 100644 --- a/administrator/language/en-GB/en-GB.tpl_isis.ini +++ b/administrator/language/en-GB/en-GB.tpl_isis.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -35,4 +35,4 @@ TPL_ISIS_STATUS_TOP="Top" TPL_ISIS_STICKY_DESC="Optionally set the toolbar to a fixed (pinned) location." TPL_ISIS_STICKY_LABEL="Pinned Toolbar" TPL_ISIS_TOOLBAR="Toolbar" -TPL_ISIS_XML_DESCRIPTION="Continuing the Egyptian god/goddess theme (Khepri from 1.5 and Hathor from 1.6), Isis is the Joomla 3 administrator template based on Bootstrap from Twitter and the launch of the Joomla User Interface library (JUI)." +TPL_ISIS_XML_DESCRIPTION="Continuing the Egyptian god/goddess theme (Khepri from 1.5 and Hathor from 1.6), Isis is the Joomla 3 administrator template based on Bootstrap and the launch of the Joomla User Interface library (JUI)." diff --git a/administrator/language/en-GB/en-GB.tpl_isis.sys.ini b/administrator/language/en-GB/en-GB.tpl_isis.sys.ini index 024b811c3bd42..6f8a6742c0066 100644 --- a/administrator/language/en-GB/en-GB.tpl_isis.sys.ini +++ b/administrator/language/en-GB/en-GB.tpl_isis.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -17,4 +17,4 @@ TPL_ISIS_POSITION_STATUS="Status" TPL_ISIS_POSITION_SUBMENU="Submenu" TPL_ISIS_POSITION_TITLE="Title" TPL_ISIS_POSITION_TOOLBAR="Toolbar" -TPL_ISIS_XML_DESCRIPTION="Continuing the Egyptian god/goddess theme (Khepri from 1.5 and Hathor from 1.6), Isis is the Joomla 3 administrator template based on Bootstrap from Twitter and the launch of the Joomla User Interface library (JUI)." +TPL_ISIS_XML_DESCRIPTION="Continuing the Egyptian god/goddess theme (Khepri from 1.5 and Hathor from 1.6), Isis is the Joomla 3 administrator template based on Bootstrap and the launch of the Joomla User Interface library (JUI)." diff --git a/administrator/language/en-GB/en-GB.xml b/administrator/language/en-GB/en-GB.xml index f806d8045f255..e2d47c59fe441 100644 --- a/administrator/language/en-GB/en-GB.xml +++ b/administrator/language/en-GB/en-GB.xml @@ -1,12 +1,12 @@ - + English (en-GB) - 3.4.6 - 2013-03-07 + 3.5.2 + April 2016 Joomla! Project admin@joomla.org www.joomla.org - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt en-GB administrator language diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml index 49113eaf842ef..871c930acbdcb 100644 --- a/administrator/language/en-GB/install.xml +++ b/administrator/language/en-GB/install.xml @@ -1,13 +1,13 @@ - + English (United Kingdom) en-GB - 3.4.6 + 3.5.2 2013-03-07 Joomla! Project admin@joomla.org www.joomla.org - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt en-GB administrator language @@ -201,6 +201,8 @@ en-GB.plg_system_remember.sys.ini en-GB.plg_system_sef.ini en-GB.plg_system_sef.sys.ini + en-GB.plg_system_stats.ini + en-GB.plg_system_stats.sys.ini en-GB.plg_system_updatenotification.ini en-GB.plg_system_updatenotification.sys.ini en-GB.plg_twofactorauth_totp.ini diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index 84d7e70d26670..8da7a9985e7cd 100644 --- a/administrator/manifests/files/joomla.xml +++ b/administrator/manifests/files/joomla.xml @@ -1,13 +1,13 @@ - + files_joomla Joomla! Project admin@joomla.org www.joomla.org - (C) 2005 - 2015 Open Source Matters. All rights reserved + (C) 2005 - 2016 Open Source Matters. All rights reserved GNU General Public License version 2 or later; see LICENSE.txt - 3.5.0-dev - June 2015 + 3.5.2-dev + April 2016 FILES_JOOMLA_XML_DESCRIPTION administrator/components/com_admin/script.php diff --git a/administrator/manifests/libraries/joomla.xml b/administrator/manifests/libraries/joomla.xml index 704e80df604c8..d6711dee765c0 100644 --- a/administrator/manifests/libraries/joomla.xml +++ b/administrator/manifests/libraries/joomla.xml @@ -5,7 +5,7 @@ 13.1 LIB_JOOMLA_XML_DESCRIPTION 2008 - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt Joomla! Project admin@joomla.org diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml new file mode 100644 index 0000000000000..c0baf0de19ead --- /dev/null +++ b/administrator/manifests/packages/pkg_en-GB.xml @@ -0,0 +1,25 @@ + + + English (en-GB) Language Pack + en-GB + 3.5.0.1 + 2013-03-07 + Joomla! Project + admin@joomla.org + www.joomla.org + Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL + https://github.com/joomla/joomla-cms + Joomla! Project + www.joomla.org + en-GB language pack + + site_en-GB + admin_en-GB + + + + http://update.joomla.org/language/translationlist_3.xml + + + diff --git a/administrator/manifests/packages/pkg_weblinks.xml b/administrator/manifests/packages/pkg_weblinks.xml index e1d67005958f2..bec5cb2a9785a 100644 --- a/administrator/manifests/packages/pkg_weblinks.xml +++ b/administrator/manifests/packages/pkg_weblinks.xml @@ -4,7 +4,7 @@ weblinks December 2012 Joomla! Project - (C) 2005 - 2015 Open Source Matters. All rights reserved. + (C) 2005 - 2016 Open Source Matters. All rights reserved. admin@joomla.org www.joomla.org Joomla! Project diff --git a/administrator/modules/mod_custom/mod_custom.php b/administrator/modules/mod_custom/mod_custom.php index 1b0e45b694e8b..e06eeaacb489e 100644 --- a/administrator/modules/mod_custom/mod_custom.php +++ b/administrator/modules/mod_custom/mod_custom.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_custom * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_custom/mod_custom.xml b/administrator/modules/mod_custom/mod_custom.xml index c734df3ca9fbe..2e4a65615db2c 100644 --- a/administrator/modules/mod_custom/mod_custom.xml +++ b/administrator/modules/mod_custom/mod_custom.xml @@ -3,7 +3,7 @@ mod_custom Joomla! Project July 2004 - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/modules/mod_custom/tmpl/default.php b/administrator/modules/mod_custom/tmpl/default.php index 84d5da1003d40..be68031860a19 100644 --- a/administrator/modules/mod_custom/tmpl/default.php +++ b/administrator/modules/mod_custom/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_custom * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_feed/helper.php b/administrator/modules/mod_feed/helper.php index 7b9338517e4a1..481f855cf5886 100644 --- a/administrator/modules/mod_feed/helper.php +++ b/administrator/modules/mod_feed/helper.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_feed * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_feed/mod_feed.php b/administrator/modules/mod_feed/mod_feed.php index 0c2f502975fa5..09abb87c12784 100644 --- a/administrator/modules/mod_feed/mod_feed.php +++ b/administrator/modules/mod_feed/mod_feed.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_feed * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_feed/mod_feed.xml b/administrator/modules/mod_feed/mod_feed.xml index 779113de9daed..62ef9204d3a58 100644 --- a/administrator/modules/mod_feed/mod_feed.xml +++ b/administrator/modules/mod_feed/mod_feed.xml @@ -3,7 +3,7 @@ mod_feed Joomla! Project July 2005 - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/modules/mod_feed/tmpl/default.php b/administrator/modules/mod_feed/tmpl/default.php index 1f74c747434bd..d44cdcf419333 100644 --- a/administrator/modules/mod_feed/tmpl/default.php +++ b/administrator/modules/mod_feed/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_feed * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_latest/helper.php b/administrator/modules/mod_latest/helper.php index ef393abd441a6..ea59efc5b8946 100644 --- a/administrator/modules/mod_latest/helper.php +++ b/administrator/modules/mod_latest/helper.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_latest * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_latest/mod_latest.php b/administrator/modules/mod_latest/mod_latest.php index 465873907cc3f..fd15cee9ee4ee 100644 --- a/administrator/modules/mod_latest/mod_latest.php +++ b/administrator/modules/mod_latest/mod_latest.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_latest * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_latest/mod_latest.xml b/administrator/modules/mod_latest/mod_latest.xml index e905299c64165..e41cd43c21452 100644 --- a/administrator/modules/mod_latest/mod_latest.xml +++ b/administrator/modules/mod_latest/mod_latest.xml @@ -3,7 +3,7 @@ mod_latest Joomla! Project July 2004 - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/modules/mod_latest/tmpl/default.php b/administrator/modules/mod_latest/tmpl/default.php index 34c3e3312a8d7..3ce5a4c0e4ffb 100644 --- a/administrator/modules/mod_latest/tmpl/default.php +++ b/administrator/modules/mod_latest/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_latest * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_logged/helper.php b/administrator/modules/mod_logged/helper.php index ca0a64006c6d8..df9386b562a8a 100644 --- a/administrator/modules/mod_logged/helper.php +++ b/administrator/modules/mod_logged/helper.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_logged * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_logged/mod_logged.php b/administrator/modules/mod_logged/mod_logged.php index edfa8cc881746..fb0c9b12d1f83 100644 --- a/administrator/modules/mod_logged/mod_logged.php +++ b/administrator/modules/mod_logged/mod_logged.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_logged * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_logged/mod_logged.xml b/administrator/modules/mod_logged/mod_logged.xml index 312c3a3e2ad6b..cc81fd4310f17 100644 --- a/administrator/modules/mod_logged/mod_logged.xml +++ b/administrator/modules/mod_logged/mod_logged.xml @@ -3,7 +3,7 @@ mod_logged Joomla! Project January 2005 - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/modules/mod_logged/tmpl/default.php b/administrator/modules/mod_logged/tmpl/default.php index f95d54869246f..7c7a38a050f9b 100644 --- a/administrator/modules/mod_logged/tmpl/default.php +++ b/administrator/modules/mod_logged/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_logged * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_login/helper.php b/administrator/modules/mod_login/helper.php index b5a30ae6d17db..906c2a59986f1 100644 --- a/administrator/modules/mod_login/helper.php +++ b/administrator/modules/mod_login/helper.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_login * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_login/mod_login.php b/administrator/modules/mod_login/mod_login.php index 709b0d8082dfd..6d5684f33263a 100644 --- a/administrator/modules/mod_login/mod_login.php +++ b/administrator/modules/mod_login/mod_login.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_login * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_login/mod_login.xml b/administrator/modules/mod_login/mod_login.xml index 1655e187f82ff..5b2ad77da2ed5 100644 --- a/administrator/modules/mod_login/mod_login.xml +++ b/administrator/modules/mod_login/mod_login.xml @@ -3,7 +3,7 @@ mod_login Joomla! Project March 2005 - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/modules/mod_login/tmpl/default.php b/administrator/modules/mod_login/tmpl/default.php index ed2f98017c2ee..cf0b435eb2f28 100644 --- a/administrator/modules/mod_login/tmpl/default.php +++ b/administrator/modules/mod_login/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_login * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_menu/helper.php b/administrator/modules/mod_menu/helper.php index ecd1c5ad37368..bcd8bdcfc5fef 100644 --- a/administrator/modules/mod_menu/helper.php +++ b/administrator/modules/mod_menu/helper.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_menu * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/modules/mod_menu/menu.php b/administrator/modules/mod_menu/menu.php index da2ac4e49ffb2..56f0a7d5efd82 100644 --- a/administrator/modules/mod_menu/menu.php +++ b/administrator/modules/mod_menu/menu.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_menu * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -128,6 +128,8 @@ public function renderMenu($id = 'menu', $class = '') } echo "
      \n"; + + echo ''; } if ($this->_css) @@ -162,6 +164,11 @@ public function renderLevel($depth) if ($this->_current->hasChildren() && $this->_current->class) { $class = ' class="dropdown-submenu"'; + + if ($this->_current->class == 'scrollable-menu') + { + $class = ' class="dropdown scrollable-menu"'; + } } if ($this->_current->class == 'disabled') @@ -187,6 +194,10 @@ public function renderLevel($depth) $dropdownCaret = ' '; } } + else + { + $linkClass[] = 'no-dropdown'; + } if ($this->_current->link != null && $this->_current->getParent()->title != 'ROOT') { @@ -231,11 +242,11 @@ public function renderLevel($depth) $id = ' id="menu-' . strtolower($this->_current->id) . '"'; } - echo '' . "\n"; + echo '' . "\n"; } else { - echo '
    - items[0]) && property_exists($this->items[0], count_unpublished)) : ?> + items[0]) && property_exists($this->items[0], 'count_unpublished')) : ?> - items[0]) && property_exists($this->items[0], count_archived)) : ?> + items[0]) && property_exists($this->items[0], 'count_archived')) : ?> - items[0]) && property_exists($this->items[0], count_trashed)) : ?> + items[0]) && property_exists($this->items[0], 'count_trashed')) : ?> - items[0]) && property_exists($this->items[0], count_unpublished)) : ?> + items[0]) && property_exists($this->items[0], 'count_unpublished')) : ?> - items[0]) && property_exists($this->items[0], count_archived)) : ?> + items[0]) && property_exists($this->items[0], 'count_archived')) : ?> - items[0]) && property_exists($this->items[0], count_trashed)) : ?> + items[0]) && property_exists($this->items[0], 'count_trashed')) : ?> - diff --git a/administrator/templates/hathor/html/com_installer/languages/default_filter.php b/administrator/templates/hathor/html/com_installer/languages/default_filter.php index 05e2d6391f94f..855df0b047388 100644 --- a/administrator/templates/hathor/html/com_installer/languages/default_filter.php +++ b/administrator/templates/hathor/html/com_installer/languages/default_filter.php @@ -2,7 +2,7 @@ /** * @package Joomla.Administrator * @subpackage com_installer - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_installer/manage/default.php b/administrator/templates/hathor/html/com_installer/manage/default.php index b1e902747ee0c..8d2c80d79ebe0 100644 --- a/administrator/templates/hathor/html/com_installer/manage/default.php +++ b/administrator/templates/hathor/html/com_installer/manage/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_installer/manage/default_filter.php b/administrator/templates/hathor/html/com_installer/manage/default_filter.php index ae61e0e440e62..416fb199161ac 100644 --- a/administrator/templates/hathor/html/com_installer/manage/default_filter.php +++ b/administrator/templates/hathor/html/com_installer/manage/default_filter.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_installer/update/default.php b/administrator/templates/hathor/html/com_installer/update/default.php index 9c4ca56c5a902..485618cf67177 100644 --- a/administrator/templates/hathor/html/com_installer/update/default.php +++ b/administrator/templates/hathor/html/com_installer/update/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_installer/warnings/default.php b/administrator/templates/hathor/html/com_installer/warnings/default.php index c9e07de670121..481003a3a75be 100644 --- a/administrator/templates/hathor/html/com_installer/warnings/default.php +++ b/administrator/templates/hathor/html/com_installer/warnings/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_joomlaupdate/default/default.php b/administrator/templates/hathor/html/com_joomlaupdate/default/default.php index 1b7fc97f2fe3a..3e4f93eeb11e1 100644 --- a/administrator/templates/hathor/html/com_joomlaupdate/default/default.php +++ b/administrator/templates/hathor/html/com_joomlaupdate/default/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_joomlaupdate * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_languages/installed/default.php b/administrator/templates/hathor/html/com_languages/installed/default.php index 00b9710629744..5234c7bf5c4db 100644 --- a/administrator/templates/hathor/html/com_languages/installed/default.php +++ b/administrator/templates/hathor/html/com_languages/installed/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -14,11 +14,9 @@ JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html'); $user = JFactory::getUser(); $userId = $user->get('id'); -$client = $this->state->get('filter.client_id', 0) ? JText::_('JADMINISTRATOR') : JText::_('JSITE'); -$clientId = $this->state->get('filter.client_id', 0); ?> - +sidebar)) : ?>
    sidebar; ?> @@ -27,6 +25,25 @@
    +
    + +
    + + + + +
    +
    ftp) : ?> loadTemplate('ftp');?> @@ -43,9 +60,6 @@
    - @@ -80,9 +94,6 @@ - diff --git a/administrator/templates/hathor/html/com_languages/installed/default_ftp.php b/administrator/templates/hathor/html/com_languages/installed/default_ftp.php index ac6cb584056d9..2a8f61bc93717 100644 --- a/administrator/templates/hathor/html/com_languages/installed/default_ftp.php +++ b/administrator/templates/hathor/html/com_languages/installed/default_ftp.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_languages/languages/default.php b/administrator/templates/hathor/html/com_languages/languages/default.php index da21814f5837f..62d364268111f 100644 --- a/administrator/templates/hathor/html/com_languages/languages/default.php +++ b/administrator/templates/hathor/html/com_languages/languages/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_languages/overrides/default.php b/administrator/templates/hathor/html/com_languages/overrides/default.php index 81b6da2e7429c..ff942b0d85953 100644 --- a/administrator/templates/hathor/html/com_languages/overrides/default.php +++ b/administrator/templates/hathor/html/com_languages/overrides/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_languages * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_menus/item/edit.php b/administrator/templates/hathor/html/com_menus/item/edit.php index b7b64b60f71e9..88e1a25aa8f81 100644 --- a/administrator/templates/hathor/html/com_menus/item/edit.php +++ b/administrator/templates/hathor/html/com_menus/item/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_menus/item/edit_options.php b/administrator/templates/hathor/html/com_menus/item/edit_options.php index c37a4487cf824..6a197c3fb7949 100644 --- a/administrator/templates/hathor/html/com_menus/item/edit_options.php +++ b/administrator/templates/hathor/html/com_menus/item/edit_options.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_menus/items/default.php b/administrator/templates/hathor/html/com_menus/items/default.php index b889d13085b94..1781aa57d0f7d 100644 --- a/administrator/templates/hathor/html/com_menus/items/default.php +++ b/administrator/templates/hathor/html/com_menus/items/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -196,10 +196,10 @@ home, $i, 'items.', ($item->language != '*' || !$item->home) && $canChange);?> - image . '.gif', $item->language_title, array('title' => JText::sprintf('COM_MENUS_GRID_UNSET_LANGUAGE', $item->language_title)), true);?> + language_image . '.gif', $item->language_title, array('title' => JText::sprintf('COM_MENUS_GRID_UNSET_LANGUAGE', $item->language_title)), true);?> - image . '.gif', $item->language_title, array('title' => $item->language_title), true);?> + language_image . '.gif', $item->language_title, array('title' => $item->language_title), true);?> @@ -218,7 +218,7 @@ language == '*'):?> - language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> + language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . ' ' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> - - - items as $i => $item) : ?> - " itemscope itemtype="http://schema.org/Person"> + " itemscope itemtype="https://schema.org/Person"> @@ -140,19 +140,19 @@ params->get('show_suburb_headings')) : ?> - params->get('show_state_headings')) : ?> - params->get('show_country_headings')) : ?> - diff --git a/components/com_contact/views/featured/view.html.php b/components/com_contact/views/featured/view.html.php index dfd7a366f4d74..9e0a5df9b7a91 100644 --- a/components/com_contact/views/featured/view.html.php +++ b/components/com_contact/views/featured/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -12,7 +12,7 @@ use Joomla\Registry\Registry; /** - * Frontpage View class + * Featured View class * * @since 1.6 */ @@ -63,7 +63,7 @@ class ContactViewFeatured extends JViewLegacy /** * Method to display the view. * - * @param string $tpl A template file to load. [optional] + * @param string $tpl The name of the template file to parse; automatically searches through the template paths. * * @return mixed Exception on failure, void on success. * @@ -71,16 +71,16 @@ class ContactViewFeatured extends JViewLegacy */ public function display($tpl = null) { - $app = JFactory::getApplication(); - $params = $app->getParams(); + $app = JFactory::getApplication(); + $params = $app->getParams(); // Get some data from the models - $state = $this->get('State'); - $items = $this->get('Items'); - $category = $this->get('Category'); - $children = $this->get('Children'); - $parent = $this->get('Parent'); - $pagination = $this->get('Pagination'); + $state = $this->get('State'); + $items = $this->get('Items'); + $category = $this->get('Category'); + $children = $this->get('Children'); + $parent = $this->get('Parent'); + $pagination = $this->get('Pagination'); // Check for errors. if (count($errors = $this->get('Errors'))) @@ -94,9 +94,9 @@ public function display($tpl = null) // Compute the contact slug. for ($i = 0, $n = count($items); $i < $n; $i++) { - $item = &$items[$i]; - $item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id; - $temp = new Registry; + $item = &$items[$i]; + $item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id; + $temp = new Registry; $temp->loadString($item->params); $item->params = clone $params; @@ -140,13 +140,13 @@ public function display($tpl = null) * * @return void * - * @since 1.5 + * @since 1.6 */ protected function _prepareDocument() { - $app = JFactory::getApplication(); - $menus = $app->getMenu(); - $title = null; + $app = JFactory::getApplication(); + $menus = $app->getMenu(); + $title = null; // Because the application sets a default page title, // we need to get it from the menu item itself @@ -165,15 +165,15 @@ protected function _prepareDocument() if (empty($title)) { - $title = $app->getCfg('sitename'); + $title = $app->get('sitename'); } - elseif ($app->getCfg('sitename_pagetitles', 0) == 1) + elseif ($app->get('sitename_pagetitles', 0) == 1) { - $title = JText::sprintf('JPAGETITLE', $app->getCfg('sitename'), $title); + $title = JText::sprintf('JPAGETITLE', $app->get('sitename'), $title); } - elseif ($app->getCfg('sitename_pagetitles', 0) == 2) + elseif ($app->get('sitename_pagetitles', 0) == 2) { - $title = JText::sprintf('JPAGETITLE', $title, $app->getCfg('sitename')); + $title = JText::sprintf('JPAGETITLE', $title, $app->get('sitename')); } $this->document->setTitle($title); diff --git a/components/com_content/content.php b/components/com_content/content.php index 974f445f12ece..ddf20c2528d6d 100644 --- a/components/com_content/content.php +++ b/components/com_content/content.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/controller.php b/components/com_content/controller.php index 3dd9feb9a9099..ae86b40a271b4 100644 --- a/components/com_content/controller.php +++ b/components/com_content/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -101,6 +101,15 @@ public function display($cachable = false, $urlparams = false) return JError::raiseError(403, JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id)); } + if ($vName == 'article') + { + // Get/Create the model + if ($model = $this->getModel($vName)) + { + $model->hit(); + } + } + parent::display($cachable, $safeurlparams); return $this; diff --git a/components/com_content/controllers/article.php b/components/com_content/controllers/article.php index 99a4b7a679943..740ddfefa2bdf 100644 --- a/components/com_content/controllers/article.php +++ b/components/com_content/controllers/article.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/helpers/association.php b/components/com_content/helpers/association.php index cc22dd1e59391..806e5db6090e3 100644 --- a/components/com_content/helpers/association.php +++ b/components/com_content/helpers/association.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/helpers/category.php b/components/com_content/helpers/category.php index b95fd199bc735..b63ce4d335292 100644 --- a/components/com_content/helpers/category.php +++ b/components/com_content/helpers/category.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/helpers/icon.php b/components/com_content/helpers/icon.php index 421bc82b37115..85d7ed248b561 100644 --- a/components/com_content/helpers/icon.php +++ b/components/com_content/helpers/icon.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/helpers/query.php b/components/com_content/helpers/query.php index 89368e60ffe1a..bcb789bc03142 100644 --- a/components/com_content/helpers/query.php +++ b/components/com_content/helpers/query.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/helpers/route.php b/components/com_content/helpers/route.php index 357b6f954cdd0..5dece4143a292 100644 --- a/components/com_content/helpers/route.php +++ b/components/com_content/helpers/route.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/models/archive.php b/components/com_content/models/archive.php index 38a0812f7cbbe..9772a466af78e 100644 --- a/components/com_content/models/archive.php +++ b/components/com_content/models/archive.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/models/article.php b/components/com_content/models/article.php index 2d20d4dccaa0e..a59567a5379aa 100644 --- a/components/com_content/models/article.php +++ b/components/com_content/models/article.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/models/articles.php b/components/com_content/models/articles.php index edb00fc7c25ea..b85479df56c93 100644 --- a/components/com_content/models/articles.php +++ b/components/com_content/models/articles.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -659,8 +659,11 @@ public function getItems() } // Get the tags - $item->tags = new JHelperTags; - $item->tags->getItemTags('com_content.article', $item->id); + if ($item->params->get('show_tags')) + { + $item->tags = new JHelperTags; + $item->tags->getItemTags('com_content.article', $item->id); + } } return $items; diff --git a/components/com_content/models/categories.php b/components/com_content/models/categories.php index 4c64212695407..ba35b9cc72966 100644 --- a/components/com_content/models/categories.php +++ b/components/com_content/models/categories.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/models/category.php b/components/com_content/models/category.php index 13175e5874312..b3d2e49e9833a 100644 --- a/components/com_content/models/category.php +++ b/components/com_content/models/category.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -127,10 +127,6 @@ protected function populateState($ordering = null, $direction = null) $this->setState('params', $mergedParams); $user = JFactory::getUser(); - // Create a new query object. - $db = $this->getDbo(); - $query = $db->getQuery(true); - $asset = 'com_content'; if ($pk) @@ -142,13 +138,6 @@ protected function populateState($ordering = null, $direction = null) { // Limit to published for people who can't edit or edit.state. $this->setState('filter.published', 1); - - // Filter by start and end dates. - $nullDate = $db->quote($db->getNullDate()); - $nowDate = $db->quote(JFactory::getDate()->toSql()); - - $query->where('(a.publish_up = ' . $nullDate . ' OR a.publish_up <= ' . $nowDate . ')') - ->where('(a.publish_down = ' . $nullDate . ' OR a.publish_down >= ' . $nowDate . ')'); } else { diff --git a/components/com_content/models/featured.php b/components/com_content/models/featured.php index e3d7ca31cb686..3eb476f23e6f5 100644 --- a/components/com_content/models/featured.php +++ b/components/com_content/models/featured.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/models/form.php b/components/com_content/models/form.php index 560da051e8e61..e8a653057a8ed 100644 --- a/components/com_content/models/form.php +++ b/components/com_content/models/form.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/router.php b/components/com_content/router.php index 322be214620f9..f180678ccb72c 100644 --- a/components/com_content/router.php +++ b/components/com_content/router.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -33,6 +33,12 @@ public function build(&$query) $params = JComponentHelper::getParams('com_content'); $advanced = $params->get('sef_advanced_link', 0); + // Unset limitstart=0 since it's pointless + if (isset($query['limitstart']) && $query['limitstart'] == 0) + { + unset($query['limitstart']); + } + // We need a menu item. Either the one specified in the query, or the current active one if none specified if (empty($query['Itemid'])) { diff --git a/components/com_content/views/archive/tmpl/default.php b/components/com_content/views/archive/tmpl/default.php index 3e466931cba05..f14093209c2e8 100644 --- a/components/com_content/views/archive/tmpl/default.php +++ b/components/com_content/views/archive/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/views/archive/tmpl/default_items.php b/components/com_content/views/archive/tmpl/default_items.php index bade1eea7b775..3b901f91097ec 100644 --- a/components/com_content/views/archive/tmpl/default_items.php +++ b/components/com_content/views/archive/tmpl/default_items.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -16,7 +16,7 @@
    items as $i => $item) : ?> params->get('info_block_position', 0); ?> -
    +

    get('link_titles')) : ?> @@ -28,7 +28,7 @@

    get('show_author') && !empty($item->author )) : ?> - diff --git a/components/com_content/views/archive/view.html.php b/components/com_content/views/archive/view.html.php index 4c03c82ad74a6..8e0907c6ffb24 100644 --- a/components/com_content/views/archive/view.html.php +++ b/components/com_content/views/archive/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/views/article/tmpl/default.php b/components/com_content/views/article/tmpl/default.php index 38f1237b12c84..dfcd4eef9f5cd 100644 --- a/components/com_content/views/article/tmpl/default.php +++ b/components/com_content/views/article/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -20,7 +20,7 @@ $info = $params->get('info_block_position', 0); JHtml::_('behavior.caption'); ?> -
    +
    params->get('show_page_heading')) : ?>
    @@ -45,11 +45,11 @@ get('show_title') || $params->get('show_author')) : ?>
    -

    - get('show_title')) : ?> + get('show_title')) : ?> +

    escape($this->item->title); ?> - -

    + + item->state == 0) : ?> @@ -83,7 +83,9 @@ item->tagLayout->render($this->item->tags->itemTags); ?> + get('show_intro')) : echo $this->item->event->afterDisplayTitle; endif; ?> + item->event->beforeDisplayContent; ?> urls_position) && ($urls->urls_position == '0')) || ($params->get('urls_position') == '0' && empty($urls->urls_position))) @@ -111,8 +113,10 @@ item->text; ?>
    - - $this->item, 'params' => $params, 'position' => 'below')); ?> + + + $this->item, 'params' => $params, 'position' => 'below')); ?> + get('show_tags', 1) && !empty($this->item->tags->itemTags)) : ?> item->tagLayout = new JLayoutFile('joomla.content.tags'); ?> item->tagLayout->render($this->item->tags->itemTags); ?> @@ -163,5 +167,6 @@ echo $this->item->pagination; ?> + item->event->afterDisplayContent; ?>
    diff --git a/components/com_content/views/article/tmpl/default_links.php b/components/com_content/views/article/tmpl/default_links.php index 7aecec18db848..58d7924407a98 100644 --- a/components/com_content/views/article/tmpl/default_links.php +++ b/components/com_content/views/article/tmpl/default_links.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/views/article/view.html.php b/components/com_content/views/article/view.html.php index 22e30910e0f8e..6b09a9330e69b 100644 --- a/components/com_content/views/article/view.html.php +++ b/components/com_content/views/article/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -170,13 +170,6 @@ public function display($tpl = null) $results = $dispatcher->trigger('onContentAfterDisplay', array('com_content.article', &$item, &$item->params, $offset)); $item->event->afterDisplayContent = trim(implode("\n", $results)); - // Increment the hit counter of the article. - if (!$this->params->get('intro_only') && $offset == 0) - { - $model = $this->getModel(); - $model->hit(); - } - // Escape strings for HTML output $this->pageclass_sfx = htmlspecialchars($this->item->params->get('pageclass_sfx')); diff --git a/components/com_content/views/categories/tmpl/default.php b/components/com_content/views/categories/tmpl/default.php index 0b9b02a563bc9..984fdec2a1075 100644 --- a/components/com_content/views/categories/tmpl/default.php +++ b/components/com_content/views/categories/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/views/categories/tmpl/default_items.php b/components/com_content/views/categories/tmpl/default_items.php index 3807ffacc9821..0ff594478f170 100644 --- a/components/com_content/views/categories/tmpl/default_items.php +++ b/components/com_content/views/categories/tmpl/default_items.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/views/categories/view.html.php b/components/com_content/views/categories/view.html.php index 69358fe66a21f..b9f56b774e055 100644 --- a/components/com_content/views/categories/view.html.php +++ b/components/com_content/views/categories/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/views/category/tmpl/blog.php b/components/com_content/views/category/tmpl/blog.php index 8a5bb822cbe49..e616e97c71eab 100644 --- a/components/com_content/views/category/tmpl/blog.php +++ b/components/com_content/views/category/tmpl/blog.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -13,7 +13,7 @@ JHtml::_('behavior.caption'); ?> -
    +
    params->get('show_page_heading')) : ?>

    escape($this->params->get('page_heading')); ?>

    @@ -55,7 +55,7 @@
    lead_items as &$item) : ?>
    + itemprop="blogPost" itemscope itemtype="https://schema.org/BlogPosting"> item = & $item; echo $this->loadTemplate('item'); @@ -80,7 +80,7 @@
    + itemprop="blogPost" itemscope itemtype="https://schema.org/BlogPosting"> item = & $item; echo $this->loadTemplate('item'); diff --git a/components/com_content/views/category/tmpl/blog_children.php b/components/com_content/views/category/tmpl/blog_children.php index 9eac816204c34..432a1086fb1cd 100644 --- a/components/com_content/views/category/tmpl/blog_children.php +++ b/components/com_content/views/category/tmpl/blog_children.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -52,8 +52,8 @@ getChildren()) > 0 && $this->maxLevel > 1) : ?> - + params->get('show_subcat_desc') == 1) : ?> description) : ?> diff --git a/components/com_content/views/category/tmpl/blog_item.php b/components/com_content/views/category/tmpl/blog_item.php index dbfc4b228d7b3..9e2cd1d43d938 100644 --- a/components/com_content/views/category/tmpl/blog_item.php +++ b/components/com_content/views/category/tmpl/blog_item.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -42,9 +42,13 @@ get('show_intro')) : ?> + item->event->afterDisplayTitle; ?> -item->event->beforeDisplayContent; ?> item->introtext; ?> + +item->event->beforeDisplayContent; ?> + +item->introtext; ?> $this->item, 'params' => $params, 'position' => 'below')); ?> @@ -70,4 +74,5 @@
    + item->event->afterDisplayContent; ?> diff --git a/components/com_content/views/category/tmpl/blog_links.php b/components/com_content/views/category/tmpl/blog_links.php index 653d406f99e37..3295351b0ce1c 100644 --- a/components/com_content/views/category/tmpl/blog_links.php +++ b/components/com_content/views/category/tmpl/blog_links.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/views/category/tmpl/default.php b/components/com_content/views/category/tmpl/default.php index 3894b2edfc1f2..7718a03785073 100644 --- a/components/com_content/views/category/tmpl/default.php +++ b/components/com_content/views/category/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/views/category/tmpl/default_articles.php b/components/com_content/views/category/tmpl/default_articles.php index e337269457359..fe6b1fc4341f8 100644 --- a/components/com_content/views/category/tmpl/default_articles.php +++ b/components/com_content/views/category/tmpl/default_articles.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/views/category/tmpl/default_children.php b/components/com_content/views/category/tmpl/default_children.php index 2b8eff5dfa1f3..75c3a9b625f4c 100644 --- a/components/com_content/views/category/tmpl/default_children.php +++ b/components/com_content/views/category/tmpl/default_children.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/views/category/view.feed.php b/components/com_content/views/category/view.feed.php index 7f453e451521a..0223547bd7f89 100644 --- a/components/com_content/views/category/view.feed.php +++ b/components/com_content/views/category/view.feed.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/views/category/view.html.php b/components/com_content/views/category/view.html.php index 4162b1db2e1f0..2f03fedf05a81 100644 --- a/components/com_content/views/category/view.html.php +++ b/components/com_content/views/category/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/views/featured/tmpl/default.php b/components/com_content/views/featured/tmpl/default.php index 884da2a465fda..49aae30b0633e 100644 --- a/components/com_content/views/featured/tmpl/default.php +++ b/components/com_content/views/featured/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -16,7 +16,7 @@ // If the page class is defined, add to class as suffix. // It will be a separate class if the user starts it with a space ?> -
    +
    params->get('show_page_heading') != 0) : ?>

    @@ -30,7 +30,7 @@
    lead_items as &$item) : ?>
    + itemprop="blogPost" itemscope itemtype="https://schema.org/BlogPosting"> item = &$item; echo $this->loadTemplate('item'); @@ -59,7 +59,7 @@
    + itemprop="blogPost" itemscope itemtype="https://schema.org/BlogPosting"> item = &$item; echo $this->loadTemplate('item'); diff --git a/components/com_content/views/featured/tmpl/default_item.php b/components/com_content/views/featured/tmpl/default_item.php index 048ac1ab186d1..00cfb99c9e898 100644 --- a/components/com_content/views/featured/tmpl/default_item.php +++ b/components/com_content/views/featured/tmpl/default_item.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -66,9 +66,13 @@ get('show_intro')) : ?> + item->event->afterDisplayTitle; ?> -item->event->beforeDisplayContent; ?> item->introtext; ?> + +item->event->beforeDisplayContent; ?> + +item->introtext; ?> $this->item, 'params' => $params, 'position' => 'below')); ?> @@ -97,4 +101,5 @@
    + item->event->afterDisplayContent; ?> diff --git a/components/com_content/views/featured/tmpl/default_links.php b/components/com_content/views/featured/tmpl/default_links.php index f98832b285657..eb9e21ce7579a 100644 --- a/components/com_content/views/featured/tmpl/default_links.php +++ b/components/com_content/views/featured/tmpl/default_links.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/views/featured/view.feed.php b/components/com_content/views/featured/view.feed.php index 6a9de9068b8b1..9e5daea5a037a 100644 --- a/components/com_content/views/featured/view.feed.php +++ b/components/com_content/views/featured/view.feed.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/views/featured/view.html.php b/components/com_content/views/featured/view.html.php index c3b651d044b51..d4ce82d42939e 100644 --- a/components/com_content/views/featured/view.html.php +++ b/components/com_content/views/featured/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_content/views/form/tmpl/edit.php b/components/com_content/views/form/tmpl/edit.php index d83bdef7df074..643e0b52983d4 100644 --- a/components/com_content/views/form/tmpl/edit.php +++ b/components/com_content/views/form/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -14,7 +14,6 @@ JHtml::_('behavior.calendar'); JHtml::_('behavior.formvalidator'); JHtml::_('formbehavior.chosen', 'select'); -JHtml::_('behavior.modal', 'a.modal_jform_contenthistory'); // Create shortcut to parameters. $params = $this->state->get('params'); @@ -59,7 +58,7 @@
    - get('save_history', 0)) : ?> + get('save_history', 0) && $this->item->id) : ?>
    form->getInput('contenthistory'); ?>
    diff --git a/components/com_content/views/form/view.html.php b/components/com_content/views/form/view.html.php index 9f91f58f228e7..e321aa3536d80 100644 --- a/components/com_content/views/form/view.html.php +++ b/components/com_content/views/form/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_content * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contenthistory/contenthistory.php b/components/com_contenthistory/contenthistory.php index 11c0b7deeebf4..4fd24181d165b 100644 --- a/components/com_contenthistory/contenthistory.php +++ b/components/com_contenthistory/contenthistory.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contenthistory * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_finder/controller.php b/components/com_finder/controller.php index 6e2c481307ce0..734cfbb9f6690 100644 --- a/components/com_finder/controller.php +++ b/components/com_finder/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_finder/controllers/suggestions.json.php b/components/com_finder/controllers/suggestions.json.php index 36ebb2168c8f1..89f003eb13c72 100644 --- a/components/com_finder/controllers/suggestions.json.php +++ b/components/com_finder/controllers/suggestions.json.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_finder/finder.php b/components/com_finder/finder.php index c3fa45572f10b..264fdcea9e5b1 100644 --- a/components/com_finder/finder.php +++ b/components/com_finder/finder.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_finder/helpers/html/filter.php b/components/com_finder/helpers/html/filter.php index 7668e4c3d6830..8584475b0acd0 100644 --- a/components/com_finder/helpers/html/filter.php +++ b/components/com_finder/helpers/html/filter.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ @@ -109,7 +109,8 @@ public static function slider($options = array()) return null; } - $html .= JHtml::_('bootstrap.startAccordion', 'accordion', array('parent' => true, 'active' => 'accordion-' . array_keys($branches)[0]) + $branch_keys = array_keys($branches); + $html .= JHtml::_('bootstrap.startAccordion', 'accordion', array('parent' => true, 'active' => 'accordion-' . $branch_keys[0]) ); // Load plug-in language files. diff --git a/components/com_finder/helpers/html/query.php b/components/com_finder/helpers/html/query.php index 14841a9f1cec0..f4a46b28a28db 100644 --- a/components/com_finder/helpers/html/query.php +++ b/components/com_finder/helpers/html/query.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_finder/helpers/route.php b/components/com_finder/helpers/route.php index 37ee80fc330dd..55476b44a725d 100644 --- a/components/com_finder/helpers/route.php +++ b/components/com_finder/helpers/route.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_finder/models/search.php b/components/com_finder/models/search.php index 91e9b64bb4317..4174c38daf248 100644 --- a/components/com_finder/models/search.php +++ b/components/com_finder/models/search.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_finder/models/suggestions.php b/components/com_finder/models/suggestions.php index 915d8fb827dd7..d97a190b52bea 100644 --- a/components/com_finder/models/suggestions.php +++ b/components/com_finder/models/suggestions.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_finder/router.php b/components/com_finder/router.php index ff436e93aea6e..2639a7ad58fe0 100644 --- a/components/com_finder/router.php +++ b/components/com_finder/router.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_finder/views/search/tmpl/default.php b/components/com_finder/views/search/tmpl/default.php index b0814ee757eed..9ae57d3682f57 100644 --- a/components/com_finder/views/search/tmpl/default.php +++ b/components/com_finder/views/search/tmpl/default.php @@ -3,13 +3,14 @@ * @package Joomla.Site * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; JHtml::_('behavior.core'); +JHtml::_('formbehavior.chosen', 'select'); JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html'); JHtml::stylesheet('com_finder/finder.css', false, true, false); ?> diff --git a/components/com_finder/views/search/tmpl/default_form.php b/components/com_finder/views/search/tmpl/default_form.php index d2dc92d5bd0af..150edd0945ab9 100644 --- a/components/com_finder/views/search/tmpl/default_form.php +++ b/components/com_finder/views/search/tmpl/default_form.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_finder/views/search/tmpl/default_result.php b/components/com_finder/views/search/tmpl/default_result.php index 8f463036483e1..970d2e2216236 100644 --- a/components/com_finder/views/search/tmpl/default_result.php +++ b/components/com_finder/views/search/tmpl/default_result.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_finder/views/search/tmpl/default_results.php b/components/com_finder/views/search/tmpl/default_results.php index 26b425cf1fecb..b18122878a4d2 100644 --- a/components/com_finder/views/search/tmpl/default_results.php +++ b/components/com_finder/views/search/tmpl/default_results.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_finder/views/search/view.feed.php b/components/com_finder/views/search/view.feed.php index a7f6fa8baf93a..dc2b08c336523 100644 --- a/components/com_finder/views/search/view.feed.php +++ b/components/com_finder/views/search/view.feed.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_finder/views/search/view.html.php b/components/com_finder/views/search/view.html.php index 29be92fa33403..b890fd7545ced 100644 --- a/components/com_finder/views/search/view.html.php +++ b/components/com_finder/views/search/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_finder/views/search/view.opensearch.php b/components/com_finder/views/search/view.opensearch.php index b1015ab3a469e..ebadd2b5cf834 100644 --- a/components/com_finder/views/search/view.opensearch.php +++ b/components/com_finder/views/search/view.opensearch.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_finder * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_mailto/controller.php b/components/com_mailto/controller.php index fc570d9ee02be..0be4ae9dd4b7a 100644 --- a/components/com_mailto/controller.php +++ b/components/com_mailto/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_mailto * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_mailto/helpers/mailto.php b/components/com_mailto/helpers/mailto.php index b812309887713..54e7c172d6e3a 100644 --- a/components/com_mailto/helpers/mailto.php +++ b/components/com_mailto/helpers/mailto.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_mailto * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_mailto/mailto.php b/components/com_mailto/mailto.php index 01b3936422d00..a9341da1dc05e 100644 --- a/components/com_mailto/mailto.php +++ b/components/com_mailto/mailto.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_mailto * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_mailto/mailto.xml b/components/com_mailto/mailto.xml index f078047077ae3..8889fec523bf7 100644 --- a/components/com_mailto/mailto.xml +++ b/components/com_mailto/mailto.xml @@ -3,7 +3,7 @@ com_mailto Joomla! Project April 2006 - (C) 2005 - 2015 Open Source Matters. All rights reserved. + (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/components/com_mailto/views/mailto/tmpl/default.php b/components/com_mailto/views/mailto/tmpl/default.php index b92b2854f4646..3b4f31aab9b90 100644 --- a/components/com_mailto/views/mailto/tmpl/default.php +++ b/components/com_mailto/views/mailto/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_mailto * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_mailto/views/mailto/view.html.php b/components/com_mailto/views/mailto/view.html.php index 6120ea390e861..1236e426f714a 100644 --- a/components/com_mailto/views/mailto/view.html.php +++ b/components/com_mailto/views/mailto/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_mailto * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_mailto/views/sent/metadata.xml b/components/com_mailto/views/sent/metadata.xml index 60628364e56d3..cb62c415a622b 100644 --- a/components/com_mailto/views/sent/metadata.xml +++ b/components/com_mailto/views/sent/metadata.xml @@ -3,7 +3,7 @@ Mailto Andrew Eddie 13 Mar 2006 - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/components/com_mailto/views/sent/tmpl/default.php b/components/com_mailto/views/sent/tmpl/default.php index 7935d3924dd1c..6b37ea6cc484c 100644 --- a/components/com_mailto/views/sent/tmpl/default.php +++ b/components/com_mailto/views/sent/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_mailto * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_mailto/views/sent/view.html.php b/components/com_mailto/views/sent/view.html.php index e1340d1edaa59..f94d9bff64dd5 100644 --- a/components/com_mailto/views/sent/view.html.php +++ b/components/com_mailto/views/sent/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_mailto * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_media/media.php b/components/com_media/media.php index af999e2bf444f..2c0bf1d3d1779 100644 --- a/components/com_media/media.php +++ b/components/com_media/media.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_modules/controller.php b/components/com_modules/controller.php index ce378d7def304..8b19da7d10d81 100644 --- a/components/com_modules/controller.php +++ b/components/com_modules/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -16,15 +16,15 @@ */ class ModulesController extends JControllerLegacy { -/** - * Constructor. - * - * @param array $config An optional associative array of configuration settings. - * Recognized key values include 'name', 'default_task', 'model_path', and - * 'view_path' (this list is not meant to be comprehensive). - * - * @since 3.5 - */ + /** + * Constructor. + * + * @param array $config An optional associative array of configuration settings. + * Recognized key values include 'name', 'default_task', 'model_path', and + * 'view_path' (this list is not meant to be comprehensive). + * + * @since 3.5 + */ public function __construct($config = array()) { $this->input = JFactory::getApplication()->input; diff --git a/components/com_modules/modules.php b/components/com_modules/modules.php index eca77a78d71ac..7543157e50899 100644 --- a/components/com_modules/modules.php +++ b/components/com_modules/modules.php @@ -3,21 +3,18 @@ * @package Joomla.Site * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; -$controller = JControllerLegacy::getInstance('Modules'); -$language = JFactory::getLanguage(); -$extension = 'com_modules'; -$base_dir = JPATH_ADMINISTRATOR; -$language_tag = $language->getTag(); - -$language->load('', $base_dir, $language_tag, true); -$language->load($extension, $base_dir, $language_tag, true); +// Load the required admin language files +$lang = JFactory::getLanguage(); +$lang->load('joomla', JPATH_ADMINISTRATOR); +$lang->load('com_modules', JPATH_ADMINISTRATOR); +// Trigger the controller +$controller = JControllerLegacy::getInstance('Modules'); $controller->execute(JFactory::getApplication()->input->get('task')); - $controller->redirect(); diff --git a/components/com_newsfeeds/controller.php b/components/com_newsfeeds/controller.php index 33186916c14c4..7c23405771f02 100644 --- a/components/com_newsfeeds/controller.php +++ b/components/com_newsfeeds/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_newsfeeds/helpers/association.php b/components/com_newsfeeds/helpers/association.php index 7711c215a18cd..7517875963cd7 100644 --- a/components/com_newsfeeds/helpers/association.php +++ b/components/com_newsfeeds/helpers/association.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_newsfeeds/helpers/category.php b/components/com_newsfeeds/helpers/category.php index 56ec926f7edc5..cfa099f114a61 100644 --- a/components/com_newsfeeds/helpers/category.php +++ b/components/com_newsfeeds/helpers/category.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_newsfeeds/helpers/route.php b/components/com_newsfeeds/helpers/route.php index 0ee6df13e9f0e..6ad2c5bdc386d 100644 --- a/components/com_newsfeeds/helpers/route.php +++ b/components/com_newsfeeds/helpers/route.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_newsfeeds/models/categories.php b/components/com_newsfeeds/models/categories.php index e380c1e5e57e9..0a4d032ef935a 100644 --- a/components/com_newsfeeds/models/categories.php +++ b/components/com_newsfeeds/models/categories.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_newsfeeds/models/category.php b/components/com_newsfeeds/models/category.php index 86f77c92a5b87..cdcbf3513e5a9 100644 --- a/components/com_newsfeeds/models/category.php +++ b/components/com_newsfeeds/models/category.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_newsfeeds/models/newsfeed.php b/components/com_newsfeeds/models/newsfeed.php index 37a8d44794972..f5a7e93703a43 100644 --- a/components/com_newsfeeds/models/newsfeed.php +++ b/components/com_newsfeeds/models/newsfeed.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_newsfeeds/newsfeeds.php b/components/com_newsfeeds/newsfeeds.php index 76123fffbcb5a..bcd559c0e093e 100644 --- a/components/com_newsfeeds/newsfeeds.php +++ b/components/com_newsfeeds/newsfeeds.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_newsfeeds/router.php b/components/com_newsfeeds/router.php index 2377d32c013e5..89fe7766b4fe9 100644 --- a/components/com_newsfeeds/router.php +++ b/components/com_newsfeeds/router.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_newsfeeds/views/categories/tmpl/default.php b/components/com_newsfeeds/views/categories/tmpl/default.php index 77abff10cc482..823b495663356 100644 --- a/components/com_newsfeeds/views/categories/tmpl/default.php +++ b/components/com_newsfeeds/views/categories/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_newsfeeds/views/categories/tmpl/default_items.php b/components/com_newsfeeds/views/categories/tmpl/default_items.php index cff9c505c51d5..be131feb2b098 100644 --- a/components/com_newsfeeds/views/categories/tmpl/default_items.php +++ b/components/com_newsfeeds/views/categories/tmpl/default_items.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_newsfeeds/views/categories/view.html.php b/components/com_newsfeeds/views/categories/view.html.php index 1de151e0e1c84..941895572255c 100644 --- a/components/com_newsfeeds/views/categories/view.html.php +++ b/components/com_newsfeeds/views/categories/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_newsfeeds/views/category/tmpl/default.php b/components/com_newsfeeds/views/category/tmpl/default.php index 38fcc93e07fc2..8041e75aaee00 100644 --- a/components/com_newsfeeds/views/category/tmpl/default.php +++ b/components/com_newsfeeds/views/category/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_newsfeeds/views/category/tmpl/default_children.php b/components/com_newsfeeds/views/category/tmpl/default_children.php index 3086cc216a4be..a8fc4fec30b60 100644 --- a/components/com_newsfeeds/views/category/tmpl/default_children.php +++ b/components/com_newsfeeds/views/category/tmpl/default_children.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_newsfeeds/views/category/tmpl/default_items.php b/components/com_newsfeeds/views/category/tmpl/default_items.php index b2d7cc1f2365b..25d6a612221ce 100644 --- a/components/com_newsfeeds/views/category/tmpl/default_items.php +++ b/components/com_newsfeeds/views/category/tmpl/default_items.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_newsfeeds/views/category/view.html.php b/components/com_newsfeeds/views/category/view.html.php index 52c47a437fe88..a2d75dc9fde0d 100644 --- a/components/com_newsfeeds/views/category/view.html.php +++ b/components/com_newsfeeds/views/category/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_newsfeeds/views/newsfeed/tmpl/default.php b/components/com_newsfeeds/views/newsfeed/tmpl/default.php index 16098f723ad72..2ccf24ab484ad 100644 --- a/components/com_newsfeeds/views/newsfeed/tmpl/default.php +++ b/components/com_newsfeeds/views/newsfeed/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_newsfeeds/views/newsfeed/view.html.php b/components/com_newsfeeds/views/newsfeed/view.html.php index aede7f8b1513a..ed59d500e706a 100644 --- a/components/com_newsfeeds/views/newsfeed/view.html.php +++ b/components/com_newsfeeds/views/newsfeed/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_newsfeeds * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -189,7 +189,7 @@ public function display($tpl = null) if ($feed_display_order == 'asc') { - $newsfeed->items = array_reverse($newsfeed->items); + $this->rssDoc->reverseItems(); } // Escape strings for HTML output diff --git a/components/com_search/controller.php b/components/com_search/controller.php index 6aae0bbcec984..585a5186ca534 100644 --- a/components/com_search/controller.php +++ b/components/com_search/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_search * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_search/models/search.php b/components/com_search/models/search.php index f1574a0f18940..c7b5df0026286 100644 --- a/components/com_search/models/search.php +++ b/components/com_search/models/search.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_search * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_search/router.php b/components/com_search/router.php index 7099f35cf5435..987d37a6012d6 100644 --- a/components/com_search/router.php +++ b/components/com_search/router.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_search * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_search/search.php b/components/com_search/search.php index 18af4b9c2dcb9..1f09e3566861e 100644 --- a/components/com_search/search.php +++ b/components/com_search/search.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_search * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_search/views/search/tmpl/default.php b/components/com_search/views/search/tmpl/default.php index 3c34b9403326b..f39b28e71f7e5 100644 --- a/components/com_search/views/search/tmpl/default.php +++ b/components/com_search/views/search/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_search * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_search/views/search/tmpl/default_error.php b/components/com_search/views/search/tmpl/default_error.php index 03f2f26557cd0..750c7fbc19458 100644 --- a/components/com_search/views/search/tmpl/default_error.php +++ b/components/com_search/views/search/tmpl/default_error.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_search * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_search/views/search/tmpl/default_form.php b/components/com_search/views/search/tmpl/default_form.php index 81e4f6237ad91..c49f570cde275 100644 --- a/components/com_search/views/search/tmpl/default_form.php +++ b/components/com_search/views/search/tmpl/default_form.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_search * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -21,7 +21,7 @@
    - +
    diff --git a/components/com_search/views/search/tmpl/default_results.php b/components/com_search/views/search/tmpl/default_results.php index af27c873153d7..edf60033df52f 100644 --- a/components/com_search/views/search/tmpl/default_results.php +++ b/components/com_search/views/search/tmpl/default_results.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_search * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_search/views/search/view.html.php b/components/com_search/views/search/view.html.php index 049af88e1cc93..38f2d7fc7938d 100644 --- a/components/com_search/views/search/view.html.php +++ b/components/com_search/views/search/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_search * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_search/views/search/view.opensearch.php b/components/com_search/views/search/view.opensearch.php index a55f4e82dc05a..a388d2ca55a43 100644 --- a/components/com_search/views/search/view.opensearch.php +++ b/components/com_search/views/search/view.opensearch.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_search * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_tags/controller.php b/components/com_tags/controller.php index 82a3fb83b85ff..7103451f42fda 100644 --- a/components/com_tags/controller.php +++ b/components/com_tags/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_tags/controllers/tags.php b/components/com_tags/controllers/tags.php index 01be64ca7824d..22b5f38398e0c 100644 --- a/components/com_tags/controllers/tags.php +++ b/components/com_tags/controllers/tags.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_tags/helpers/route.php b/components/com_tags/helpers/route.php index b0b733c071290..eb3f448a750fa 100644 --- a/components/com_tags/helpers/route.php +++ b/components/com_tags/helpers/route.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_tags/models/tag.php b/components/com_tags/models/tag.php index 63ca9afdba10d..4c1bfd3299495 100644 --- a/components/com_tags/models/tag.php +++ b/components/com_tags/models/tag.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -324,6 +324,11 @@ public function hit($pk = 0) $table = JTable::getInstance('Tag', 'TagsTable'); $table->load($pk); $table->hit($pk); + + if (!$table->hasPrimaryKey()) + { + JError::raiseError(404, JText::_('COM_TAGS_TAG_NOT_FOUND')); + } } return true; diff --git a/components/com_tags/models/tags.php b/components/com_tags/models/tags.php index 544fe03d4cc92..e10c7953d8c57 100644 --- a/components/com_tags/models/tags.php +++ b/components/com_tags/models/tags.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_tags/router.php b/components/com_tags/router.php index c2a069ab7012d..bcbb4babd3c28 100644 --- a/components/com_tags/router.php +++ b/components/com_tags/router.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_tags/tags.php b/components/com_tags/tags.php index fd735b2a56741..6ebe271eb8c61 100644 --- a/components/com_tags/tags.php +++ b/components/com_tags/tags.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_tags/views/tag/tmpl/default.php b/components/com_tags/views/tag/tmpl/default.php index a62d0c7bf2af6..09983f81e5944 100644 --- a/components/com_tags/views/tag/tmpl/default.php +++ b/components/com_tags/views/tag/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_tags/views/tag/tmpl/default_items.php b/components/com_tags/views/tag/tmpl/default_items.php index 92322c66fd381..ffef4727a7cfb 100644 --- a/components/com_tags/views/tag/tmpl/default_items.php +++ b/components/com_tags/views/tag/tmpl/default_items.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -71,6 +71,7 @@

    + event->afterDisplayTitle; ?> core_images);?> params->get('tag_list_show_item_image', 1) == 1 && !empty($images->image_intro)) :?> @@ -79,10 +80,12 @@ params->get('tag_list_show_item_description', 1)) : ?> + event->beforeDisplayContent; ?> core_body, $this->params->get('tag_list_item_maximum_characters')); ?> + event->afterDisplayContent; ?> diff --git a/components/com_tags/views/tag/tmpl/list.php b/components/com_tags/views/tag/tmpl/list.php index 11e21286382e3..070a2d086ec3c 100644 --- a/components/com_tags/views/tag/tmpl/list.php +++ b/components/com_tags/views/tag/tmpl/list.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_tags/views/tag/tmpl/list_items.php b/components/com_tags/views/tag/tmpl/list_items.php index ad4ccbb4630a1..ac02f5eaf9267 100644 --- a/components/com_tags/views/tag/tmpl/list_items.php +++ b/components/com_tags/views/tag/tmpl/list_items.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_tags/views/tag/view.feed.php b/components/com_tags/views/tag/view.feed.php index 3d02f9716d5fc..9375eaf0c9a90 100644 --- a/components/com_tags/views/tag/view.feed.php +++ b/components/com_tags/views/tag/view.feed.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_tags/views/tag/view.html.php b/components/com_tags/views/tag/view.html.php index a13877171ff89..cf50a7c3b3f52 100644 --- a/components/com_tags/views/tag/view.html.php +++ b/components/com_tags/views/tag/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -261,11 +261,6 @@ protected function _prepareDocument() { $this->document->setMetadata('robots', $this->params->get('robots')); } - - if ($app->get('MetaAuthor') == '1') - { - $this->document->setMetaData('author', $itemElement->created_user_id); - } } // @TODO: create tag feed document diff --git a/components/com_tags/views/tags/tmpl/default.php b/components/com_tags/views/tags/tmpl/default.php index f62d056c24650..9d36518fc2d6b 100644 --- a/components/com_tags/views/tags/tmpl/default.php +++ b/components/com_tags/views/tags/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_tags/views/tags/tmpl/default_items.php b/components/com_tags/views/tags/tmpl/default_items.php index 6264606130370..c9611519436cf 100644 --- a/components/com_tags/views/tags/tmpl/default_items.php +++ b/components/com_tags/views/tags/tmpl/default_items.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -43,96 +43,96 @@
    params->get('filter_field') || $this->params->get('show_pagination_limit')) : ?> -
    - params->get('filter_field')) : ?> -
    - - -
    - - params->get('show_pagination_limit')) : ?> -
    - - pagination->getLimitBox(); ?> -
    - +
    + params->get('filter_field')) : ?> +
    + + +
    + + params->get('show_pagination_limit')) : ?> +
    + + pagination->getLimitBox(); ?> +
    + - - - - -
    -
    + + + + +
    +
    -items == false || $n == 0) : ?> -

    - - items as $i => $item) : ?> - -
      - - access)) && in_array($item->access, $this->user->getAuthorisedViewLevels())) : ?> -
    • -

      - - escape($item->title); ?> - -

      + items == false || $n == 0) : ?> +

      + + items as $i => $item) : ?> + +
        + + access)) && in_array($item->access, $this->user->getAuthorisedViewLevels())) : ?> +
      • +

        + + escape($item->title); ?> + +

        - params->get('all_tags_show_tag_image') && !empty($item->images)) : ?> - images); ?> - + params->get('all_tags_show_tag_image') && !empty($item->images)) : ?> + images); ?> + image_intro)): ?> float_intro)) ? $this->params->get('float_intro') : $images->float_intro; ?>
        image_intro_caption) : ?> - image_intro_caption) . '"'; ?> - - src="image_intro; ?>" alt="image_fulltext_alt); ?>"/> + image_intro_caption) : ?> + image_intro_caption) . '"'; ?> + + src="image_intro; ?>" alt="image_fulltext_alt); ?>"/>
        - -
        - params->get('all_tags_show_tag_description', 1)) : ?> - + +
        + params->get('all_tags_show_tag_description', 1)) : ?> + description, $this->params->get('tag_list_item_maximum_characters')); ?> - - params->get('all_tags_show_tag_hits')) : ?> - + + params->get('all_tags_show_tag_hits')) : ?> + hits); ?> - -
        -
        • + +
    + - - - + + + - - + + - -items)) : ?> + + items)) : ?> params->def('show_pagination', 2) == 1 || ($this->params->get('show_pagination') == 2)) && ($this->pagination->pagesTotal > 1)) : ?> - diff --git a/components/com_tags/views/tags/view.feed.php b/components/com_tags/views/tags/view.feed.php index 42ea30d20635c..f0ad7081aad59 100644 --- a/components/com_tags/views/tags/view.feed.php +++ b/components/com_tags/views/tags/view.feed.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_tags/views/tags/view.html.php b/components/com_tags/views/tags/view.html.php index 43ff6b70ce396..2c40e2c4ad6e4 100644 --- a/components/com_tags/views/tags/view.html.php +++ b/components/com_tags/views/tags/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/controller.php b/components/com_users/controller.php index 3265ea37bc7f1..5797e86c2b28c 100644 --- a/components/com_users/controller.php +++ b/components/com_users/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/controllers/profile.json.php b/components/com_users/controllers/profile.json.php index 73eeb744afbaf..6426a222b064e 100644 --- a/components/com_users/controllers/profile.json.php +++ b/components/com_users/controllers/profile.json.php @@ -3,47 +3,19 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; -require_once JPATH_COMPONENT . '/controller.php'; +require_once JPATH_SITE . '/components/com_users/controllers/profile_base_json.php'; /** * Profile controller class for Users. * * @since 1.6 */ -class UsersControllerProfile extends UsersController +class UsersControllerProfile extends UsersControllerProfile_Base_Json { - /** - * Returns the updated options for help site selector - * - * @return void - * - * @since 3.2 - * @throws Exception - */ - public function gethelpsites() - { - jimport('joomla.filesystem.file'); - - // Set FTP credentials, if given - JClientHelper::setCredentialsFromRequest('ftp'); - - if (($data = file_get_contents('http://update.joomla.org/helpsites/helpsites.xml')) === false) - { - throw new Exception(JText::_('COM_CONFIG_ERROR_HELPREFRESH_FETCH'), 500); - } - elseif (!JFile::write(JPATH_ADMINISTRATOR . '/help/helpsites.xml', $data)) - { - throw new Exception(JText::_('COM_CONFIG_ERROR_HELPREFRESH_ERROR_STORE'), 500); - } - - $options = JHelp::createSiteList(JPATH_ADMINISTRATOR . '/help/helpsites.xml'); - echo json_encode($options); - JFactory::getApplication()->close(); - } } diff --git a/components/com_users/controllers/profile.php b/components/com_users/controllers/profile.php index 6b226fbc6d124..c9efdc6e835b8 100644 --- a/components/com_users/controllers/profile.php +++ b/components/com_users/controllers/profile.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/controllers/profile_base_json.php b/components/com_users/controllers/profile_base_json.php new file mode 100644 index 0000000000000..61e4945f58e5f --- /dev/null +++ b/components/com_users/controllers/profile_base_json.php @@ -0,0 +1,53 @@ +close(); + } +} diff --git a/components/com_users/controllers/registration.php b/components/com_users/controllers/registration.php index f89d9d2b0c89e..b2c17c6616616 100644 --- a/components/com_users/controllers/registration.php +++ b/components/com_users/controllers/registration.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/controllers/remind.php b/components/com_users/controllers/remind.php index ac440ad6bda92..7c297d022291a 100644 --- a/components/com_users/controllers/remind.php +++ b/components/com_users/controllers/remind.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/controllers/reset.php b/components/com_users/controllers/reset.php index a2ab90dd02d2b..cca19ef6cfe8e 100644 --- a/components/com_users/controllers/reset.php +++ b/components/com_users/controllers/reset.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/controllers/user.php b/components/com_users/controllers/user.php index 7acce2f746a61..c94194e078648 100644 --- a/components/com_users/controllers/user.php +++ b/components/com_users/controllers/user.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -68,24 +68,26 @@ public function login() $credentials['secretkey'] = $data['secretkey']; // Perform the log in. - if (true === $app->login($credentials, $options)) - { - // Success - if ($options['remember'] == true) - { - $app->setUserState('rememberLogin', true); - } - - $app->setUserState('users.login.form.data', array()); - $app->redirect(JRoute::_($app->getUserState('users.login.form.return'), false)); - } - else + if (true !== $app->login($credentials, $options)) { // Login failed ! + // Clear user name, password and secret key before sending the login form back to the user. $data['remember'] = (int) $options['remember']; + $data['username'] = ''; + $data['password'] = ''; + $data['secretkey'] = ''; $app->setUserState('users.login.form.data', $data); $app->redirect(JRoute::_('index.php?option=com_users&view=login', false)); } + + // Success + if ($options['remember'] == true) + { + $app->setUserState('rememberLogin', true); + } + + $app->setUserState('users.login.form.data', array()); + $app->redirect(JRoute::_($app->getUserState('users.login.form.return'), false)); } /** @@ -107,24 +109,22 @@ public function logout() $method = $input->getMethod(); // Check if the log out succeeded. - if (!($error instanceof Exception)) + if ($error instanceof Exception) { - // Get the return url from the request and validate that it is internal. - $return = $input->$method->get('return', '', 'BASE64'); - $return = base64_decode($return); + $app->redirect(JRoute::_('index.php?option=com_users&view=login', false)); + } - if (!JUri::isInternal($return)) - { - $return = ''; - } + // Get the return url from the request and validate that it is internal. + $return = $input->$method->get('return', '', 'BASE64'); + $return = base64_decode($return); - // Redirect the user. - $app->redirect(JRoute::_($return, false)); - } - else + if (!JUri::isInternal($return)) { - $app->redirect(JRoute::_('index.php?option=com_users&view=login', false)); + $return = ''; } + + // Redirect the user. + $app->redirect(JRoute::_($return, false)); } /** @@ -189,11 +189,11 @@ public function register() if ($errors[$i] instanceof Exception) { $app->enqueueMessage($errors[$i]->getMessage(), 'notice'); + + continue; } - else - { - $app->enqueueMessage($errors[$i], 'notice'); - } + + $app->enqueueMessage($errors[$i], 'notice'); } // Save the data in the session. @@ -250,14 +250,9 @@ public function remind() if ($return instanceof Exception) { // Get the error message to display. - if ($app->get('error_reporting')) - { - $message = $return->getMessage(); - } - else - { - $message = JText::_('COM_USERS_REMIND_REQUEST_ERROR'); - } + $message = $app->get('error_reporting') + ? $return->getMessage() + : JText::_('COM_USERS_REMIND_REQUEST_ERROR'); // Get the route to the next page. $itemid = UsersHelperRoute::getRemindRoute(); @@ -269,7 +264,8 @@ public function remind() return false; } - elseif ($return === false) + + if ($return === false) { // Complete failed. // Get the route to the next page. @@ -283,20 +279,18 @@ public function remind() return false; } - else - { - // Complete succeeded. - // Get the route to the next page. - $itemid = UsersHelperRoute::getLoginRoute(); - $itemid = $itemid !== null ? '&Itemid=' . $itemid : ''; - $route = 'index.php?option=com_users&view=login' . $itemid; - // Proceed to the login form. - $message = JText::_('COM_USERS_REMIND_REQUEST_SUCCESS'); - $this->setRedirect(JRoute::_($route, false), $message); + // Complete succeeded. + // Get the route to the next page. + $itemid = UsersHelperRoute::getLoginRoute(); + $itemid = $itemid !== null ? '&Itemid=' . $itemid : ''; + $route = 'index.php?option=com_users&view=login' . $itemid; - return true; - } + // Proceed to the login form. + $message = JText::_('COM_USERS_REMIND_REQUEST_SUCCESS'); + $this->setRedirect(JRoute::_($route, false), $message); + + return true; } /** diff --git a/components/com_users/helpers/html/users.php b/components/com_users/helpers/html/users.php index c809d9404ea1e..a490b17198d86 100644 --- a/components/com_users/helpers/html/users.php +++ b/components/com_users/helpers/html/users.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/helpers/route.php b/components/com_users/helpers/route.php index 9e75df63c16cb..cdca8373d3f1c 100644 --- a/components/com_users/helpers/route.php +++ b/components/com_users/helpers/route.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/models/forms/profile.xml b/components/com_users/models/forms/profile.xml index f02eccac6a4a4..b733e036fe06f 100644 --- a/components/com_users/models/forms/profile.xml +++ b/components/com_users/models/forms/profile.xml @@ -67,6 +67,7 @@ size="30" unique="true" validate="email" + autocomplete="email" /> activation); - $crypt = $parts[0]; - - if (!isset($parts[1])) + if (!$user->activation) { $this->setError(JText::_('COM_USERS_USER_NOT_FOUND')); return false; } - $salt = $parts[1]; - $testcrypt = JUserHelper::getCryptedPassword($data['token'], $salt, 'md5-hex'); - // Verify the token - if (!($crypt == $testcrypt)) + if (!(JUserHelper::verifyPassword($data['token'], $user->activation))) { $this->setError(JText::_('COM_USERS_USER_NOT_FOUND')); @@ -330,7 +324,7 @@ public function processResetConfirm($data) // Push the user data into the session. $app = JFactory::getApplication(); - $app->setUserState('com_users.reset.token', $crypt . ':' . $salt); + $app->setUserState('com_users.reset.token', $user->activation); $app->setUserState('com_users.reset.user', $user->id); return true; @@ -441,8 +435,8 @@ public function processResetRequest($data) // Set the confirmation token. $token = JApplicationHelper::getHash(JUserHelper::genRandomPassword()); - $salt = JUserHelper::getSalt('crypt-md5'); - $hashedToken = md5($token . $salt) . ':' . $salt; + $hashedToken = JUserHelper::hashPassword($token); + $user->activation = $hashedToken; // Save the user to the database. diff --git a/components/com_users/router.php b/components/com_users/router.php index 7b55b409f146c..082b73e90532a 100644 --- a/components/com_users/router.php +++ b/components/com_users/router.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/users.php b/components/com_users/users.php index 963cff3fb6721..99cbdc522d16c 100644 --- a/components/com_users/users.php +++ b/components/com_users/users.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/views/login/tmpl/default.php b/components/com_users/views/login/tmpl/default.php index 304995ed63c98..31e3f84792145 100644 --- a/components/com_users/views/login/tmpl/default.php +++ b/components/com_users/views/login/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/views/login/tmpl/default_login.php b/components/com_users/views/login/tmpl/default_login.php index 47a335c52c3dc..c2825075606ff 100644 --- a/components/com_users/views/login/tmpl/default_login.php +++ b/components/com_users/views/login/tmpl/default_login.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/views/login/tmpl/default_logout.php b/components/com_users/views/login/tmpl/default_logout.php index 393dc88da5ec6..39ee27bb1cfc2 100644 --- a/components/com_users/views/login/tmpl/default_logout.php +++ b/components/com_users/views/login/tmpl/default_logout.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/views/login/view.html.php b/components/com_users/views/login/view.html.php index 6959776283506..4bb35cbf1f201 100644 --- a/components/com_users/views/login/view.html.php +++ b/components/com_users/views/login/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/views/profile/tmpl/default.php b/components/com_users/views/profile/tmpl/default.php index 9f7df93644af5..cad0b6d564f27 100644 --- a/components/com_users/views/profile/tmpl/default.php +++ b/components/com_users/views/profile/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/views/profile/tmpl/default_core.php b/components/com_users/views/profile/tmpl/default_core.php index 55622f00ec396..b5a69337f553f 100644 --- a/components/com_users/views/profile/tmpl/default_core.php +++ b/components/com_users/views/profile/tmpl/default_core.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/views/profile/tmpl/default_custom.php b/components/com_users/views/profile/tmpl/default_custom.php index b52deda817c64..edd13c0c93bd5 100644 --- a/components/com_users/views/profile/tmpl/default_custom.php +++ b/components/com_users/views/profile/tmpl/default_custom.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -12,39 +12,43 @@ JLoader::register('JHtmlUsers', JPATH_COMPONENT . '/helpers/html/users.php'); JHtml::register('users.spacer', array('JHtmlUsers', 'spacer')); - $fieldsets = $this->form->getFieldsets(); -if (isset($fieldsets['core'])) unset($fieldsets['core']); -if (isset($fieldsets['params'])) unset($fieldsets['params']); -foreach ($fieldsets as $group => $fieldset): // Iterate through the form fieldsets - $fields = $this->form->getFieldset($group); - if (count($fields)): -?> +if (isset($fieldsets['core'])) +{ + unset($fieldsets['core']); +} -
    - - label)): ?> - label); ?> - -
    - hidden && $field->type != 'Spacer') : ?> -
    title; ?>
    -
    - id)) : ?> - id, $field->value); ?> - fieldname)) : ?> - fieldname, $field->value); ?> - type)) : ?> - type, $field->value); ?> - - value); ?> +if (isset($fieldsets['params'])) +{ + unset($fieldsets['params']); +} +?> + $fieldset) : ?> + form->getFieldset($group); ?> + +
    + label) && strlen($legend = trim(JText::_($fieldset->label)))) : ?> + -
    - - -
    -
    +
    + + hidden && $field->type !== 'Spacer') : ?> +
    title; ?>
    +
    + id)) : ?> + id, $field->value); ?> + fieldname)) : ?> + fieldname, $field->value); ?> + type)) : ?> + type, $field->value); ?> + + value); ?> + +
    + + +
    + diff --git a/components/com_users/views/profile/tmpl/default_params.php b/components/com_users/views/profile/tmpl/default_params.php index 4819baf3cbb77..53bd37efefa11 100644 --- a/components/com_users/views/profile/tmpl/default_params.php +++ b/components/com_users/views/profile/tmpl/default_params.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/views/profile/tmpl/edit.php b/components/com_users/views/profile/tmpl/edit.php index 759cd5ffe5607..668cbda9072c8 100644 --- a/components/com_users/views/profile/tmpl/edit.php +++ b/components/com_users/views/profile/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -70,7 +70,7 @@
    fieldname == 'password1') : ?> - + input; ?>
    @@ -131,7 +131,7 @@
    - +
    diff --git a/components/com_users/views/profile/view.html.php b/components/com_users/views/profile/view.html.php index 893342221e7ba..9a33a90d9a2de 100644 --- a/components/com_users/views/profile/view.html.php +++ b/components/com_users/views/profile/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/views/registration/tmpl/complete.php b/components/com_users/views/registration/tmpl/complete.php index eaf712d97e878..b73bfcabcf5e1 100644 --- a/components/com_users/views/registration/tmpl/complete.php +++ b/components/com_users/views/registration/tmpl/complete.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/views/registration/tmpl/default.php b/components/com_users/views/registration/tmpl/default.php index aeaa500b249ee..900e8bd8831ff 100644 --- a/components/com_users/views/registration/tmpl/default.php +++ b/components/com_users/views/registration/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/views/registration/view.html.php b/components/com_users/views/registration/view.html.php index 571e4110e3283..fe9393181bed3 100644 --- a/components/com_users/views/registration/view.html.php +++ b/components/com_users/views/registration/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/views/remind/tmpl/default.php b/components/com_users/views/remind/tmpl/default.php index 83e2bf4242416..9a89aa8f43850 100644 --- a/components/com_users/views/remind/tmpl/default.php +++ b/components/com_users/views/remind/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/views/remind/view.html.php b/components/com_users/views/remind/view.html.php index 8a1b267354a5b..19b8bcee5b509 100644 --- a/components/com_users/views/remind/view.html.php +++ b/components/com_users/views/remind/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/views/reset/tmpl/complete.php b/components/com_users/views/reset/tmpl/complete.php index 3bf89f84bd48c..aa6010ad51c9d 100644 --- a/components/com_users/views/reset/tmpl/complete.php +++ b/components/com_users/views/reset/tmpl/complete.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/views/reset/tmpl/confirm.php b/components/com_users/views/reset/tmpl/confirm.php index d94e685c7a0dd..f16eae4c2b8bc 100644 --- a/components/com_users/views/reset/tmpl/confirm.php +++ b/components/com_users/views/reset/tmpl/confirm.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/views/reset/tmpl/default.php b/components/com_users/views/reset/tmpl/default.php index 268606084612a..231893a6f8a18 100644 --- a/components/com_users/views/reset/tmpl/default.php +++ b/components/com_users/views/reset/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_users/views/reset/view.html.php b/components/com_users/views/reset/view.html.php index d2334ec367fd5..54d3620c71bbd 100644 --- a/components/com_users/views/reset/view.html.php +++ b/components/com_users/views/reset/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_wrapper/controller.php b/components/com_wrapper/controller.php index e06b706c661a4..31838b8f617b4 100644 --- a/components/com_wrapper/controller.php +++ b/components/com_wrapper/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_wrapper * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_wrapper/router.php b/components/com_wrapper/router.php index d116638155bbe..4d5f3a89cd727 100644 --- a/components/com_wrapper/router.php +++ b/components/com_wrapper/router.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_wrapper * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_wrapper/views/wrapper/tmpl/default.php b/components/com_wrapper/views/wrapper/tmpl/default.php index db07f96c646b9..6bf79cbe27c61 100644 --- a/components/com_wrapper/views/wrapper/tmpl/default.php +++ b/components/com_wrapper/views/wrapper/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_wrapper * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_wrapper/views/wrapper/view.html.php b/components/com_wrapper/views/wrapper/view.html.php index cb6601d977a5f..b956ade255164 100644 --- a/components/com_wrapper/views/wrapper/view.html.php +++ b/components/com_wrapper/views/wrapper/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_wrapper * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_wrapper/wrapper.php b/components/com_wrapper/wrapper.php index efe7c7c7425da..af70cbd884416 100644 --- a/components/com_wrapper/wrapper.php +++ b/components/com_wrapper/wrapper.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_wrapper * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_wrapper/wrapper.xml b/components/com_wrapper/wrapper.xml index 571451154a2c2..f9a7c729de2b1 100644 --- a/components/com_wrapper/wrapper.xml +++ b/components/com_wrapper/wrapper.xml @@ -3,7 +3,7 @@ com_wrapper Joomla! Project April 2006 - (C) 2005 - 2015 Open Source Matters. All rights reserved. + (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org diff --git a/composer.json b/composer.json index cf90245bb8c6e..ba4e4930ec1d9 100644 --- a/composer.json +++ b/composer.json @@ -6,6 +6,9 @@ "homepage": "https://github.com/joomla/joomla-cms", "license": "GPL-2.0+", "config": { + "platform": { + "php": "5.3.10" + }, "vendor-dir": "libraries/vendor" }, "require": { @@ -19,8 +22,10 @@ "joomla/uri": "~1.1", "joomla/utilities": "~1.3 >=1.3.3", "ircmaxell/password-compat": "1.*", - "leafo/lessphp": "0.3.9", - "phpmailer/phpmailer": "5.2.9", + "leafo/lessphp": "0.5.0", + "paragonie/random_compat": "~1.0", + "phpmailer/phpmailer": "5.2.14", + "symfony/polyfill-php56": "~1.0", "symfony/yaml": "2.*" }, "require-dev": { diff --git a/composer.lock b/composer.lock index 5ee2228f2d645..004b7720fae3a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "ea2b1550a8ac55f171e4d818cc5d28b6", + "hash": "d500f4784ce37841dad0b29e32660849", + "content-hash": "800b07fe877fd7416bf7c046ad42a55a", "packages": [ { "name": "ircmaxell/password-compat", @@ -50,29 +51,29 @@ }, { "name": "joomla/application", - "version": "1.5.0", + "version": "1.5.1", "source": { "type": "git", "url": "https://github.com/joomla-framework/application.git", - "reference": "a50d524bdc31488aad46da0da8cb59b1767fc4fd" + "reference": "9ac5463d5437759dc523bf02d59d279a43f361e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-framework/application/zipball/a50d524bdc31488aad46da0da8cb59b1767fc4fd", - "reference": "a50d524bdc31488aad46da0da8cb59b1767fc4fd", + "url": "https://api.github.com/repos/joomla-framework/application/zipball/9ac5463d5437759dc523bf02d59d279a43f361e0", + "reference": "9ac5463d5437759dc523bf02d59d279a43f361e0", "shasum": "" }, "require": { "joomla/input": "~1.2", "joomla/registry": "~1.1", - "php": ">=5.3.10", + "php": ">=5.3.10|>=7.0", "psr/log": "~1.0" }, "require-dev": { - "joomla/session": "~1.1", + "joomla/session": "^1.2.1", "joomla/test": "~1.1", "joomla/uri": "~1.1", - "phpunit/phpunit": "4.*", + "phpunit/phpunit": "~4.8|~5.0", "squizlabs/php_codesniffer": "1.*" }, "suggest": { @@ -102,7 +103,7 @@ "framework", "joomla" ], - "time": "2015-10-09 12:10:44" + "time": "2016-03-18 15:08:10" }, { "name": "joomla/compat", @@ -192,22 +193,31 @@ }, { "name": "joomla/event", - "version": "1.1.1", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/joomla-framework/event.git", - "reference": "bb957bc45aba897e465384bbe21cd0eb79aca901" + "reference": "d8cc2a4757c4556f0ab12e58903e9d168077018b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-framework/event/zipball/bb957bc45aba897e465384bbe21cd0eb79aca901", - "reference": "bb957bc45aba897e465384bbe21cd0eb79aca901", + "url": "https://api.github.com/repos/joomla-framework/event/zipball/d8cc2a4757c4556f0ab12e58903e9d168077018b", + "reference": "d8cc2a4757c4556f0ab12e58903e9d168077018b", "shasum": "" }, "require": { - "php": ">=5.3.10" + "php": ">=5.3.10|>=7.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.8|~5.0", + "squizlabs/php_codesniffer": "1.*" }, "type": "joomla-package", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, "autoload": { "psr-4": { "Joomla\\Event\\": "src/", @@ -225,34 +235,33 @@ "framework", "joomla" ], - "time": "2014-02-09 01:30:54" + "time": "2016-03-13 19:41:09" }, { "name": "joomla/filter", - "version": "1.1.5", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/joomla-framework/filter.git", - "reference": "ed6d695a81e71508782ab8d711498c684465b041" + "reference": "45a504f0cd6fa2312a0260955e957435ca2cedc9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-framework/filter/zipball/ed6d695a81e71508782ab8d711498c684465b041", - "reference": "ed6d695a81e71508782ab8d711498c684465b041", + "url": "https://api.github.com/repos/joomla-framework/filter/zipball/45a504f0cd6fa2312a0260955e957435ca2cedc9", + "reference": "45a504f0cd6fa2312a0260955e957435ca2cedc9", "shasum": "" }, "require": { + "joomla/string": "~1.3", "php": ">=5.3.10" }, "require-dev": { "joomla/language": "~1.0", - "joomla/string": "~1.0", "phpunit/phpunit": "4.*", "squizlabs/php_codesniffer": "1.*" }, "suggest": { - "joomla/language": "Required only if you want to use `OutputFilter::stringURLSafe`.", - "joomla/string": "Required only if you want to use `OutputFilter::stringURLSafe` and `OutputFilter::stringURLUnicodeSlug`." + "joomla/language": "Required only if you want to use `OutputFilter::stringURLSafe`." }, "type": "joomla-package", "extra": { @@ -277,7 +286,7 @@ "framework", "joomla" ], - "time": "2014-12-12 21:46:44" + "time": "2016-01-08 17:27:47" }, { "name": "joomla/input", @@ -383,17 +392,17 @@ }, { "name": "joomla/session", - "version": "1.3.0", + "version": "1.3.1", "target-dir": "Joomla/Session", "source": { "type": "git", "url": "https://github.com/joomla-framework/session.git", - "reference": "6b5d16661213ea41d3ef7dcb8c8d355e18e75d45" + "reference": "a91ea38b797f505c8ab20773604b901b567ed0ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-framework/session/zipball/6b5d16661213ea41d3ef7dcb8c8d355e18e75d45", - "reference": "6b5d16661213ea41d3ef7dcb8c8d355e18e75d45", + "url": "https://api.github.com/repos/joomla-framework/session/zipball/a91ea38b797f505c8ab20773604b901b567ed0ab", + "reference": "a91ea38b797f505c8ab20773604b901b567ed0ab", "shasum": "" }, "require": { @@ -428,28 +437,28 @@ "joomla", "session" ], - "time": "2015-07-26 23:44:05" + "time": "2015-12-14 18:23:13" }, { "name": "joomla/string", - "version": "1.3.1", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/joomla-framework/string.git", - "reference": "1a61294f887a95ec3eb2e4dac12ba18ab6b2bf5a" + "reference": "05197132a075ee22a3f0f7da31a19a6d5b4717db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-framework/string/zipball/1a61294f887a95ec3eb2e4dac12ba18ab6b2bf5a", - "reference": "1a61294f887a95ec3eb2e4dac12ba18ab6b2bf5a", + "url": "https://api.github.com/repos/joomla-framework/string/zipball/05197132a075ee22a3f0f7da31a19a6d5b4717db", + "reference": "05197132a075ee22a3f0f7da31a19a6d5b4717db", "shasum": "" }, "require": { - "php": ">=5.3.10" + "php": ">=5.3.10|>=7.0" }, "require-dev": { "joomla/test": "~1.0", - "phpunit/phpunit": "4.*", + "phpunit/phpunit": "~4.8|~5.0", "squizlabs/php_codesniffer": "1.*" }, "type": "joomla-package", @@ -462,7 +471,24 @@ "psr-4": { "Joomla\\String\\": "src/", "Joomla\\String\\Tests\\": "Tests/" - } + }, + "files": [ + "src/phputf8/utf8.php", + "src/phputf8/ord.php", + "src/phputf8/str_ireplace.php", + "src/phputf8/str_pad.php", + "src/phputf8/str_split.php", + "src/phputf8/strcasecmp.php", + "src/phputf8/strcspn.php", + "src/phputf8/stristr.php", + "src/phputf8/strrev.php", + "src/phputf8/strspn.php", + "src/phputf8/trim.php", + "src/phputf8/ucfirst.php", + "src/phputf8/ucwords.php", + "src/phputf8/utils/ascii.php", + "src/phputf8/utils/validation.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -475,7 +501,7 @@ "joomla", "string" ], - "time": "2015-05-03 16:08:20" + "time": "2016-01-30 20:04:23" }, { "name": "joomla/uri", @@ -516,16 +542,16 @@ }, { "name": "joomla/utilities", - "version": "1.3.3", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/joomla-framework/utilities.git", - "reference": "3e43b0806c194a92b58a176b73d6cc2dc6c9c3a4" + "reference": "ecf18231ff86ab06cf555a7c3ed4dd447ae39e9b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/joomla-framework/utilities/zipball/3e43b0806c194a92b58a176b73d6cc2dc6c9c3a4", - "reference": "3e43b0806c194a92b58a176b73d6cc2dc6c9c3a4", + "url": "https://api.github.com/repos/joomla-framework/utilities/zipball/ecf18231ff86ab06cf555a7c3ed4dd447ae39e9b", + "reference": "ecf18231ff86ab06cf555a7c3ed4dd447ae39e9b", "shasum": "" }, "require": { @@ -559,26 +585,26 @@ "joomla", "utilities" ], - "time": "2015-03-28 17:52:43" + "time": "2015-09-05 16:41:24" }, { "name": "leafo/lessphp", - "version": "v0.3.9", + "version": "v0.5.0", "source": { "type": "git", "url": "https://github.com/leafo/lessphp.git", - "reference": "a11a6141b5715162b933c405379765d817891c5d" + "reference": "0f5a7f5545d2bcf4e9fad9a228c8ad89cc9aa283" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/leafo/lessphp/zipball/a11a6141b5715162b933c405379765d817891c5d", - "reference": "a11a6141b5715162b933c405379765d817891c5d", + "url": "https://api.github.com/repos/leafo/lessphp/zipball/0f5a7f5545d2bcf4e9fad9a228c8ad89cc9aa283", + "reference": "0f5a7f5545d2bcf4e9fad9a228c8ad89cc9aa283", "shasum": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "0.3-dev" + "dev-master": "0.4.x-dev" } }, "autoload": { @@ -600,20 +626,68 @@ ], "description": "lessphp is a compiler for LESS written in PHP.", "homepage": "http://leafo.net/lessphp/", - "time": "2013-03-02 16:13:31" + "time": "2014-11-24 18:39:20" + }, + { + "name": "paragonie/random_compat", + "version": "v1.4.1", + "source": { + "type": "git", + "url": "https://github.com/paragonie/random_compat.git", + "reference": "c7e26a21ba357863de030f0b9e701c7d04593774" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/c7e26a21ba357863de030f0b9e701c7d04593774", + "reference": "c7e26a21ba357863de030f0b9e701c7d04593774", + "shasum": "" + }, + "require": { + "php": ">=5.2.0" + }, + "require-dev": { + "phpunit/phpunit": "4.*|5.*" + }, + "suggest": { + "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." + }, + "type": "library", + "autoload": { + "files": [ + "lib/random.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Paragon Initiative Enterprises", + "email": "security@paragonie.com", + "homepage": "https://paragonie.com" + } + ], + "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7", + "keywords": [ + "csprng", + "pseudorandom", + "random" + ], + "time": "2016-03-18 20:34:03" }, { "name": "phpmailer/phpmailer", - "version": "v5.2.9", + "version": "v5.2.14", "source": { "type": "git", "url": "https://github.com/PHPMailer/PHPMailer.git", - "reference": "73b61679809615850706f1dbf88e6df2ddc05745" + "reference": "e774bc9152de85547336e22b8926189e582ece95" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/73b61679809615850706f1dbf88e6df2ddc05745", - "reference": "73b61679809615850706f1dbf88e6df2ddc05745", + "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/e774bc9152de85547336e22b8926189e582ece95", + "reference": "e774bc9152de85547336e22b8926189e582ece95", "shasum": "" }, "require": { @@ -621,14 +695,22 @@ }, "require-dev": { "phpdocumentor/phpdocumentor": "*", - "phpunit/phpunit": "4.1.*" + "phpunit/phpunit": "4.7.*" + }, + "suggest": { + "league/oauth2-client": "Needed for XOAUTH2 authentication", + "league/oauth2-google": "Needed for Gmail XOAUTH2" }, "type": "library", "autoload": { "classmap": [ "class.phpmailer.php", + "class.phpmaileroauth.php", + "class.phpmaileroauthgoogle.php", + "class.smtp.php", "class.pop3.php", - "class.smtp.php" + "extras/EasyPeasyICS.php", + "extras/ntlm_sasl_client.php" ] }, "notification-url": "https://packagist.org/downloads/", @@ -653,7 +735,7 @@ } ], "description": "PHPMailer is a full-featured email creation and transfer class for PHP", - "time": "2014-09-26 18:33:30" + "time": "2015-11-01 10:15:28" }, { "name": "psr/log", @@ -693,36 +775,144 @@ ], "time": "2012-12-21 11:40:51" }, + { + "name": "symfony/polyfill-php56", + "version": "v1.1.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php56.git", + "reference": "4d891fff050101a53a4caabb03277284942d1ad9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/4d891fff050101a53a4caabb03277284942d1ad9", + "reference": "4d891fff050101a53a4caabb03277284942d1ad9", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "symfony/polyfill-util": "~1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php56\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 5.6+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2016-01-20 09:13:37" + }, + { + "name": "symfony/polyfill-util", + "version": "v1.1.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-util.git", + "reference": "8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4", + "reference": "8de62801aa12bc4dfcf85eef5d21981ae7bb3cc4", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Util\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony utilities for portability of PHP codes", + "homepage": "https://symfony.com", + "keywords": [ + "compat", + "compatibility", + "polyfill", + "shim" + ], + "time": "2016-01-20 09:13:37" + }, { "name": "symfony/yaml", - "version": "v2.7.5", + "version": "v2.8.4", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "31cb2ad0155c95b88ee55fe12bc7ff92232c1770" + "reference": "584e52cb8f788a887553ba82db6caacb1d6260bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/31cb2ad0155c95b88ee55fe12bc7ff92232c1770", - "reference": "31cb2ad0155c95b88ee55fe12bc7ff92232c1770", + "url": "https://api.github.com/repos/symfony/yaml/zipball/584e52cb8f788a887553ba82db6caacb1d6260bb", + "reference": "584e52cb8f788a887553ba82db6caacb1d6260bb", "shasum": "" }, "require": { "php": ">=5.3.9" }, - "require-dev": { - "symfony/phpunit-bridge": "~2.7" - }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { "psr-4": { "Symfony\\Component\\Yaml\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -740,22 +930,22 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2015-09-14 14:14:09" + "time": "2016-03-04 07:54:35" } ], "packages-dev": [ { "name": "doctrine/instantiator", - "version": "1.0.4", + "version": "1.0.5", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119" + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f976e5de371104877ebc89bd8fecb0019ed9c119", - "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", "shasum": "" }, "require": { @@ -765,8 +955,8 @@ "athletic/athletic": "~0.1.8", "ext-pdo": "*", "ext-phar": "*", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "2.0.*@ALPHA" + "phpunit/phpunit": "4.*", + "squizlabs/php_codesniffer": "~2.0" }, "type": "library", "extra": { @@ -775,8 +965,8 @@ } }, "autoload": { - "psr-0": { - "Doctrine\\Instantiator\\": "src" + "psr-4": { + "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" } }, "notification-url": "https://packagist.org/downloads/", @@ -796,7 +986,7 @@ "constructor", "instantiate" ], - "time": "2014-10-13 12:58:55" + "time": "2015-06-14 21:17:01" }, { "name": "pear/cache_lite", @@ -866,7 +1056,7 @@ "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "4.*" }, "suggest": { "dflydev/markdown": "~1.0", @@ -899,22 +1089,24 @@ }, { "name": "phpspec/prophecy", - "version": "v1.4.1", + "version": "v1.6.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373" + "reference": "3c91bdf81797d725b14cb62906f9a4ce44235972" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373", - "reference": "3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/3c91bdf81797d725b14cb62906f9a4ce44235972", + "reference": "3c91bdf81797d725b14cb62906f9a4ce44235972", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", + "php": "^5.3|^7.0", "phpdocumentor/reflection-docblock": "~2.0", - "sebastian/comparator": "~1.1" + "sebastian/comparator": "~1.1", + "sebastian/recursion-context": "~1.0" }, "require-dev": { "phpspec/phpspec": "~2.0" @@ -922,7 +1114,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4.x-dev" + "dev-master": "1.5.x-dev" } }, "autoload": { @@ -955,7 +1147,7 @@ "spy", "stub" ], - "time": "2015-04-27 22:15:08" + "time": "2016-02-15 07:46:21" }, { "name": "phpunit/dbunit", @@ -1018,16 +1210,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "2.1.5", + "version": "2.2.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "be2286cb8c7e1773eded49d9719219e6f74f9e3e" + "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/be2286cb8c7e1773eded49d9719219e6f74f9e3e", - "reference": "be2286cb8c7e1773eded49d9719219e6f74f9e3e", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979", + "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979", "shasum": "" }, "require": { @@ -1035,7 +1227,7 @@ "phpunit/php-file-iterator": "~1.3", "phpunit/php-text-template": "~1.2", "phpunit/php-token-stream": "~1.3", - "sebastian/environment": "~1.0", + "sebastian/environment": "^1.3.2", "sebastian/version": "~1.0" }, "require-dev": { @@ -1050,7 +1242,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1.x-dev" + "dev-master": "2.2.x-dev" } }, "autoload": { @@ -1076,20 +1268,20 @@ "testing", "xunit" ], - "time": "2015-06-09 13:05:42" + "time": "2015-10-06 15:47:00" }, { "name": "phpunit/php-file-iterator", - "version": "1.4.0", + "version": "1.4.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "a923bb15680d0089e2316f7a4af8f437046e96bb" + "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a923bb15680d0089e2316f7a4af8f437046e96bb", - "reference": "a923bb15680d0089e2316f7a4af8f437046e96bb", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0", + "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0", "shasum": "" }, "require": { @@ -1123,20 +1315,20 @@ "filesystem", "iterator" ], - "time": "2015-04-02 05:19:05" + "time": "2015-06-21 13:08:43" }, { "name": "phpunit/php-text-template", - "version": "1.2.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a" + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/206dfefc0ffe9cebf65c413e3d0e809c82fbf00a", - "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", "shasum": "" }, "require": { @@ -1145,20 +1337,17 @@ "type": "library", "autoload": { "classmap": [ - "Text/" + "src/" ] }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], "license": [ "BSD-3-Clause" ], "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", + "email": "sebastian@phpunit.de", "role": "lead" } ], @@ -1167,20 +1356,20 @@ "keywords": [ "template" ], - "time": "2014-01-30 17:20:04" + "time": "2015-06-21 13:50:34" }, { "name": "phpunit/php-timer", - "version": "1.0.6", + "version": "1.0.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "83fe1bdc5d47658b727595c14da140da92b3d66d" + "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/83fe1bdc5d47658b727595c14da140da92b3d66d", - "reference": "83fe1bdc5d47658b727595c14da140da92b3d66d", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3e82f4e9fc92665fafd9157568e4dcb01d014e5b", + "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b", "shasum": "" }, "require": { @@ -1208,20 +1397,20 @@ "keywords": [ "timer" ], - "time": "2015-06-13 07:35:30" + "time": "2015-06-21 08:01:12" }, { "name": "phpunit/php-token-stream", - "version": "1.4.2", + "version": "1.4.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "db63be1159c81df649cd0260e30249a586d4129e" + "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/db63be1159c81df649cd0260e30249a586d4129e", - "reference": "db63be1159c81df649cd0260e30249a586d4129e", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da", + "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da", "shasum": "" }, "require": { @@ -1229,7 +1418,7 @@ "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "~4.2" + "phpunit/phpunit": "~4.8" }, "type": "library", "extra": { @@ -1257,20 +1446,20 @@ "keywords": [ "tokenizer" ], - "time": "2015-06-12 07:34:24" + "time": "2015-09-15 10:49:45" }, { "name": "phpunit/phpunit", - "version": "4.8.11", + "version": "4.8.24", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "bdd199472410fd7e32751f9c814c7e06f2c21bd5" + "reference": "a1066c562c52900a142a0e2bbf0582994671385e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/bdd199472410fd7e32751f9c814c7e06f2c21bd5", - "reference": "bdd199472410fd7e32751f9c814c7e06f2c21bd5", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a1066c562c52900a142a0e2bbf0582994671385e", + "reference": "a1066c562c52900a142a0e2bbf0582994671385e", "shasum": "" }, "require": { @@ -1329,29 +1518,30 @@ "testing", "xunit" ], - "time": "2015-10-07 10:39:46" + "time": "2016-03-14 06:16:08" }, { "name": "phpunit/phpunit-mock-objects", - "version": "2.3.4", + "version": "2.3.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "92408bb1968a81b3217a6fdf6c1a198da83caa35" + "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/92408bb1968a81b3217a6fdf6c1a198da83caa35", - "reference": "92408bb1968a81b3217a6fdf6c1a198da83caa35", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983", + "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983", "shasum": "" }, "require": { - "doctrine/instantiator": "~1.0,>=1.0.2", + "doctrine/instantiator": "^1.0.2", "php": ">=5.3.3", - "phpunit/php-text-template": "~1.2" + "phpunit/php-text-template": "~1.2", + "sebastian/exporter": "~1.2" }, "require-dev": { - "phpunit/phpunit": "~4.4" + "phpunit/phpunit": "~4.8" }, "suggest": { "ext-soap": "*" @@ -1384,20 +1574,20 @@ "mock", "xunit" ], - "time": "2015-06-11 15:55:48" + "time": "2015-10-02 06:51:40" }, { "name": "sebastian/comparator", - "version": "1.1.1", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "1dd8869519a225f7f2b9eb663e225298fade819e" + "reference": "937efb279bd37a375bcadf584dec0726f84dbf22" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1dd8869519a225f7f2b9eb663e225298fade819e", - "reference": "1dd8869519a225f7f2b9eb663e225298fade819e", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22", + "reference": "937efb279bd37a375bcadf584dec0726f84dbf22", "shasum": "" }, "require": { @@ -1406,12 +1596,12 @@ "sebastian/exporter": "~1.2" }, "require-dev": { - "phpunit/phpunit": "~4.4" + "phpunit/phpunit": "~4.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { @@ -1448,32 +1638,32 @@ "compare", "equality" ], - "time": "2015-01-29 16:28:08" + "time": "2015-07-26 15:48:44" }, { "name": "sebastian/diff", - "version": "1.3.0", + "version": "1.4.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3" + "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/863df9687835c62aa423a22412d26fa2ebde3fd3", - "reference": "863df9687835c62aa423a22412d26fa2ebde3fd3", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e", + "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "~4.2" + "phpunit/phpunit": "~4.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -1496,24 +1686,24 @@ } ], "description": "Diff implementation", - "homepage": "http://www.github.com/sebastianbergmann/diff", + "homepage": "https://github.com/sebastianbergmann/diff", "keywords": [ "diff" ], - "time": "2015-02-22 15:13:53" + "time": "2015-12-08 07:14:41" }, { "name": "sebastian/environment", - "version": "1.3.2", + "version": "1.3.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "6324c907ce7a52478eeeaede764f48733ef5ae44" + "reference": "dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6324c907ce7a52478eeeaede764f48733ef5ae44", - "reference": "6324c907ce7a52478eeeaede764f48733ef5ae44", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf", + "reference": "dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf", "shasum": "" }, "require": { @@ -1550,20 +1740,20 @@ "environment", "hhvm" ], - "time": "2015-08-03 06:14:51" + "time": "2016-02-26 18:40:46" }, { "name": "sebastian/exporter", - "version": "1.2.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "84839970d05254c73cde183a721c7af13aede943" + "reference": "7ae5513327cb536431847bcc0c10edba2701064e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/84839970d05254c73cde183a721c7af13aede943", - "reference": "84839970d05254c73cde183a721c7af13aede943", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/7ae5513327cb536431847bcc0c10edba2701064e", + "reference": "7ae5513327cb536431847bcc0c10edba2701064e", "shasum": "" }, "require": { @@ -1571,7 +1761,7 @@ "sebastian/recursion-context": "~1.0" }, "require-dev": { - "phpunit/phpunit": "~4.4" + "phpunit/phpunit": "~4.8" }, "type": "library", "extra": { @@ -1616,27 +1806,27 @@ "export", "exporter" ], - "time": "2015-01-27 07:23:06" + "time": "2015-06-21 07:55:53" }, { "name": "sebastian/global-state", - "version": "1.0.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01" + "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/c7428acdb62ece0a45e6306f1ae85e1c05b09c01", - "reference": "c7428acdb62ece0a45e6306f1ae85e1c05b09c01", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4", + "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "~4.2" + "phpunit/phpunit": "~4.8" }, "suggest": { "ext-uopz": "*" @@ -1667,27 +1857,27 @@ "keywords": [ "global state" ], - "time": "2014-10-06 09:23:50" + "time": "2015-10-12 03:26:01" }, { "name": "sebastian/recursion-context", - "version": "1.0.0", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "3989662bbb30a29d20d9faa04a846af79b276252" + "reference": "913401df809e99e4f47b27cdd781f4a258d58791" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/3989662bbb30a29d20d9faa04a846af79b276252", - "reference": "3989662bbb30a29d20d9faa04a846af79b276252", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/913401df809e99e4f47b27cdd781f4a258d58791", + "reference": "913401df809e99e4f47b27cdd781f4a258d58791", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "~4.4" + "phpunit/phpunit": "~4.8" }, "type": "library", "extra": { @@ -1720,20 +1910,20 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2015-01-24 09:48:32" + "time": "2015-11-11 19:50:13" }, { "name": "sebastian/version", - "version": "1.0.5", + "version": "1.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/version.git", - "reference": "ab931d46cd0d3204a91e1b9a40c4bc13032b58e4" + "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/ab931d46cd0d3204a91e1b9a40c4bc13032b58e4", - "reference": "ab931d46cd0d3204a91e1b9a40c4bc13032b58e4", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6", + "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6", "shasum": "" }, "type": "library", @@ -1755,7 +1945,7 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "time": "2015-02-24 06:35:25" + "time": "2015-06-21 13:59:46" }, { "name": "squizlabs/php_codesniffer", @@ -1841,5 +2031,8 @@ "platform": { "php": ">=5.3.10" }, - "platform-dev": [] + "platform-dev": [], + "platform-overrides": { + "php": "5.3.10" + } } diff --git a/htaccess.txt b/htaccess.txt index c066fd0fcf5df..b5a1e910ed6d3 100644 --- a/htaccess.txt +++ b/htaccess.txt @@ -1,6 +1,6 @@ ## # @package Joomla -# @copyright Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +# @copyright Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. # @license GNU General Public License version 2 or later; see LICENSE.txt ## diff --git a/images/banners/osmbanner1.png b/images/banners/osmbanner1.png index c6c1178415a3d..c7398134716ce 100644 Binary files a/images/banners/osmbanner1.png and b/images/banners/osmbanner1.png differ diff --git a/images/banners/osmbanner2.png b/images/banners/osmbanner2.png index d102cdece738c..b69b6746deb62 100644 Binary files a/images/banners/osmbanner2.png and b/images/banners/osmbanner2.png differ diff --git a/images/banners/shop-ad-books.jpg b/images/banners/shop-ad-books.jpg index 1f19c22759e27..d1588cea14c83 100644 Binary files a/images/banners/shop-ad-books.jpg and b/images/banners/shop-ad-books.jpg differ diff --git a/images/banners/shop-ad.jpg b/images/banners/shop-ad.jpg index e6d5219591cf9..0b94e4857c236 100644 Binary files a/images/banners/shop-ad.jpg and b/images/banners/shop-ad.jpg differ diff --git a/images/banners/white.png b/images/banners/white.png index 1d90cd660faf5..aa8d9aae7fae2 100644 Binary files a/images/banners/white.png and b/images/banners/white.png differ diff --git a/images/headers/blue-flower.jpg b/images/headers/blue-flower.jpg index c5efe42d0749f..f8340a48707d5 100644 Binary files a/images/headers/blue-flower.jpg and b/images/headers/blue-flower.jpg differ diff --git a/images/headers/maple.jpg b/images/headers/maple.jpg index 05b9eb135b1c2..c22b520cf8aa5 100644 Binary files a/images/headers/maple.jpg and b/images/headers/maple.jpg differ diff --git a/images/headers/raindrops.jpg b/images/headers/raindrops.jpg index 67b24d5334ea4..f220b8dc27d20 100644 Binary files a/images/headers/raindrops.jpg and b/images/headers/raindrops.jpg differ diff --git a/images/headers/walden-pond.jpg b/images/headers/walden-pond.jpg index 13fae34c07356..4ceecd7cbb216 100644 Binary files a/images/headers/walden-pond.jpg and b/images/headers/walden-pond.jpg differ diff --git a/images/headers/windows.jpg b/images/headers/windows.jpg index 91c09de333309..c5113b138aeae 100644 Binary files a/images/headers/windows.jpg and b/images/headers/windows.jpg differ diff --git a/images/joomla_black.png b/images/joomla_black.png index 4d07ba618b6fb..785fd2a2dc81d 100644 Binary files a/images/joomla_black.png and b/images/joomla_black.png differ diff --git a/images/powered_by.png b/images/powered_by.png index 9c00e47639fb9..9422f1a66d0cd 100644 Binary files a/images/powered_by.png and b/images/powered_by.png differ diff --git a/images/sampledata/fruitshop/apple.jpg b/images/sampledata/fruitshop/apple.jpg index dccc86ccfae3c..9b05376b5b9ad 100644 Binary files a/images/sampledata/fruitshop/apple.jpg and b/images/sampledata/fruitshop/apple.jpg differ diff --git a/images/sampledata/fruitshop/bananas_2.jpg b/images/sampledata/fruitshop/bananas_2.jpg index 4fe486a3c4cfd..a3960a017ee5d 100644 Binary files a/images/sampledata/fruitshop/bananas_2.jpg and b/images/sampledata/fruitshop/bananas_2.jpg differ diff --git a/images/sampledata/fruitshop/tamarind.jpg b/images/sampledata/fruitshop/tamarind.jpg index c51bd6c63c74f..34898750e2ad1 100644 Binary files a/images/sampledata/fruitshop/tamarind.jpg and b/images/sampledata/fruitshop/tamarind.jpg differ diff --git a/images/sampledata/parks/animals/180px_koala_ag1.jpg b/images/sampledata/parks/animals/180px_koala_ag1.jpg index 203843f438991..e86a370feb309 100644 Binary files a/images/sampledata/parks/animals/180px_koala_ag1.jpg and b/images/sampledata/parks/animals/180px_koala_ag1.jpg differ diff --git a/images/sampledata/parks/animals/180px_wobbegong.jpg b/images/sampledata/parks/animals/180px_wobbegong.jpg index b8820ceac41c3..f96f5960711e2 100644 Binary files a/images/sampledata/parks/animals/180px_wobbegong.jpg and b/images/sampledata/parks/animals/180px_wobbegong.jpg differ diff --git a/images/sampledata/parks/animals/200px_phyllopteryx_taeniolatus1.jpg b/images/sampledata/parks/animals/200px_phyllopteryx_taeniolatus1.jpg index c44b2214e17f4..4a534dd9b7653 100644 Binary files a/images/sampledata/parks/animals/200px_phyllopteryx_taeniolatus1.jpg and b/images/sampledata/parks/animals/200px_phyllopteryx_taeniolatus1.jpg differ diff --git a/images/sampledata/parks/animals/220px_spottedquoll_2005_seanmcclean.jpg b/images/sampledata/parks/animals/220px_spottedquoll_2005_seanmcclean.jpg index a088e890b2d6a..0d1c13855a249 100644 Binary files a/images/sampledata/parks/animals/220px_spottedquoll_2005_seanmcclean.jpg and b/images/sampledata/parks/animals/220px_spottedquoll_2005_seanmcclean.jpg differ diff --git a/images/sampledata/parks/animals/789px_spottedquoll_2005_seanmcclean.jpg b/images/sampledata/parks/animals/789px_spottedquoll_2005_seanmcclean.jpg index d16bde392cf7a..83842ce275edb 100644 Binary files a/images/sampledata/parks/animals/789px_spottedquoll_2005_seanmcclean.jpg and b/images/sampledata/parks/animals/789px_spottedquoll_2005_seanmcclean.jpg differ diff --git a/images/sampledata/parks/animals/800px_koala_ag1.jpg b/images/sampledata/parks/animals/800px_koala_ag1.jpg index d83deb89e4f59..2bb1c4113d7b8 100644 Binary files a/images/sampledata/parks/animals/800px_koala_ag1.jpg and b/images/sampledata/parks/animals/800px_koala_ag1.jpg differ diff --git a/images/sampledata/parks/animals/800px_phyllopteryx_taeniolatus1.jpg b/images/sampledata/parks/animals/800px_phyllopteryx_taeniolatus1.jpg index a967c4b4dd78b..201800d91c741 100644 Binary files a/images/sampledata/parks/animals/800px_phyllopteryx_taeniolatus1.jpg and b/images/sampledata/parks/animals/800px_phyllopteryx_taeniolatus1.jpg differ diff --git a/images/sampledata/parks/animals/800px_wobbegong.jpg b/images/sampledata/parks/animals/800px_wobbegong.jpg index 00095607cf8c1..eff08080a04ce 100644 Binary files a/images/sampledata/parks/animals/800px_wobbegong.jpg and b/images/sampledata/parks/animals/800px_wobbegong.jpg differ diff --git a/images/sampledata/parks/banner_cradle.jpg b/images/sampledata/parks/banner_cradle.jpg index 0340ce747cd40..6fada18903891 100644 Binary files a/images/sampledata/parks/banner_cradle.jpg and b/images/sampledata/parks/banner_cradle.jpg differ diff --git a/images/sampledata/parks/landscape/120px_pinnacles_western_australia.jpg b/images/sampledata/parks/landscape/120px_pinnacles_western_australia.jpg index cb669a7b14ea4..90a7d36ef8c40 100644 Binary files a/images/sampledata/parks/landscape/120px_pinnacles_western_australia.jpg and b/images/sampledata/parks/landscape/120px_pinnacles_western_australia.jpg differ diff --git a/images/sampledata/parks/landscape/120px_rainforest_bluemountainsnsw.jpg b/images/sampledata/parks/landscape/120px_rainforest_bluemountainsnsw.jpg index 132667ea71712..6393613b154de 100644 Binary files a/images/sampledata/parks/landscape/120px_rainforest_bluemountainsnsw.jpg and b/images/sampledata/parks/landscape/120px_rainforest_bluemountainsnsw.jpg differ diff --git a/images/sampledata/parks/landscape/180px_ormiston_pound.jpg b/images/sampledata/parks/landscape/180px_ormiston_pound.jpg index 58317efe028d7..6a9ff33a7dfb7 100644 Binary files a/images/sampledata/parks/landscape/180px_ormiston_pound.jpg and b/images/sampledata/parks/landscape/180px_ormiston_pound.jpg differ diff --git a/images/sampledata/parks/landscape/250px_cradle_mountain_seen_from_barn_bluff.jpg b/images/sampledata/parks/landscape/250px_cradle_mountain_seen_from_barn_bluff.jpg index 67cc9c8ea19dc..2a3f050be5099 100644 Binary files a/images/sampledata/parks/landscape/250px_cradle_mountain_seen_from_barn_bluff.jpg and b/images/sampledata/parks/landscape/250px_cradle_mountain_seen_from_barn_bluff.jpg differ diff --git a/images/sampledata/parks/landscape/727px_rainforest_bluemountainsnsw.jpg b/images/sampledata/parks/landscape/727px_rainforest_bluemountainsnsw.jpg index 15e033e8970f3..3aa43e94991c2 100644 Binary files a/images/sampledata/parks/landscape/727px_rainforest_bluemountainsnsw.jpg and b/images/sampledata/parks/landscape/727px_rainforest_bluemountainsnsw.jpg differ diff --git a/images/sampledata/parks/landscape/800px_cradle_mountain_seen_from_barn_bluff.jpg b/images/sampledata/parks/landscape/800px_cradle_mountain_seen_from_barn_bluff.jpg index 66e05e5f2da24..721167516257b 100644 Binary files a/images/sampledata/parks/landscape/800px_cradle_mountain_seen_from_barn_bluff.jpg and b/images/sampledata/parks/landscape/800px_cradle_mountain_seen_from_barn_bluff.jpg differ diff --git a/images/sampledata/parks/landscape/800px_ormiston_pound.jpg b/images/sampledata/parks/landscape/800px_ormiston_pound.jpg index 2f25cab830a8d..a7ebb0edbf3b0 100644 Binary files a/images/sampledata/parks/landscape/800px_ormiston_pound.jpg and b/images/sampledata/parks/landscape/800px_ormiston_pound.jpg differ diff --git a/images/sampledata/parks/landscape/800px_pinnacles_western_australia.jpg b/images/sampledata/parks/landscape/800px_pinnacles_western_australia.jpg index 7d80ca895341e..e13fec777edec 100644 Binary files a/images/sampledata/parks/landscape/800px_pinnacles_western_australia.jpg and b/images/sampledata/parks/landscape/800px_pinnacles_western_australia.jpg differ diff --git a/includes/defines.php b/includes/defines.php index cad307da1cbe2..6f39e107b8c7f 100644 --- a/includes/defines.php +++ b/includes/defines.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/includes/framework.php b/includes/framework.php index 726b14a3b6c0e..932332cbd1ff7 100644 --- a/includes/framework.php +++ b/includes/framework.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/index.php b/index.php index 364fbe5337dbd..ecef5a443bfdb 100644 --- a/index.php +++ b/index.php @@ -2,7 +2,7 @@ /** * @package Joomla.Site * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -16,6 +16,10 @@ die('Your host needs to use PHP ' . JOOMLA_MINIMUM_PHP . ' or higher to run this version of Joomla!'); } +// Saves the start time and memory usage. +$startTime = microtime(1); +$startMem = memory_get_usage(); + /** * Constant that is checked in included files to prevent direct access. * define() is used in the installation folder rather than "const" to not error for PHP 5.2 and lower @@ -35,8 +39,8 @@ require_once JPATH_BASE . '/includes/framework.php'; -// Mark afterLoad in the profiler. -JDEBUG ? $_PROFILER->mark('afterLoad') : null; +// Set profiler start time and memory usage and mark afterLoad in the profiler. +JDEBUG ? $_PROFILER->setStart($startTime, $startMem)->mark('afterLoad') : null; // Instantiate the application. $app = JFactory::getApplication('site'); diff --git a/installation/COPYRIGHT b/installation/COPYRIGHT index 128cfb7c19b07..6b4c73a263ab9 100644 --- a/installation/COPYRIGHT +++ b/installation/COPYRIGHT @@ -1,7 +1,7 @@ addCategory($siteLang); + $installContent = (int) $data['installLocalisedContent']; - if ($tableCategory === false) + if ($installContent) + { + if (!$error) { - $app->enqueueMessage(JText::sprintf('INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CATEGORY', $frontend_lang)); - $error = true; - } - } + $tableCategory = $model->addCategory($siteLang); - if (!$error) - { - $categoryId = $tableCategory->id; + if ($tableCategory === false) + { + $app->enqueueMessage(JText::sprintf('INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CATEGORY', $frontend_lang)); + $error = true; + } + } - if (!$model->addArticle($siteLang, $categoryId)) + if (!$error) { - $app->enqueueMessage(JText::sprintf('INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_ARTICLE', $frontend_lang)); - $error = true; + $categoryId = $tableCategory->id; + + if (!$model->addArticle($siteLang, $categoryId)) + { + $app->enqueueMessage(JText::sprintf('INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_ARTICLE', $frontend_lang)); + $error = true; + } } } } diff --git a/installation/controller/setlanguage.php b/installation/controller/setlanguage.php index 574c9d908b78c..e927b23cb73a3 100644 --- a/installation/controller/setlanguage.php +++ b/installation/controller/setlanguage.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage Controller * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/controller/site.php b/installation/controller/site.php index 9d9f5365d1afa..794dd8ba79290 100644 --- a/installation/controller/site.php +++ b/installation/controller/site.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage Controller * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/controller/summary.php b/installation/controller/summary.php index 85b2d4315bfe0..e391445bcf383 100644 --- a/installation/controller/summary.php +++ b/installation/controller/summary.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage Controller * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/controller/verifyftpsettings.php b/installation/controller/verifyftpsettings.php index 8436b50198c7c..6c81f6b05ef9e 100644 --- a/installation/controller/verifyftpsettings.php +++ b/installation/controller/verifyftpsettings.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage Controller * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/form/field/language.php b/installation/form/field/language.php index d979a83656840..0b202c03e985d 100644 --- a/installation/form/field/language.php +++ b/installation/form/field/language.php @@ -2,7 +2,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/form/field/prefix.php b/installation/form/field/prefix.php index 28be2ff4bf7a0..ecefb9f48a16d 100644 --- a/installation/form/field/prefix.php +++ b/installation/form/field/prefix.php @@ -2,7 +2,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/form/field/sample.php b/installation/form/field/sample.php index 3faa117337de8..4f6879b2242c0 100644 --- a/installation/form/field/sample.php +++ b/installation/form/field/sample.php @@ -2,7 +2,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/form/rule/prefix.php b/installation/form/rule/prefix.php index 60d6ada89410d..2fc3143236acd 100644 --- a/installation/form/rule/prefix.php +++ b/installation/form/rule/prefix.php @@ -2,7 +2,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/helper/database.php b/installation/helper/database.php index 5416a3583098b..1444d5ec6115c 100644 --- a/installation/helper/database.php +++ b/installation/helper/database.php @@ -2,7 +2,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/html/helper.php b/installation/html/helper.php index a6e56565ad977..6d546ba434a43 100644 --- a/installation/html/helper.php +++ b/installation/html/helper.php @@ -2,7 +2,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/index.php b/installation/index.php index 7315c10723e50..054f53401a154 100644 --- a/installation/index.php +++ b/installation/index.php @@ -2,7 +2,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/language/af-ZA/af-ZA.ini b/installation/language/af-ZA/af-ZA.ini index 1f0c692627d7b..b6ec9ad91268e 100644 --- a/installation/language/af-ZA/af-ZA.ini +++ b/installation/language/af-ZA/af-ZA.ini @@ -1,7 +1,8 @@ +; $Id: af-ZA.ini 1939 2015-07-04 14:16:48Z gerrit_hoekstra $ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. -; License GNU General Public License version 2 or later; see LICENSE.txt -; Note : All ini files need to be saved as UTF-8 +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php +; Let op: Alle ini lêërs moet as UTF-8 gestoor word ;Stepbar INSTL_STEP_COMPLETE_LABEL="Voltooi" @@ -248,8 +249,8 @@ INSTL_LANGUAGES_WARNING_BACK_BUTTON="Gaan terug na die vorige installateerings-s INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla kon nie met die taal-bediener vebind nie. Voltooi asb. die installasie proses per hand." INSTL_LANGUAGES_WARNING_NO_INTERNET2="Let op: Jy kan tale op 'n latere stadium installeer deur die Joomla administrateur-koppelvlak." INSTL_SAMPLE_BLOG_SET_DESC="Installeer Joomla met 'n paar artikels en blog-verwandte modules soos bv. 'Older Posts', 'Blog Roll', 'Most Read Posts'." -INSTL_SAMPLE_BROCHURE_SET_DESC="Installeer Joomla met net 'n paar bladsye ('n menu met 'n bladsy vir Tuiste, Aangaande, Nuus, Kontak) en modules soos Soektog, Pasgemaakte HTML, Inlog Vorm." -INSTL_SAMPLE_DATA_SET_DESC="Installeer Joomla met net een bladsy ('n menu met net een webskakel) en modules soos Onlangse Artikel en Inlog Vorm." +INSTL_SAMPLE_BROCHURE_SET_DESC="Installeer Joomla met net 'n paar bladsye ('n menu met 'n bladsy vir Tuiste, Aangaande, Nuus, Kontak) en modules soos Soektog, Pasgemaak, Inlog vorm." +INSTL_SAMPLE_DATA_SET_DESC="Installeer Joomla met net een bladsy ('n menu met net een webskakel) en modules soos Onlangse Artikel en Inlog vorm." INSTL_SAMPLE_LEARN_SET_DESC="Installeer Joomla met voorbeeld artikels wat verduidelik hoe Joomla werk." INSTL_SAMPLE_TESTING_SET_DESC="Installeer Joomla met al die moontlike menu items om te help met die toets van Joomla." INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Installeer Joomla met net een menu en 'n inlog vorm, sonder enige inhoud." @@ -277,15 +278,15 @@ JLIB_FILESYSTEM_ERROR_COPY_FAILED="Kopieer het gefaal" JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Kon nie die lêer van %1$s na %2$s kopieer nie." INSTL_LANGUAGES_MORE_LANGUAGES="Druk die 'Vorige' knoppie as jy verdere tale wil installeer." JLIB_INSTALLER_NOT_ERROR="As die fout aan die installeering van TinyMCE se taal lêërs verbonde is, sal dit nie installeer van tale affekteer nie. Sekere taal pakette wat voor Joomla 3.2.0 geskep is probeer om aparte TinyMCE taal lêërs te installeer. Noudat hulle in die kern is, hoef hulle nie geinstalleer te word nie." -INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="Die installeerder kon nie met die aangegewe databasis verbind nie en kon ook nie die databasis skep nie. Verfiëer asb. jou instellings en indien nodig skep self die databasis per hand." +INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="Die installeerder kon nie met die aangegewe databasis verbind nie en kon ook nie die databasis skep nie. Verifiëer asb. jou instellings en indien nodig skep self die databasis per hand." INSTL_DATABASE_INVALID_PDOMYSQL_VERSION="Jy benodig MySQL 5.0.4 of hoër om met die installeering verder te gaan. Jou versie is: %s" INSTL_DATABASE_INVALID_POSTGRESQL_VERSION="Jy benodig PostgreSQL 8.3.18 of hoër om met die installeering verder te gaan. Jou versie is: %s" INSTL_PHP_VERSION_NEWER="PHP Versie >= %s" ; Necessary for errors -ADMIN_EMAIL="Administrateur e-posadres" -ADMIN_PASSWORD="Administrateur Wagwoord" -ADMIN_PASSWORD2="Bevestig Administrateur Wagwoord" +ADMIN_EMAIL="Administrateur eposadres" +ADMIN_PASSWORD="Administrateur wagwoord" +ADMIN_PASSWORD2="Bevestig Administrateur wagwoord" SITE_NAME="Werf Naam" ; Database types (allows for a more descriptive label than the internal name) @@ -297,3 +298,6 @@ POSTGRESQL="PostgreSQL" SQLAZURE="Microsoft SQL Azure" SQLITE="SQLite" SQLSRV="Microsoft SQL Server" + +INSTL_DATABASE_FIX_LOWERCASE="Die tabel-voorvoegsel moet in kleinletters wees vir PostgreSQL." + diff --git a/installation/language/af-ZA/af-ZA.xml b/installation/language/af-ZA/af-ZA.xml index 82a2f7603d7a2..9814259335bb1 100644 --- a/installation/language/af-ZA/af-ZA.xml +++ b/installation/language/af-ZA/af-ZA.xml @@ -1,21 +1,18 @@ - - Afrikaans (Suid-Afrika) - 3.4.4 - August 2015 - Joomla4Africa Project - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. - http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL - 3.0 Joomla Afrikaanse Taalpaket - - af-ZA.ini - - - Afrikaans (South Africa) - af-ZA - 0 - - + + Afrikaans (Suid-Afrika) + 3.5.0.1 + 2016.02.02 + Joomla4Africa Project + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL + + af-ZA.ini + + + Afrikaans (South Africa) + af-ZA + 0 + + diff --git a/installation/language/ar-AA/ar-AA.xml b/installation/language/ar-AA/ar-AA.xml index 7192a4b38d600..ee650978e1feb 100644 --- a/installation/language/ar-AA/ar-AA.xml +++ b/installation/language/ar-AA/ar-AA.xml @@ -6,9 +6,8 @@ 3.4.4 August 2015 Joomla! Arabic Unitag Translation team - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - Arabic Unitag language installation files for Joomla! 3.x ملفات اللغة العربية الموحدة لتنصيب نظام جوملا! ar-AA.ini diff --git a/installation/language/be-BY/be-BY.ini b/installation/language/be-BY/be-BY.ini index 2d3171d38550b..9a1c6ed05ae0c 100644 --- a/installation/language/be-BY/be-BY.ini +++ b/installation/language/be-BY/be-BY.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/be-BY/be-BY.xml b/installation/language/be-BY/be-BY.xml index db67049681e5f..d1178ae06f359 100644 --- a/installation/language/be-BY/be-BY.xml +++ b/installation/language/be-BY/be-BY.xml @@ -6,9 +6,8 @@ 3.4.4 August 2015 Dennis Hermatski - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - Беларускі моўны файл для інсталятара Joomla! be-BY.ini diff --git a/installation/language/bg-BG/bg-BG.ini b/installation/language/bg-BG/bg-BG.ini index 97273780ddc36..a2875c13ba5fc 100644 --- a/installation/language/bg-BG/bg-BG.ini +++ b/installation/language/bg-BG/bg-BG.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 @@ -31,6 +31,7 @@ INSTL_PRECHECK_ACTUAL="Действително" ; Database view INSTL_DATABASE="Настройки на базата данни" +INSTL_DATABASE_FIX_LOWERCASE="Префиксът на базата данни трябва да бъде с малки букви, ако използвате PostgreSQL." INSTL_DATABASE_HOST_DESC="Това обикновено е "_QQ_"localhost"_QQ_"" INSTL_DATABASE_HOST_LABEL="Име на хоста" INSTL_DATABASE_NAME_DESC="Някои хостинг доставчици позволяват само по една база данни за един сайт. Използвайте представка за таблиците, ако това е случаят при Вас." diff --git a/installation/language/bg-BG/bg-BG.xml b/installation/language/bg-BG/bg-BG.xml index 92a5b5d7076fb..469d8c50bf4e2 100644 --- a/installation/language/bg-BG/bg-BG.xml +++ b/installation/language/bg-BG/bg-BG.xml @@ -1,14 +1,13 @@ Bulgarian (Български) - 3.4.4 - August 2015 + 3.5.0 + January 2016 Yuriy Boev - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - Bulgarian language installation for Joomla bg-BG.ini diff --git a/installation/language/bs-BA/bs-BA.ini b/installation/language/bs-BA/bs-BA.ini index 31a0008b96527..023ece382de11 100644 --- a/installation/language/bs-BA/bs-BA.ini +++ b/installation/language/bs-BA/bs-BA.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 @@ -89,7 +89,7 @@ INSTL_SAMPLE_LEARN_SET="Joomla Engleski (GB) Set primjera za učenje" INSTL_SAMPLE_TESTING_SET="Testni Engleski (GB) Set primjera" INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Instalacija Joomla! sa samo jednim izbornikom i formom za prijavu, bez ikakvog sadržaja." INSTL_SAMPLE_BLOG_SET_DESC="Instalacija Joomla! sa nekoliko članaka i blog modulima kao Stariji postovi, Blog roll, Najčitaniji postovi." -INSTL_SAMPLE_BROCHURE_SET_DESC="Instalacija Joomla! sa nekoliko stranica (Izbornik sa stranicom Naslovna, O nama, Novosti, Kontaktirajte nas) i modulima kao Pretraga, Prilagođeni HTML, Forma za prijavu." +INSTL_SAMPLE_BROCHURE_SET_DESC="Instalacija Joomla! sa nekoliko stranica (Izbornik sa stranicom Naslovna, O nama, Novosti, Kontaktirajte nas) i modulima kao Pretraga, Prilagođeno, Forma za prijavu." INSTL_SAMPLE_DATA_SET_DESC="Instalacija Joomla! sa jednom stranicom (izbornik sa jednim linkom) i modulima kao Zadnji članak, Forma za prijavu." INSTL_SAMPLE_LEARN_SET_DESC="Instalacija Joomla! sa primjerima članaka koji opisuju kako Joomla! radi." INSTL_SAMPLE_TESTING_SET_DESC="Instalacija Joomla! sa svim mogućim stavkama izbornika za pomoć kod testiranja." @@ -187,6 +187,7 @@ INSTL_DATABASE_ERROR_CREATE="Pojavila se greška prilikom izrade baze %s.
    K INSTL_DATABASE_ERROR_DELETE="Pojavile su se greške prilikom brisanja baze." INSTL_DATABASE_FIELD_VALUE_REMOVE="Izbriši" INSTL_DATABASE_FIELD_VALUE_BACKUP="Sigurnosna kopija" +INSTL_DATABASE_FIX_LOWERCASE="Prefiks tabele Postgresql baze mora biti napisan malim slovima." INSTL_DATABASE_FIX_TOO_LONG="Prefiks MySQL tablice smije imati najviše 15 znakova" INSTL_DATABASE_INVALID_DB_DETAILS="Sadržaj baze je pogrešan i/ili prazan." INSTL_DATABASE_INVALID_MYSQL_VERSION="Potreban je MySQL 5.0.4 ili viša verzija za nastavak instalacije. Vaša verzija je: %s" diff --git a/installation/language/bs-BA/bs-BA.xml b/installation/language/bs-BA/bs-BA.xml index abdd5d98c9f50..ffca22f534e23 100644 --- a/installation/language/bs-BA/bs-BA.xml +++ b/installation/language/bs-BA/bs-BA.xml @@ -1,14 +1,13 @@ Bosanski (BA) - 3.4.4 - September 2012 + 3.5.0 + January 2016 Bosnian Translation Team - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - bs-BA.ini diff --git a/installation/language/ca-ES/ca-ES.ini b/installation/language/ca-ES/ca-ES.ini index ea307c0b5974d..bc1e253dee88b 100644 --- a/installation/language/ca-ES/ca-ES.ini +++ b/installation/language/ca-ES/ca-ES.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 @@ -87,7 +87,7 @@ INSTL_SAMPLE_LEARN_SET="Dades de mostra Aprendre Joomla en anglès (GB)" INSTL_SAMPLE_TESTING_SET="Dades de mostra de Prova en Anglès (GB)" INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Instal·lar Joomla amb només un menú i formulari d'entrada sense cap contingut." INSTL_SAMPLE_BLOG_SET_DESC="Instal·lar Joomla amb alguns articles i mòduls d'estil blog tals com articles anteriors,enllaços,articles més llegits...." -INSTL_SAMPLE_BROCHURE_SET_DESC="Instal·lar Joomla amb algunes pàgines (un menú amb pàgines tipus inici, sobre nosaltres,notícies,contacta'ns) i mòduls com cerca, codi html, formulari d'entrada." +INSTL_SAMPLE_BROCHURE_SET_DESC="Instal·lar Joomla amb algunes pàgines (un menú amb pàgines tipus inici, sobre nosaltres, notícies, contacta'ns) i mòduls com cerca, codi, formulari d'entrada." INSTL_SAMPLE_DATA_SET_DESC="Instal·lar Joomla amb una pàgina (menú amb un enllaç) i mòduls tals com Darrer article, formulari d'entrada." INSTL_SAMPLE_LEARN_SET_DESC="Instal·lar Joomla amb articles d'exemple que descriuen com funciona Joomla." INSTL_SAMPLE_TESTING_SET_DESC="Instal·la Joomla amb tots els ítems de menú possibles per provar Joomla." @@ -119,7 +119,7 @@ INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Informació sobre l'entrada a l'adm ; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="La carpeta installation ja s'ha eliminat." ; The word 'installation' should not be translated as it is a physical folder. -INSTL_COMPLETE_ERROR_FOLDER_DELETE="La carpeta installation no s'ha pogut eliminar. Si us plau, elimina-la manualment. " +INSTL_COMPLETE_ERROR_FOLDER_DELETE="La carpeta installation no s'ha pogut eliminar. Elimina-la manualment." ; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_FOLDER_REMOVED="Carpeta installation eliminada correctament" INSTL_COMPLETE_LANGUAGE_1="Joomla! en el teu propi idioma?" @@ -129,7 +129,7 @@ INSTL_COMPLETE_LANGUAGE_DESC2="Nota: necessites connexió a internet per permetr ; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_REMOVE_FOLDER="Esborrar la carpeta d'instal·lació" ; The word 'installation' should not be translated as it is a physical folder. -INSTL_COMPLETE_REMOVE_INSTALLATION="SI US PLAU RECORDA ESBORRAR EL DIRECTORI D'INSTAL·LACIÓ.
    No podràs continuar fins que esborris el directori d'instal·lació. Aquesta és una característica de seguretat de Joomla." +INSTL_COMPLETE_REMOVE_INSTALLATION="RECORDA ESBORRAR EL DIRECTORI D'INSTAL·LACIÓ.
    No podràs continuar fins que esborris el directori d'instal·lació. Aquesta és una característica de seguretat de Joomla!" INSTL_COMPLETE_TITLE="Felicitats! Joomla! està instal·lat." INSTL_COMPLETE_INSTALL_LANGUAGES="Passos Extra: Instal·lar idiomes" @@ -138,10 +138,10 @@ INSTL_LANGUAGES="Instal·lació dels paquets d'idioma " INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Idioma" INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Versió" INSTL_LANGUAGES_DESC="La interfície de Joomla està disponible en diversos idiomes. Tria els teus idiomes preferits marcant-los i instal·la'ls clicant al botó de Següent.
    Nota:Aquesta operació portarà aproximadament 5 segons per descarregar i instal·lar cada idioma. Si us plau, no triïs més de 3 idiomes a instal·lar per evitar els temps d'espera." -INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Aquesta operació pot trigar fins a 10 segons per idioma per completar-los.
    Si us plau, espera't mentre es descarreguen i s'instal·len..." +INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Aquesta operació pot trigar fins a 10 segons per idioma per completar-los.
    Espera't mentre es baixen i s'instal·len..." INSTL_LANGUAGES_MORE_LANGUAGES="Prem el botó d'Anterior' si vols instal·lar més idiomes." INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="No s'han triat idiomes per instal·lar.Si necessites més idiomes, prem el botó d'Anterior' i tria els idiomes de la llista." -INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! no ha estat capaç de connectar amb el servidor idiomes. Si us plau finalitza el procés d'instal·lació." +INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! no ha estat capaç de connectar amb el servidor idiomes. Finalitza el procés d'instal·lació." INSTL_LANGUAGES_WARNING_NO_INTERNET2="Nota: podràs instal·lar més idiomes més endavant des de l'administració de Joomla!" INSTL_LANGUAGES_WARNING_BACK_BUTTON="Tornar a la darrera etapa de la instal·lació" @@ -186,12 +186,13 @@ INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Català (ES)" INSTL_DATABASE_COULD_NOT_CONNECT="No s'ha pogut connectar a la base de dades. Connector retornat número : %s" INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="L'instal·lador no pot connectar a la base de dades especificada i no ha pogut crear la base de dades. Comprova la configuració i si és necessari crea manualment la base de dades." INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="No s'ha pogut actualitzar la memòria cau per l'extensió: %s" -INSTL_DATABASE_EMPTY_NAME=" " +INSTL_DATABASE_EMPTY_NAME="" INSTL_DATABASE_ERROR_BACKINGUP="Ha hagut alguns errors en la còpia de seguretat de la base de dades." INSTL_DATABASE_ERROR_CREATE="S'ha produït un error en intentar crear la base de dades %s.
    L'usuari/a no té suficients privilegis per crear una base de dades. La base de dades requerida pot ser necessari crear-la per separat abans de poder instal·lar Joomla." INSTL_DATABASE_ERROR_DELETE="Ha hagut alguns errors esborrant la base de dades." INSTL_DATABASE_FIELD_VALUE_REMOVE="Eliminar" INSTL_DATABASE_FIELD_VALUE_BACKUP="Còpia de seguretat" +INSTL_DATABASE_FIX_LOWERCASE="El prefix ha de ser minúscula per Postgresql." INSTL_DATABASE_FIX_TOO_LONG="El prefix de taula MySQL ha de tenir un màxim de 15 caràcters." INSTL_DATABASE_INVALID_DB_DETAILS="Els detalls de la base de dades proporcionades són incorrectes o inexistents." INSTL_DATABASE_INVALID_MYSQL_VERSION="Necessites MySQL 5.0.4 o superior per continuar la instal·lació. La teva versió és: %s" @@ -262,7 +263,7 @@ INSTL_WRITABLE="%s amb permís d'escriptura" INSTL_XML_SUPPORT="Suport XML" INSTL_ZIP_SUPPORT_AVAILABLE="Suport nadiu ZIP" INSTL_ZLIB_COMPRESSION_SUPPORT="Suport a compressió Zlib" -INSTL_PROCESS_BUSY="Procés realitzant-se.Si us plau espera..." +INSTL_PROCESS_BUSY="Procés realitzant-se. Espera..." ;Global strings JADMINISTRATOR="Administrador/a" diff --git a/installation/language/ca-ES/ca-ES.xml b/installation/language/ca-ES/ca-ES.xml index d2c6d1b05292d..f4896519c4f2d 100644 --- a/installation/language/ca-ES/ca-ES.xml +++ b/installation/language/ca-ES/ca-ES.xml @@ -1,14 +1,13 @@ Catalan (ES) - 3.4.4 + 3.5.0 August 2015 Catalan Translation Team - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - ca-ES.ini diff --git a/installation/language/ckb-IQ/ckb-IQ.ini b/installation/language/ckb-IQ/ckb-IQ.ini index 2f6ae8aeccd00..d30e326658d7b 100644 --- a/installation/language/ckb-IQ/ckb-IQ.ini +++ b/installation/language/ckb-IQ/ckb-IQ.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/ckb-IQ/ckb-IQ.xml b/installation/language/ckb-IQ/ckb-IQ.xml index 1b33aa8f8f2fe..37ddc3b85ae5f 100644 --- a/installation/language/ckb-IQ/ckb-IQ.xml +++ b/installation/language/ckb-IQ/ckb-IQ.xml @@ -6,9 +6,8 @@ 3.2.0 January 2011 Kurdish Soranî Translation team - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - ckb-IQ.ini diff --git a/installation/language/cs-CZ/cs-CZ.ini b/installation/language/cs-CZ/cs-CZ.ini index a3a3c230117f1..1786c6293ddaf 100644 --- a/installation/language/cs-CZ/cs-CZ.ini +++ b/installation/language/cs-CZ/cs-CZ.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/cs-CZ/cs-CZ.xml b/installation/language/cs-CZ/cs-CZ.xml index 631562d55f75f..1add65397c7b2 100644 --- a/installation/language/cs-CZ/cs-CZ.xml +++ b/installation/language/cs-CZ/cs-CZ.xml @@ -6,9 +6,8 @@ 3.2.0 January 2013 Czech Translation Team - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - cs-CZ.ini diff --git a/installation/language/cy-GB/cy-GB.ini b/installation/language/cy-GB/cy-GB.ini index 0781934641afe..df7e342454ca5 100644 --- a/installation/language/cy-GB/cy-GB.ini +++ b/installation/language/cy-GB/cy-GB.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/cy-GB/cy-GB.xml b/installation/language/cy-GB/cy-GB.xml index 79ba45a300599..c4466dd83465f 100644 --- a/installation/language/cy-GB/cy-GB.xml +++ b/installation/language/cy-GB/cy-GB.xml @@ -4,11 +4,8 @@ 3.3.0.1 2014-05-07 Joomla! Project - admin@joomla.org - www.joomla.org - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - cy-GB site language Welsh (United Kingdom) cy-GB diff --git a/installation/language/da-DK/da-DK.ini b/installation/language/da-DK/da-DK.ini index cc23803956558..bb08bdc957d2d 100644 --- a/installation/language/da-DK/da-DK.ini +++ b/installation/language/da-DK/da-DK.ini @@ -1,9 +1,9 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 -; Stepbar +;Stepbar INSTL_STEP_COMPLETE_LABEL="Afslutning" INSTL_STEP_DATABASE_LABEL="Database" INSTL_STEP_DEFAULTLANGUAGE_LABEL="Vælg standardsprog" @@ -11,11 +11,13 @@ INSTL_STEP_FTP_LABEL="FTP" INSTL_STEP_LANGUAGES_LABEL="Installer sprog" INSTL_STEP_SITE_LABEL="Konfiguration" INSTL_STEP_SUMMARY_LABEL="Oversigt" -; Language view + +;Language view INSTL_SELECT_LANGUAGE_TITLE="Vælg sprog" INSTL_WARNJAVASCRIPT="Advarsel! JavaScript skal være aktiveret for korrekt installation af Joomla!" INSTL_WARNJSON="Din PHP installation skal have JSON aktiveret for at Joomla kan installeres!" -; Preinstall view + +;Preinstall view INSTL_PRECHECK_TITLE="Pre-installation" INSTL_PRECHECK_DESC="Hvis nogle af disse elementer ikke er understøttet (markeret som Nej) så tag venligst handling for at rette dem.
    Du kan ikke installere Joomla! før dit setup opfylder kravene nedenfor." INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Anbefalede indstillinger:" @@ -23,9 +25,10 @@ INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Disse indstillinger er anbefalet for P INSTL_PRECHECK_DIRECTIVE="Direktiv" INSTL_PRECHECK_RECOMMENDED="Anbefalet" INSTL_PRECHECK_ACTUAL="Aktuel" + ; Database view INSTL_DATABASE="Databasekonfiguration" -INSTL_DATABASE_HOST_DESC="Dette er typisk "localhost"." +INSTL_DATABASE_HOST_DESC="Dette er typisk "_QQ_"localhost"_QQ_"." INSTL_DATABASE_HOST_LABEL="Hostnavn" INSTL_DATABASE_NAME_DESC="Nogle webhosts tillader kun et bestemt databasenavn pr websted. Anvend tabelprefiks i disse situationer for at køre flere Joomla! websteder fra samme database." INSTL_DATABASE_NAME_LABEL="Databasenavn" @@ -37,11 +40,12 @@ INSTL_DATABASE_PASSWORD_LABEL="Adgangskode" INSTL_DATABASE_PREFIX_DESC="Vælg et database præfiks eller anvend det tilfældigt genererede. Optimalt, tre eller fire karakterers længde, kun indeholdende alfanumeriske karakterer, og SKAL slutte med understregning. Vær sikker på at det valgte prefiks ikke anvendes af andre tabeller i databasen." INSTL_DATABASE_PREFIX_LABEL="Tabelpræfiks" INSTL_DATABASE_PREFIX_MSG="Databasepræfiks skal starte med et bogstav, efterfulgt af valgfri alphanumeriske karakterer og en afsluttende understregning" -INSTL_DATABASE_TYPE_DESC="Dette er sandsynligvis "mysqli"." +INSTL_DATABASE_TYPE_DESC="Dette er sandsynligvis "_QQ_"mysqli"_QQ_"." INSTL_DATABASE_TYPE_LABEL="Databasetype" -INSTL_DATABASE_USER_DESC="Enten noget som "root" eller et brugernavn leveret af din host." +INSTL_DATABASE_USER_DESC="Enten noget som "_QQ_"root"_QQ_" eller et brugernavn leveret af din host." INSTL_DATABASE_USER_LABEL="Brugernavn" -; FTP view + +;FTP view INSTL_AUTOFIND_FTP_PATH="Find FTP-sti automatisk" INSTL_FTP="FTP-konfiguration" INSTL_FTP_DESC="

    På nogle servere kan du være nødt til at angive FTP-oplysninger for at installation kan fuldføres. Hvis du har problemer med at fuldføre installationen uden disse FTP-informationer, tjek da med din host for at afgøre om det er mødvendigt.

    Af sikkerhedsårsager, er det bedst at oprette en særskilt FTP-brugerkonto kun med adgang til Joomla!-installationen og ikke til hele webserveren. Din host kan hjælpe dig med at gøre dette.

    Note: Hvis du installerer på et Windows operativsystem, er FTP-laget ikke påkrævet.

    " @@ -57,7 +61,8 @@ INSTL_VERIFY_FTP_SETTINGS="Bekræft FTP-indstillinger" INSTL_FTP_SETTINGS_CORRECT="Indstillinger er korrekte" INSTL_FTP_USER_DESC="Advarsel! Det anbefales at lade dette felt være tomt og istedet indtaste dit FTP-brugernavn hver gang du overfører filer." INSTL_FTP_PASSWORD_DESC="Advarsel! Det anbefales at lade dette felt være tomt og istedet indtaste din FTP-adgangkode hver gang du overfører filer." -; Site View + +;Site View INSTL_SITE="Generel konfiguration" INSTL_ADMIN_EMAIL_LABEL="Administrator e-mail" INSTL_ADMIN_EMAIL_DESC="Angiv din emailadresse. Dette bliver email adressen for webstedets superbruger." @@ -86,14 +91,16 @@ INSTL_SAMPLE_BROCHURE_SET_DESC="Installer Joomla med et par sider (en menu med s INSTL_SAMPLE_DATA_SET_DESC="Installer Joomla med en side (en menu med et link) og moduler såsom Seneste artikler, log på Formular." INSTL_SAMPLE_LEARN_SET_DESC="Installer Joomla med eksempel artikler som beskriver hvordan Joomla fungerer." INSTL_SAMPLE_TESTING_SET_DESC="Installer Joomla med alle de mulige menu elementer for at hjælpe med at afprøve Joomla." -; Summary view + +;Summary view INSTL_FINALISATION="Afslutning" INSTL_SUMMARY_INSTALL="Installer" INSTL_SUMMARY_EMAIL_LABEL="Email konfiguration" INSTL_SUMMARY_EMAIL_DESC="Vælg om du vil emaile nedenstående konfigurationsindstillinger til %s efter installationen." INSTL_SUMMARY_EMAIL_PASSWORDS_LABEL="Inkluder adgangskoder i email" INSTL_SUMMARY_EMAIL_PASSWORDS_DESC="Advarsel! Det anbefales ikke at sende og gemme dine adgangskoder i emails." -; Installing view + +;Installing view INSTL_INSTALLING="Installerer ..." INSTL_INSTALLING_DATABASE_BACKUP="Laver backup af gamle database tabeller" INSTL_INSTALLING_DATABASE_REMOVE="Fjerner gamle databasetabeller" @@ -101,11 +108,13 @@ INSTL_INSTALLING_DATABASE="Opretter databasetabeller" INSTL_INSTALLING_SAMPLE="Installerer demodata" INSTL_INSTALLING_CONFIG="Opretter konfigurationsfil" INSTL_INSTALLING_EMAIL="Sender email til %s" -; Email + +;Email INSTL_EMAIL_SUBJECT="Konfigurations detaljer: %s" INSTL_EMAIL_HEADING="Nedenfor finder du konfigurationsindstillingerne for et nyligt opsat Joomla! websted:" INSTL_EMAIL_NOT_SENT="Email kunne ikke sendes." -; Complete view + +;Complete view INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Log ind detaljer for administration" ; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Mappen installation er allerede blevet fjernet." @@ -123,7 +132,8 @@ INSTL_COMPLETE_REMOVE_FOLDER="Fjern mappen installation" INSTL_COMPLETE_REMOVE_INSTALLATION="HUSK VENLIGST AT FJERNE MAPPEN 'INSTALLATION' FULDSTÆNDIGT
    Du kan ikke fortsætte før du har fjernet mappen 'installation'. Dette er en sikkerhedsfunktion i Joomla!" INSTL_COMPLETE_TITLE="Tillykke! Joomla! er nu installeret." INSTL_COMPLETE_INSTALL_LANGUAGES="Ekstra skridt: Installer sprog" -; Languages view + +;Languages view INSTL_LANGUAGES="Installer sprogpakker" INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Sprog" INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Version" @@ -134,7 +144,8 @@ INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Der er ikke valgt nogen sprog til installa INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! kunne ikke forbinde til sprogserveren. Færdiggør venligst installationsprocessen." INSTL_LANGUAGES_WARNING_NO_INTERNET2="Bemærk: Du kan installere sprog senere, ved at anvende Joomla! administrator" INSTL_LANGUAGES_WARNING_BACK_BUTTON="Returner til seneste installations skridt" -; Default language view + +;Default language view INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE="Aktiver multisprog funktionen" INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="Hvis aktiv, så vil multisprogsfunktionen være aktiv på dit Joomla websted med lokaliserede menuer for hvert sprog." INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN="Aktiver sprogkode programudvidelsen" @@ -167,18 +178,21 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Hvis aktiv, så vil Joomla INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Multisprog" INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Denne sektion tillader dig at aktivere Joomla! multisprogsfunktionen automatisk." INSTL_DEFAULTLANGUAGE_TRY_LATER="Du kan installere det senere, ved at anvende Joomla administrator." + ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Dansk (DK)" -; Database Model + +;Database Model INSTL_DATABASE_COULD_NOT_CONNECT="Kunne ikke tilslutte til databasen. Forbindelsen returnerede fejl/nummer: %s" INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="Installationsprocessen kunne ikke forbinde til den angivne database og kunne ikke oprette databasen. Kontroller venligst dine indstillinger og om nødvendigt, opret manuelt din database." INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Kunne ikke opdatere manifest cache for udvidelsen: %s" -INSTL_DATABASE_EMPTY_NAME="Du skal angive et databasenavn!" +INSTL_DATABASE_EMPTY_NAME="http://forum.joomla.org/viewforum.php?f=16" INSTL_DATABASE_ERROR_BACKINGUP="Nogle fejl opstod under backup af databasen." INSTL_DATABASE_ERROR_CREATE="En fejl opstod under forsøget på at oprette databasen %s.
    Brugeren har formodentlig ikke rettigheder til at oprette en databse. Den påkrævede database skal oprettes inden installationen af Joomla!" INSTL_DATABASE_ERROR_DELETE="Nogle fejl opstod under sletning af databasen" INSTL_DATABASE_FIELD_VALUE_REMOVE="Fjern" INSTL_DATABASE_FIELD_VALUE_BACKUP="Backup" +INSTL_DATABASE_FIX_LOWERCASE="Tabel præfikset skal være med småbogstaver for Postgresql." INSTL_DATABASE_FIX_TOO_LONG="MySQL tabelpræfikset må maksimalt være 15 karakterer" INSTL_DATABASE_INVALID_DB_DETAILS="Databaseinformationerne angivet er ikke korrekte og/eller tomme." INSTL_DATABASE_INVALID_MYSQL_VERSION="Du behøver MySQL 5.0.4 eller højere for at fortsætte installationen. Din version er: %s" @@ -189,35 +203,40 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="Du behøver SQL Server 2008 R2 (10.50.160 INSTL_DATABASE_INVALID_SQLZURE_VERSION="Du behøver SQL Server 2008 R2 (10.50.1600.1) eller højere for at fortsætte installationen. Din version er: %s" INSTL_DATABASE_INVALID_TYPE="Vælg venligst databasetype" INSTL_DATABASE_NAME_TOO_LONG="MySQL databasenavnet må maksimalt være 64 karakterer" -INSTL_DATABASE_INVALID_NAME="MySQL versioner tidligere end 5.1.6 må ikke indeholde punktum eller andre "specielle" tegn i navnet. Din version er: %s" +INSTL_DATABASE_INVALID_NAME="MySQL versioner tidligere end 5.1.6 må ikke indeholde punktum eller andre "_QQ_"specielle"_QQ_" tegn i navnet. Din version er: %s" INSTL_DATABASE_NAME_INVALID_SPACES="MySQL databasenavne og tabelnavne må ikke begynde med eller slutte med mellemrum." INSTL_DATABASE_NAME_INVALID_CHAR="Ingen MySQL identifikator kan indeholde et NULL ASCII(0x00)." INSTL_DATABASE_FILE_DOES_NOT_EXIST="Filen %s findes ikke" -; controllers + +;controllers INSTL_COOKIES_NOT_ENABLED="Cookies ser ikke ud til at være aktiveret på din klient. Du vil ikke kunne installere applikationen med denne funktion deaktiveret. Alternativt, kan der være et problem med serverens session.save_path, hvis dette er årsagen til problemet så kontakt venligst din hostingudbyder hvis du ikke selv ved hvordan du skal kontrollere eller rette dette problem." INSTL_HEADER_ERROR="Fejl" -; Helpers + +;Helpers INSTL_PAGE_TITLE="Joomla! Web-installation" -; Configuration model + +;Configuration model INSTL_ERROR_CONNECT_DB="Kunne ikke tilslutte til databasen. Forbindelsen returnerede fejl/nummer: %s" INSTL_STD_OFFLINE_MSG="Dette websted opdateres i øjeblikket.
    Prøv venligst igen senere." -; FTP model + +;FTP model INSTL_FTP_INVALIDROOT="Den angivne FTP-mappe er ikke mappen for denne Joomla! installation" INSTL_FTP_NOCONNECT="Kunne ikke forbinde til FTP-serveren" -INSTL_FTP_NODELE="Funktionen "DELE" fejlede." +INSTL_FTP_NODELE="Funktionen "_QQ_"DELE"_QQ_" fejlede." INSTL_FTP_NODIRECTORYLISTING="Kunne ikke hente en mappe-liste fra FTP-serveren." -INSTL_FTP_NOLIST="Funktionen "LIST" fejlede." +INSTL_FTP_NOLIST="Funktionen "_QQ_"LIST"_QQ_" fejlede." INSTL_FTP_NOLOGIN="Kunne ikke logge ind på FTP-serveren." -INSTL_FTP_NOMKD="Funktionen "MKD" fejlede." -INSTL_FTP_NONLST="Funktionen "NLST" fejlede." -INSTL_FTP_NOPWD="Funktionen "PWD" fejlede." -INSTL_FTP_NORETR="Funktionen "RETR" fejlede." -INSTL_FTP_NORMD="Funktionen "RMD" fejlede." +INSTL_FTP_NOMKD="Funktionen "_QQ_"MKD"_QQ_" fejlede." +INSTL_FTP_NONLST="Funktionen "_QQ_"NLST"_QQ_" fejlede." +INSTL_FTP_NOPWD="Funktionen "_QQ_"PWD"_QQ_" fejlede." +INSTL_FTP_NORETR="Funktionen "_QQ_"RETR"_QQ_" fejlede." +INSTL_FTP_NORMD="Funktionen "_QQ_"RMD"_QQ_" fejlede." INSTL_FTP_NOROOT="Kunne ikke tilgå den angivne FTP-mappe." -INSTL_FTP_NOSTOR="Funktionen "STOR" fejlede." -INSTL_FTP_NOSYST="Funktionen "SYST" fejlede." +INSTL_FTP_NOSTOR="Funktionen "_QQ_"STOR"_QQ_" fejlede." +INSTL_FTP_NOSYST="Funktionen "_QQ_"SYST"_QQ_" fejlede." INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Kunne ikke autodetekte FTP-rodmappen" -; others + +;others INSTL_CONFPROBLEM="Din konfigurationsfil eller mappe er ikke skrivbar, eller der opstod et problem med at oprette konfigurationsfilen. Du er nødt til at uploade den følgende kode manuelt. Tryk i tekstfeltet for at markere hele koden, for derefter at kopiere og indsætte den i en ny fil, navngivet:configuration.php. Upload derefter filen til din rodmappe på dit websted." INSTL_DATABASE_SUPPORT="Database understøttelse:" INSTL_DISPLAY_ERRORS="Fejlvisning" @@ -245,7 +264,8 @@ INSTL_XML_SUPPORT="XML understøttelse" INSTL_ZIP_SUPPORT_AVAILABLE="Nativ ZIP understøttelse (Anbefalet)" INSTL_ZLIB_COMPRESSION_SUPPORT="zlib kompressionsunderstøttelse" INSTL_PROCESS_BUSY="Processen er i gang. Vent venligst ..." -; Global strings + +;Global strings JADMINISTRATOR="Administrator" JCHECK_AGAIN="Kontroller igen" JERROR="Fejl" @@ -265,6 +285,7 @@ JPREVIOUS="Forrige" JSITE="Websted" JUSERNAME="Brugernavn" JYES="Ja" + ; Framework strings necessary when no lang pack is available JLIB_DATABASE_ERROR_CONNECT_MYSQL="Kunne ikke forbinde til MySQL." JLIB_DATABASE_ERROR_DATABASE="En database fejl opstod." @@ -272,21 +293,24 @@ JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Kan ikke indlæse Database driver: %s" JLIB_ENVIRONMENT_SESSION_EXPIRED="Din session er udløbet, opdater venligst siden." JLIB_FILESYSTEM_ERROR_COPY_FAILED="Kopiering fejlede" JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :filer: Stien er ikke en mappe: Sti: %s" -JLIB_FORM_FIELD_INVALID="Ugyldigt felt: \"" +JLIB_FORM_FIELD_INVALID="Ugyldigt felt: \"_QQ_"" JLIB_FORM_VALIDATE_FIELD_INVALID="Ugyldigt felt: %s" JLIB_FORM_VALIDATE_FIELD_REQUIRED="Felt påkrævet: %s" JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Installer: Kunne ikke kopiere filen %1$s til %2$s." JLIB_INSTALLER_NOT_ERROR="Hvis fejlen er relateret til installationen af TinyMCE sprogfiler, så har det ingen effekt på installationen af sprog. Nogle sprogpakker, der er oprettet før Joomla! 3.2.0 kan forsøge at installere separate TinyMCE sprogfiler. Da disse nu er inkluderet i kernen behøves de ikke længere at blive installeret." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Kunne ikke forbinde til database
    joomla.library: %1$s - %2$s" + ; Strings for the language debugger JDEBUG_LANGUAGE_FILES_IN_ERROR="Parser fejl i sprogfiler" JDEBUG_LANGUAGE_UNTRANSLATED_STRING="Ikke oversatte strenge" JNONE="Ingen" + ; Necessary for errors ADMIN_EMAIL="Administrator e-mail" ADMIN_PASSWORD="Administrator adgangskode" ADMIN_PASSWORD2="Bekræft administrator adgangskode" SITE_NAME="Webstedets navn" + ; Database types (allows for a more descriptive label than the internal name) MYSQL="MySQL" MYSQLI="MySQLi" @@ -296,3 +320,4 @@ POSTGRESQL="PostgreSQL" SQLAZURE="Microsoft SQL Azure" SQLITE="SQLite" SQLSRV="Microsoft SQL Server" + diff --git a/installation/language/da-DK/da-DK.xml b/installation/language/da-DK/da-DK.xml index 54ad92c3564c3..4912728e6141a 100644 --- a/installation/language/da-DK/da-DK.xml +++ b/installation/language/da-DK/da-DK.xml @@ -1,15 +1,13 @@ Danish (DK) - 3.4.4 + 3.5.0 August 2015 Danish Translation project - www.joomla.org - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - da-DK.ini diff --git a/installation/language/de-DE/de-DE.ini b/installation/language/de-DE/de-DE.ini index d68ee018fc7c3..3a800876d894d 100644 --- a/installation/language/de-DE/de-DE.ini +++ b/installation/language/de-DE/de-DE.ini @@ -1,5 +1,5 @@ ; Author J!German (Joomla! German Translation Team) -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 @@ -89,7 +89,7 @@ INSTL_SAMPLE_LEARN_SET="Englische (GB) Beispieldaten: Joomla! erlernen" INSTL_SAMPLE_TESTING_SET="Englische (GB) Beispieldaten: Testinhalte" INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Joomla! mit nur einem Menü, einem Anmeldeformular und ohne weitere Inhalte installieren." INSTL_SAMPLE_BLOG_SET_DESC="Joomla! mit ein paar Beiträgen, Blog bezogenen Modulen, wie letzte Beiträge und am häufigsten gelesene Beiträge installieren." -INSTL_SAMPLE_BROCHURE_SET_DESC="Joomla! mit ein paar Seiten (ein Menü mit: Home, Über uns, News, Kontakt) und Modulen, wie der Suche, eigenes HTML und einem Anmeldeformular installieren." +INSTL_SAMPLE_BROCHURE_SET_DESC="Joomla! mit ein paar Seiten (ein Menü mit: Home, Über uns, News, Kontakt) und den Modulen: Suche, Benutzerdefiniertes Modul und Anmeldeformular installieren." INSTL_SAMPLE_DATA_SET_DESC="Joomla! mit nur einer Seite (einem Menü mit nur einem Link) und Modulen, wie letzter Beitrag und dem Anmeldeformular installieren." INSTL_SAMPLE_DATA_DE_SET_DESC="Joomla! mit nur einer Seite (einem Menü mit nur einem Link) und Modulen, wie letzter Beitrag und dem Anmeldeformular installieren." INSTL_SAMPLE_LEARN_SET_DESC="Joomla! mit Beispielbeiträgen installieren, die beschreiben, wie Joomla! funktioniert." @@ -120,11 +120,11 @@ INSTL_EMAIL_NOT_SENT="Die E-Mail konnte nicht gesendet werden!" ; Complete view INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Anmeldeinformation für die Administration" ; The word 'installation' should not be translated as it is a physical folder. -INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Das Verzeichnis „installation“ wurde bereits gelöscht." +INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Das Verzeichnis „installation“ wurde bereits gelöscht." ; The word 'installation' should not be translated as it is a physical folder. -INSTL_COMPLETE_ERROR_FOLDER_DELETE="Das Verzeichnis „installation“ konnte nicht gelöscht werden. Bitte das Verzeichnis manuell löschen." +INSTL_COMPLETE_ERROR_FOLDER_DELETE="Das Verzeichnis „installation“ konnte nicht gelöscht werden. Bitte das Verzeichnis manuell löschen." ; The word 'installation' should not be translated as it is a physical folder. -INSTL_COMPLETE_FOLDER_REMOVED="Das Verzeichnis „installation“ wurde gelöscht!" +INSTL_COMPLETE_FOLDER_REMOVED="Das Verzeichnis „installation“ wurde gelöscht!" INSTL_COMPLETE_LANGUAGE_1="Joomla! in der eigenen Sprache und/oder eine automatisch standardmäßig eingerichtete multilinguale Webseitenerstellung" ; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_LANGUAGE_DESC="Bevor das Installationsverzeichnis gelöscht werden sollte, können noch weitere Sprachen für Joomla! installiert werden. Dazu genügt ein Klick auf den folgenden Button." @@ -195,6 +195,7 @@ INSTL_DATABASE_ERROR_CREATE="Es ist ein Fehler beim Erstellen der Datenbank &bdq INSTL_DATABASE_ERROR_DELETE="Beim Löschen der Datenbank sind einige Fehler aufgetreten!" INSTL_DATABASE_FIELD_VALUE_REMOVE="Löschen" INSTL_DATABASE_FIELD_VALUE_BACKUP="Sichern" +INSTL_DATABASE_FIX_LOWERCASE="Der PostgreSQL-Tabellenpräfix darf nur Kleinbuchstaben enthalten!" INSTL_DATABASE_FIX_TOO_LONG="Der MySQL-Tabellenpräfix darf maximal 15 Zeichen lang sein!" INSTL_DATABASE_INVALID_DB_DETAILS="Die eingegebenen Datenbankangaben sind nicht korrekt und/oder leer!" INSTL_DATABASE_INVALID_MYSQL_VERSION="Um die Installation fortzusetzen wird MySQL 5.0.4 oder höher benötigt. Die installierte Version ist aber: %s" diff --git a/installation/language/de-DE/de-DE.xml b/installation/language/de-DE/de-DE.xml index 8f6686136631f..ba7dd9b706c44 100644 --- a/installation/language/de-DE/de-DE.xml +++ b/installation/language/de-DE/de-DE.xml @@ -1,12 +1,11 @@ - + German (Germany-Switzerland-Austria) - 3.4.4 + 3.5.0 September 2015 J!German - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - de-DE.ini diff --git a/installation/language/dz-BT/dz-BT.ini b/installation/language/dz-BT/dz-BT.ini new file mode 100644 index 0000000000000..7b1fa45c8eaa2 --- /dev/null +++ b/installation/language/dz-BT/dz-BT.ini @@ -0,0 +1,321 @@ +; Joomla! Project +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; License GNU General Public License version 2 or later; see LICENSE.txt +; Note : All ini files need to be saved as UTF-8 + +;Stepbar +INSTL_STEP_COMPLETE_LABEL="མཇུག་བསྡུ།" +INSTL_STEP_DATABASE_LABEL="གནས་སྡུད་གཞི་མཛོད།" +INSTL_STEP_DEFAULTLANGUAGE_LABEL="སྔ་སྒྲིག་སྐད་ཡིག་འདི་གདམ་ཁ་རྐྱབ།" +INSTL_STEP_FTP_LABEL="ཨེབ་ཀྲི་པི་(FTP)" +INSTL_STEP_LANGUAGES_LABEL="སྐད་ཡིག་ཚུ་བཙུགས།" +INSTL_STEP_SITE_LABEL="རིམ་སྒྲིག" +INSTL_STEP_SUMMARY_LABEL="སྤྱིར་བཏང་མཐོང་སྣང༌།" + +;Language view +INSTL_SELECT_LANGUAGE_TITLE="སྐད་ཡིག་གདམ་ཁ་རྐྱབ།" +INSTL_WARNJAVASCRIPT="ཉེན་བརྡ། ཇུམ་ལ་ཚུལ་མཐུན་སྦེ་ བཙུགས་ནི་དོན་ལུ་ JavaScript འདི་འབད་ཚུགསཔ་བཟོ།" +INSTL_WARNJSON="ཇུམ་ལ་ བཙུགས་ནི་དོན་ལུ་ ཁྱོད་རའི་ PHP བཙུགས་སྒྲིག་འདི་ JSON འབད་ཚུགསཔ་བཟོ་འོང་དགོ།" + +;Preinstall view +INSTL_PRECHECK_TITLE="ཧེ་མའི་བཙུགས་སྒྲིག་འདི་ ཞིབ་དཔྱད་འབད།" +INSTL_PRECHECK_DESC="རྣམ་གྲངས་འདི་ཚུའི་གྲལ་ལས་ གཅིག་ཡང་རྒྱབ་རྟེན་མེད་པ་ཅིན་ (མེན། རྟགས་སྐྱེལ་) དེ་ལས་ འཛོལ་བ་མེདཔ་སྦེ་ བཟོ་ནིའི་དོན་ལུ་ བྱ་ལེན་འབད་གནང་།
    འོག་གི་ དགོས་མཁོ་ཚུ་ མ་ཚངམ་ཚན་ཚད་ ཁྱོད་གི་ ཇུམ་ལ་(Joomla!) འདི་བཙུགས་མི་ཚུགས།" +INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="རྒྱབ་སྣོན་ཡོད་པའི་ བཟོ་བཀོད་ཚུ་:" +INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="ཇུམ་ལ་(Joomla) དང་ཅིག་ཁར་ ལེགས་ཤོམ་སྦེ་སྒྲིག་བཏུབ་ནིའི་དོན་ལུ་ བཟོ་བཀོད་འདི་ཚུ་ རྒྱབ་སྣོན་ཡོད།
    ཨིན་རུང་ ཁྱོད་ཀྱི་བཟོ་བཀོད་ཚུ་ རྒྱབ་སྣོན་ཡོད་པའི་རིམ་སྒྲིག་དང་ཅིག་ཁར་ མཐུན་འགྲིགས་མེད་རུང་ ཇུམ་ལ་(Joomla!) འདི་ལཱ་འབད་བཏུབ།" +INSTL_PRECHECK_DIRECTIVE="ལམ་སྟོན།" +INSTL_PRECHECK_RECOMMENDED="རྒྱབ་སྣོན་ཡོདཔ།" +INSTL_PRECHECK_ACTUAL="ངོ་མ།" + +; Database view +INSTL_DATABASE="གནས་སྡུད་གཞི་མཛོད་ཀྱི་རིམ་སྒྲིག" +INSTL_DATABASE_HOST_DESC="འདི་ ཨ་རྟག་བཟུམ་སྦེ་ "localhost" ཨིན།" +INSTL_DATABASE_HOST_LABEL="འགོ་འདྲེན་པའི་མིང་།" +INSTL_DATABASE_NAME_DESC="ལ་ལུ་འགོ་འདྲེན་པ་གི་ ས་ཁོངས་རེ་རེ་ལུ་ གནས་སྡུད་གཞི་མཛོད་ཀྱི་མིང་ འཚམས་ཅིག་རྐྱངམ་ཅིག་བཞག་བཅུག་འོང་། འ་ནི་ ཇུམ་ལ་(Joomla) ས་ཁོངས་སོ་སོའི་གནས་སྟངས་ཀྱི་དོན་ལུ་ རྫས་ཐོའི་སྔོན་ཚིག་ལག་ལེན་འཐབ།" +INSTL_DATABASE_NAME_LABEL="གནས་སྡུད་གཞི་མཛོད་ཀྱི་མིང་།" +INSTL_DATABASE_NO_SCHEMA="འ་ནི་ གནས་སྡུད་གཞི་མཛོད་དབྱེ་ཁག་གི་དོན་ལུ་ གནས་སྡུད་གཞི་མཛོད་ཀྱི་སྔོན་འགྲོའི་འཆར་གཞི་མིན་འདུག" +INSTL_DATABASE_OLD_PROCESS_DESC="ཧེ་མའི་ཇུམ་ལ་(Joomla) བཙུགས་བཞག་ལས་ རྫས་ཐོའི་རྒྱབ་སྣོན་ག་ཡོད་མི་འདི་ཚུ་ གསརཔ་བཙུགས་འོང་།" +INSTL_DATABASE_OLD_PROCESS_LABEL="གནས་སྡུད་གཞི་མཛོད་རྙིངམ་གྱི་ བྱ་རིམ།" +INSTL_DATABASE_PASSWORD_DESC="ས་ཁོངས་ཉེན་སྲུང་གི་དོན་ལུ་ གནས་སྡུད་གཞི་མཛོད་ཀྱི་རྩིས་ཁྲ་ལུ་ གསང་ཡིག་ ངེས་པར་དུ་ལག་ལེན་འཐབ་་དགོཔ་ཨིན།" +INSTL_DATABASE_PASSWORD_LABEL="གསང་ཡིག" +INSTL_DATABASE_PREFIX_DESC="རྫས་ཐོའི་སྔོན་ཚིག་འདི་འདམ་ཁ་རྐྱབ་ ཡང་ན་ རིམ་བྲལ་ལས་སྤེལ་མི་འདི་ལག་ལེན་འཐབ། འོས་འབབ་ལྡན་ཏོག་ཏོ་འདི་ ཁྱད་ཆོས་རིངམོ་ གསུམ་དང་བཞི་ དེ་ཡང་ ཨལ་ཕ་ནུ་མི་རིཊ(alphanumeric)ཀྱི་ཁྱོད་ཆོས་རྐྱངམ་ཅིག་འོང་ནི་དང་ མཇུག་འདི་འོག་ཐིག་གི་འབད་མཇུག་བསྡུ་དགོ། སྔོན་ཚིག་འདི་ རྫས་ཐོ་གཞན་གྱི་ ལག་ལེན་མ་འཐབ་མི་ཅིག་ གདམ་ཁ་གཏན་འཁེལ་བཟོ།." +INSTL_DATABASE_PREFIX_LABEL="རྫས་ཐོའི་སྔོན་ཚིག" +INSTL_DATABASE_PREFIX_MSG="རྫས་ཐོའི་སྔོན་ཚིག་འདི་ འགོ་ཡི་གུ་གི་འགོ་བཙུགས་ནི་ འདི་རྟིང་བདའ་སྟེ་ གདམ་ཁ་ཅན་གྱི་ ཨལ་ཕ་ནུ་མི་རིཊ(alphanumeric)ཁྱོད་ཆོས་བཙུགས་ནི་ དེ་ལས་ མཇུག་འདི་འོག་ཐིག་གི་འབད་མཇུག་བསྡུ་དགོ།" +INSTL_DATABASE_TYPE_DESC="འདི་ གཅིག་འབདན་ "MySQLi" འོང་།" +INSTL_DATABASE_TYPE_LABEL="གནས་སྡུད་གཞི་མཛོད་ཀྱི་དབྱེ་ཁག" +INSTL_DATABASE_USER_DESC="གང་རུང༌ "root" ཡང་ན་ ལག་ལེན་པའི་མིང་འདི་ འགོ་འདྲེན་པ་གི་བྱིན་འོང་།" +INSTL_DATABASE_USER_LABEL="ལག་ལེན་པའི་མིང་།" + +;FTP view +INSTL_AUTOFIND_FTP_PATH=" ངམ་ངམ་ཤུགས་ཀྱིས་འཐོབ་ནིའི་ FTP འབྲེལ་ལམ།" +INSTL_FTP="FTP རིམ་སྒྲིག" +INSTL_FTP_DESC="

    ལ་ལུ་ སར་བར་(server)ལུ་ བཙུགས་བཞག་མཇུག་བསྡུ་ནི་དོན་ལུ་ FTP ཁྱད་ཚང༌ཚུ་ བྱིན་དགོ། ཁྱོད་ར་ འདི་ཁྱད་ཚང་མེད་པར་ བཙུགས་བཞག་འབད་ནིའི་དཀའ་ངལ་མཐོན་པ་ཅིན་ གལ་སྲིད་ ངེས་པར་དགོཔ་ཨིན་པ་ཅིན་ ཏན་ཏན་བཟོ་ནི་དོན་ལུ་ ཁྱོད་རའི་འགོ་འདྲེན་པ་དང་ཅིག་ཁར་ ཞིབ་དཔྱད་འབད།

    ཉེན་སྲུང་གི་དོན་ལུ་ ཡོངས་འབྲེལ་འཆར་སྒོའི་སར་བར་(server) ག་ར་གི་དོན་ལུ་མེན་པར་ ཇུམ་ལ་(Joomla!) བཙུགས་བཞག་རྐྱངམ་ཅིག་ ལྷོད་ལམ་གྱི་དོན་ལུ་ FTP ལག་ལེན་པའི་རྩིས་ཁྲ་སོ་སོ་བཟོ་ནི་འདི་ གལ་ཆེ། ཁྱོད་རའི་འགོ་འདྲེན་པ་གི་ ཁྱོད་ལུ་ཆ་རོགས་འབད་ཚུག།

    བརྗེད་ཐོ།: གལ་སྲིད་ Windows ལག་ལེན་རིམ་ལུགས་འདི་ བཙུགས་བཞག་འབད་བ་ཅིན་ FTP རིམ་པ་འདི་ མེད་ དགོ།

    " +INSTL_FTP_ENABLE_LABEL="FTP རིམ་པ་ ལཱ་འབད་ཚུགསཔ་བཟོ།" +INSTL_FTP_HOST_LABEL="FTP གི་འགོ་འདྲེན་པ།" +INSTL_FTP_PASSWORD_LABEL="FTP གསང་ཡིག།" +INSTL_FTP_PORT_LABEL="FTP དོང་།" +INSTL_FTP_ROOT_LABEL="FTP རྩ་བའི་འབྲེལ་ལམ།" +INSTL_FTP_SAVE_LABEL="FTP གསང་ཡིག་བསག་བཞག་འབད།" +INSTL_FTP_TITLE="FTP རིམ་སྒྲིག་ (གདམ་ཁ་ཅན།- ལག་ལེན་པ་མང་ཤོས་ཅིག་གི་ར་ འདི་རིམ་པ་བཀོ་བཞག་འོང་། - བཀོ་བཞག་ནི་དོན་ལུ་ ཤུལ་མམ་ལུ་ཨེབ།)" +INSTL_FTP_USER_LABEL="FTP ལག་ལེན་པའི་མིང་།" +INSTL_VERIFY_FTP_SETTINGS="FTP བཟོ་བཀོད་ཚུ་ བདེན་དཔྱད་འབད།" +INSTL_FTP_SETTINGS_CORRECT="བཟོ་བཀོད་ཚུ་ཀྲིག་ཀྲི་འདུག" +INSTL_FTP_USER_DESC="ཉེན་བརྡ། འ་ནི་འདི་ ས་སྟོང་བཞག་སྟེ་ ཁྱོད་རའི་ ཡིག་སྣོད་སྤོ་སོར་འབད་བའི་སྐབས་ FTP ལག་ལེན་པའི་མིང་བཙུགས་ནི་ལུ་ རྒྱབ་སྣོན་ཡོད།" +INSTL_FTP_PASSWORD_DESC="ཉེན་བརྡ། འ་ནི་འདི་ ས་སྟོང་བཞག་སྟེ་ ཁྱོད་རའི་ ཡིག་སྣོད་སྤོ་སོར་འབད་བའི་སྐབས་ FTP ལག་ལེན་པའི་མིང་བཙུགས་ནི་ལུ་ རྒྱབ་སྣོན་ཡོད།" + +;Site View +INSTL_SITE="རིམ་སྒྲིག་ངོ་མ།" +INSTL_ADMIN_EMAIL_LABEL="བདག་སྐྱོང༌པའི་གློག་འཕྲིན།" +INSTL_ADMIN_EMAIL_DESC="གློག་འཕྲིན་ཁ་བྱང་བཙུགས། འ་ནི་འདི་ ཡོངས་འབྲེལ་འཆར་སྒོའི་རྩ་ལག་ལག་ལེན་པ་གྱི་ གློག་འཕྲིན་ཁ་བྱང་ཨིན།" +INSTL_ADMIN_PASSWORD_LABEL="བདག་སྐྱོང་པའི་གསང་ཡིག" +INSTL_ADMIN_PASSWORD_DESC="རྩ་ལག་ལག་ལེན་པའི་རྩིས་ཁྲ་གི་དོན་ལུ་ གསང་ཡིག་བཟོ་སྟེ་ འོག་གི་ས་ཁོངས་ཚུ་ གཏན་འཁེལ་བཟོ།" +INSTL_ADMIN_PASSWORD2_LABEL="བདག་སྐྱོང་པའི་གསང་ཡིག་ གཏན་འཁེལ་བཟོ།" +INSTL_ADMIN_USER_LABEL="བདག་སྐྱོང་ ལག་ལེན་པའི་མིང་།" +INSTL_ADMIN_USER_DESC="ཁྱོད་རའི་ རྩ་ལག་ལག་ལེན་པའི་རྩིས་ཁྲ་གི་དོན་ལུ་ ལག་ལེན་པའི་མིང་བཟོ།" +INSTL_SITE_NAME_LABEL="ས་ཁོངས་མིང་།" +INSTL_SITE_NAME_DESC="ཁྱོད་རའི་ ཇོམ་ལ་(Joomla) ས་ཁོངས་ཀྱི་མིང་བཙུགས།" +INSTL_SITE_METADESC_LABEL="བཤད་པ།" +INSTL_SITE_METADESC_TITLE_LABEL="འཚོལ་ཞིབ་འཕྲུལ་ཨམ་གི་ལག་ལེན་འཐབ་ནི་དོན་ལུ་ ཡོངས་འབྲེལ་འཆར་སྒོའི་སྤྱིར་བཏང་གི་བཤད་པ་བཙུགས། སྤྱིར་བཏང་ལུ་ མིང་ཚིག་ ༢༠ ལས་ མ་མངམ་ཅིག་བཙུགས།" +INSTL_SITE_OFFLINE_LABEL="ཡོངས་འབྲེལ་འབྲེལ་མེད་ཀྱི་ས་ཁོངས།" +INSTL_SITE_OFFLINE_TITLE_LABEL="བཙུགས་བཞག་འབད་བཞིནམ་ལས་ གདོང་ཤོག་གི་ས་ཁོངས་ ཡོངས་འབྲེལ་འབྲེལ་མེད་བཟོ། རྒྱལ་སྤྱིའི་རིམ་སྒྲིག་ཐོག་ལས་ ཤུལ་ལས་ ས་ཁོངས་འདི་ ཡོངས་འབྲེལ་ འབྲེལ་ཡོད་བཟོ་བཏུབ།" +INSTL_SITE_INSTALL_SAMPLE_LABEL="གནས་སྡུད་དཔེ་ཚད་བཙུགས།" +INSTL_SITE_INSTALL_SAMPLE_DESC="འགོ་བཙུགས་མི་ཚུ་གི་དོན་ལུ་ གནས་སྡུད་དཔེ་ཚད་བཙུགས་ནི་འདི་ རྒྱབ་སྣོན་སྦོམ་ཡོད།
    འ་ནི་གི་ ཇུམ་ལ་ (Joomla) བཙུགས་བཞག་གི་ཡོངས་འཐུས་ནང་ལུ་ཡོད་མི་ བརྗོད་དོན་དཔེ་ཚད་འདི་བཙུགས་འོང་།" +INSTL_SITE_INSTALL_SAMPLE_NONE="ག་ཡང་མེནམ། (སྐྱེས་ལུང་གི་སྐད་སྣ་ལྡན་པའི་ས་ཁོངས་ གསར་བཙུགས་འབད་ནི་དོན་ལུ་དགོ།)" +INSTL_SAMPLE_BLOG_SET="དབྱིན་སྐད་(GB) བྲི་སྒོའི་ གནས་སྡུད་ཀྱི་དཔེ་ཚད།" +INSTL_SAMPLE_BROCHURE_SET="དབྱིན་སྐད་(GB) གནས་ཤོགའི་ གནས་སྡུད་ཀྱི་དཔེ་ཚད།" +INSTL_SAMPLE_DATA_SET="དབྱིན་སྐད་(GB) སྔ་སྒྲིགའི་ གནས་སྡུད་ཀྱི་དཔེ་ཚད།" +INSTL_SAMPLE_LEARN_SET="དབྱིན་སྐད་(GB) ཇུམ་ལ་གི་ གནས་སྡུད་ཀྱི་དཔེ་ཚད་འདི་ལྷབ།" +INSTL_SAMPLE_TESTING_SET="དབྱིན་སྐད་(GB)གི་ གནས་སྡུད་ཀྱི་དཔེ་ཚད་བརྟག་དཔྱད་འབད།" +INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="ཇུམ་ལ་(Joomla) འདི་ བརྗོད་དོན་ག་ནི་ཡང་མེད་པར་ གློག་རིམ་དཀར་ཆག་དང་ ནང་སྐྱོད་བཀང་ཤོག་རྐྱངམ་ཅིག་སྦེ་ བཙུགས་བཞག་འབད།" +INSTL_SAMPLE_BLOG_SET_DESC="ཇུམ་ལ་(Joomla) འདི་ རྩོམ་བྲིས་དག་པ་ཅིག་ དེ་ལས་བྲི་སྒོ་དང་འབྲེལ་བ་ཡོད་པའི་རིམ་ཚན་ (དཔྱེ་འབད་བ་ཅིན་ གསལ་བསྒྲགས་རྙིངམ། བྲི་སྒོ་མིང་ཐོ། གསལ་བསྒྲགས་མངམ་ལྷག་མི་ཚུ།) ཚུ་དང་ཅིག་ཁར་ བཙུགས་བཞག་འབད།" +INSTL_SAMPLE_BROCHURE_SET_DESC="ཇུམ་ལ་(Joomla) འདི་ཤོག་ལེབ་དག་པ་ཅིག་ (གློག་རིམ་དཀར་ཆག་འདི་ གདོང་ཤོག་ཤོག་ལེབ། ང་བཅས་སྐོར་ལས། གནས་ཚུལ། འབྲེལ་བ་འཐབ་ས།) དང་ རིམ་ཚན་(དཔྱེ་འབད་བ་ཅིན་ འཚོལ་ཞིབ། གོམས་འདྲིས་ ནང་སྐྱོད་འབྲི་ཤོག) ཚུ་དང་ཅིག་ཁར་ བཙུགས་བཞག་འབད། " +INSTL_SAMPLE_DATA_SET_DESC="ཇུམ་ལ་(Joomla) འདི་ཤོག་ལེབ་ཅིག་ (འབྲེལ་ལམ་ཡོད་པའི་གློག་རིམ་དཀར་ཆག) དང་ གློག་རིག་གི་རིམ་ཚན་ (དཔྱེ་འབད་བ་ཅིན་ རྩོམ་བྲིས་གསརཔ། ནང་སྐྱོད་འབྲི་ཤོག) ཚུ་དང་ཅིག་ཁར་ བཙུགས་བཞག་འབད།" +INSTL_SAMPLE_LEARN_SET_DESC="ཇུམ་ལ་(Joomla)འདི་ ཇུམ་ལ་ག་དེ་སྦེ་ ལཱ་འབདཝ་ཨིན་ན་གི་སྐོར་ལས་ འགྲེལ་བཤད་རྐྱབ་ཡོད་མི་རྩོམ་བྲིས་དང་ཅིག་ཁར་ བཙུགས་བཞག་འབད།" +INSTL_SAMPLE_TESTING_SET_DESC="ཇུམ་ལ་(Joomla) བརྟག་ཞིབ་ལེགས་ཤོམ་འབད་ནིའི་དོན་ལུ་ རྣམ་གྲངས་དཀར་ཆག་ག་ར་ཡོད་མི་དང་ཅིག་ཁར་ ཇུམ་ལ་བཙུགས་བཞག་འབད།" + +;Summary view +INSTL_FINALISATION="མཇུག་བསྡུ་ནི།" +INSTL_SUMMARY_INSTALL="བཙུགས།" +INSTL_SUMMARY_EMAIL_LABEL="གློག་འཕྲིན་རིམ་སྒྲིག" +INSTL_SUMMARY_EMAIL_DESC="བཙུགས་བཞག་འབད་བཞིནམ་ལས་ གློག་འཕྲིན་ཐོག་ལས་ རིམ་སྒྲིག་བཟོ་བཀོད་འབད་ནི་དོན་ལུ་ %s ལུ་བསྐྱལ།" +INSTL_SUMMARY_EMAIL_PASSWORDS_LABEL="གློག་ཕྲིན་ནང་ལུ་ གསང་ཡིག་བཙུགས།" +INSTL_SUMMARY_EMAIL_PASSWORDS_DESC="ཉེན་བརྡ། ཁྱོད་རའི་ གློག་ཕྲིན་ནང་ལུ་ གསང་ཡིག་བསྐྱལ་ནི་དང་ གསང་ཡིག་གློག་ཕྲིན་ནང་ལུ་བཙུགས་ནི་ལུ་ རྒྱབ་སྣོན་མེད།" + +;Installing view +INSTL_INSTALLING="བཙུགས་བཞག་འབད་དོ་་་་་་་" +INSTL_INSTALLING_DATABASE_BACKUP="གནས་སྡུད་གཞི་མཛོད་ཀྱི་རྫས་ཐོ་རྙིངམ་ཚུ་ རྒྱབ་སྣོན་བཟོ་དོ།" +INSTL_INSTALLING_DATABASE_REMOVE="གནས་སྡུད་གཞི་མཛོད་ཀྱི་རྫས་ཐོ་རྙིངམ་ཚུ་ བཏོན་གཏང་དོ།" +INSTL_INSTALLING_DATABASE="གནས་སྡུད་གཞི་མཛོད་ཀྱི་རྫས་ཐོ་ཚུ་ གསརཔ་བཟོ་དོ།" +INSTL_INSTALLING_SAMPLE="གནས་སྡུད་ཀྱི་དཔེ་ཚད་ བཙུགས་བཞག་འབད་དོ།" +INSTL_INSTALLING_CONFIG="ཡིག་སྣོད་རིམ་སྒྲིག་ གསརཔ་བཟོ་དོ།" +INSTL_INSTALLING_EMAIL="གློག་ཕྲིན་ %s ལུ་བསྐྱལ་དོ།" + +;Email +INSTL_EMAIL_SUBJECT="རིམ་སྒྲིག་ཁ་གསལ: %s" +INSTL_EMAIL_HEADING="ཇུམ་ལ་(Joomla)འི་ཡོངས་འབྲེལ་འཆར་སྒོ་ གསརཔ་གསལ་བཙུགས་འབད་མི་དོན་ལུ་ རིམ་སྒྲིག་བཟོ་བཀོད་ཚུ་འོག་ལུ་ཐོབ་ཚུགས།" +INSTL_EMAIL_NOT_SENT="གློག་ཕྲིན་འདི་བསྐྱལ་མ་ཚུགས།" + +;Complete view +INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="བདག་སྐྱོང༌ནང་སྐྱོད་ཀྱི་ཁ་གསལ།" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="བཙུགས་བཞག་གི་ཡིག་སྣོད་འདི་ ཧེ་མ་ལས་བཏོན་གཏང་ནུག" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_ERROR_FOLDER_DELETE="བཙུགས་བཞག་གི་ཡིག་སྣོད་འདི་ བཏོན་གཏང་མི་ཚུགས་པས། ཡིག་སྣོད་འདི་ལག་ཐོག་ལས་བཏོན་གཏང་གནང་།" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_FOLDER_REMOVED="བཙུགས་བཞག་གི་ཡིག་སྣོད་འདི་ ལེགས་ཤོམ་སྦེ་་བཏོན་གཏང་ཡི།" +INSTL_COMPLETE_LANGUAGE_1="ཁྱོད་རའི་སྐད་ཡིག་དང་ སྐད་སྣ་ལྡན་པའི་ནང་ལུ་ ཇུམ་ལ་(Joomla)གི་ས་ཁོངས་ གསར་བཙུགས།" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_LANGUAGE_DESC="བཙུགས་བཞག་གི་ཡིག་སྣོད་འདི་ བཏོན་མ་གཏང་བའི་ཧེ་མ་ སྐད་ཡིག་ཁ་སྐོང་བཙུགས་བཏུབ། ཁྱོད་ར་ ཇུམ་ལའི་(Joomla) ལག་ལེན་ནང་ལུ་ སྐད་ཡིག་ཁ་སྐོང་བཀལ་ནི་ཨིན་པ་ཅིན་ འོག་གི་འཕྲུལ་རྟ་འདི་ གདམ་ཁ་རྐྱབ།" +INSTL_COMPLETE_LANGUAGE_DESC2="བརྗེད་ཐོ།: ཁྱོད་ར་ ཇུམ་ལ་(Joomla) གནས་སྡུད་སྤོ་ནི་དང་ སྐད་ཡིག་གསརཔ་ཚུ་བཙུགས་ནི་དོན་ལུ་ གློག་རིག་ཡོངས་འབྲེལ་གྱི་ལྷོད་ལམ་དགོ།
    སར་བར་(server) རིམ་སྒྲིག་ལ་ལུ་ཅིག་གི་ ཇུམ་ལ་(Joomla)ལུ་ སྐད་ཡིག་ཚུ་བཙུགས་ནི་ལུ་ བཀག་ཆ་འབད་འོང་། ཁྱོད་ར་ འ་ནི་བཟུམ་གྱི་གནས་སྟངས་འབྱུང་སྲིད་པ་ཅིན་ ཚ་གྱང་མ་ལང་ ཤུལ་ལས་ ཇུམ་ལ་(Joomla) གི་བདག་སྐྱོང་པ་ལག་ལེན་འཐབ་ཏེ་ བཙུགས་བཞག་འབད་ཚུགས།" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_REMOVE_FOLDER="བཙུགས་བཞག་གི་ཡིག་སྣོད་འདི་ བཏོན་གཏང།" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_REMOVE_INSTALLATION="བཙུགས་བཞག་གི་ཡིག་སྣོད་འདི་ ཆ་ཚང་སྦེ་བཏོན་གཏང་ནི་ སེམས་ཁར་བཞག་གནང།
    བཙུགས་བཞག་གི་ཡིག་སྣོད་འདི་ བཏོན་མ་གཏང་ཚུན་ཚད་ འདི་ལས་གལ་ཏེ་ འཕྲོ་མཐུད་འགྱོ་མི་ཚུགས། འ་ནི་འདི་ ཇུམ་ལ་(Joomla)གི་ ཉེན་སྲུང་རྣམ་པ་ཨིན།" +INSTL_COMPLETE_TITLE="བཀྲིས་བདེ་ལེགས། ཇུམ་ལ་(Joomla)འདི་ ད་ལྟོ་བཙུགས་བཞག་འབད་ཡོདཔ།" +INSTL_COMPLETE_INSTALL_LANGUAGES="གོ་རིམ་ལྷན་ཐབས། : སྐད་ཡིག་ཚུ་བཙུགས་བཞག་འབད།" + +;Languages view +INSTL_LANGUAGES="སྐད་ཡིག་ཆ་ཚང་བཙུགས།" +INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="སྐད་ཡིག" +INSTL_LANGUAGES_COLUMN_HEADER_VERSION="ཐོན་རིམ།" +INSTL_LANGUAGES_DESC="ཇུམ་ལ་(Joomla)ངོ་བྱང་འདི་ སྐད་ཡིག་ལེ་ཤ་ཅིག་ནང་ལུ་ཐོབ་ཚུགས། ཁྱོད་ར་ གདམ་ཁ་ཅན་གྱི་སྐད་ཡིག་འདི་ གདམ་འཛིན་ནང་ལས་གདམ་ཁ་རྐྱབ་བཞིནམ་ལས་ ཤུལ་མམ་གྱི་འཕྲུལ་རྟ་འདི་ གདམ་ཁ་རྐྱབ་ཏེ་བཙུགས་བཞག་འབད།
    བརྗེད་ཐོ།: འ་ནི་གློག་རིག་ལས་སྤྱོད་ཀྱི་ སྐད་ཡིག་གནས་སྡུད་སྤོ་ནི་དང་བཙུགས་ནི་དོན་ལུ་ སྐར་ཆ་ ༡༠ དེ་ཅིག་འགོར་འོང་། འདི་ དུས་ཚད་མ་ལང་པའི་དཀའ་ངལ་ལས་འཛེམ་ནི་དོན་ལུ་ སྐད་ཡིག་བཙུགས་ནི་ ༣ ལས་མངམ་ གདམ་ཁ་མ་རྐྱབ། " +INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="འ་ནི་གློག་རིག་ལས་སྤྱོད་ཀྱི་ སྐད་ཡིག་ཅིག་བཟོ་ནིའི་དོན་ལུ་ སྐར་ཆ་ ༡༠ ཚུན་ཚད་འགོར་འོང་།
    སྐད་ཡིག་ཚུ་ གནས་སྡུད་སྤོ་བའི་སྐབས་དང་ བཙུགས་བཞག་འབད་བའི་སྐབས་ལུ་ སྒུག་གནང།" +INSTL_LANGUAGES_MORE_LANGUAGES="ཁྱོད་ར་ སྐད་ཡིག་ལེ་ཤ་བཙུགས་ནི་ཨིན་པ་ཅིན་ སྔོན་མའི་འཕྲུལ་རྟ་འདི་ ཨེབ་གནང།" +INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="བཙུགས་བཞག་འབད་ནིའི་དོན་ལུ་ སྐད་ཡིག་གདམ་ཁ་མ་རྐྱབ་ནུག ཁྱོད་ར་ སྐད་ཡིག་ལེ་ཤ་བཙུགས་ནི་ཨིན་པ་ཅིན་ སྔོན་མའི་འཕྲུལ་རྟ་འདི་ ཨེབ་ཏེ་ ཐོ་ཡིག་ནང་ལས་ གདམ་ཁ་ཅན་གྱི་སྐད་ཡིག་འདི་གདམ་ཁ་རྐྱབ།" +INSTL_LANGUAGES_WARNING_NO_INTERNET="ཇུམ་ལ་(Joomla)འདི་ སྐད་ཡིག་གི་སར་བར་(server)ལུ་ འབྲེལ་མཐུད་མ་ཚུགས། བཙུགས་བཞག་གི་བྱ་རིམ་ རྫོགས་གནང།" +INSTL_LANGUAGES_WARNING_NO_INTERNET2="བརྗེད་ཐོ།: ཤུལ་ལས་ ཁྱོད་ར་ ཇུམ་ལ་(Joomla)གི་བདག་སྐྱོང་པ་ལག་ལེན་འཐབ་ཏེ་ སྐད་ཡིག་ཚུ་བཙུགས་བཞག་འབད་ཚུགས།" +INSTL_LANGUAGES_WARNING_BACK_BUTTON="བཙུགས་བཞག་གི་བྱ་རིམ་མཇུག་ལུ་ ལོག་འགྱོ།" + +;Default language view +INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE="སྐད་སྣ་ལྡན་པའི་ངོ་བྱང་འདི་ ལག་ལེན་འཐབ་བཏུབ་བཟོ།" +INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="འདི་ལག་ལེན་འཐབ་བཏུབ་བཟོ་ཡོད་པ་ཅིན་ ཁྱོད་ཀྱི་ ཇུམ་ལ་(Joomla)ས་ཁོངས་འདི་ སྐད་ཡིག་བཙུགས་ཡོད་མི་རེ་རེ་ལུ་ གློག་རིམ་དཀར་ཆག་ས་གནས་ནང་མཁོད་དང་ཅིག་ཁར་ སྐད་སྣ་ལྡན་པའི་ངོ་བྱང་འབད་བཏུབ་བཟོ་དེ་འོང།" +INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN="སྐད་ཡིག་གསང་རྟགས་ཀྱི་པླག་ཨིན་(plugin)འདི་ འབད་ཚུགསཔ་བཟོ།" +INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN_DESC="འདི་འབད་ཚུགསཔ་བཟོ་ཡོད་པ་ཅིན་ SEO ཡར་དྲག་བཟོ་ནིའི་དོན་ལུ་ HTML ཡིག་ཆ་བཟོ་ཡོད་མི་ནང་ལུ་ སྐད་ཡིག་གསང་རྟགས་ཀྱི་པླག་ཨིན་(plugin)འདི་གི་ སྐད་ཡིག་གསང་རྟགས་སོར་ནི་ལུ་ ལྕོགས་གྲུབ་ཧེང་སྐལ་བཀལ་འོང་།" +INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="བདག་སྐྱོང་པ་གི་ སྔོན་སྒྲིག་སྐད་ཡིག" +INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="ཇུམ་ལ་(Joomla)འདི་ལུ་ སྔོན་སྒྲིག་གི་སྐད་ཡིག་བཙུགས་མ་བཏུབ། རྒྱབ་གནས་ཀྱི་བདག་སྐྱོང་པའི་དོན་ལུ་ དབྱིན་སྐད་ཀྱི་སྐད་ཡིག་འདི་ སྔོན་སྒྲིག་འབད་ ལག་ལེན་འཐབ་འོང།" +INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="ཇུམ་ལ་(Joomla)དེ་གི་ སྐད་ཡིག་ %s འདི་བདག་སྐྱོང་གི་སྔོན་སྒྲིག་སྐད་ཡིག་འབད་བཙུགས་ཅིག" +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="གདམ་ཁ་རྐྱབ།" +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="སྐད་ཡིག" +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="མིང་རྟགས།" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CONTENT_LANGUAGE="ཇུམ་ལ་(Joomla)དེ་གི་ བརྗོད་དོན་སྐད་ཡིག་ %s འདི་ངམ་ངམ་ཤུགས་ཀྱིས་འབད་ གསརཔ་བཟོ་མ་ཚུགས།" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU="ཇུམ་ལ་(Joomla)དེ་གི་ གློག་རིམ་དཀར་ཆག་ %s འདི་ངམ་ངམ་ཤུགས་ཀྱིས་འབད་ གསརཔ་བཟོ་མ་ཚུགས།" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_ITEM="ཇུམ་ལ་(Joomla)དེ་གི་ གདོང་ཤོག་གི་རྣམ་གྲངས་དཀར་ཆག་ %s འདི་ངམ་ངམ་ཤུགས་ཀྱིས་འབད་ གསརཔ་བཟོ་མ་ཚུགས།" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_MODULE="ཇུམ་ལ་(Joomla)དེ་གི་ གློག་རིམ་དཀར་ཆག་གི་རིམ་ཚན་ %s འདི་ངམ་ངམ་ཤུགས་ཀྱིས་འབད་ གསརཔ་བཟོ་མ་ཚུགས།" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CATEGORY="ཇུམ་ལ་(Joomla)དེ་གི་ བརྗོད་དོན་དབྱེ་བ་ %s འདི་ངམ་ངམ་ཤུགས་ཀྱིས་འབད་ གསརཔ་བཟོ་མ་ཚུགས།" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_ARTICLE="ཇུམ་ལ་(Joomla)དེ་གི་ ས་གནས་ནང་འཁོད་ཀྱི་རྩོམ་བྲིས་ %s འདི་ངམ་ངམ་ཤུགས་ཀྱིས་འབད་ གསརཔ་བཟོ་མ་ཚུགས།" +INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_MODULESWHITCHER_LANGUAGECODE="ཇུམ་ལ་(Joomla)དེ་གི་ སྐད་ཡིག་བརྗེ་སོར་གྱི་རིམ་ཚན་འདི ་ངམ་ངམ་ཤུགས་ཀྱིས་འབད་ དཔེ་སྐྲུན་འབད་མ་ཚུགས།" +INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGECODE="ཇུམ་ལ་(Joomla)དེ་གི་ སྐད་ཡིག་གསང་རྟགས་ཀྱི་པླག་ཨིན་(plugin)འདི ་ངམ་ངམ་ཤུགས་ཀྱིས་འབད་ འབད་ཚུགསཔ་བཟོ་མ་ཚུགས།" +INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGEFILTER="ཇུམ་ལ་(Joomla)དེ་གི་ སྐད་ཡིག་སེལ་ཚགས་ཀྱི་པླག་ཨིན་(plugin)འདི ་ངམ་ངམ་ཤུགས་ཀྱིས་འབད་ འབད་ཚུགསཔ་བཟོ་མ་ཚུགས།" +INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="ཇུམ་ལ་(Joomla)ལུ་ སྐད་ཡིག་ %s བཙུགས་བཞག་འབད་མ་ཚུགས།" +INSTL_DEFAULTLANGUAGE_COULD_NOT_PUBLISH_MOD_MULTILANGSTATUS="ཇུམ་ལ་(Joomla)དེ་གི་ སྐད་ཡིག་གནས་རིམ་གྱི་རིམ་ཚན་འདི་ ངམ་ངམ་ཤུགས་ཀྱིས་འབད་ དཔེ་སྐྲུན་འབད་མ་ཚུགས།" +INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="ཇུམ་ལ་(Joomla)དེ་གི་ སྔོན་སྒྲིག་གི་གློག་རིམ་དཀར་ཆག་རིམ་ཚན་འདི་ ངམ་ངམ་ཤུགས་ཀྱིས་འབད་ དཔེ་སྐྲུན་མ་འབདཝ་ བཟོ་མ་ཚུགས།" +INSTL_DEFAULTLANGUAGE_DESC="ཇུམ་ལ་(Joomla)ལུ་ འོག་གི་སྐད་ཡིག་འདི་ཚུ་ བཙུགས་བཞག་འབད་ནུག། ཇུམ་ལའིབདག་སྐྱོང་གི་དོན་ལུ་ གདམ་ཁ་ཅན་གྱི་སྐད་ཡིག་འདི་གདམ་ཁ་རྐྱབ་གནང།" +INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="ཇུམ་ལ་(Joomla)ལུ་ འོག་གི་སྐད་ཡིག་འདི་ཚུ་ བཙུགས་བཞག་འབད་ནུག། ཇུམ་ལའི་གདོང་ཤོག་་གི་དོན་ལུ་ གདམ་ཁ་ཅན་གྱི་སྐད་ཡིག་འདི་གདམ་ཁ་རྐྱབ་གནང།" +INSTL_DEFAULTLANGUAGE_FRONTEND="ས་ཁོངས་ཀྱི་སྔོན་སྒྲིག་སྐད་ཡིག" +INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="ཇུམ་ལ་(Joomla)འདི་ལུ་ སྔོན་སྒྲིག་གི་སྐད་ཡིག་བཙུགས་མ་བཏུབ། གདོང་ཤོག་གི་ས་ཁོངས་དོན་ལུ་ དབྱིན་སྐད་ཀྱི་སྐད་ཡིག་འདི་ སྔོན་སྒྲིག་འབད་ ལག་ལེན་འཐབ་འོང།" +INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="ཇུམ་ལ་(Joomla)དེ་གི་ སྐད་ཡིག་ %s འདི་ས་ཁོངས་ཀྱི་སྔོན་སྒྲིག་སྐད་ཡིག་འབད་བཙུགས་ཅིག" +INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="ས་གནས་ནང་འཁོད་ཀྱི་བརྗོད་དོན་འདི་བཙུགས།" +INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="འདི་ལག་ལེན་འཐབ་བཏུབ་བཟོ་ཡོད་པ་ཅིན་ སྐད་ཡིག་བཙུགས་ཡོད་མི་རེ་རེ་ལུ་ བརྗོད་དོན་གྱི་དབྱེ་ཁག་གསརཔ་ ངམ་ངམ་ཤུགས་ཀྱི་བཟོ་འོང། འདི་ཅིག་ཁར་ དབྱེ་ཁག་རེ་རེ་ལུ་ རྩོམ་བྲིས་ངོ་བྱང་ཡོད་མི་ གཞི་དཔེ་གི་བརྗོད་དོན་འདི་ གསརཔ་བཟོ་འོང།" +INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="སྐད་སྣ།" +INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="འ་ནི་ཚ་ཚན་འདི་གི་ ཇུམ་ལ་(Joomla)སྐད་སྣའི་ངོ་བྱང་ ངམ་ངམ་ཤུགས་ཀྱི་ལག་ལེན་འཐབ་བཏུབ་བཟོ་ནི་ལུ་ འབད་བཅུག་འོང།" +INSTL_DEFAULTLANGUAGE_TRY_LATER="ཤུལ་ལས་ ཁྱོད་ར་ཇུམ་ལ་(Joomla)གི་བདག་སྐྱོང་པ་ལག་ལེན་འཐབ་ཏེ་ བཙུགས་བཞག་འབད་ཚུགས།" + +; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español +INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="རྫོང་ཁ་ (BT)" + +;Database Model +INSTL_DATABASE_COULD_NOT_CONNECT="གནས་སྡུད་གཞི་མཛོད་ལུ་ མཐུད་མ་ཚུགས། འབྲེལ་མཐུད་ལོག་མི་གྱངས་ཁ་ : %s" +INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="བཙུགས་བཞག་འབད་མི་ གསལ་བཀོད་ཅན་གྱི་གནས་སྡུད་གཞི་མཛོད་ལུ་ མཐུད་མ་ཚུགསཔ་མ་ཚད་ གནས་སྡུད་གཞི་མཛོད་གསརཔ་ཡང་བཟོ་མ་ཚུགས། ཁྱོད་རའི་ བཟོ་བཀོད་འདི་བདེན་དཔྱད་འབད་ དེ་ལས་ གནས་སྡུད་གཞི་མཛོད་ངེས་པར་དུ་དགོཔ་ཡོད་པ་ཅིན་ གསརཔ་བཟོ་གནང།" +INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="ཡིག་སྣོད་བརྡ་ཡིག་དོན་ལུ་ གསལ་སྟོན་གྱི་དྲན་མཛོད་འདི་ ཁ་གསོ་མ་ཚུགས་ : %s" +INSTL_DATABASE_EMPTY_NAME="" +INSTL_DATABASE_ERROR_BACKINGUP="གནས་སྡུད་གཞི་མཛོད་ཀྱི་རྒྱབ་སྣོན་འབད་བའི་སྐབས་ འཛོལ་བ་དག་པ་ཅིག་མཐོན་ཡི།" +INSTL_DATABASE_ERROR_CREATE="གནས་སྡུད་གཞི་མཛོད་ %s བཟོ་ནི་འབད་བའི་སྐབས་ འཛོལ་བ་མཐོན་ཡོད།
    ལག་ལེན་པ་འདི་ གནས་སྡུད་གཞི་མཛོད་གསརཔ་བཟོ་ནིའི་དོན་ལུ་ ཁེ་དབང་མེད་བཟུམ་འདུག། ཇུམ་ལ་(Joomla) བཙུགས་བཞག་མ་འབད་བའི་ཧེ་མ་ དགོས་མཁོ་ཅན་གྱི་གནས་སྡུད་གཞི་མཛོད་འདི་ གསརཔ་སོ་སོ་སྦེ་བཟོ་དགོཔ་འོང།" +INSTL_DATABASE_ERROR_DELETE="འཛོལ་བ་ལ་ལུ་ གནས་སྡུད་གཞི་མཛོད་བཏོན་གཏང་བའི་སྐབས་འབྱུང་ནུག" +INSTL_DATABASE_FIELD_VALUE_REMOVE="བཏོན་གཏང།" +INSTL_DATABASE_FIELD_VALUE_BACKUP="རྒྱབ་སྣོན།" +INSTL_DATABASE_FIX_TOO_LONG="མའི་ཨེས་ཀིཝ་ཨེལ་(MySQL) རྫས་ཐོའི་སྔོན་ཚིག་འདི་ ཁྱད་ཆོས་མཐོ་ཤོས་ ༡༥ དགོ།" +INSTL_DATABASE_INVALID_DB_DETAILS="གནས་སྡུད་གཞི་མཛོད་ཀྱི་ཁ་གསལ་བཀལ་ཡོད་མི་འདི་ འཛོལ་བ་ ཡང་ན་ སྟོངམ་འདུག" +INSTL_DATABASE_INVALID_MYSQL_VERSION="ཁྱོད་ར་ བཙུགས་བཞག་འཕྲོ་མཐུད་འབད་ནིའི་དོན་ལུ་ མའི་ཨེས་ཀིཝ་ཨེལ་(MySQL) ༥.༠.༤ ཡང་ན་ འདི་ལས་མཐོ་ཤོས་དགོ། ཁྱོད་ཀྱི་ ཐོན་རིམ་འདི་ %s" +INSTL_DATABASE_INVALID_MYSQLI_VERSION="ཁྱོད་ར་ བཙུགས་བཞག་འཕྲོ་མཐུད་འབད་ནིའི་དོན་ལུ་ མའི་ཨེས་ཀིཝ་ཨེལ་(MySQL) ༥.༠.༤ ཡང་ན་ འདི་ལས་མཐོ་ཤོས་དགོ། ཁྱོད་ཀྱི་ ཐོན་རིམ་འདི་ %s" +INSTL_DATABASE_INVALID_PDOMYSQL_VERSION="ཁྱོད་ར་ བཙུགས་བཞག་འཕྲོ་མཐུད་འབད་ནིའི་དོན་ལུ་ མའི་ཨེས་ཀིཝ་ཨེལ་(MySQL) ༥.༠.༤ ཡང་ན་ འདི་ལས་མཐོ་ཤོས་དགོ། ཁྱོད་ཀྱི་ ཐོན་རིམ་འདི་ %s" +INSTL_DATABASE_INVALID_POSTGRESQL_VERSION="ཁྱོད་ར་ བཙུགས་བཞག་འཕྲོ་མཐུད་འབད་ནིའི་དོན་ལུ་ PostgreSQL ༨.༣.༡༨ ཡང་ན་ འདི་ལས་མཐོ་ཤོས་དགོ། ཁྱོད་ཀྱི་ ཐོན་རིམ་འདི་ %s" +INSTL_DATABASE_INVALID_SQLSRV_VERSION="ཁྱོད་ར་ བཙུགས་བཞག་འཕྲོ་མཐུད་འབད་ནིའི་དོན་ལུ་ ཨེས་ཀིཝ་ཨེལ་སར་བར་(SQL Server) ༢༠༠༨ R2 (10.50.1600.1) ཡང་ན་ འདི་ལས་མཐོ་ཤོས་དགོ། ཁྱོད་ཀྱི་ ཐོན་རིམ་འདི་ %s" +INSTL_DATABASE_INVALID_SQLZURE_VERSION="ཁྱོད་ར་ བཙུགས་བཞག་འཕྲོ་མཐུད་འབད་ནིའི་དོན་ལུ་ ཨེས་ཀིཝ་ཨེལ་སར་བར་(SQL Server) ༢༠༠༨ R2 (10.50.1600.1) ཡང་ན་ འདི་ལས་མཐོ་ཤོས་དགོ། ཁྱོད་ཀྱི་ ཐོན་རིམ་འདི་ %s" +INSTL_DATABASE_INVALID_TYPE="གནས་སྡུད་གཞི་མཛོད་ཀྱི་དབྱེ་ཁག་ གདམ་ཁ་རྐྱབ་གནང།" +INSTL_DATABASE_NAME_TOO_LONG="མའི་ཨེས་ཀིཝ་ཨེལ་(MySQL) གནས་སྡུད་གཞི་མཛོད་ཀྱི་མིང་འདི་ ཁྱོད་ཆོས་ མཐོ་ཤོས་ར་ ༦༤ དགོ།" +INSTL_DATABASE_INVALID_NAME="མའི་ཨེས་ཀིཝ་ཨེལ་(MySQL)གི་ཐོན་རིམ་ ༥.༡.༦ གི་ཧེ་མམ་ཚུ་གི་ མིང་ནང་ལུ་ ཐུན་ཚད་ཀྱི་ཁྱོད་ཆོས་ ཡང་ན་ "རྩ་ཅན་" གྱི་ཁྱོད་ཆོས་ཚུ་ མེད་འོང་ནི་བཟུམ་ཅིག་ཨིན། ཁྱོད་ཀྱི་ཐོན་རིམ་འདི་ %s" +INSTL_DATABASE_NAME_INVALID_SPACES="མའི་ཨེས་ཀིཝ་ཨེལ་(MySQL) གནས་སྡུད་གཞི་མཛོད་ཀྱི་མིང་དང་ རྫས་ཐོའི་མིང་ཚུ་ འགོ་དང་མཇུག་ལུ་ས་སྟོང༌བཞག་མ་ཆོགཔ་བཟུམ་ཨིན།" +INSTL_DATABASE_NAME_INVALID_CHAR="མའི་ཨེས་ཀིཝ་ཨེལ་(MySQL) ངོ་སྟོན་འདི་ཚུ་ནང་ལུ་ སྟོང་པ(NULL ASCII(0x00)) འོང་ནི་མི་འོང།" +INSTL_DATABASE_FILE_DOES_NOT_EXIST="ཡིག་སྣོད་ %s འདི་མིན་འདུག" + +;controllers +INSTL_COOKIES_NOT_ENABLED="ཁྱོད་ཀྱི་ཡོངས་འབྲེལ་འཚོལ་སྒོའི་ལས་མགྲོན་ནང་ལུ་ ཀུ་ཀིས་(Cookies) འབད་ཚུགསཔ་བཟོ་ཡོདཔ་མེད་མཐོན་པས། ངོ་བྱང་འབད་མ་ཚུགསཔ་བཟོ་ཡོདཔ་ལས་སྟེན་ ཁྱོད་ཀྱི་འཇུག་ཐངས་འདི་ བཙུགས་བཞག་འབད་མི་ཚུགས་པས། གཞན་སོ་སོ་ཡང་ བར་སར་(server)གྱི་འབྲེལ་མཐུད་ session.save_path ལུ་ཡང་དཀའ་ངལ་ཡོདཔ་འོང། དེ་སྦེ་ཨིན་པའི་ཁར་ ཁྱོད་ར་གི་ ཉམས་བཅོས་འབད་མ་ཚུགས་པ་ཅིན་ ཡོངས་འབྲེལ་བྱིན་མི་འགོ་འདྲེན་པ་དང་ཅིག་ཁར་ འབྲེལ་བ་འཐབ་གནང།" +INSTL_HEADER_ERROR="འཛོལ་བ།" + +;Helpers +INSTL_PAGE_TITLE="ཇུམ་ལ་(Joomla!) ཡོངས་འབྲེལ་འཆར་སྒོ་བཙུགས་མི།" + +;Configuration model +INSTL_ERROR_CONNECT_DB="གནས་སྡུད་གཞི་མཛོད་ལུ་ མཐུད་མ་ཚུགས། འབྲེལ་མཐུད་ལོག་མི་གྱངས་ཁ་ : %s" +INSTL_STD_OFFLINE_MSG="ས་ཁོངས་ཉམས་བཅོས་ཀྱི་དོན་ལུ་ ལག་ལེན་འཐབ་མ་བཏུབ་བཟོ་ཡོད།
    མགྱོགས་པར་ར་ ལོག་སྟེ་ཞིབ་དཔྱད་འབད་གནང།" + +;FTP model +INSTL_FTP_INVALIDROOT="གསལ་བཀོད་འབད་ཡོད་པའི་ ཨེབ་ཀྲི་པི་(FTP)གི་ཡིག་སྣོད་འདི་ ཇུམ་ལ་(Joomla)བཙུགས་བཞག་འབད་ནིའི་ཡིག་སྣོད་མེན་འབད།" +INSTL_FTP_NOCONNECT="ཨེབ་ཀྲི་པི་སར་བར་(FTP Server) ལུ་མཐུད་མི་ཚུགས་པས།" +INSTL_FTP_NODELE="ལས་རིམ་ "DELE" འདི་ མཐར་འཁྱོལ་མ་ཚུགས།" +INSTL_FTP_NODIRECTORYLISTING="ཨེབ་ཀྲི་པི་སར་བར་(FTP Server) ལས་ཐོ་བཀོད་འབད་ནི་ཡིག་སྣོད་འདི་ སླར་གསོ་འབད་མ་ཚུགས།" +INSTL_FTP_NOLIST="ལས་རིམ་ "LIST" འདི་ མཐར་འཁྱོལ་མ་ཚུགས།" +INSTL_FTP_NOLOGIN="ཨེབ་ཀྲི་པི་སར་བར་(FTP Server) ནང་ལུ་ནང་སྐྱོད་འབད་མ་ཚུགས་པས།" +INSTL_FTP_NOMKD="ལས་རིམ་ "MKD" འདི་ མཐར་འཁྱོལ་མ་ཚུགས།" +INSTL_FTP_NONLST="ལས་རིམ་ "NLST" འདི་ མཐར་འཁྱོལ་མ་ཚུགས།" +INSTL_FTP_NOPWD="ལས་རིམ་ "PWD" འདི་ མཐར་འཁྱོལ་མ་ཚུགས།" +INSTL_FTP_NORETR="ལས་རིམ་ "RETR" འདི་ མཐར་འཁྱོལ་མ་ཚུགས།" +INSTL_FTP_NORMD="ལས་རིམ་ "RMD" འདི་ མཐར་འཁྱོལ་མ་ཚུགས།" +INSTL_FTP_NOROOT="གསལ་བཀོད་འབད་ཡོད་པའི་ ཨེབ་ཀྲི་པི་(FTP)གི་ཡིག་སྣོད་འདི་ ལག་ལེན་འཐབ་མ་ཚུགས་པས།" +INSTL_FTP_NOSTOR="ལས་རིམ་ "STOR" འདི་ མཐར་འཁྱོལ་མ་ཚུགས།" +INSTL_FTP_NOSYST="ལས་རིམ་ "SYST" འདི་ མཐར་འཁྱོལ་མ་ཚུགས།" +INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="ཨེབ་ཀྲི་པི་(FTP)གི་རྩ་ལག་ཡིག་སྣོད་འདི་ ངམ་ཤུགས་ཀྱིས་མཐོང་ནི་བཟོ་མི་ཚུགས།" + +;others +INSTL_CONFPROBLEM="ཁྱོད་ཀྱི་ རིམ་སྒྲིག་གི་ཡིག་སྣོད་འདི་ བྲི་བཏུབ་མི་མེན་པས་ ཡང་ན་ རིམ་སྒྲིག་གི་ཡིག་སྣོད་བཟོ་བའི་སྐབས་ དཀའ་ངལ་སྡོད་ནུག། འོག་གི་གསང་ཡིག་འདི་ཚུ་ ཁྱོད་ར་ ལགཔ་གི་བཙུགས་དགོ། ཚིག་ཡིག་ས་ཁོངས་ནང་ལས་ གསང་ཡིག་འདི་གདམ་ཁ་རྐྱབ་ཏེ་ གཙོ་རྟགས་བཀལ་ དེ་ལས་ ཡིག་སྣོད་གསརཔ་ནང་ལུ་བཙུགས། ཡིག་སྣོད་ཀྱི་མིང་ 'configuration.php' བཟོ་སྟེ་ ས་ཁོངས་རྩ་ལག་གི་ཡིག་སྣོད་ནང་ལུ་བཙུགས།" +INSTL_DATABASE_SUPPORT="གནས་སྡུད་གཞི་མཛོད་ཀྱི་རྒྱབ་རྟེན།:" +INSTL_DISPLAY_ERRORS="འཛོལ་བ་ཚུ་གསལ་སྟོན་འབད།" +INSTL_ERROR_DB="འཛོལ་བ་ལ་ལུ་ གནས་སྡུད་གཞི་མཛོད་གསརཔ་བཟོ་བའི་སྐབས་འབྱུང་། : %s" +INSTL_ERROR_INITIALISE_SCHEMA="གནས་སྡུད་གཞི་མཛོད་དབྱེ་ཁག་ལུ་ གསརཔ་བཙུགས་མི་ཚུགས་པས།" +INSTL_FILE_UPLOADS="ཡིག་སྣོད་ཚུ་བཙུགས་ནི།" +INSTL_GNU_GPL_LICENSE="GNU སྤྱིར་བཏང་མི་སེར་གྱི་ཆོག་ཐམ།" +INSTL_JSON_SUPPORT_AVAILABLE="JSON རྒྱབ་རྟེན།" +INSTL_MAGIC_QUOTES_GPC="སྒྱུ་མའི་དཔེ་བཀོད་ GPC འདི་ངོས་ལེན་མེདཔ།" +INSTL_MAGIC_QUOTES_RUNTIME="སྒྱུ་མའི་དཔེ་བཀོད་རྒྱུ་ལམ་གྱི་དུས།" +INSTL_MB_LANGUAGE_IS_DEFAULT="སྐད་ཡིག་ MB འདི་སྔོན་སྒྲིག་ཨིན།" +INSTL_MB_STRING_OVERLOAD_OFF="རྗོད་ཚིག་ MB གི་མང་དྲགས་འདི་ ངོས་ལེན་མེདཔ།" +INSTL_NOTICEMBLANGNOTDEFAULT="སྐད་ཡིག་ PHP mbstring འདི་བར་གནས་ལུ་མ་བཟོ་ནུག། འ་ནི་འདི་ .htaccess གི་ཡིག་སྣོད་ནང་ལུ་ ས་གནས་ལས་ php_value mbstring.language བར་གནས་ འདི་བཙུགས་ཚུགས།" +INSTL_NOTICEMBSTRINGOVERLOAD="PHP mbstring ལས་རིམ་ལུ་ མང་དྲགས་འདི་བཟོ་ནུག། འ་ནི་འདི་ .htaccess གི་ཡིག་སྣོད་ནང་ལུ་ ས་གནས་ལས་ php_value mbstring.language བར་གནས་ འདི་ངོས་ལེན་མེདཔ་བཟོ་ཚུགས།" +INSTL_NOTICEYOUCANSTILLINSTALL="
    རིམ་སྒྲིག་བཟོ་བཀོད་འདི་མཇུག་ལུ་གསལ་སྟོན་འབད་ནི་ཨིནམ་ལས་ ཁྱོད་ར་ བཙུགས་བཞག་འདི་ད་ལྟོ་ཡང༌འཕྲོ་མཐུད་འབད་ཚུགས། ཁྱོད་ར་ གསང་ཚིག་འདི་ལགཔ་གི་འབད་ བཙུགས་དགོ། ཚིག་ཡིག་ས་ཁོངས་ནང་ལས་ གསང་ཡིག་འདི་གདམ་ཁ་རྐྱབ་ཏེ་ གཙོ་རྟགས་བཀལ་ དེ་ལས་ ཡིག་སྣོད་གསརཔ་ནང་ལུ་བཙུགས། ཡིག་སྣོད་ཀྱི་མིང་ 'configuration.php' བཟོ་སྟེ་ ས་ཁོངས་རྩ་ལག་གི་ཡིག་སྣོད་ནང་ལུ་བཙུགས།" +INSTL_OUTPUT_BUFFERING="གྲུབ་འབྲསའི་བར་ཤུགས་བཟེད་མི།" +INSTL_PARSE_INI_FILE_AVAILABLE="INI པར་སར་(Parser) རྒྱབ་རྟེན།" +INSTL_PHP_VERSION="PHP ཐོན་རིམ།" +INSTL_PHP_VERSION_NEWER="PHP ཐོན་རིམ། >= %s" +INSTL_REGISTER_GLOBALS="རྒྱལ་སྤྱིའི་ཐོ་བཀོད་ཚུ་ ངོས་ལེན་མེདཔ་བཟོ།" +INSTL_SAFE_MODE="ཉེན་སྲུང་ཅན་གྱི་ལམ་ལུགས།" +INSTL_SESSION_AUTO_START="ནམ་དུས་ ངམ་ཤུགས་ཀྱི་འགོ་བཙུགས།" +INSTL_WRITABLE="%s འདི་བྲི་བཏུབ་མི།" +INSTL_XML_SUPPORT="XML རྒྱབ་རྟེན།" +INSTL_ZIP_SUPPORT_AVAILABLE="བྱུང་བའི་ ZIP གི་རྒྱབ་རྟེན།" +INSTL_ZLIB_COMPRESSION_SUPPORT="Zlib སྨན་རས་ཀྱི་རྒྱབ་རྟེན།" +INSTL_PROCESS_BUSY="བྱ་རིམ་འདི་ཡར་རྒྱས་འགྱོ་དེ་་། ཨ་ཙི་ཅིག་སྒུག་གནང།" + +;Global strings +JADMINISTRATOR="བདག་སྐྱོང་པ།" +JCHECK_AGAIN="ལོག་སྟེན་ཞིབ་དཔྱད་འབད།" +JERROR="འཛོལ་བ།" +JEMAIL="གློག་འཕྲིན།" +JGLOBAL_ISFREESOFTWARE="གློག་རིག་མཉེན་ཆས་ %s འདི་ %s གི་འོག་ལུ་གསར་བཏོན་འབད་ཡོདཔ།" +JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="སྐད་ཡིག་ཆ་ཚང༌འདི་ འ་ནི་ཇུམ་ལ་(Joomla)གི་ཐོན་རིམ་དང་ཅིག་ཁར་ མཐུན་འགྲིགས་མིན་འདུག། རྗོད་ཚིག་ལ་ལུ་འདི་མ་ཚངམ་འོང།" +JGLOBAL_SELECT_AN_OPTION="གདམ་ཁ་ནང་ལས་གདམ་ཁ་རྐྱབ།" +JGLOBAL_SELECT_NO_RESULTS_MATCH="གྲུབ་འབྲས་གཅིག་ཡང་ མི་མཐུན་པས། " +JGLOBAL_SELECT_SOME_OPTIONS="གདམ་ཁ་ཚུ་ལས་ལ་ལུ་གདམ་ཁ་རྐྱབ།" +JINVALID_TOKEN="འཕྲལ་གྱི་ཞུ་བ་ནང་ལུ་ ཆ་གནས་མེད་པའི་ཉེན་སྲུང༌གི་བརྡ་མཚོན་ཡོདཔ་ལས་ ཁས་ལེན་མེད་འབད། ཤོག་ལེབ་འདི་ཁ་གསོ་བཞིནམ་ལས་ ལོག་སྟེ་དཔའ་བཅམ།" +JNEXT="ཤུལ་མམ།" +JNO="མེན།" +JNOTICE="གསལ་བསྒྲགས། " +JOFF="ངོས་ལེན་འབད་མ་ཚུགསཔ་བཟོ།" +JON="ངོས་ལེན་འབད་ཚུགསཔ་བཟོ།" +JPREVIOUS="ཧེ་མ།" +JSITE="ས་ཁོངས།" +JUSERNAME="ལག་ལེན་པའི་མིང།" +JYES="ཨིན།" + +; Framework strings necessary when no lang pack is available +JLIB_DATABASE_ERROR_CONNECT_MYSQL="མའི་ཨེས་ཀིཝ་ཨེལ་(MySQL) ལུ་མཐུད་མ་ཚུགས།" +JLIB_DATABASE_ERROR_DATABASE="གནས་སྡུད་གཞི་མཛོད་ལུ་འཛོལ་བ་འབྱུང་ཡི།" +JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="གནས་སྡུད་གཞི་མཛོད་ཀྱི་ ལྷག་འཛིནམ་འདི་བཙུགས་མ་ཚུགས། : %s" +JLIB_ENVIRONMENT_SESSION_EXPIRED="དུས་ཡུན་འདི་ཛོགས་སོ་ནུག་ ཤོག་ལེབ་འདི་ལོག་སྟེ་བཏོན་གནང།" +JLIB_FILESYSTEM_ERROR_COPY_FAILED="འདྲ་བཤུས་རྐྱབ་མ་ཚུགས།" +JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :ཡིག་སྣོད་ཚུ་ : འབྲེལ་ལམ་འདི་ཡིག་སྣོད་མེན་པས། འབྲེལ་ལམ་ : %s" +JLIB_FORM_FIELD_INVALID="ཆ་གནས་མེད་པའི་སཁོངས་ : " +JLIB_FORM_VALIDATE_FIELD_INVALID="ཆ་གནས་མེད་པའི་སཁོངས་ : %s" +JLIB_FORM_VALIDATE_FIELD_REQUIRED="ས་ཁོངས་དགོཔ་ : %s" +JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :བཙུགས་བཞག་འབད་ : ཡིག་སྣོད་ %1$s ལས་ %2$s ལུ་ འདྲ་བཤུས་རྐྱབ་ནི་མཐར་འཁྱོལ་མ་ཚུགས།" +JLIB_INSTALLER_NOT_ERROR="འཛོལ་བ་འདི་ TinyMCE སྐད་ཡིག་གི་ཡིག་སྣོད་ཚུ་ བཙུགས་བཞག་འབད་སྐབས་ཀྱི་ཨིན་པ་ཅིན་ སྐད་ཡིག་བཙུགས་ནི་ལུ་ བྱེམ་མི་འབྱུང་། སྐད་ཡིག་གི་ཆ་ཚང་བཟོ་བའི་སྐབས་ ཇུམ་ལ་(Joomla) ༣.༢.༠ དང་ཅིག་ཁར་སྔ་གོང་སྟེ་བཟོ་ཡོདཔ་ལས་ TinyMCE སྐད་ཡིག་གི་ཡིག་སྣོད་ཚུ་སོ་སོ་འབད་ བཙུགས་བཞག་འབད། ད་འདི་ ནང་སྙིང་ནང་ལུ་བཙུགས་ཡོདཔ་ལས་ བཙུགས་བཞག་འབད་མེད་དགོ།" +JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: གནས་སྡུད་གཞི་མཛོད་ལུ་མཐུད་མ་ཚུགས།
    joomla.library: %1$s - %2$s" + +; Strings for the language debugger +JDEBUG_LANGUAGE_FILES_IN_ERROR="སྐད་ཡིག་ཡིག་སྣོད་བཟོ་ནི་ལུ་ འཛོལ་བ་འབྱུང་ཡི།" +JDEBUG_LANGUAGE_UNTRANSLATED_STRING="སྐད་སྒྱུར་མ་རྐྱབ་ཡོད་མི་རྗོད་ཚིག་ཚུ།" +JNONE="ག་ཡང་མེནམ།" + +; Necessary for errors +ADMIN_EMAIL="བདག་སྐྱོང་པའི་གློག་འཕྲིན།" +ADMIN_PASSWORD="བདག་སྐྱོང་པའི་གསང་ཡིག།" +ADMIN_PASSWORD2="བདག་སྐྱོང་པའི་གསང་ཡིག་ཏན་ཏན་བཟོ།" +SITE_NAME="ས་ཁོངས་ཀྱི་མིང།" + +; Database types (allows for a more descriptive label than the internal name) +MYSQL="MySQL" +MYSQLI="MySQLi" +ORACLE="Oracle" +PDOMYSQL="MySQL (PDO)" +POSTGRESQL="PostgreSQL" +SQLAZURE="Microsoft SQL Azure" +SQLITE="SQLite" +SQLSRV="Microsoft SQL Server" \ No newline at end of file diff --git a/installation/language/dz-BT/dz-BT.xml b/installation/language/dz-BT/dz-BT.xml new file mode 100644 index 0000000000000..c1f8e2c127f5e --- /dev/null +++ b/installation/language/dz-BT/dz-BT.xml @@ -0,0 +1,21 @@ + + + Dzongkha (Bhutan) + 3.5.0 + November 2015 + Dzongkha Translation Team + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + GNU General Public License version 2 or later; see LICENSE.txt + + + dz-BT.ini + + + Dzongkha (Bhutan) + dz-BT + 0 + + + diff --git a/installation/language/el-GR/el-GR.ini b/installation/language/el-GR/el-GR.ini index c63e8b71d6afb..f5b494fc2b600 100644 --- a/installation/language/el-GR/el-GR.ini +++ b/installation/language/el-GR/el-GR.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/el-GR/el-GR.xml b/installation/language/el-GR/el-GR.xml index 62146c859bf76..2a3ddf5aae801 100644 --- a/installation/language/el-GR/el-GR.xml +++ b/installation/language/el-GR/el-GR.xml @@ -6,11 +6,8 @@ 3.4.2 2015-06-13 Greek translation team : joomla.gr - joomla@joomla.gr - http://www.joomla.gr Copyright (C) 2005 - 2013 joomla.gr και Open Source Matters. All rights reserved. GNU General Public License έκδοση 2 ή νεότερη· δες LICENSE.txt - Greek language pack for Joomla! 3.4.2 installation - Ελληνική μετάφραση για την εγκατάσταση του Joomla! 3.4.2 el-GR.ini diff --git a/installation/language/en-AU/en-AU.ini b/installation/language/en-AU/en-AU.ini index 2e6e3227668ed..614ad75b2d11d 100644 --- a/installation/language/en-AU/en-AU.ini +++ b/installation/language/en-AU/en-AU.ini @@ -1,14 +1,12 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 - - ;Stepbar INSTL_STEP_COMPLETE_LABEL="Finish" INSTL_STEP_DATABASE_LABEL="Database" -INSTL_STEP_DEFAULTLANGUAGE_LABEL="Choose default language" +INSTL_STEP_DEFAULTLANGUAGE_LABEL="Choose Default Language" INSTL_STEP_FTP_LABEL="FTP" INSTL_STEP_LANGUAGES_LABEL="Install Languages" INSTL_STEP_SITE_LABEL="Configuration" @@ -21,7 +19,7 @@ INSTL_WARNJSON="Your PHP installation needs to have JSON enabled for Joomla to b ;Preinstall view INSTL_PRECHECK_TITLE="Pre-Installation Check" -INSTL_PRECHECK_DESC="If any of these items are not supported (marked as No) then please take actions to correct them.
    You cannot install Joomla! until your setup meets the requirements below." +INSTL_PRECHECK_DESC="If any of these items are not supported (marked as No) then please take actions to correct them.
    You can't install Joomla! until your setup meets the requirements below." INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Recommended settings:" INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="These settings are recommended for PHP in order to ensure full compatibility with Joomla.
    However, Joomla! will still operate if your settings do not quite match the recommended configuration." INSTL_PRECHECK_DIRECTIVE="Directive" @@ -30,21 +28,21 @@ INSTL_PRECHECK_ACTUAL="Actual" ; Database view INSTL_DATABASE="Database Configuration" -INSTL_DATABASE_HOST_DESC="This is usually "localhost"" +INSTL_DATABASE_HOST_DESC="This is usually "localhost"." INSTL_DATABASE_HOST_LABEL="Host Name" INSTL_DATABASE_NAME_DESC="Some hosts allow only a certain DB name per site. Use table prefix in this case for distinct Joomla! sites." INSTL_DATABASE_NAME_LABEL="Database Name" INSTL_DATABASE_NO_SCHEMA="No database schema exists for this database type." -INSTL_DATABASE_OLD_PROCESS_DESC="Any existing backup tables from former Joomla! installations will be replaced" +INSTL_DATABASE_OLD_PROCESS_DESC="Any existing backup tables from former Joomla! installations will be replaced." INSTL_DATABASE_OLD_PROCESS_LABEL="Old Database Process" -INSTL_DATABASE_PASSWORD_DESC="For site security using a password for the database account is mandatory" +INSTL_DATABASE_PASSWORD_DESC="For site security using a password for the database account is mandatory." INSTL_DATABASE_PASSWORD_LABEL="Password" -INSTL_DATABASE_PREFIX_DESC="Choose a table prefix or use the randomly generated. Ideally, three or four characters long, contain only alphanumeric characters, and MUST end in an underscore. Make sure that the prefix chosen is not used by other tables." +INSTL_DATABASE_PREFIX_DESC="Choose a table prefix or use the randomly generated. Ideally, three or four characters long, contain only alphanumeric characters and MUST end in an underscore. Make sure that the prefix chosen is not used by other tables." INSTL_DATABASE_PREFIX_LABEL="Table Prefix" INSTL_DATABASE_PREFIX_MSG="The table prefix must start with a letter, be followed by optional alphanumeric characters and by an underscore" -INSTL_DATABASE_TYPE_DESC="This is probably "MySQLi"" +INSTL_DATABASE_TYPE_DESC="This is probably "MySQLi"." INSTL_DATABASE_TYPE_LABEL="Database Type" -INSTL_DATABASE_USER_DESC="Either something as "_QQ_"root"_QQ_" or a username given by the host" +INSTL_DATABASE_USER_DESC="Either something as "root" or a username given by the host." INSTL_DATABASE_USER_LABEL="Username" ;FTP view @@ -66,19 +64,19 @@ INSTL_FTP_PASSWORD_DESC="Warning! It is recommended to leave this blank and ente ;Site View INSTL_SITE="Main Configuration" -INSTL_ADMIN_EMAIL_LABEL="Admin Email" -INSTL_ADMIN_EMAIL_DESC="Enter an email address. This will be the email address of the Web site Super Administrator." -INSTL_ADMIN_PASSWORD_LABEL="Admin Password" -INSTL_ADMIN_PASSWORD_DESC="Set the password for your Super Administrator account and confirm it in the field below." -INSTL_ADMIN_PASSWORD2_LABEL="Confirm Admin Password" -INSTL_ADMIN_USER_LABEL="Admin Username" -INSTL_ADMIN_USER_DESC="Set the username for your Super Administrator account." +INSTL_ADMIN_EMAIL_LABEL="Administrator Email" +INSTL_ADMIN_EMAIL_DESC="Enter an email address. This will be the email address of the website Super User." +INSTL_ADMIN_PASSWORD_LABEL="Administrator Password" +INSTL_ADMIN_PASSWORD_DESC="Set the password for your Super User account and confirm it in the field below." +INSTL_ADMIN_PASSWORD2_LABEL="Confirm Administrator Password" +INSTL_ADMIN_USER_LABEL="Administrator Username" +INSTL_ADMIN_USER_DESC="Set the username for your Super User account." INSTL_SITE_NAME_LABEL="Site Name" INSTL_SITE_NAME_DESC="Enter the name of your Joomla! site." INSTL_SITE_METADESC_LABEL="Description" -INSTL_SITE_METADESC_TITLE_LABEL="Enter a description of the overall Web site that is to be used by search engines. Generally, a maximum of 20 words is optimal." +INSTL_SITE_METADESC_TITLE_LABEL="Enter a description of the overall website that is to be used by search engines. Generally, a maximum of 20 words is optimal." INSTL_SITE_OFFLINE_LABEL="Site Offline" -INSTL_SITE_OFFLINE_TITLE_LABEL="Set the site frontend offline when installation is completed. The site can be set online later on through the Global Configuration." +INSTL_SITE_OFFLINE_TITLE_LABEL="Set the site Frontend offline when installation is completed. The site can be set online later on through the Global Configuration." INSTL_SITE_INSTALL_SAMPLE_LABEL="Install Sample Data" INSTL_SITE_INSTALL_SAMPLE_DESC="Installing sample data is strongly recommended for beginners.
    This will install sample content that is included in the Joomla! installation package." INSTL_SITE_INSTALL_SAMPLE_NONE="None (Required for basic native multilingual site creation)" @@ -89,7 +87,7 @@ INSTL_SAMPLE_LEARN_SET="Learn Joomla English (GB) Sample Data" INSTL_SAMPLE_TESTING_SET="Test English (GB) Sample Data" INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Install Joomla with just one menu and a login form, without any content." INSTL_SAMPLE_BLOG_SET_DESC="Install Joomla with a few articles and blog related modules like Older Posts, Blog Roll, Most Read Posts." -INSTL_SAMPLE_BROCHURE_SET_DESC="Install Joomla with a few pages (a menu with pages Home, About Us, News, Contact Us) and modules like Search, Custom HTML, Login Form." +INSTL_SAMPLE_BROCHURE_SET_DESC="Install Joomla with a few pages (a menu with pages Home, About Us, News, Contact Us) and modules like Search, Custom, Login Form." INSTL_SAMPLE_DATA_SET_DESC="Install Joomla with one page (a menu with one link) and modules like Latest Article, Login Form." INSTL_SAMPLE_LEARN_SET_DESC="Install Joomla with example articles that describe how Joomla works." INSTL_SAMPLE_TESTING_SET_DESC="Install Joomla with all possible menu items to help with testing Joomla." @@ -103,7 +101,7 @@ INSTL_SUMMARY_EMAIL_PASSWORDS_LABEL="Include Passwords in Email" INSTL_SUMMARY_EMAIL_PASSWORDS_DESC="Warning! It is recommended to not send and store your passwords in emails." ;Installing view -INSTL_INSTALLING="Installing..." +INSTL_INSTALLING="Installing ..." INSTL_INSTALLING_DATABASE_BACKUP="Backing up old database tables" INSTL_INSTALLING_DATABASE_REMOVE="Removing old database tables" INSTL_INSTALLING_DATABASE="Creating database tables" @@ -123,15 +121,15 @@ INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="The installation folder has already ; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_ERROR_FOLDER_DELETE="Installation folder could not be deleted. Please manually delete the folder." ; The word 'installation' should not be translated as it is a physical folder. -INSTL_COMPLETE_FOLDER_REMOVED="Installation folder successfully removed" +INSTL_COMPLETE_FOLDER_REMOVED="Installation folder successfully removed." INSTL_COMPLETE_LANGUAGE_1="Joomla! in your own language and/or automatic basic native multilingual site creation" ; The word 'installation' should not be translated as it is a physical folder. -INSTL_COMPLETE_LANGUAGE_DESC="Before removing the installation folder you can install extra languages. If you want to add extra languages to your Joomla! application click the following button." -INSTL_COMPLETE_LANGUAGE_DESC2="Note: you will need Internet access for Joomla! to download and install the new languages.
    Some server configurations won't allow Joomla! to install the languages. If this is your case, don't worry, you will be able to install them later using the Joomla! administrator." +INSTL_COMPLETE_LANGUAGE_DESC="Before removing the installation folder you can install extra languages. If you want to add extra languages to your Joomla! application select the following button." +INSTL_COMPLETE_LANGUAGE_DESC2="Note: you will need internet access for Joomla! to download and install the new languages.
    Some server configurations won't allow Joomla! to install the languages. If this is your case, don't worry, you will be able to install them later using the Joomla! Administrator." ; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_REMOVE_FOLDER="Remove installation folder" ; The word 'installation' should not be translated as it is a physical folder. -INSTL_COMPLETE_REMOVE_INSTALLATION="PLEASE REMEMBER TO COMPLETELY REMOVE THE INSTALLATION FOLDER.
    You will not be able to proceed beyond this point until the installation folder has been removed. This is a security feature of Joomla!." +INSTL_COMPLETE_REMOVE_INSTALLATION="PLEASE REMEMBER TO COMPLETELY REMOVE THE INSTALLATION FOLDER.
    You will not be able to proceed beyond this point until the installation folder has been removed. This is a security feature of Joomla!" INSTL_COMPLETE_TITLE="Congratulations! Joomla! is now installed." INSTL_COMPLETE_INSTALL_LANGUAGES="Extra steps: Install languages" @@ -139,21 +137,21 @@ INSTL_COMPLETE_INSTALL_LANGUAGES="Extra steps: Install languages" INSTL_LANGUAGES="Install Language packages" INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Language" INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Version" -INSTL_LANGUAGES_DESC="The Joomla interface is available in several languages. Choose your preferred languages by clicking in the checkboxes and then install them by clicking on the Next button.
    Note: this operation will take about 10 seconds to download and install every language. To avoid timeouts please select no more than 3 languages to install." -INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="This operation will take up to 10 seconds per language to complete
    Please wait while we download and install the languages..." +INSTL_LANGUAGES_DESC="The Joomla interface is available in several languages. Choose your preferred languages by choosing the checkboxes and then install them by selecting the Next button.
    Note: this operation will take about 10 seconds to download and install every language. To avoid timeouts please select no more than 3 languages to install." +INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="This operation will take up to 10 seconds per language to complete
    Please wait while we download and install the languages ..." INSTL_LANGUAGES_MORE_LANGUAGES="Press the 'Previous' button if you want to install more languages." INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="No languages have been selected to be installed. If you need to install more languages, press the 'Previous' button and choose the desired languages from the list." INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! was not able to connect to the languages server. Please finish the installation process." -INSTL_LANGUAGES_WARNING_NO_INTERNET2="Note: You will be able to install languages later using the Joomla! administrator" +INSTL_LANGUAGES_WARNING_NO_INTERNET2="Note: You will be able to install languages later using the Joomla! Administrator" INSTL_LANGUAGES_WARNING_BACK_BUTTON="Return to last installation step" -;Defaultlanguage view +;Default language view INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE="Activate the multilingual feature" -INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="If active, your Joomla site will have the multilingual feature active with localised menus for each installed language" +INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="If active, your Joomla site will have the multilingual feature active with localised menus for each installed language." INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN="Enable the language code plugin" INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN_DESC="If enabled, the language code plugin will add the ability to change the language code in the generated HTML document to improve SEO." INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Default Administrator language" -INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Joomla was not able to set the language as default. English will be used as default language for the backend ADMINISTRATOR." +INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Joomla was not able to set the language as default. English will be used as default language for the Backend Administrator." INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Joomla has set %s as your default ADMINISTRATOR language." INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Select" INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Language" @@ -170,15 +168,15 @@ INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGEFILTER="Joomla was not able t INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Joomla was unable to install %s language." INSTL_DEFAULTLANGUAGE_COULD_NOT_PUBLISH_MOD_MULTILANGSTATUS="Joomla was not able to automatically publish the language status module" INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="Joomla was not able to automatically unpublish the default menu module" -INSTL_DEFAULTLANGUAGE_DESC="Joomla has installed the following languages. Please select your desired default language for the Joomla administrator." -INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla has installed the following languages. Please select your desired default language for the Joomla frontend." +INSTL_DEFAULTLANGUAGE_DESC="Joomla has installed the following languages. Please select your desired default language for the Joomla Administrator." +INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla has installed the following languages. Please select your desired default language for the Joomla Frontend." INSTL_DEFAULTLANGUAGE_FRONTEND="Default Site language" -INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla was not able to set the language as default. English will be used as default language for the frontend SITE." +INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla was not able to set the language as default. English will be used as default language for the Frontend SITE." INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Joomla has set %s as your default SITE language." INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Install localised content" -INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="If active, Joomla will automatically create one content category per each installed language. Also, one featured article containing dummy content will be created on each category" +INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="If active, Joomla will automatically create one content category per each installed language. Also, one featured article containing dummy content will be created on each category." INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Multilingual" -INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="This section allows you to automatically activate the Joomla! multilingual feature" +INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="This section allows you to automatically activate the Joomla! multilingual feature." INSTL_DEFAULTLANGUAGE_TRY_LATER="You will be able to install it later using the Joomla! Administrator" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español @@ -186,14 +184,15 @@ INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="English (AU)" ;Database Model INSTL_DATABASE_COULD_NOT_CONNECT="Could not connect to the database. Connector returned number: %s" -INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="The installer could not connect to the specified database and was unable to create the database. Please verify your settings and if necessary manually create your database." +INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="The installer could not connect to the specified database and was unable to create the database. Please verify your settings and if necessary manually create your database." INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Could not refresh manifest cache for extension: %s" INSTL_DATABASE_EMPTY_NAME="" INSTL_DATABASE_ERROR_BACKINGUP="Some errors occurred in backing up the database." -INSTL_DATABASE_ERROR_CREATE="An error occurred while trying to create the database %s.
    The user may not have enough privileges to create a database. The required database may need to be created separately before you can install Joomla!." +INSTL_DATABASE_ERROR_CREATE="An error occurred while trying to create the database %s.
    The user may not have enough privileges to create a database. The required database may need to be created separately before you can install Joomla!" INSTL_DATABASE_ERROR_DELETE="Some errors occurred deleting the database." INSTL_DATABASE_FIELD_VALUE_REMOVE="Remove" INSTL_DATABASE_FIELD_VALUE_BACKUP="Backup" +INSTL_DATABASE_FIX_LOWERCASE="The table prefix must be lowercase for PostgreSQL." INSTL_DATABASE_FIX_TOO_LONG="The MySQL table prefix must be a maximum of 15 characters." INSTL_DATABASE_INVALID_DB_DETAILS="The database details provided are incorrect and/or empty." INSTL_DATABASE_INVALID_MYSQL_VERSION="You need MySQL 5.0.4 or higher to continue the installation. Your version is: %s" @@ -204,7 +203,7 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="You need SQL Server 2008 R2 (10.50.1600.1 INSTL_DATABASE_INVALID_SQLZURE_VERSION="You need SQL Server 2008 R2 (10.50.1600.1) or higher to continue the installation. Your version is: %s" INSTL_DATABASE_INVALID_TYPE="Please select the database type" INSTL_DATABASE_NAME_TOO_LONG="The MySQL database name must be a maximum of 64 characters." -INSTL_DATABASE_INVALID_NAME="MySQL versions previous to 5.1.6 may not contain periods or other "_QQ_"special"_QQ_" characters in the name. Your version is: %s" +INSTL_DATABASE_INVALID_NAME="MySQL versions previous to 5.1.6 may not contain periods or other "special" characters in the name. Your version is: %s" INSTL_DATABASE_NAME_INVALID_SPACES="MySQL database names and table names may not begin or end with spaces." INSTL_DATABASE_NAME_INVALID_CHAR="No MySQL identifier can contain a NULL ASCII(0x00)." INSTL_DATABASE_FILE_DOES_NOT_EXIST="File %s does not exist" @@ -218,27 +217,27 @@ INSTL_PAGE_TITLE="Joomla! Web Installer" ;Configuration model INSTL_ERROR_CONNECT_DB="Could not connect to the database. Connector returned number: %s" -INSTL_STD_OFFLINE_MSG="This site is down for maintenance.
    Please check back again soon." +INSTL_STD_OFFLINE_MSG="This site is down for maintenance.
    Please check back again soon." ;FTP model INSTL_FTP_INVALIDROOT="The specified FTP Folder is not the folder of this Joomla! installation" INSTL_FTP_NOCONNECT="Could not connect to the FTP server" -INSTL_FTP_NODELE="The function "_QQ_"DELE"_QQ_" failed." +INSTL_FTP_NODELE="The function "DELE" failed." INSTL_FTP_NODIRECTORYLISTING="Could not retrieve a folder listing from the FTP server." -INSTL_FTP_NOLIST="The function "_QQ_"LIST"_QQ_" failed." +INSTL_FTP_NOLIST="The function "LIST" failed." INSTL_FTP_NOLOGIN="Could not log in to the FTP server." -INSTL_FTP_NOMKD="The function "_QQ_"MKD"_QQ_" failed." -INSTL_FTP_NONLST="The function "_QQ_"NLST"_QQ_" failed." -INSTL_FTP_NOPWD="The function "_QQ_"PWD"_QQ_" failed." -INSTL_FTP_NORETR="The function "_QQ_"RETR"_QQ_" failed." -INSTL_FTP_NORMD="The function "_QQ_"RMD"_QQ_" failed." +INSTL_FTP_NOMKD="The function "MKD" failed." +INSTL_FTP_NONLST="The function "NLST" failed." +INSTL_FTP_NOPWD="The function "PWD" failed." +INSTL_FTP_NORETR="The function "RETR" failed." +INSTL_FTP_NORMD="The function "RMD" failed." INSTL_FTP_NOROOT="Could not access the specified FTP folder." -INSTL_FTP_NOSTOR="The function "_QQ_"STOR"_QQ_" failed." -INSTL_FTP_NOSYST="The function "_QQ_"SYST"_QQ_" failed." +INSTL_FTP_NOSTOR="The function "STOR" failed." +INSTL_FTP_NOSYST="The function "SYST" failed." INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Unable to auto-detect the FTP root folder." ;others -INSTL_CONFPROBLEM="Your configuration file or folder is not writable or there was a problem creating the configuration file. You will have to upload the following code by hand. Click in the text area to highlight all of the code and then paste into a new text file. Name this file 'configuration.php' and upload it to your site root folder." +INSTL_CONFPROBLEM="Your configuration file or folder is not writable or there was a problem creating the configuration file. You will have to upload the following code by hand. Select in the text area to highlight all of the code and then paste into a new text file. Name this file 'configuration.php' and upload it to your site root folder." INSTL_DATABASE_SUPPORT="Database Support:" INSTL_DISPLAY_ERRORS="Display Errors" INSTL_ERROR_DB="Some errors occurred while populating the database: %s" @@ -252,7 +251,7 @@ INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language is Default" INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Off" INSTL_NOTICEMBLANGNOTDEFAULT="PHP mbstring language is not set to neutral. This can be set locally by entering php_value mbstring.language neutral in your .htaccess file." INSTL_NOTICEMBSTRINGOVERLOAD="PHP mbstring function overload is set. This can be turned off locally by entering php_value mbstring.func_overload 0 in your .htaccess file." -INSTL_NOTICEYOUCANSTILLINSTALL="
    You can still continue the installation as the configuration settings will be displayed at the end. You will have to manually upload the code. Click in the text area to highlight all of the code and then paste into a new text file. Name this file 'configuration.php' and upload it to your site root folder." +INSTL_NOTICEYOUCANSTILLINSTALL="
    You can still continue the installation as the configuration settings will be displayed at the end. You will have to manually upload the code. Select in the text area to highlight all of the code and then paste into a new text file. Name this file 'configuration.php' and upload it to your site root folder." INSTL_OUTPUT_BUFFERING="Output Buffering" INSTL_PARSE_INI_FILE_AVAILABLE="INI Parser Support" INSTL_PHP_VERSION="PHP Version" @@ -264,7 +263,7 @@ INSTL_WRITABLE="%s Writeable" INSTL_XML_SUPPORT="XML Support" INSTL_ZIP_SUPPORT_AVAILABLE="Native ZIP support" INSTL_ZLIB_COMPRESSION_SUPPORT="Zlib Compression Support" -INSTL_PROCESS_BUSY="Process is in progress. Please wait..." +INSTL_PROCESS_BUSY="Process is in progress. Please wait ..." ;Global strings JADMINISTRATOR="Administrator" @@ -307,9 +306,9 @@ JDEBUG_LANGUAGE_UNTRANSLATED_STRING="Untranslated strings" JNONE="None" ; Necessary for errors -ADMIN_EMAIL="Admin Email" -ADMIN_PASSWORD="Admin Password" -ADMIN_PASSWORD2="Confirm Admin Password" +ADMIN_EMAIL="Administrator Email" +ADMIN_PASSWORD="Administrator Password" +ADMIN_PASSWORD2="Confirm Administrator Password" SITE_NAME="Site Name" ; Database types (allows for a more descriptive label than the internal name) diff --git a/installation/language/en-AU/en-AU.xml b/installation/language/en-AU/en-AU.xml index d19c056d05831..883231595d650 100644 --- a/installation/language/en-AU/en-AU.xml +++ b/installation/language/en-AU/en-AU.xml @@ -1,14 +1,13 @@ English (Australia) - 3.4.6 - September 2012 + 3.5.0 + January 2016 Joomla! Project - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - en-AU.ini diff --git a/installation/language/en-CA/en-CA.ini b/installation/language/en-CA/en-CA.ini index 5fa0a27a697e0..8e69a70a7c2e9 100644 --- a/installation/language/en-CA/en-CA.ini +++ b/installation/language/en-CA/en-CA.ini @@ -1,293 +1,241 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 - - -;Stepbar -INSTL_STEP_COMPLETE_LABEL="Finish" -INSTL_STEP_DATABASE_LABEL="Database" -INSTL_STEP_DEFAULTLANGUAGE_LABEL="Choose default language" -INSTL_STEP_FTP_LABEL="FTP" -INSTL_STEP_LANGUAGES_LABEL="Install Languages" -INSTL_STEP_SITE_LABEL="Configuration" -INSTL_STEP_SUMMARY_LABEL="Overview" - -;Language view -INSTL_SELECT_LANGUAGE_TITLE="Select Language" -INSTL_WARNJAVASCRIPT="Warning! JavaScript must be enabled for proper installation of Joomla!" -INSTL_WARNJSON="Your PHP installation needs to have JSON enabled for Joomla to be installed!" - -;Preinstall view -INSTL_PRECHECK_TITLE="Pre-Installation Check" -INSTL_PRECHECK_DESC="If any of these items are not supported (marked as No) then please take actions to correct them.
    You cannot install Joomla! until your setup meets the requirements below." -INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Recommended settings:" -INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="These settings are recommended for PHP in order to ensure full compatibility with Joomla.
    However, Joomla! will still operate if your settings do not quite match the recommended configuration." -INSTL_PRECHECK_DIRECTIVE="Directive" -INSTL_PRECHECK_RECOMMENDED="Recommended" -INSTL_PRECHECK_ACTUAL="Actual" - -; Database view +ADMIN_EMAIL="Administrator Email" +ADMIN_PASSWORD="Administrator Password" +ADMIN_PASSWORD2="Confirm Administrator Password" +INSTL_ADMIN_EMAIL_DESC="Enter an email address. This will be the email address of the website Super User." +INSTL_ADMIN_EMAIL_LABEL="Administrator Email" +INSTL_ADMIN_PASSWORD2_LABEL="Confirm Administrator Password" +INSTL_ADMIN_PASSWORD_DESC="Set the password for your Super User account and confirm it in the field below." +INSTL_ADMIN_PASSWORD_LABEL="Administrator Password" +INSTL_ADMIN_USER_DESC="Set the username for your Super User account." +INSTL_ADMIN_USER_LABEL="Administrator Username" +INSTL_AUTOFIND_FTP_PATH="Autofind FTP Path" +INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Administration Login Details" +INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="The installation folder has already been deleted." +INSTL_COMPLETE_ERROR_FOLDER_DELETE="Installation folder could not be deleted. Please manually delete the folder." +INSTL_COMPLETE_FOLDER_REMOVED="Installation folder successfully removed." +INSTL_COMPLETE_INSTALL_LANGUAGES="Extra steps: Install languages" +INSTL_COMPLETE_LANGUAGE_1="Joomla! in your own language and/or automatic basic native multilingual site creation" +INSTL_COMPLETE_LANGUAGE_DESC="Before removing the installation folder you can install extra languages. If you want to add extra languages to your Joomla! application select the following button." +INSTL_COMPLETE_LANGUAGE_DESC2="Note: you will need internet access for Joomla! to download and install the new languages.
    Some server configurations won't allow Joomla! to install the languages. If this is your case, don't worry, you will be able to install them later using the Joomla! Administrator." +INSTL_COMPLETE_REMOVE_FOLDER="Remove installation folder" +INSTL_COMPLETE_REMOVE_INSTALLATION="PLEASE REMEMBER TO COMPLETELY REMOVE THE INSTALLATION FOLDER.
    You will not be able to proceed beyond this point until the installation folder has been removed. This is a security feature of Joomla!" +INSTL_COMPLETE_TITLE="Congratulations! Joomla! is now installed." +INSTL_CONFPROBLEM="Your configuration file or folder is not writable or there was a problem creating the configuration file. You will have to upload the following code by hand. Select in the text area to highlight all of the code and then paste into a new text file. Name this file 'configuration.php' and upload it to your site root folder." +INSTL_COOKIES_NOT_ENABLED="Cookies do not appear to be enabled on your browser client. You will not be able to install the application with this feature disabled. Alternatively, there could also be a problem with the server's session.save_path. If this is the case, please consult your hosting provider if you don't know how to check or fix this yourself." INSTL_DATABASE="Database Configuration" -INSTL_DATABASE_HOST_DESC="This is usually "localhost"" +INSTL_DATABASE_COULD_NOT_CONNECT="Could not connect to the database. Connector returned number: %s" +INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="The installer could not connect to the specified database and was unable to create the database. Please verify your settings and if necessary manually create your database." +INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Could not refresh manifest cache for extension: %s" +INSTL_DATABASE_EMPTY_NAME="" +INSTL_DATABASE_ERROR_BACKINGUP="Some errors occurred in backing up the database." +INSTL_DATABASE_ERROR_CREATE="An error occurred while trying to create the database %s.
    The user may not have enough privileges to create a database. The required database may need to be created separately before you can install Joomla!" +INSTL_DATABASE_ERROR_DELETE="Some errors occurred deleting the database." +INSTL_DATABASE_FIELD_VALUE_BACKUP="Backup" +INSTL_DATABASE_FIELD_VALUE_REMOVE="Remove" +INSTL_DATABASE_FILE_DOES_NOT_EXIST="File %s does not exist" +INSTL_DATABASE_FIX_LOWERCASE="The table prefix must be lowercase for PostgreSQL." +INSTL_DATABASE_FIX_TOO_LONG="The MySQL table prefix must be a maximum of 15 characters." +INSTL_DATABASE_HOST_DESC="This is usually "localhost"." INSTL_DATABASE_HOST_LABEL="Host Name" +INSTL_DATABASE_INVALID_DB_DETAILS="The database details provided are incorrect and/or empty." +INSTL_DATABASE_INVALID_MYSQL_VERSION="You need MySQL 5.0.4 or higher to continue the installation. Your version is: %s" +INSTL_DATABASE_INVALID_MYSQLI_VERSION="You need MySQL 5.0.4 or higher to continue the installation. Your version is: %s" +INSTL_DATABASE_INVALID_NAME="MySQL versions previous to 5.1.6 may not contain periods or other "special" characters in the name. Your version is: %s" +INSTL_DATABASE_INVALID_PDOMYSQL_VERSION="You need MySQL 5.0.4 or higher to continue the installation. Your version is: %s" +INSTL_DATABASE_INVALID_POSTGRESQL_VERSION="You need PostgreSQL 8.3.18 or higher to continue the installation. Your version is: %s" +INSTL_DATABASE_INVALID_SQLSRV_VERSION="You need SQL Server 2008 R2 (10.50.1600.1) or higher to continue the installation. Your version is: %s" +INSTL_DATABASE_INVALID_SQLZURE_VERSION="You need SQL Server 2008 R2 (10.50.1600.1) or higher to continue the installation. Your version is: %s" +INSTL_DATABASE_INVALID_TYPE="Please select the database type" INSTL_DATABASE_NAME_DESC="Some hosts allow only a certain DB name per site. Use table prefix in this case for distinct Joomla! sites." +INSTL_DATABASE_NAME_INVALID_CHAR="No MySQL identifier can contain a NULL ASCII(0x00)." +INSTL_DATABASE_NAME_INVALID_SPACES="MySQL database names and table names may not begin or end with spaces." INSTL_DATABASE_NAME_LABEL="Database Name" +INSTL_DATABASE_NAME_TOO_LONG="The MySQL database name must be a maximum of 64 characters." INSTL_DATABASE_NO_SCHEMA="No database schema exists for this database type." -INSTL_DATABASE_OLD_PROCESS_DESC="Any existing backup tables from former Joomla! installations will be replaced" +INSTL_DATABASE_OLD_PROCESS_DESC="Any existing backup tables from former Joomla! installations will be replaced." INSTL_DATABASE_OLD_PROCESS_LABEL="Old Database Process" -INSTL_DATABASE_PASSWORD_DESC="For site security using a password for the database account is mandatory" +INSTL_DATABASE_PASSWORD_DESC="For site security using a password for the database account is mandatory." INSTL_DATABASE_PASSWORD_LABEL="Password" -INSTL_DATABASE_PREFIX_DESC="Choose a table prefix or use the randomly generated. Ideally, three or four characters long, contain only alphanumeric characters, and MUST end in an underscore. Make sure that the prefix chosen is not used by other tables." +INSTL_DATABASE_PREFIX_DESC="Choose a table prefix or use the randomly generated. Ideally, three or four characters long, contain only alphanumeric characters and MUST end in an underscore. Make sure that the prefix chosen is not used by other tables." INSTL_DATABASE_PREFIX_LABEL="Table Prefix" INSTL_DATABASE_PREFIX_MSG="The table prefix must start with a letter, be followed by optional alphanumeric characters and by an underscore" -INSTL_DATABASE_TYPE_DESC="This is probably "MySQLi"" +INSTL_DATABASE_SUPPORT="Database Support:" +INSTL_DATABASE_TYPE_DESC="This is probably "MySQLi"." INSTL_DATABASE_TYPE_LABEL="Database Type" -INSTL_DATABASE_USER_DESC="Either something as "_QQ_"root"_QQ_" or a username given by the host" +INSTL_DATABASE_USER_DESC="Either something as "root" or a username given by the host." INSTL_DATABASE_USER_LABEL="Username" - -;FTP view -INSTL_AUTOFIND_FTP_PATH="Autofind FTP Path" -INSTL_FTP="FTP Configuration" -INSTL_FTP_DESC="

    On some servers you may need to provide FTP credentials for installation to complete. If you have difficulties completing installation without these credentials, check with your host to determine if this is necessary.

    For security reasons, it is best to create a separate FTP user account with access to the Joomla! installation only and not the entire web server. Your host can assist you with this.

    Note: If you are installing on a Windows Operating System, the FTP layer is not required.

    " -INSTL_FTP_ENABLE_LABEL="Enable FTP Layer" -INSTL_FTP_HOST_LABEL="FTP Host" -INSTL_FTP_PASSWORD_LABEL="FTP Password" -INSTL_FTP_PORT_LABEL="FTP Port" -INSTL_FTP_ROOT_LABEL="FTP Root Path" -INSTL_FTP_SAVE_LABEL="Save FTP Password" -INSTL_FTP_TITLE="FTP Configuration (Optional - Most Users Can Skip This Step - Press Next to Skip)" -INSTL_FTP_USER_LABEL="FTP Username" -INSTL_VERIFY_FTP_SETTINGS="Verify FTP Settings" -INSTL_FTP_SETTINGS_CORRECT="Settings correct" -INSTL_FTP_USER_DESC="Warning! It is recommended to leave this blank and enter your FTP username each time you transfer files." -INSTL_FTP_PASSWORD_DESC="Warning! It is recommended to leave this blank and enter your FTP password each time you transfer files." - -;Site View -INSTL_SITE="Main Configuration" -INSTL_ADMIN_EMAIL_LABEL="Admin Email" -INSTL_ADMIN_EMAIL_DESC="Enter an email address. This will be the email address of the Web site Super Administrator." -INSTL_ADMIN_PASSWORD_LABEL="Admin Password" -INSTL_ADMIN_PASSWORD_DESC="Set the password for your Super Administrator account and confirm it in the field below." -INSTL_ADMIN_PASSWORD2_LABEL="Confirm Admin Password" -INSTL_ADMIN_USER_LABEL="Admin Username" -INSTL_ADMIN_USER_DESC="Set the username for your Super Administrator account." -INSTL_SITE_NAME_LABEL="Site Name" -INSTL_SITE_NAME_DESC="Enter the name of your Joomla! site." -INSTL_SITE_METADESC_LABEL="Description" -INSTL_SITE_METADESC_TITLE_LABEL="Enter a description of the overall Web site that is to be used by search engines. Generally, a maximum of 20 words is optimal." -INSTL_SITE_OFFLINE_LABEL="Site Offline" -INSTL_SITE_OFFLINE_TITLE_LABEL="Set the site frontend offline when installation is completed. The site can be set online later on through the Global Configuration." -INSTL_SITE_INSTALL_SAMPLE_LABEL="Install Sample Data" -INSTL_SITE_INSTALL_SAMPLE_DESC="Installing sample data is strongly recommended for beginners.
    This will install sample content that is included in the Joomla! installation package." -INSTL_SITE_INSTALL_SAMPLE_NONE="None (Required for basic native multilingual site creation)" -INSTL_SAMPLE_BLOG_SET="Blog English (GB) Sample Data" -INSTL_SAMPLE_BROCHURE_SET="Brochure English (GB) Sample Data" -INSTL_SAMPLE_DATA_SET="Default English (GB) Sample Data" -INSTL_SAMPLE_LEARN_SET="Learn Joomla English (GB) Sample Data" -INSTL_SAMPLE_TESTING_SET="Test English (GB) Sample Data" -INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Install Joomla with just one menu and a login form, without any content." -INSTL_SAMPLE_BLOG_SET_DESC="Install Joomla with a few articles and blog related modules like Older Posts, Blog Roll, Most Read Posts." -INSTL_SAMPLE_BROCHURE_SET_DESC="Install Joomla with a few pages (a menu with pages Home, About Us, News, Contact Us) and modules like Search, Custom HTML, Login Form." -INSTL_SAMPLE_DATA_SET_DESC="Install Joomla with one page (a menu with one link) and modules like Latest Article, Login Form." -INSTL_SAMPLE_LEARN_SET_DESC="Install Joomla with example articles that describe how Joomla works." -INSTL_SAMPLE_TESTING_SET_DESC="Install Joomla with all possible menu items to help with testing Joomla." - -;Summary view -INSTL_FINALISATION="Finalisation" -INSTL_SUMMARY_INSTALL="Install" -INSTL_SUMMARY_EMAIL_LABEL="Email Configuration" -INSTL_SUMMARY_EMAIL_DESC="Send configuration settings to %s by email after installation." -INSTL_SUMMARY_EMAIL_PASSWORDS_LABEL="Include Passwords in Email" -INSTL_SUMMARY_EMAIL_PASSWORDS_DESC="Warning! It is recommended to not send and store your passwords in emails." - -;Installing view -INSTL_INSTALLING="Installing..." -INSTL_INSTALLING_DATABASE_BACKUP="Backing up old database tables" -INSTL_INSTALLING_DATABASE_REMOVE="Removing old database tables" -INSTL_INSTALLING_DATABASE="Creating database tables" -INSTL_INSTALLING_SAMPLE="Installing sample data" -INSTL_INSTALLING_CONFIG="Creating configuration File" -INSTL_INSTALLING_EMAIL="Sending email to %s" - -;Email -INSTL_EMAIL_SUBJECT="Configuration Details: %s" -INSTL_EMAIL_HEADING="Below you can find the configuration settings for a newly setup Joomla! website:" -INSTL_EMAIL_NOT_SENT="Email could not be sent." - -;Complete view -INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Administration Login Details" -; The word 'installation' should not be translated as it is a physical folder. -INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="The installation folder has already been deleted." -; The word 'installation' should not be translated as it is a physical folder. -INSTL_COMPLETE_ERROR_FOLDER_DELETE="Installation folder could not be deleted. Please manually delete the folder." -; The word 'installation' should not be translated as it is a physical folder. -INSTL_COMPLETE_FOLDER_REMOVED="Installation folder successfully removed" -INSTL_COMPLETE_LANGUAGE_1="Joomla! in your own language and/or automatic basic native multilingual site creation" -; The word 'installation' should not be translated as it is a physical folder. -INSTL_COMPLETE_LANGUAGE_DESC="Before removing the installation folder you can install extra languages. If you want to add extra languages to your Joomla! application click the following button." -INSTL_COMPLETE_LANGUAGE_DESC2="Note: you will need Internet access for Joomla! to download and install the new languages.
    Some server configurations won't allow Joomla! to install the languages. If this is your case, don't worry, you will be able to install them later using the Joomla! administrator." -; The word 'installation' should not be translated as it is a physical folder. -INSTL_COMPLETE_REMOVE_FOLDER="Remove installation folder" -; The word 'installation' should not be translated as it is a physical folder. -INSTL_COMPLETE_REMOVE_INSTALLATION="PLEASE REMEMBER TO COMPLETELY REMOVE THE INSTALLATION FOLDER.
    You will not be able to proceed beyond this point until the installation folder has been removed. This is a security feature of Joomla!." -INSTL_COMPLETE_TITLE="Congratulations! Joomla! is now installed." -INSTL_COMPLETE_INSTALL_LANGUAGES="Extra steps: Install languages" - -;Languages view -INSTL_LANGUAGES="Install Language packages" -INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Language" -INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Version" -INSTL_LANGUAGES_DESC="The Joomla interface is available in several languages. Choose your preferred languages by clicking in the checkboxes and then install them by clicking on the Next button.
    Note: this operation will take about 10 seconds to download and install every language. To avoid timeouts please select no more than 3 languages to install." -INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="This operation will take up to 10 seconds per language to complete
    Please wait while we download and install the languages..." -INSTL_LANGUAGES_MORE_LANGUAGES="Press the 'Previous' button if you want to install more languages." -INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="No languages have been selected to be installed. If you need to install more languages, press the 'Previous' button and choose the desired languages from the list." -INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! was not able to connect to the languages server. Please finish the installation process." -INSTL_LANGUAGES_WARNING_NO_INTERNET2="Note: You will be able to install languages later using the Joomla! administrator" -INSTL_LANGUAGES_WARNING_BACK_BUTTON="Return to last installation step" - -;Defaultlanguage view -INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE="Activate the multilingual feature" -INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="If active, your Joomla site will have the multilingual feature active with localised menus for each installed language" INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN="Enable the language code plugin" INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN_DESC="If enabled, the language code plugin will add the ability to change the language code in the generated HTML document to improve SEO." -INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Default Administrator language" -INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Joomla was not able to set the language as default. English will be used as default language for the backend ADMINISTRATOR." +INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE="Activate the multilingual feature" +INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="If active, your Joomla site will have the multilingual feature active with localized menus for each installed language." +INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Joomla was not able to set the language as default. English will be used as default language for the Backend Administrator." INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Joomla has set %s as your default ADMINISTRATOR language." -INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Select" +INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Default Administrator language" INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Language" +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Select" INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="Tag" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_ARTICLE="Joomla was not able to automatically create the %s localized article" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CATEGORY="Joomla was not able to automatically create the %s content category" INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CONTENT_LANGUAGE="Joomla was not able to automatically create the %s content language" INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU="Joomla was not able to automatically create the %s menu" INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_ITEM="Joomla was not able to automatically create the %s home menu item" INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_MODULE="Joomla was not able to automatically create the %s menu module" -INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CATEGORY="Joomla was not able to automatically create the %s content category" -INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_ARTICLE="Joomla was not able to automatically create the %s localised article" INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_MODULESWHITCHER_LANGUAGECODE="Joomla was not able to automatically publish the language switcher module" INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGECODE="Joomla was not able to automatically enable the Language Code Plugin" INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGEFILTER="Joomla was not able to automatically enable the Language Filter Plugin" INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Joomla was unable to install %s language." INSTL_DEFAULTLANGUAGE_COULD_NOT_PUBLISH_MOD_MULTILANGSTATUS="Joomla was not able to automatically publish the language status module" INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="Joomla was not able to automatically unpublish the default menu module" -INSTL_DEFAULTLANGUAGE_DESC="Joomla has installed the following languages. Please select your desired default language for the Joomla administrator." -INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla has installed the following languages. Please select your desired default language for the Joomla frontend." +INSTL_DEFAULTLANGUAGE_DESC="Joomla has installed the following languages. Please select your desired default language for the Joomla Administrator." +INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla has installed the following languages. Please select your desired default language for the Joomla Frontend." INSTL_DEFAULTLANGUAGE_FRONTEND="Default Site language" -INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla was not able to set the language as default. English will be used as default language for the frontend SITE." +INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla was not able to set the language as default. English will be used as default language for the Frontend SITE." INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Joomla has set %s as your default SITE language." -INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Install localised content" -INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="If active, Joomla will automatically create one content category per each installed language. Also, one featured article containing dummy content will be created on each category" +INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Install localized content" +INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="If active, Joomla will automatically create one content category per each installed language. Also, one featured article containing dummy content will be created on each category." +INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="This section allows you to automatically activate the Joomla! multilingual feature." INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Multilingual" -INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="This section allows you to automatically activate the Joomla! multilingual feature" +INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="English (CA)" INSTL_DEFAULTLANGUAGE_TRY_LATER="You will be able to install it later using the Joomla! Administrator" - -; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español -INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="English (UK)" - -;Database Model -INSTL_DATABASE_COULD_NOT_CONNECT="Could not connect to the database. Connector returned number: %s" -INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="The installer could not connect to the specified database and was unable to create the database. Please verify your settings and if necessary manually create your database." -INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Could not refresh manifest cache for extension: %s" -INSTL_DATABASE_EMPTY_NAME="" -INSTL_DATABASE_ERROR_BACKINGUP="Some errors occurred in backing up the database." -INSTL_DATABASE_ERROR_CREATE="An error occurred while trying to create the database %s.
    The user may not have enough privileges to create a database. The required database may need to be created separately before you can install Joomla!." -INSTL_DATABASE_ERROR_DELETE="Some errors occurred deleting the database." -INSTL_DATABASE_FIELD_VALUE_REMOVE="Remove" -INSTL_DATABASE_FIELD_VALUE_BACKUP="Backup" -INSTL_DATABASE_FIX_TOO_LONG="The MySQL table prefix must be a maximum of 15 characters." -INSTL_DATABASE_INVALID_DB_DETAILS="The database details provided are incorrect and/or empty." -INSTL_DATABASE_INVALID_MYSQL_VERSION="You need MySQL 5.0.4 or higher to continue the installation. Your version is: %s" -INSTL_DATABASE_INVALID_MYSQLI_VERSION="You need MySQL 5.0.4 or higher to continue the installation. Your version is: %s" -INSTL_DATABASE_INVALID_PDOMYSQL_VERSION="You need MySQL 5.0.4 or higher to continue the installation. Your version is: %s" -INSTL_DATABASE_INVALID_POSTGRESQL_VERSION="You need PostgreSQL 8.3.18 or higher to continue the installation. Your version is: %s" -INSTL_DATABASE_INVALID_SQLSRV_VERSION="You need SQL Server 2008 R2 (10.50.1600.1) or higher to continue the installation. Your version is: %s" -INSTL_DATABASE_INVALID_SQLZURE_VERSION="You need SQL Server 2008 R2 (10.50.1600.1) or higher to continue the installation. Your version is: %s" -INSTL_DATABASE_INVALID_TYPE="Please select the database type" -INSTL_DATABASE_NAME_TOO_LONG="The MySQL database name must be a maximum of 64 characters." -INSTL_DATABASE_INVALID_NAME="MySQL versions previous to 5.1.6 may not contain periods or other "_QQ_"special"_QQ_" characters in the name. Your version is: %s" -INSTL_DATABASE_NAME_INVALID_SPACES="MySQL database names and table names may not begin or end with spaces." -INSTL_DATABASE_NAME_INVALID_CHAR="No MySQL identifier can contain a NULL ASCII(0x00)." -INSTL_DATABASE_FILE_DOES_NOT_EXIST="File %s does not exist" - -;controllers -INSTL_COOKIES_NOT_ENABLED="Cookies do not appear to be enabled on your browser client. You will not be able to install the application with this feature disabled. Alternatively, there could also be a problem with the server's session.save_path. If this is the case, please consult your hosting provider if you don't know how to check or fix this yourself." -INSTL_HEADER_ERROR="Error" - -;Helpers -INSTL_PAGE_TITLE="Joomla! Web Installer" - -;Configuration model +INSTL_DISPLAY_ERRORS="Display Errors" +INSTL_EMAIL_HEADING="Below you can find the configuration settings for a newly setup Joomla! website:" +INSTL_EMAIL_NOT_SENT="Email could not be sent." +INSTL_EMAIL_SUBJECT="Configuration Details: %s" INSTL_ERROR_CONNECT_DB="Could not connect to the database. Connector returned number: %s" -INSTL_STD_OFFLINE_MSG="This site is down for maintenance.
    Please check back again soon." - -;FTP model +INSTL_ERROR_DB="Some errors occurred while populating the database: %s" +INSTL_ERROR_INITIALISE_SCHEMA="Can't initialise database schema" +INSTL_FILE_UPLOADS="File Uploads" +INSTL_FINALISATION="Finalisation" +INSTL_FTP="FTP Configuration" +INSTL_FTP_DESC="

    On some servers you may need to provide FTP credentials for installation to complete. If you have difficulties completing installation without these credentials, check with your host to determine if this is necessary.

    For security reasons, it is best to create a separate FTP user account with access to the Joomla! installation only and not the entire web server. Your host can assist you with this.

    Note: If you are installing on a Windows Operating System, the FTP layer is not required.

    " +INSTL_FTP_ENABLE_LABEL="Enable FTP Layer" +INSTL_FTP_HOST_LABEL="FTP Host" INSTL_FTP_INVALIDROOT="The specified FTP Folder is not the folder of this Joomla! installation" INSTL_FTP_NOCONNECT="Could not connect to the FTP server" -INSTL_FTP_NODELE="The function "_QQ_"DELE"_QQ_" failed." +INSTL_FTP_NODELE="The function "DELE" failed." INSTL_FTP_NODIRECTORYLISTING="Could not retrieve a folder listing from the FTP server." -INSTL_FTP_NOLIST="The function "_QQ_"LIST"_QQ_" failed." +INSTL_FTP_NOLIST="The function "LIST" failed." INSTL_FTP_NOLOGIN="Could not log in to the FTP server." -INSTL_FTP_NOMKD="The function "_QQ_"MKD"_QQ_" failed." -INSTL_FTP_NONLST="The function "_QQ_"NLST"_QQ_" failed." -INSTL_FTP_NOPWD="The function "_QQ_"PWD"_QQ_" failed." -INSTL_FTP_NORETR="The function "_QQ_"RETR"_QQ_" failed." -INSTL_FTP_NORMD="The function "_QQ_"RMD"_QQ_" failed." +INSTL_FTP_NOMKD="The function "MKD" failed." +INSTL_FTP_NONLST="The function "NLST" failed." +INSTL_FTP_NOPWD="The function "PWD" failed." +INSTL_FTP_NORETR="The function "RETR" failed." +INSTL_FTP_NORMD="The function "RMD" failed." INSTL_FTP_NOROOT="Could not access the specified FTP folder." -INSTL_FTP_NOSTOR="The function "_QQ_"STOR"_QQ_" failed." -INSTL_FTP_NOSYST="The function "_QQ_"SYST"_QQ_" failed." +INSTL_FTP_NOSTOR="The function "STOR" failed." +INSTL_FTP_NOSYST="The function "SYST" failed." +INSTL_FTP_PASSWORD_DESC="Warning! It is recommended to leave this blank and enter your FTP password each time you transfer files." +INSTL_FTP_PASSWORD_LABEL="FTP Password" +INSTL_FTP_PORT_LABEL="FTP Port" +INSTL_FTP_ROOT_LABEL="FTP Root Path" +INSTL_FTP_SAVE_LABEL="Save FTP Password" +INSTL_FTP_SETTINGS_CORRECT="Settings correct" +INSTL_FTP_TITLE="FTP Configuration (Optional - Most Users Can Skip This Step - Press Next to Skip)" INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Unable to auto-detect the FTP root folder." - -;others -INSTL_CONFPROBLEM="Your configuration file or folder is not writable or there was a problem creating the configuration file. You will have to upload the following code by hand. Click in the text area to highlight all of the code and then paste into a new text file. Name this file 'configuration.php' and upload it to your site root folder." -INSTL_DATABASE_SUPPORT="Database Support:" -INSTL_DISPLAY_ERRORS="Display Errors" -INSTL_ERROR_DB="Some errors occurred while populating the database: %s" -INSTL_ERROR_INITIALISE_SCHEMA="Can't initialise database schema" -INSTL_FILE_UPLOADS="File Uploads" +INSTL_FTP_USER_DESC="Warning! It is recommended to leave this blank and enter your FTP username each time you transfer files." +INSTL_FTP_USER_LABEL="FTP Username" INSTL_GNU_GPL_LICENSE="GNU General Public License" +INSTL_HEADER_ERROR="Error" +INSTL_INSTALLING="Installing ..." +INSTL_INSTALLING_CONFIG="Creating configuration File" +INSTL_INSTALLING_DATABASE="Creating database tables" +INSTL_INSTALLING_DATABASE_BACKUP="Backing up old database tables" +INSTL_INSTALLING_DATABASE_REMOVE="Removing old database tables" +INSTL_INSTALLING_EMAIL="Sending email to %s" +INSTL_INSTALLING_SAMPLE="Installing sample data" INSTL_JSON_SUPPORT_AVAILABLE="JSON Support" +INSTL_LANGUAGES="Install Language packages" +INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Language" +INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Version" +INSTL_LANGUAGES_DESC="The Joomla interface is available in several languages. Choose your preferred languages by choosing the checkboxes and then install them by selecting the Next button.
    Note: this operation will take about 10 seconds to download and install every language. To avoid timeouts please select no more than 3 languages to install." +INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="This operation will take up to 10 seconds per language to complete
    Please wait while we download and install the languages ..." +INSTL_LANGUAGES_MORE_LANGUAGES="Press the 'Previous' button if you want to install more languages." +INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="No languages have been selected to be installed. If you need to install more languages, press the 'Previous' button and choose the desired languages from the list." +INSTL_LANGUAGES_WARNING_BACK_BUTTON="Return to last installation step" +INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! was not able to connect to the languages server. Please finish the installation process." +INSTL_LANGUAGES_WARNING_NO_INTERNET2="Note: You will be able to install languages later using the Joomla! Administrator" INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC Off" INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime" INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language is Default" INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Off" INSTL_NOTICEMBLANGNOTDEFAULT="PHP mbstring language is not set to neutral. This can be set locally by entering php_value mbstring.language neutral in your .htaccess file." INSTL_NOTICEMBSTRINGOVERLOAD="PHP mbstring function overload is set. This can be turned off locally by entering php_value mbstring.func_overload 0 in your .htaccess file." -INSTL_NOTICEYOUCANSTILLINSTALL="
    You can still continue the installation as the configuration settings will be displayed at the end. You will have to manually upload the code. Click in the text area to highlight all of the code and then paste into a new text file. Name this file 'configuration.php' and upload it to your site root folder." +INSTL_NOTICEYOUCANSTILLINSTALL="
    You can still continue the installation as the configuration settings will be displayed at the end. You will have to manually upload the code. Select in the text area to highlight all of the code and then paste into a new text file. Name this file 'configuration.php' and upload it to your site root folder." INSTL_OUTPUT_BUFFERING="Output Buffering" +INSTL_PAGE_TITLE="Joomla! Web Installer" INSTL_PARSE_INI_FILE_AVAILABLE="INI Parser Support" INSTL_PHP_VERSION="PHP Version" INSTL_PHP_VERSION_NEWER="PHP Version >= %s" +INSTL_PRECHECK_ACTUAL="Actual" +INSTL_PRECHECK_DESC="If any of these items are not supported (marked as No) then please take actions to correct them.
    You can't install Joomla! until your setup meets the requirements below." +INSTL_PRECHECK_DIRECTIVE="Directive" +INSTL_PRECHECK_RECOMMENDED="Recommended" +INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="These settings are recommended for PHP in order to ensure full compatibility with Joomla.
    However, Joomla! will still operate if your settings do not quite match the recommended configuration." +INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Recommended settings:" +INSTL_PRECHECK_TITLE="Pre-Installation Check" +INSTL_PROCESS_BUSY="Process is in progress. Please wait ..." INSTL_REGISTER_GLOBALS="Register Globals Off" INSTL_SAFE_MODE="Safe Mode" +INSTL_SAMPLE_BLOG_SET="Blog English (GB) Sample Data" +INSTL_SAMPLE_BLOG_SET_DESC="Install Joomla with a few articles and blog related modules like Older Posts, Blog Roll, Most Read Posts." +INSTL_SAMPLE_BROCHURE_SET="Brochure English (GB) Sample Data" +INSTL_SAMPLE_BROCHURE_SET_DESC="Install Joomla with a few pages (a menu with pages Home, About Us, News, Contact Us) and modules like Search, Custom, Login Form." +INSTL_SAMPLE_DATA_SET="Default English (GB) Sample Data" +INSTL_SAMPLE_DATA_SET_DESC="Install Joomla with one page (a menu with one link) and modules like Latest Article, Login Form." +INSTL_SAMPLE_LEARN_SET="Learn Joomla English (GB) Sample Data" +INSTL_SAMPLE_LEARN_SET_DESC="Install Joomla with example articles that describe how Joomla works." +INSTL_SAMPLE_TESTING_SET="Test English (GB) Sample Data" +INSTL_SAMPLE_TESTING_SET_DESC="Install Joomla with all possible menu items to help with testing Joomla." +INSTL_SELECT_LANGUAGE_TITLE="Select Language" INSTL_SESSION_AUTO_START="Session Auto Start" +INSTL_SITE="Main Configuration" +INSTL_SITE_INSTALL_SAMPLE_DESC="Installing sample data is strongly recommended for beginners.
    This will install sample content that is included in the Joomla! installation package." +INSTL_SITE_INSTALL_SAMPLE_LABEL="Install Sample Data" +INSTL_SITE_INSTALL_SAMPLE_NONE="None (Required for basic native multilingual site creation)" +INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Install Joomla with just one menu and a login form, without any content." +INSTL_SITE_METADESC_LABEL="Description" +INSTL_SITE_METADESC_TITLE_LABEL="Enter a description of the overall website that is to be used by search engines. Generally, a maximum of 20 words is optimal." +INSTL_SITE_NAME_DESC="Enter the name of your Joomla! site." +INSTL_SITE_NAME_LABEL="Site Name" +INSTL_SITE_OFFLINE_LABEL="Site Offline" +INSTL_SITE_OFFLINE_TITLE_LABEL="Set the site Frontend offline when installation is completed. The site can be set online later on through the Global Configuration." +INSTL_STD_OFFLINE_MSG="This site is down for maintenance.
    Please check back again soon." +INSTL_STEP_COMPLETE_LABEL="Finish" +INSTL_STEP_DATABASE_LABEL="Database" +INSTL_STEP_DEFAULTLANGUAGE_LABEL="Choose Default Language" +INSTL_STEP_FTP_LABEL="FTP" +INSTL_STEP_LANGUAGES_LABEL="Install Languages" +INSTL_STEP_SITE_LABEL="Configuration" +INSTL_STEP_SUMMARY_LABEL="Overview" +INSTL_SUMMARY_EMAIL_DESC="Send configuration settings to %s by email after installation." +INSTL_SUMMARY_EMAIL_LABEL="Email Configuration" +INSTL_SUMMARY_EMAIL_PASSWORDS_DESC="Warning! It is recommended to not send and store your passwords in emails." +INSTL_SUMMARY_EMAIL_PASSWORDS_LABEL="Include Passwords in Email" +INSTL_SUMMARY_INSTALL="Install" +INSTL_VERIFY_FTP_SETTINGS="Verify FTP Settings" +INSTL_WARNJAVASCRIPT="Warning! JavaScript must be enabled for proper installation of Joomla!" +INSTL_WARNJSON="Your PHP installation needs to have JSON enabled for Joomla to be installed!" INSTL_WRITABLE="%s Writeable" INSTL_XML_SUPPORT="XML Support" INSTL_ZIP_SUPPORT_AVAILABLE="Native ZIP support" INSTL_ZLIB_COMPRESSION_SUPPORT="Zlib Compression Support" -INSTL_PROCESS_BUSY="Process is in progress. Please wait..." - -;Global strings JADMINISTRATOR="Administrator" JCHECK_AGAIN="Check Again" -JERROR="Error" +JDEBUG_LANGUAGE_FILES_IN_ERROR="Parsing errors in language files" +JDEBUG_LANGUAGE_UNTRANSLATED_STRING="Untranslated strings" JEMAIL="Email" +JERROR="Error" JGLOBAL_ISFREESOFTWARE="%s is free software released under the %s." JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="Language pack does not match this Joomla! version. Some strings may be missing." JGLOBAL_SELECT_AN_OPTION="Select an option" JGLOBAL_SELECT_NO_RESULTS_MATCH="No results match" JGLOBAL_SELECT_SOME_OPTIONS="Select some options" JINVALID_TOKEN="The most recent request was denied because it contained an invalid security token. Please refresh the page and try again." -JNEXT="Next" -JNO="No" -JNOTICE="Notice" -JOFF="Off" -JON="On" -JPREVIOUS="Previous" -JSITE="Site" -JUSERNAME="Username" -JYES="Yes" - -; Framework strings necessary when no lang pack is available JLIB_DATABASE_ERROR_CONNECT_MYSQL="Could not connect to MySQL." JLIB_DATABASE_ERROR_DATABASE="A Database error occurred." JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Unable to load Database Driver: %s" @@ -300,24 +248,24 @@ JLIB_FORM_VALIDATE_FIELD_REQUIRED="Field required: %s" JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Failed to copy file %1$s to %2$s." JLIB_INSTALLER_NOT_ERROR="If the error is related to the installation of TinyMCE language files it has no effect on the installation of the language(s). Some language packs created prior to Joomla! 3.2.0 may try to install separate TinyMCE language files. As these are now included in the core they no longer need to be installed." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Could not connect to database
    joomla.library: %1$s - %2$s" - -; Strings for the language debugger -JDEBUG_LANGUAGE_FILES_IN_ERROR="Parsing errors in language files" -JDEBUG_LANGUAGE_UNTRANSLATED_STRING="Untranslated strings" +JNEXT="Next" +JNO="No" JNONE="None" - -; Necessary for errors -ADMIN_EMAIL="Admin Email" -ADMIN_PASSWORD="Admin Password" -ADMIN_PASSWORD2="Confirm Admin Password" -SITE_NAME="Site Name" - -; Database types (allows for a more descriptive label than the internal name) +JNOTICE="Notice" +JOFF="Off" +JON="On" +JPREVIOUS="Previous" +JSITE="Site" +JUSERNAME="Username" +JYES="Yes" MYSQL="MySQL" MYSQLI="MySQLi" ORACLE="Oracle" PDOMYSQL="MySQL (PDO)" POSTGRESQL="PostgreSQL" +SITE_NAME="Site Name" SQLAZURE="Microsoft SQL Azure" SQLITE="SQLite" SQLSRV="Microsoft SQL Server" + + diff --git a/installation/language/en-CA/en-CA.xml b/installation/language/en-CA/en-CA.xml index 4ce87b1e64e9a..5a02a7345cba0 100644 --- a/installation/language/en-CA/en-CA.xml +++ b/installation/language/en-CA/en-CA.xml @@ -1,14 +1,13 @@ English (Canada) - 3.4.6 - 2014-04-12 - Martin Lamothe - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + 3.5.0 + January 2016 + Joomla! Project + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - en-CA.ini diff --git a/installation/language/en-GB/en-GB.ini b/installation/language/en-GB/en-GB.ini index 3d7cb0144cd89..ee8de6484dc4f 100644 --- a/installation/language/en-GB/en-GB.ini +++ b/installation/language/en-GB/en-GB.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 @@ -192,6 +192,7 @@ INSTL_DATABASE_ERROR_CREATE="An error occurred while trying to create the databa INSTL_DATABASE_ERROR_DELETE="Some errors occurred deleting the database." INSTL_DATABASE_FIELD_VALUE_REMOVE="Remove" INSTL_DATABASE_FIELD_VALUE_BACKUP="Backup" +INSTL_DATABASE_FIX_LOWERCASE="The table prefix must be lowercase for PostgreSQL." INSTL_DATABASE_FIX_TOO_LONG="The MySQL table prefix must be a maximum of 15 characters." INSTL_DATABASE_INVALID_DB_DETAILS="The database details provided are incorrect and/or empty." INSTL_DATABASE_INVALID_MYSQL_VERSION="You need MySQL 5.0.4 or higher to continue the installation. Your version is: %s" diff --git a/installation/language/en-GB/en-GB.xml b/installation/language/en-GB/en-GB.xml index c8be785f55cc3..43b06ccb33086 100644 --- a/installation/language/en-GB/en-GB.xml +++ b/installation/language/en-GB/en-GB.xml @@ -1,16 +1,13 @@ English (United Kingdom) - 3.4.6 + 3.5.0 August 2015 Joomla! Project - admin@joomla.org - www.joomla.org - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - en-GB.ini diff --git a/installation/language/en-US/en-US.ini b/installation/language/en-US/en-US.ini index 2475fe7620eca..54b04af1dfd9e 100644 --- a/installation/language/en-US/en-US.ini +++ b/installation/language/en-US/en-US.ini @@ -1,293 +1,241 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 - - -;Stepbar -INSTL_STEP_COMPLETE_LABEL="Finish" -INSTL_STEP_DATABASE_LABEL="Database" -INSTL_STEP_DEFAULTLANGUAGE_LABEL="Choose default language" -INSTL_STEP_FTP_LABEL="FTP" -INSTL_STEP_LANGUAGES_LABEL="Install Languages" -INSTL_STEP_SITE_LABEL="Configuration" -INSTL_STEP_SUMMARY_LABEL="Overview" - -;Language view -INSTL_SELECT_LANGUAGE_TITLE="Select Language" -INSTL_WARNJAVASCRIPT="Warning! JavaScript must be enabled for proper installation of Joomla!" -INSTL_WARNJSON="Your PHP installation needs to have JSON enabled for Joomla to be installed!" - -;Preinstall view -INSTL_PRECHECK_TITLE="Pre-Installation Check" -INSTL_PRECHECK_DESC="If any of these items are not supported (marked as No) then please take actions to correct them.
    You cannot install Joomla! until your setup meets the requirements below." -INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Recommended settings:" -INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="These settings are recommended for PHP in order to ensure full compatibility with Joomla.
    However, Joomla! will still operate if your settings do not quite match the recommended configuration." -INSTL_PRECHECK_DIRECTIVE="Directive" -INSTL_PRECHECK_RECOMMENDED="Recommended" -INSTL_PRECHECK_ACTUAL="Actual" - -; Database view +ADMIN_EMAIL="Administrator Email" +ADMIN_PASSWORD="Administrator Password" +ADMIN_PASSWORD2="Confirm Administrator Password" +INSTL_ADMIN_EMAIL_DESC="Enter an email address. This will be the email address of the website Super User." +INSTL_ADMIN_EMAIL_LABEL="Administrator Email" +INSTL_ADMIN_PASSWORD2_LABEL="Confirm Administrator Password" +INSTL_ADMIN_PASSWORD_DESC="Set the password for your Super User account and confirm it in the field below." +INSTL_ADMIN_PASSWORD_LABEL="Administrator Password" +INSTL_ADMIN_USER_DESC="Set the username for your Super User account." +INSTL_ADMIN_USER_LABEL="Administrator Username" +INSTL_AUTOFIND_FTP_PATH="Autofind FTP Path" +INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Administration Login Details" +INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="The installation folder has already been deleted." +INSTL_COMPLETE_ERROR_FOLDER_DELETE="Installation folder could not be deleted. Please manually delete the folder." +INSTL_COMPLETE_FOLDER_REMOVED="Installation folder successfully removed." +INSTL_COMPLETE_INSTALL_LANGUAGES="Extra steps: Install languages" +INSTL_COMPLETE_LANGUAGE_1="Joomla! in your own language and/or automatic basic native multilingual site creation" +INSTL_COMPLETE_LANGUAGE_DESC="Before removing the installation folder you can install extra languages. If you want to add extra languages to your Joomla! application select the following button." +INSTL_COMPLETE_LANGUAGE_DESC2="Note: you will need internet access for Joomla! to download and install the new languages.
    Some server configurations won't allow Joomla! to install the languages. If this is your case, don't worry, you will be able to install them later using the Joomla! Administrator." +INSTL_COMPLETE_REMOVE_FOLDER="Remove installation folder" +INSTL_COMPLETE_REMOVE_INSTALLATION="PLEASE REMEMBER TO COMPLETELY REMOVE THE INSTALLATION FOLDER.
    You will not be able to proceed beyond this point until the installation folder has been removed. This is a security feature of Joomla!" +INSTL_COMPLETE_TITLE="Congratulations! Joomla! is now installed." +INSTL_CONFPROBLEM="Your configuration file or folder is not writable or there was a problem creating the configuration file. You will have to upload the following code by hand. Select in the text area to highlight all of the code and then paste into a new text file. Name this file 'configuration.php' and upload it to your site root folder." +INSTL_COOKIES_NOT_ENABLED="Cookies do not appear to be enabled on your browser client. You will not be able to install the application with this feature disabled. Alternatively, there could also be a problem with the server's session.save_path. If this is the case, please consult your hosting provider if you don't know how to check or fix this yourself." INSTL_DATABASE="Database Configuration" -INSTL_DATABASE_HOST_DESC="This is usually "localhost"" +INSTL_DATABASE_COULD_NOT_CONNECT="Could not connect to the database. Connector returned number: %s" +INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="The installer could not connect to the specified database and was unable to create the database. Please verify your settings and if necessary manually create your database." +INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Could not refresh manifest cache for extension: %s" +INSTL_DATABASE_EMPTY_NAME="" +INSTL_DATABASE_ERROR_BACKINGUP="Some errors occurred in backing up the database." +INSTL_DATABASE_ERROR_CREATE="An error occurred while trying to create the database %s.
    The user may not have enough privileges to create a database. The required database may need to be created separately before you can install Joomla!" +INSTL_DATABASE_ERROR_DELETE="Some errors occurred deleting the database." +INSTL_DATABASE_FIELD_VALUE_BACKUP="Backup" +INSTL_DATABASE_FIELD_VALUE_REMOVE="Remove" +INSTL_DATABASE_FILE_DOES_NOT_EXIST="File %s does not exist" +INSTL_DATABASE_FIX_LOWERCASE="The table prefix must be lowercase for PostgreSQL." +INSTL_DATABASE_FIX_TOO_LONG="The MySQL table prefix must be a maximum of 15 characters." +INSTL_DATABASE_HOST_DESC="This is usually "localhost"." INSTL_DATABASE_HOST_LABEL="Host Name" +INSTL_DATABASE_INVALID_DB_DETAILS="The database details provided are incorrect and/or empty." +INSTL_DATABASE_INVALID_MYSQL_VERSION="You need MySQL 5.0.4 or higher to continue the installation. Your version is: %s" +INSTL_DATABASE_INVALID_MYSQLI_VERSION="You need MySQL 5.0.4 or higher to continue the installation. Your version is: %s" +INSTL_DATABASE_INVALID_NAME="MySQL versions previous to 5.1.6 may not contain periods or other "special" characters in the name. Your version is: %s" +INSTL_DATABASE_INVALID_PDOMYSQL_VERSION="You need MySQL 5.0.4 or higher to continue the installation. Your version is: %s" +INSTL_DATABASE_INVALID_POSTGRESQL_VERSION="You need PostgreSQL 8.3.18 or higher to continue the installation. Your version is: %s" +INSTL_DATABASE_INVALID_SQLSRV_VERSION="You need SQL Server 2008 R2 (10.50.1600.1) or higher to continue the installation. Your version is: %s" +INSTL_DATABASE_INVALID_SQLZURE_VERSION="You need SQL Server 2008 R2 (10.50.1600.1) or higher to continue the installation. Your version is: %s" +INSTL_DATABASE_INVALID_TYPE="Please select the database type" INSTL_DATABASE_NAME_DESC="Some hosts allow only a certain DB name per site. Use table prefix in this case for distinct Joomla! sites." +INSTL_DATABASE_NAME_INVALID_CHAR="No MySQL identifier can contain a NULL ASCII(0x00)." +INSTL_DATABASE_NAME_INVALID_SPACES="MySQL database names and table names may not begin or end with spaces." INSTL_DATABASE_NAME_LABEL="Database Name" +INSTL_DATABASE_NAME_TOO_LONG="The MySQL database name must be a maximum of 64 characters." INSTL_DATABASE_NO_SCHEMA="No database schema exists for this database type." -INSTL_DATABASE_OLD_PROCESS_DESC="Any existing backup tables from former Joomla! installations will be replaced" +INSTL_DATABASE_OLD_PROCESS_DESC="Any existing backup tables from former Joomla! installations will be replaced." INSTL_DATABASE_OLD_PROCESS_LABEL="Old Database Process" -INSTL_DATABASE_PASSWORD_DESC="For site security using a password for the database account is mandatory" +INSTL_DATABASE_PASSWORD_DESC="For site security using a password for the database account is mandatory." INSTL_DATABASE_PASSWORD_LABEL="Password" -INSTL_DATABASE_PREFIX_DESC="Choose a table prefix or use the randomly generated. Ideally, three or four characters long, contain only alphanumeric characters, and MUST end in an underscore. Make sure that the prefix chosen is not used by other tables." +INSTL_DATABASE_PREFIX_DESC="Choose a table prefix or use the randomly generated. Ideally, three or four characters long, contain only alphanumeric characters and MUST end in an underscore. Make sure that the prefix chosen is not used by other tables." INSTL_DATABASE_PREFIX_LABEL="Table Prefix" INSTL_DATABASE_PREFIX_MSG="The table prefix must start with a letter, be followed by optional alphanumeric characters and by an underscore" -INSTL_DATABASE_TYPE_DESC="This is probably "MySQLi"" +INSTL_DATABASE_SUPPORT="Database Support:" +INSTL_DATABASE_TYPE_DESC="This is probably "MySQLi"." INSTL_DATABASE_TYPE_LABEL="Database Type" -INSTL_DATABASE_USER_DESC="Either something as "_QQ_"root"_QQ_" or a username given by the host" +INSTL_DATABASE_USER_DESC="Either something as "root" or a username given by the host." INSTL_DATABASE_USER_LABEL="Username" - -;FTP view -INSTL_AUTOFIND_FTP_PATH="Autofind FTP Path" -INSTL_FTP="FTP Configuration" -INSTL_FTP_DESC="

    On some servers you may need to provide FTP credentials for installation to complete. If you have difficulties completing installation without these credentials, check with your host to determine if this is necessary.

    For security reasons, it is best to create a separate FTP user account with access to the Joomla! installation only and not the entire web server. Your host can assist you with this.

    Note: If you are installing on a Windows Operating System, the FTP layer is not required.

    " -INSTL_FTP_ENABLE_LABEL="Enable FTP Layer" -INSTL_FTP_HOST_LABEL="FTP Host" -INSTL_FTP_PASSWORD_LABEL="FTP Password" -INSTL_FTP_PORT_LABEL="FTP Port" -INSTL_FTP_ROOT_LABEL="FTP Root Path" -INSTL_FTP_SAVE_LABEL="Save FTP Password" -INSTL_FTP_TITLE="FTP Configuration (Optional - Most Users Can Skip This Step - Press Next to Skip)" -INSTL_FTP_USER_LABEL="FTP Username" -INSTL_VERIFY_FTP_SETTINGS="Verify FTP Settings" -INSTL_FTP_SETTINGS_CORRECT="Settings correct" -INSTL_FTP_USER_DESC="Warning! It is recommended to leave this blank and enter your FTP username each time you transfer files." -INSTL_FTP_PASSWORD_DESC="Warning! It is recommended to leave this blank and enter your FTP password each time you transfer files." - -;Site View -INSTL_SITE="Main Configuration" -INSTL_ADMIN_EMAIL_LABEL="Admin Email" -INSTL_ADMIN_EMAIL_DESC="Enter an email address. This will be the email address of the Web site Super Administrator." -INSTL_ADMIN_PASSWORD_LABEL="Admin Password" -INSTL_ADMIN_PASSWORD_DESC="Set the password for your Super Administrator account and confirm it in the field below." -INSTL_ADMIN_PASSWORD2_LABEL="Confirm Admin Password" -INSTL_ADMIN_USER_LABEL="Admin Username" -INSTL_ADMIN_USER_DESC="Set the username for your Super Administrator account." -INSTL_SITE_NAME_LABEL="Site Name" -INSTL_SITE_NAME_DESC="Enter the name of your Joomla! site." -INSTL_SITE_METADESC_LABEL="Description" -INSTL_SITE_METADESC_TITLE_LABEL="Enter a description of the overall Web site that is to be used by search engines. Generally, a maximum of 20 words is optimal." -INSTL_SITE_OFFLINE_LABEL="Site Offline" -INSTL_SITE_OFFLINE_TITLE_LABEL="Set the site frontend offline when installation is completed. The site can be set online later on through the Global Configuration." -INSTL_SITE_INSTALL_SAMPLE_LABEL="Install Sample Data" -INSTL_SITE_INSTALL_SAMPLE_DESC="Installing sample data is strongly recommended for beginners.
    This will install sample content that is included in the Joomla! installation package." -INSTL_SITE_INSTALL_SAMPLE_NONE="None (Required for basic native multilingual site creation)" -INSTL_SAMPLE_BLOG_SET="Blog English (GB) Sample Data" -INSTL_SAMPLE_BROCHURE_SET="Brochure English (GB) Sample Data" -INSTL_SAMPLE_DATA_SET="Default English (GB) Sample Data" -INSTL_SAMPLE_LEARN_SET="Learn Joomla English (GB) Sample Data" -INSTL_SAMPLE_TESTING_SET="Test English (GB) Sample Data" -INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Install Joomla with just one menu and a login form, without any content." -INSTL_SAMPLE_BLOG_SET_DESC="Install Joomla with a few articles and blog related modules like Older Posts, Blog Roll, Most Read Posts." -INSTL_SAMPLE_BROCHURE_SET_DESC="Install Joomla with a few pages (a menu with pages Home, About Us, News, Contact Us) and modules like Search, Custom HTML, Login Form." -INSTL_SAMPLE_DATA_SET_DESC="Install Joomla with one page (a menu with one link) and modules like Latest Article, Login Form." -INSTL_SAMPLE_LEARN_SET_DESC="Install Joomla with example articles that describe how Joomla works." -INSTL_SAMPLE_TESTING_SET_DESC="Install Joomla with all possible menu items to help with testing Joomla." - -;Summary view -INSTL_FINALISATION="Finalization" -INSTL_SUMMARY_INSTALL="Install" -INSTL_SUMMARY_EMAIL_LABEL="Email Configuration" -INSTL_SUMMARY_EMAIL_DESC="Send configuration settings to %s by email after installation." -INSTL_SUMMARY_EMAIL_PASSWORDS_LABEL="Include Passwords in Email" -INSTL_SUMMARY_EMAIL_PASSWORDS_DESC="Warning! It is recommended to not send and store your passwords in emails." - -;Installing view -INSTL_INSTALLING="Installing..." -INSTL_INSTALLING_DATABASE_BACKUP="Backing up old database tables" -INSTL_INSTALLING_DATABASE_REMOVE="Removing old database tables" -INSTL_INSTALLING_DATABASE="Creating database tables" -INSTL_INSTALLING_SAMPLE="Installing sample data" -INSTL_INSTALLING_CONFIG="Creating configuration File" -INSTL_INSTALLING_EMAIL="Sending email to %s" - -;Email -INSTL_EMAIL_SUBJECT="Configuration Details: %s" -INSTL_EMAIL_HEADING="Below you can find the configuration settings for a newly setup Joomla! website:" -INSTL_EMAIL_NOT_SENT="Email could not be sent." - -;Complete view -INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Administration Login Details" -; The word 'installation' should not be translated as it is a physical folder. -INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="The installation folder has already been deleted." -; The word 'installation' should not be translated as it is a physical folder. -INSTL_COMPLETE_ERROR_FOLDER_DELETE="Installation folder could not be deleted. Please manually delete the folder." -; The word 'installation' should not be translated as it is a physical folder. -INSTL_COMPLETE_FOLDER_REMOVED="Installation folder successfully removed" -INSTL_COMPLETE_LANGUAGE_1="Joomla! in your own language and/or automatic basic native multilingual site creation" -; The word 'installation' should not be translated as it is a physical folder. -INSTL_COMPLETE_LANGUAGE_DESC="Before removing the installation folder you can install extra languages. If you want to add extra languages to your Joomla! application click the following button." -INSTL_COMPLETE_LANGUAGE_DESC2="Note: you will need Internet access for Joomla! to download and install the new languages.
    Some server configurations won't allow Joomla! to install the languages. If this is your case, don't worry, you will be able to install them later using the Joomla! administrator." -; The word 'installation' should not be translated as it is a physical folder. -INSTL_COMPLETE_REMOVE_FOLDER="Remove installation folder" -; The word 'installation' should not be translated as it is a physical folder. -INSTL_COMPLETE_REMOVE_INSTALLATION="PLEASE REMEMBER TO COMPLETELY REMOVE THE INSTALLATION FOLDER.
    You will not be able to proceed beyond this point until the installation folder has been removed. This is a security feature of Joomla!." -INSTL_COMPLETE_TITLE="Congratulations! Joomla! is now installed." -INSTL_COMPLETE_INSTALL_LANGUAGES="Extra steps: Install languages" - -;Languages view -INSTL_LANGUAGES="Install Language packages" -INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Language" -INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Version" -INSTL_LANGUAGES_DESC="The Joomla interface is available in several languages. Choose your preferred languages by clicking in the checkboxes and then install them by clicking on the Next button.
    Note: this operation will take about 10 seconds to download and install every language. To avoid timeouts please select no more than 3 languages to install." -INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="This operation will take up to 10 seconds per language to complete
    Please wait while we download and install the languages..." -INSTL_LANGUAGES_MORE_LANGUAGES="Press the 'Previous' button if you want to install more languages." -INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="No languages have been selected to be installed. If you need to install more languages, press the 'Previous' button and choose the desired languages from the list." -INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! was not able to connect to the languages server. Please finish the installation process." -INSTL_LANGUAGES_WARNING_NO_INTERNET2="Note: You will be able to install languages later using the Joomla! administrator" -INSTL_LANGUAGES_WARNING_BACK_BUTTON="Return to last installation step" - -;Defaultlanguage view -INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE="Activate the multilingual feature" -INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="If active, your Joomla site will have the multilingual feature active with localized menus for each installed language" INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN="Enable the language code plugin" INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN_DESC="If enabled, the language code plugin will add the ability to change the language code in the generated HTML document to improve SEO." -INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Default Administrator language" -INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Joomla was not able to set the language as default. English will be used as default language for the backend ADMINISTRATOR." +INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE="Activate the multilingual feature" +INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="If active, your Joomla site will have the multilingual feature active with localized menus for each installed language." +INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Joomla was not able to set the language as default. English will be used as default language for the Backend Administrator." INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Joomla has set %s as your default ADMINISTRATOR language." -INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Select" +INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Default Administrator language" INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Language" +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Select" INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="Tag" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_ARTICLE="Joomla was not able to automatically create the %s localized article" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CATEGORY="Joomla was not able to automatically create the %s content category" INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CONTENT_LANGUAGE="Joomla was not able to automatically create the %s content language" INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU="Joomla was not able to automatically create the %s menu" INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_ITEM="Joomla was not able to automatically create the %s home menu item" INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_MODULE="Joomla was not able to automatically create the %s menu module" -INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CATEGORY="Joomla was not able to automatically create the %s content category" -INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_ARTICLE="Joomla was not able to automatically create the %s localized article" INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_MODULESWHITCHER_LANGUAGECODE="Joomla was not able to automatically publish the language switcher module" INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGECODE="Joomla was not able to automatically enable the Language Code Plugin" INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGEFILTER="Joomla was not able to automatically enable the Language Filter Plugin" INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Joomla was unable to install %s language." INSTL_DEFAULTLANGUAGE_COULD_NOT_PUBLISH_MOD_MULTILANGSTATUS="Joomla was not able to automatically publish the language status module" INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="Joomla was not able to automatically unpublish the default menu module" -INSTL_DEFAULTLANGUAGE_DESC="Joomla has installed the following languages. Please select your desired default language for the Joomla administrator." -INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla has installed the following languages. Please select your desired default language for the Joomla frontend." +INSTL_DEFAULTLANGUAGE_DESC="Joomla has installed the following languages. Please select your desired default language for the Joomla Administrator." +INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla has installed the following languages. Please select your desired default language for the Joomla Frontend." INSTL_DEFAULTLANGUAGE_FRONTEND="Default Site language" -INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla was not able to set the language as default. English will be used as default language for the frontend SITE." +INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla was not able to set the language as default. English will be used as default language for the Frontend SITE." INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Joomla has set %s as your default SITE language." INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Install localized content" -INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="If active, Joomla will automatically create one content category per each installed language. Also, one featured article containing dummy content will be created on each category" +INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="If active, Joomla will automatically create one content category per each installed language. Also, one featured article containing dummy content will be created on each category." +INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="This section allows you to automatically activate the Joomla! multilingual feature." INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Multilingual" -INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="This section allows you to automatically activate the Joomla! multilingual feature" -INSTL_DEFAULTLANGUAGE_TRY_LATER="You will be able to install it later using the Joomla! Administrator" - -; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="English (US)" - -;Database Model -INSTL_DATABASE_COULD_NOT_CONNECT="Could not connect to the database. Connector returned number: %s" -INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="The installer could not connect to the specified database and was unable to create the database. Please verify your settings and if necessary manually create your database." -INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Could not refresh manifest cache for extension: %s" -INSTL_DATABASE_EMPTY_NAME="" -INSTL_DATABASE_ERROR_BACKINGUP="Some errors occurred in backing up the database." -INSTL_DATABASE_ERROR_CREATE="An error occurred while trying to create the database %s.
    The user may not have enough privileges to create a database. The required database may need to be created separately before you can install Joomla!." -INSTL_DATABASE_ERROR_DELETE="Some errors occurred deleting the database." -INSTL_DATABASE_FIELD_VALUE_REMOVE="Remove" -INSTL_DATABASE_FIELD_VALUE_BACKUP="Backup" -INSTL_DATABASE_FIX_TOO_LONG="The MySQL table prefix must be a maximum of 15 characters." -INSTL_DATABASE_INVALID_DB_DETAILS="The database details provided are incorrect and/or empty." -INSTL_DATABASE_INVALID_MYSQL_VERSION="You need MySQL 5.0.4 or higher to continue the installation. Your version is: %s" -INSTL_DATABASE_INVALID_MYSQLI_VERSION="You need MySQL 5.0.4 or higher to continue the installation. Your version is: %s" -INSTL_DATABASE_INVALID_PDOMYSQL_VERSION="You need MySQL 5.0.4 or higher to continue the installation. Your version is: %s" -INSTL_DATABASE_INVALID_POSTGRESQL_VERSION="You need PostgreSQL 8.3.18 or higher to continue the installation. Your version is: %s" -INSTL_DATABASE_INVALID_SQLSRV_VERSION="You need SQL Server 2008 R2 (10.50.1600.1) or higher to continue the installation. Your version is: %s" -INSTL_DATABASE_INVALID_SQLZURE_VERSION="You need SQL Server 2008 R2 (10.50.1600.1) or higher to continue the installation. Your version is: %s" -INSTL_DATABASE_INVALID_TYPE="Please select the database type" -INSTL_DATABASE_NAME_TOO_LONG="The MySQL database name must be a maximum of 64 characters." -INSTL_DATABASE_INVALID_NAME="MySQL versions previous to 5.1.6 may not contain periods or other "_QQ_"special"_QQ_" characters in the name. Your version is: %s" -INSTL_DATABASE_NAME_INVALID_SPACES="MySQL database names and table names may not begin or end with spaces." -INSTL_DATABASE_NAME_INVALID_CHAR="No MySQL identifier can contain a NULL ASCII(0x00)." -INSTL_DATABASE_FILE_DOES_NOT_EXIST="File %s does not exist" - -;controllers -INSTL_COOKIES_NOT_ENABLED="Cookies do not appear to be enabled on your browser client. You will not be able to install the application with this feature disabled. Alternatively, there could also be a problem with the server's session.save_path. If this is the case, please consult your hosting provider if you don't know how to check or fix this yourself." -INSTL_HEADER_ERROR="Error" - -;Helpers -INSTL_PAGE_TITLE="Joomla! Web Installer" - -;Configuration model +INSTL_DEFAULTLANGUAGE_TRY_LATER="You will be able to install it later using the Joomla! Administrator" +INSTL_DISPLAY_ERRORS="Display Errors" +INSTL_EMAIL_HEADING="Below you can find the configuration settings for a newly setup Joomla! website:" +INSTL_EMAIL_NOT_SENT="Email could not be sent." +INSTL_EMAIL_SUBJECT="Configuration Details: %s" INSTL_ERROR_CONNECT_DB="Could not connect to the database. Connector returned number: %s" -INSTL_STD_OFFLINE_MSG="This site is down for maintenance.
    Please check back again soon." - -;FTP model +INSTL_ERROR_DB="Some errors occurred while populating the database: %s" +INSTL_ERROR_INITIALISE_SCHEMA="Can't initialise database schema" +INSTL_FILE_UPLOADS="File Uploads" +INSTL_FINALISATION="Finalisation" +INSTL_FTP="FTP Configuration" +INSTL_FTP_DESC="

    On some servers you may need to provide FTP credentials for installation to complete. If you have difficulties completing installation without these credentials, check with your host to determine if this is necessary.

    For security reasons, it is best to create a separate FTP user account with access to the Joomla! installation only and not the entire web server. Your host can assist you with this.

    Note: If you are installing on a Windows Operating System, the FTP layer is not required.

    " +INSTL_FTP_ENABLE_LABEL="Enable FTP Layer" +INSTL_FTP_HOST_LABEL="FTP Host" INSTL_FTP_INVALIDROOT="The specified FTP Folder is not the folder of this Joomla! installation" INSTL_FTP_NOCONNECT="Could not connect to the FTP server" -INSTL_FTP_NODELE="The function "_QQ_"DELE"_QQ_" failed." +INSTL_FTP_NODELE="The function "DELE" failed." INSTL_FTP_NODIRECTORYLISTING="Could not retrieve a folder listing from the FTP server." -INSTL_FTP_NOLIST="The function "_QQ_"LIST"_QQ_" failed." +INSTL_FTP_NOLIST="The function "LIST" failed." INSTL_FTP_NOLOGIN="Could not log in to the FTP server." -INSTL_FTP_NOMKD="The function "_QQ_"MKD"_QQ_" failed." -INSTL_FTP_NONLST="The function "_QQ_"NLST"_QQ_" failed." -INSTL_FTP_NOPWD="The function "_QQ_"PWD"_QQ_" failed." -INSTL_FTP_NORETR="The function "_QQ_"RETR"_QQ_" failed." -INSTL_FTP_NORMD="The function "_QQ_"RMD"_QQ_" failed." +INSTL_FTP_NOMKD="The function "MKD" failed." +INSTL_FTP_NONLST="The function "NLST" failed." +INSTL_FTP_NOPWD="The function "PWD" failed." +INSTL_FTP_NORETR="The function "RETR" failed." +INSTL_FTP_NORMD="The function "RMD" failed." INSTL_FTP_NOROOT="Could not access the specified FTP folder." -INSTL_FTP_NOSTOR="The function "_QQ_"STOR"_QQ_" failed." -INSTL_FTP_NOSYST="The function "_QQ_"SYST"_QQ_" failed." +INSTL_FTP_NOSTOR="The function "STOR" failed." +INSTL_FTP_NOSYST="The function "SYST" failed." +INSTL_FTP_PASSWORD_DESC="Warning! It is recommended to leave this blank and enter your FTP password each time you transfer files." +INSTL_FTP_PASSWORD_LABEL="FTP Password" +INSTL_FTP_PORT_LABEL="FTP Port" +INSTL_FTP_ROOT_LABEL="FTP Root Path" +INSTL_FTP_SAVE_LABEL="Save FTP Password" +INSTL_FTP_SETTINGS_CORRECT="Settings correct" +INSTL_FTP_TITLE="FTP Configuration (Optional - Most Users Can Skip This Step - Press Next to Skip)" INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Unable to auto-detect the FTP root folder." - -;others -INSTL_CONFPROBLEM="Your configuration file or folder is not writable or there was a problem creating the configuration file. You will have to upload the following code by hand. Click in the text area to highlight all of the code and then paste into a new text file. Name this file 'configuration.php' and upload it to your site root folder." -INSTL_DATABASE_SUPPORT="Database Support:" -INSTL_DISPLAY_ERRORS="Display Errors" -INSTL_ERROR_DB="Some errors occurred while populating the database: %s" -INSTL_ERROR_INITIALISE_SCHEMA="Can't initialize database schema" -INSTL_FILE_UPLOADS="File Uploads" +INSTL_FTP_USER_DESC="Warning! It is recommended to leave this blank and enter your FTP username each time you transfer files." +INSTL_FTP_USER_LABEL="FTP Username" INSTL_GNU_GPL_LICENSE="GNU General Public License" +INSTL_HEADER_ERROR="Error" +INSTL_INSTALLING="Installing ..." +INSTL_INSTALLING_CONFIG="Creating configuration File" +INSTL_INSTALLING_DATABASE="Creating database tables" +INSTL_INSTALLING_DATABASE_BACKUP="Backing up old database tables" +INSTL_INSTALLING_DATABASE_REMOVE="Removing old database tables" +INSTL_INSTALLING_EMAIL="Sending email to %s" +INSTL_INSTALLING_SAMPLE="Installing sample data" INSTL_JSON_SUPPORT_AVAILABLE="JSON Support" +INSTL_LANGUAGES="Install Language packages" +INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Language" +INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Version" +INSTL_LANGUAGES_DESC="The Joomla interface is available in several languages. Choose your preferred languages by choosing the checkboxes and then install them by selecting the Next button.
    Note: this operation will take about 10 seconds to download and install every language. To avoid timeouts please select no more than 3 languages to install." +INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="This operation will take up to 10 seconds per language to complete
    Please wait while we download and install the languages ..." +INSTL_LANGUAGES_MORE_LANGUAGES="Press the 'Previous' button if you want to install more languages." +INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="No languages have been selected to be installed. If you need to install more languages, press the 'Previous' button and choose the desired languages from the list." +INSTL_LANGUAGES_WARNING_BACK_BUTTON="Return to last installation step" +INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! was not able to connect to the languages server. Please finish the installation process." +INSTL_LANGUAGES_WARNING_NO_INTERNET2="Note: You will be able to install languages later using the Joomla! Administrator" INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC Off" INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime" INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language is Default" INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Off" INSTL_NOTICEMBLANGNOTDEFAULT="PHP mbstring language is not set to neutral. This can be set locally by entering php_value mbstring.language neutral in your .htaccess file." INSTL_NOTICEMBSTRINGOVERLOAD="PHP mbstring function overload is set. This can be turned off locally by entering php_value mbstring.func_overload 0 in your .htaccess file." -INSTL_NOTICEYOUCANSTILLINSTALL="
    You can still continue the installation as the configuration settings will be displayed at the end. You will have to manually upload the code. Click in the text area to highlight all of the code and then paste into a new text file. Name this file 'configuration.php' and upload it to your site root folder." +INSTL_NOTICEYOUCANSTILLINSTALL="
    You can still continue the installation as the configuration settings will be displayed at the end. You will have to manually upload the code. Select in the text area to highlight all of the code and then paste into a new text file. Name this file 'configuration.php' and upload it to your site root folder." INSTL_OUTPUT_BUFFERING="Output Buffering" +INSTL_PAGE_TITLE="Joomla! Web Installer" INSTL_PARSE_INI_FILE_AVAILABLE="INI Parser Support" INSTL_PHP_VERSION="PHP Version" INSTL_PHP_VERSION_NEWER="PHP Version >= %s" +INSTL_PRECHECK_ACTUAL="Actual" +INSTL_PRECHECK_DESC="If any of these items are not supported (marked as No) then please take actions to correct them.
    You can't install Joomla! until your setup meets the requirements below." +INSTL_PRECHECK_DIRECTIVE="Directive" +INSTL_PRECHECK_RECOMMENDED="Recommended" +INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="These settings are recommended for PHP in order to ensure full compatibility with Joomla.
    However, Joomla! will still operate if your settings do not quite match the recommended configuration." +INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Recommended settings:" +INSTL_PRECHECK_TITLE="Pre-Installation Check" +INSTL_PROCESS_BUSY="Process is in progress. Please wait ..." INSTL_REGISTER_GLOBALS="Register Globals Off" INSTL_SAFE_MODE="Safe Mode" +INSTL_SAMPLE_BLOG_SET="Blog English (GB) Sample Data" +INSTL_SAMPLE_BLOG_SET_DESC="Install Joomla with a few articles and blog related modules like Older Posts, Blog Roll, Most Read Posts." +INSTL_SAMPLE_BROCHURE_SET="Brochure English (GB) Sample Data" +INSTL_SAMPLE_BROCHURE_SET_DESC="Install Joomla with a few pages (a menu with pages Home, About Us, News, Contact Us) and modules like Search, Custom, Login Form." +INSTL_SAMPLE_DATA_SET="Default English (GB) Sample Data" +INSTL_SAMPLE_DATA_SET_DESC="Install Joomla with one page (a menu with one link) and modules like Latest Article, Login Form." +INSTL_SAMPLE_LEARN_SET="Learn Joomla English (GB) Sample Data" +INSTL_SAMPLE_LEARN_SET_DESC="Install Joomla with example articles that describe how Joomla works." +INSTL_SAMPLE_TESTING_SET="Test English (GB) Sample Data" +INSTL_SAMPLE_TESTING_SET_DESC="Install Joomla with all possible menu items to help with testing Joomla." +INSTL_SELECT_LANGUAGE_TITLE="Select Language" INSTL_SESSION_AUTO_START="Session Auto Start" +INSTL_SITE="Main Configuration" +INSTL_SITE_INSTALL_SAMPLE_DESC="Installing sample data is strongly recommended for beginners.
    This will install sample content that is included in the Joomla! installation package." +INSTL_SITE_INSTALL_SAMPLE_LABEL="Install Sample Data" +INSTL_SITE_INSTALL_SAMPLE_NONE="None (Required for basic native multilingual site creation)" +INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Install Joomla with just one menu and a login form, without any content." +INSTL_SITE_METADESC_LABEL="Description" +INSTL_SITE_METADESC_TITLE_LABEL="Enter a description of the overall website that is to be used by search engines. Generally, a maximum of 20 words is optimal." +INSTL_SITE_NAME_DESC="Enter the name of your Joomla! site." +INSTL_SITE_NAME_LABEL="Site Name" +INSTL_SITE_OFFLINE_LABEL="Site Offline" +INSTL_SITE_OFFLINE_TITLE_LABEL="Set the site Frontend offline when installation is completed. The site can be set online later on through the Global Configuration." +INSTL_STD_OFFLINE_MSG="This site is down for maintenance.
    Please check back again soon." +INSTL_STEP_COMPLETE_LABEL="Finish" +INSTL_STEP_DATABASE_LABEL="Database" +INSTL_STEP_DEFAULTLANGUAGE_LABEL="Choose Default Language" +INSTL_STEP_FTP_LABEL="FTP" +INSTL_STEP_LANGUAGES_LABEL="Install Languages" +INSTL_STEP_SITE_LABEL="Configuration" +INSTL_STEP_SUMMARY_LABEL="Overview" +INSTL_SUMMARY_EMAIL_DESC="Send configuration settings to %s by email after installation." +INSTL_SUMMARY_EMAIL_LABEL="Email Configuration" +INSTL_SUMMARY_EMAIL_PASSWORDS_DESC="Warning! It is recommended to not send and store your passwords in emails." +INSTL_SUMMARY_EMAIL_PASSWORDS_LABEL="Include Passwords in Email" +INSTL_SUMMARY_INSTALL="Install" +INSTL_VERIFY_FTP_SETTINGS="Verify FTP Settings" +INSTL_WARNJAVASCRIPT="Warning! JavaScript must be enabled for proper installation of Joomla!" +INSTL_WARNJSON="Your PHP installation needs to have JSON enabled for Joomla to be installed!" INSTL_WRITABLE="%s Writeable" INSTL_XML_SUPPORT="XML Support" INSTL_ZIP_SUPPORT_AVAILABLE="Native ZIP support" INSTL_ZLIB_COMPRESSION_SUPPORT="Zlib Compression Support" -INSTL_PROCESS_BUSY="Process is in progress. Please wait..." - -;Global strings JADMINISTRATOR="Administrator" JCHECK_AGAIN="Check Again" -JERROR="Error" +JDEBUG_LANGUAGE_FILES_IN_ERROR="Parsing errors in language files" +JDEBUG_LANGUAGE_UNTRANSLATED_STRING="Untranslated strings" JEMAIL="Email" +JERROR="Error" JGLOBAL_ISFREESOFTWARE="%s is free software released under the %s." JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="Language pack does not match this Joomla! version. Some strings may be missing." JGLOBAL_SELECT_AN_OPTION="Select an option" JGLOBAL_SELECT_NO_RESULTS_MATCH="No results match" JGLOBAL_SELECT_SOME_OPTIONS="Select some options" JINVALID_TOKEN="The most recent request was denied because it contained an invalid security token. Please refresh the page and try again." -JNEXT="Next" -JNO="No" -JNOTICE="Notice" -JOFF="Off" -JON="On" -JPREVIOUS="Previous" -JSITE="Site" -JUSERNAME="Username" -JYES="Yes" - -; Framework strings necessary when no lang pack is available JLIB_DATABASE_ERROR_CONNECT_MYSQL="Could not connect to MySQL." JLIB_DATABASE_ERROR_DATABASE="A Database error occurred." JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Unable to load Database Driver: %s" @@ -300,24 +248,24 @@ JLIB_FORM_VALIDATE_FIELD_REQUIRED="Field required: %s" JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Failed to copy file %1$s to %2$s." JLIB_INSTALLER_NOT_ERROR="If the error is related to the installation of TinyMCE language files it has no effect on the installation of the language(s). Some language packs created prior to Joomla! 3.2.0 may try to install separate TinyMCE language files. As these are now included in the core they no longer need to be installed." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Could not connect to database
    joomla.library: %1$s - %2$s" - -; Strings for the language debugger -JDEBUG_LANGUAGE_FILES_IN_ERROR="Parsing errors in language files" -JDEBUG_LANGUAGE_UNTRANSLATED_STRING="Untranslated strings" +JNEXT="Next" +JNO="No" JNONE="None" - -; Necessary for errors -ADMIN_EMAIL="Admin Email" -ADMIN_PASSWORD="Admin Password" -ADMIN_PASSWORD2="Confirm Admin Password" -SITE_NAME="Site Name" - -; Database types (allows for a more descriptive label than the internal name) +JNOTICE="Notice" +JOFF="Off" +JON="On" +JPREVIOUS="Previous" +JSITE="Site" +JUSERNAME="Username" +JYES="Yes" MYSQL="MySQL" MYSQLI="MySQLi" ORACLE="Oracle" PDOMYSQL="MySQL (PDO)" POSTGRESQL="PostgreSQL" +SITE_NAME="Site Name" SQLAZURE="Microsoft SQL Azure" SQLITE="SQLite" SQLSRV="Microsoft SQL Server" + + diff --git a/installation/language/en-US/en-US.xml b/installation/language/en-US/en-US.xml index 6651c8435e193..e28d5eb8abfd6 100644 --- a/installation/language/en-US/en-US.xml +++ b/installation/language/en-US/en-US.xml @@ -1,13 +1,13 @@ - - US English - en-US - 3.4.6 - September 2012 - US Translation Team - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + English (United States) + 3.5.0 + January 2016 + Joomla! Project + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - en-US installation language pack en-US.ini diff --git a/installation/language/eo-XX/eo-XX.ini b/installation/language/eo-XX/eo-XX.ini new file mode 100644 index 0000000000000..1862cb53b3926 --- /dev/null +++ b/installation/language/eo-XX/eo-XX.ini @@ -0,0 +1,322 @@ +; Joomla! Project +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; License GNU General Public License version 2 or later; see LICENSE.txt +; Note : All ini files need to be saved as UTF-8 + +;Stepbar +INSTL_STEP_COMPLETE_LABEL="Fino" +INSTL_STEP_DATABASE_LABEL="Datumbazo" +INSTL_STEP_DEFAULTLANGUAGE_LABEL="Elekti defaŭltan lingvon" +INSTL_STEP_FTP_LABEL="FTP" +INSTL_STEP_LANGUAGES_LABEL="Instali lingvojn" +INSTL_STEP_SITE_LABEL="Agordo" +INSTL_STEP_SUMMARY_LABEL="Superrigardo" + +;Language view +INSTL_SELECT_LANGUAGE_TITLE="Elekti lingvon" +INSTL_WARNJAVASCRIPT="Averto! Ĝavaskripto devas esti ebligita por korekta instalo de Joomla!" +INSTL_WARNJSON="Via PHP-instalo postulas ebligitan JSON por instalo de Joomla!" + +;Preinstall view +INSTL_PRECHECK_TITLE="Antaŭ-instala kontrolo" +INSTL_PRECHECK_DESC="Se iu el tiuj ĉi eroj ne estas subtenataj (markitaj Ne) bonvolu korekti tion.
    Vi ne povas instali Joomlan antaŭ la agordoj egalas al la subaj postuloj." +INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Rekomenditaj agordoj:" +INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Tiuj ĉi agordoj estas rekomenditaj por PHP por sekurigi plenan kongruecon kun Joomla.
    Tamen, Joomla! ankoraŭ funkcios se viaj agordoj ne entute sekvas la rekomenditajn agordojn." +INSTL_PRECHECK_DIRECTIVE="Direktivo" +INSTL_PRECHECK_RECOMMENDED="Rekomendita" +INSTL_PRECHECK_ACTUAL="Efektiva" + +; Database view +INSTL_DATABASE="Datumbaza agordo" +INSTL_DATABASE_HOST_DESC="Plej ofte "_QQ_"localhost"_QQ_"." +INSTL_DATABASE_HOST_LABEL="Gastiganta nomo" +INSTL_DATABASE_NAME_DESC="Kelkaj gastigantoj nur permesas specifan DBan nomon po retejo. Uzu tabelan prefikson tiuokaze por distingi inter la Joomla!jn retejojn." +INSTL_DATABASE_NAME_LABEL="Datumbaza nomo" +INSTL_DATABASE_NO_SCHEMA="Neniu datumbaza skemo ekzistas por tiu ĉi datumbaza tipo." +INSTL_DATABASE_OLD_PROCESS_DESC="Iu ajn ekzistanta tabela savkopio de antaŭaj Joomla!-instaloj estos anstataŭigita." +INSTL_DATABASE_OLD_PROCESS_LABEL="Malnova datumbaza reĝimo" +INSTL_DATABASE_PASSWORD_DESC="Pro reteja sekureco uzo de pasvorto por la datumbaza konto nepras." +INSTL_DATABASE_PASSWORD_LABEL="Pasvorto" +INSTL_DATABASE_PREFIX_DESC="Elekti tabelan prefikson aŭ uzi la hazarde kreitan. Ideale tri aŭ kvar signojn longa, enhavu nur leterciferajn signojn kaj DEVAS finiĝi per substreko. Kontroli ke la elektita prefikso ne estas uzata por aliaj tabeloj." +INSTL_DATABASE_PREFIX_LABEL="Tabela prefikso" +INSTL_DATABASE_PREFIX_MSG="La tabela prefikso devas komenci per letero, sekvata de laŭvolaj leterciferaj signoj kaj substreko" +INSTL_DATABASE_TYPE_DESC="Plej probable "_QQ_"MySQLi"_QQ_"." +INSTL_DATABASE_TYPE_LABEL="Tipo de datumbazo" +INSTL_DATABASE_USER_DESC="Aŭ io simila al "_QQ_"root"_QQ_" aŭ salutnomo donita de la gastiganto." +INSTL_DATABASE_USER_LABEL="Salutnomo" + +;FTP view +INSTL_AUTOFIND_FTP_PATH="Aŭtomate trovi FTP-vojon" +INSTL_FTP="FTP-agordoj" +INSTL_FTP_DESC="

    Por kelkaj serviloj vi devas provizi ensalutiloj por FTP por kompleta instalo. Se vi havas problemojn instali sen tiuj salutiloj, kontroli ĉe via gastiganto por decidi ĉu ili nepras.

    Pro sekurecaj kialoj, estas plej bone krei apartan FTPan uzantkonton kun nura alirrajto al la Joomla!-instalo, ne al la tuta interreta servilo. Via gastiganto povas helpi vin rilate al tio.

    Notu: Se vi instalas en Vindoza operacisistemo, la FTP-tavolo ne necesas.

    " +INSTL_FTP_ENABLE_LABEL="Ebligi FTP-tavolon" +INSTL_FTP_HOST_LABEL="FTP-gastiganto" +INSTL_FTP_PASSWORD_LABEL="FTP-pasvorto" +INSTL_FTP_PORT_LABEL="FTP-pordo" +INSTL_FTP_ROOT_LABEL="FTPa radika vojo" +INSTL_FTP_SAVE_LABEL="Konservi FTPan pasvorton" +INSTL_FTP_TITLE="FTPa agordo (Opcia - plej ofte eblas pasi tiun ĉi paŝon - Klaki Sekva por preterpaŝi)" +INSTL_FTP_USER_LABEL="FTP-salutnomo" +INSTL_VERIFY_FTP_SETTINGS="Konfirmi FTP-agordojn" +INSTL_FTP_SETTINGS_CORRECT="Agordoj korektaj" +INSTL_FTP_USER_DESC="Averto! Estas rekomendite lasi tion ĉi malplena aŭ entajpi vian FTPan uzantnomon ĉiufoje vi sendas dosierojn." +INSTL_FTP_PASSWORD_DESC="Averto! Estas rekomendite lasi tion ĉi malplena aŭ entajpi vian FTPan uzantnomon ĉiufoje vi sendas dosierojn." + +;Site View +INSTL_SITE="Ĉefa agordo" +INSTL_ADMIN_EMAIL_LABEL="Retpoŝto de administranto" +INSTL_ADMIN_EMAIL_DESC="Entajpu retadreson. Tio estos la retadreson de la ĉefadministranto de la retejo." +INSTL_ADMIN_PASSWORD_LABEL="Administranta pasvorto" +INSTL_ADMIN_PASSWORD_DESC="Entajpu la pasvorton por via ĉefadministra konto kaj konfirmu ĝin en la suba kampo." +INSTL_ADMIN_PASSWORD2_LABEL="Konfirmi pasvorton de administranto" +INSTL_ADMIN_USER_LABEL="Administranta salutnomo" +INSTL_ADMIN_USER_DESC="Elekti salutnomon por via Ĉefadministra konto." +INSTL_SITE_NAME_LABEL="Reteja nomo" +INSTL_SITE_NAME_DESC="Entajpi la nomon de via Joomla! retejo." +INSTL_SITE_METADESC_LABEL="Priskribo" +INSTL_SITE_METADESC_TITLE_LABEL="Entajpi priskribon pri la tuta retejo uzata de serĉmotoroj. Ĝenerale maksimume 20 vortoj sufiĉas." +INSTL_SITE_OFFLINE_LABEL="Retejo senkonekta" +INSTL_SITE_OFFLINE_TITLE_LABEL="Senkonektigi la Fronton kiam instalo pretas. La retejo poste povas esti retkonektita ene de la Tutloka agordo." +INSTL_SITE_INSTALL_SAMPLE_LABEL="Instali specimenajn datumojn" +INSTL_SITE_INSTALL_SAMPLE_DESC="Instalo de specimenaj datumoj estas forte rekomendata por novuloj.
    Tio instalas ekzemplan enhavon inkluzivitan en la Joomla! instala pakaĵo." +INSTL_SITE_INSTALL_SAMPLE_NONE="Neniu (Postulata por baza plurlingva reteja kreiĝo)" +INSTL_SAMPLE_BLOG_SET="Anglalingva blogo (GB) ekzemplaj datumoj" +INSTL_SAMPLE_BROCHURE_SET="Anglalingva broŝuro (GB) ekzemplaj datumoj" +INSTL_SAMPLE_DATA_SET="Anglalingva defaŭlto (GB) ekzemplaj datumoj" +INSTL_SAMPLE_LEARN_SET="Anglalingva Joomla lernado (GB) ekzemplaj datumoj" +INSTL_SAMPLE_TESTING_SET="Anglalingva testo (GB) ekzemplaj datumoj" +INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Instali Joomlan nur havante unu menuo kaj ensaluta modulo, sen iu ajn enhavo." +INSTL_SAMPLE_BLOG_SET_DESC="Instali Joomlan kun kelkaj artikoloj kaj blogo kun rilataj moduloj kiel Malnovaj eroj, Bloglisto, Plej legataj eroj." +INSTL_SAMPLE_BROCHURE_SET_DESC="Instali Joomlan kun kelkaj paĝoj (menuo kun paĝoj Hejme, Pri ni, Novaĵoj, Kontakti nin) kaj moduloj kiel Serci, Propra, Ensalutujo." +INSTL_SAMPLE_DATA_SET_DESC="Instali Joomlan kun unu paĝo (menuo kun unu ligo) kaj moduloj kiel Lastaj artikoloj, Ensalutujo." +INSTL_SAMPLE_LEARN_SET_DESC="Instali Joomlan kun ekzemplaj artikoloj kiuj priskribas kiel funkcias Joomla." +INSTL_SAMPLE_TESTING_SET_DESC="Instali Joomlan kun ĉiu ebla menua objekto por helpi testi Joomlan." + +;Summary view +INSTL_FINALISATION="Finiĝo" +INSTL_SUMMARY_INSTALL="Instali" +INSTL_SUMMARY_EMAIL_LABEL="Retpoŝtadresa agordo" +INSTL_SUMMARY_EMAIL_DESC="Sendi agordojn al %s per retpoŝto post instalo." +INSTL_SUMMARY_EMAIL_PASSWORDS_LABEL="Inkluzivi pasvortojn en retpoŝto" +INSTL_SUMMARY_EMAIL_PASSWORDS_DESC="Averto! Estas rekomendite ne sendi kaj stoki viajn pasvortojn en retmesaĝoj." + +;Installing view +INSTL_INSTALLING="Instalas..." +INSTL_INSTALLING_DATABASE_BACKUP="Savkopias malnovajn datumbazajn tabelojn" +INSTL_INSTALLING_DATABASE_REMOVE="Forigas malnovajn datumbazajn tabelojn" +INSTL_INSTALLING_DATABASE="Kreas datumbazajn tabelojn" +INSTL_INSTALLING_SAMPLE="Instalas specimenajn datumojn" +INSTL_INSTALLING_CONFIG="Kreas agordan dosieron" +INSTL_INSTALLING_EMAIL="Sendas retmesaĝon al %s" + +;Email +INSTL_EMAIL_SUBJECT="Agordaj detaloj: %s" +INSTL_EMAIL_HEADING="Sube vi trovas la agordojn por nove instalita Joomla! retejo:" +INSTL_EMAIL_NOT_SENT="Ne povis sendi retmesaĝon." + +;Complete view +INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Administraj ensalutiloj" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="La instala dosierujo jam estis forigita." +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_ERROR_FOLDER_DELETE="Instala dosierujo ne povas esti forigita. Bonvolu permane forigi ĝin." +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_FOLDER_REMOVED="Instala dosierujo sukcese forigita." +INSTL_COMPLETE_LANGUAGE_1="Joomla! en via propra lingvo kaj/aŭ aŭtomata baza plurlingva reteja kreiĝo" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_LANGUAGE_DESC="Antaŭ ol forigi la instalan dosierujon vi povas instali ekstrajn lingvojn. Se vi volas aldoni ekstrajn lingvojn al via Joomla aplikaĵo, elekti la sekvan butonon." +INSTL_COMPLETE_LANGUAGE_DESC2="Notu: vi bezonas interretan aliron de Joomla! por elŝuti kaj instali novajn lingvojn.
    Kelkaj servilaj agordoj ne permesas al Joomla! instali la lingvojn. Se tio estas la kazo por vi, ne zorgu, ĉar vi povos instali ilin pli malfrue per la Joomla! administrilo." +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_REMOVE_FOLDER="Forigi instalan dosierujon" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_REMOVE_INSTALLATION="BONVOLU MEMORI TUTE FORIGI LA INSTALAN DOSIERUJON.
    Vi ne povos preterpasi tiun ĉi paŝon se la instala dosierujo ne estis forigata. Tio estas sekureca trajto de Joomla!" +INSTL_COMPLETE_TITLE="Gratulojn! Joomla estas nun instalita." +INSTL_COMPLETE_INSTALL_LANGUAGES="Ekstraj paŝoj: Instali lingvojn" + +;Languages view +INSTL_LANGUAGES="Intali lingvopakaĵojn" +INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Lingvo" +INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Versio" +INSTL_LANGUAGES_DESC="La Joomla interfaco haveblas en pluraj lingvoj. Elekti viajn preferatajn lingvojn per alklako al la elektobutonoj kaj poste instali ilin per elekto de la butono Sekva.
    Notu: la elŝuto kaj instalo de ĉiu lingvo daŭras proksimume 10 sekundojn. Por eviti tempolimigojn bonvolu elekti ne pli ol 3 lingvoj por instali." +INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="La plenumo de tiu ĉi operacio daŭras proksimume 10 sekundojn
    Bonvolu atendi dum la elŝuto kaj instalo de la lingvoj..." +INSTL_LANGUAGES_MORE_LANGUAGES="Alklai la butonon 'Antaŭa' se vi volas instali pliajn lingvojn." +INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Neniu lingvo elektita por instalo. Se vi bezonas pliajn lingvojn, alklaku la butonon 'Antaŭa' kaj elekti la deziratajn lingvojn el la listo." +INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! ne povis konekti al la lingva servilo. Bonvolu finigi la instaladan procedon." +INSTL_LANGUAGES_WARNING_NO_INTERNET2="Notu: Vi povos instali lingvojn pli poste uzante la Joomla!n administrilon" +INSTL_LANGUAGES_WARNING_BACK_BUTTON="Reiri al lasta instala paŝo" + +;Default language view +INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE="Aktivigi la plurlingvan funkcion" +INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="Se aktiva, via Joomla retejo havos la plurlingvan funkcion aktiva kun tradukataj menuoj por ĉiu instalita lingvo." +INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN="Ebligi la lingvokodan kromaĵon" +INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN_DESC="Se ebligita, la lingvokoda kromaĵo aldonas eblecon ŝanĝi la lingvan kodon en la generita HTML-dokumento por plibonigi SEOn." +INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Defaŭlta Administranta lingvo" +INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Joomla ne povis defaŭltigi la lingvon. La angla estos uzata kiel defaŭlta lingvo por la Dorsa administrejo." +INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Joomla elektis %s kiel via defaŭlta ADMINISTREJA lingvo." +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Elekti" +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Lingvo" +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="Marko" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CONTENT_LANGUAGE="Joomla ne eblis aŭtomate krei la enhavan lingvon %s" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU="Joomla ne povis aŭtomate krei la menuon %s" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_ITEM="Joomla ne povis aŭtomate krei la hejman menuobjekton %s" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_MODULE="Joomla ne povis aŭtomate krei la menuan modulon %s" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CATEGORY="Joomla ne povis aŭtomate krei la enhavan kategorion %s" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_ARTICLE="Joomla ne povis aŭtomate krei la tradukitan artikolon %s" +INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_MODULESWHITCHER_LANGUAGECODE="Joomla ne povis aŭtomate publikigi la lingvoŝanĝan modulon" +INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGECODE="Joomla ne povis aŭtomate ebligi la Lingvokodan kromaĵon" +INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGEFILTER="Joomla ne povis aŭtomate ebligi la Lingvofiltran kromaĵon" +INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Joomla ne povis instali la lingvon %s." +INSTL_DEFAULTLANGUAGE_COULD_NOT_PUBLISH_MOD_MULTILANGSTATUS="Joomla ne povis aŭtomate publikigi la modulon por lingva stato" +INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="Joomla ne povis aŭtomate malpublikigi la defaŭltan menuan modulon" +INSTL_DEFAULTLANGUAGE_DESC="Joomla instalis la jenajn lingvojn. Bonvolu elekti vian deziratan defaŭltan lingvon por la Joomla Administrejo." +INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla instalis la jenajn lingvojn. Bonvolu elekti la deziratan defaŭltan lingvon por la Joomla Fronto." +INSTL_DEFAULTLANGUAGE_FRONTEND="Defaŭlta reteja lingvo" +INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla ne povis elekti la lingvon kiel defaŭlto. La angla estos uzata kiel defaŭlta lingvo en la Fronta RETEJO." +INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Joomla elektis %s kiel via defaŭlta RETEJA lingvo." +INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Instali tradukitan enhavon" +INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Se aktiva, Joomla aŭtomate kreos enhavan kategorion por ĉiu instalita lingvo. Aldone, unu emfazita artikolo enhavante sensencaĵon estos kreata por ĉiu kategorio." +INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Plurlingva" +INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Tiu ĉi sekcio permesas vin aŭtomate aktivi la Joomla!n plurlingvan funkcion." +INSTL_DEFAULTLANGUAGE_TRY_LATER="Vi povos instali ĝin poste uzante la Joomla!n Administrejon" + +; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español +INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="la anglan (UK)" + +;Database Model +INSTL_DATABASE_COULD_NOT_CONNECT="Ne povis konekti al la datumbazo. Konektilo redonis numeron: %s" +INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="La instalilo ne povis konekti al la specifita datumbazo kaj ne eblis krei la datumbazon. Bonvolu konfirmi viajn agordojn kaj se necese permane krei vian datumbazon." +INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Ne povis aktualigi manifestan kaŝmemoron por etendaĵo: %s" +INSTL_DATABASE_ERROR_BACKINGUP="Kelkaj eraroj okazis dum savkopiado de la datumbazo." +INSTL_DATABASE_ERROR_CREATE="Eraro okazis dum kreado de la datumbazo %s.
    La uzanto eble ne havas sufiĉajn rajtojn por krei datumbazon. La postulata datumbazo eble devas esti aparte kreita antaŭ eblas instali Joomla!n." +INSTL_DATABASE_ERROR_DELETE="Kelkaj eraroj okazis dum forigo de la datumbazo." +INSTL_DATABASE_FIELD_VALUE_REMOVE="Forigi" +INSTL_DATABASE_FIELD_VALUE_BACKUP="Savkopio" +INSTL_DATABASE_FIX_TOO_LONG="Tabela prefikso de MySQL nur povas havi 15 signojn." +INSTL_DATABASE_INVALID_DB_DETAILS="La provizitaj datumbazaj detaloj malkorektas kaj/aŭ mankas." +INSTL_DATABASE_INVALID_MYSQL_VERSION="Vi bezonas MySQL 5.0.4 aŭ pli alte por daŭrigi la instalon. Via versio estas: %s" +INSTL_DATABASE_INVALID_MYSQLI_VERSION="Vi bezonas MySQL 5.0.4 aŭ pli alte por daŭrigi la instalon. Via versio estas: %s" +INSTL_DATABASE_INVALID_PDOMYSQL_VERSION="Vi bezonas MySQL 5.0.4 aŭ pli alte por daŭrigi la instalon. Via versio estas: %s" +INSTL_DATABASE_INVALID_POSTGRESQL_VERSION="Vi bezonas PostgreSQL 8.3.18 aŭ pli alte por daŭrigi la instalon. Via versio estas: %s" +INSTL_DATABASE_INVALID_SQLSRV_VERSION="Vi bezonas SQL-servilon 2008 R2 (10.50.1600.1) aŭ pli alte por daŭrigi la instalon. Via versio estas: %s" +INSTL_DATABASE_INVALID_SQLZURE_VERSION="Vi bezonas SQL-servilon 2008 R2 (10.50.1600.1) aŭ pli alte por daŭrigi la instalon. Via versio estas: %s" +INSTL_DATABASE_INVALID_TYPE="Bonvolu elekti la datumbazan tipon" +INSTL_DATABASE_NAME_TOO_LONG="La datumbaza nomo de MySQL nur povas havi 64 signojn." +INSTL_DATABASE_INVALID_NAME="Versioj de MySQL antaŭ 5.1.6 eble ne povas enhavi punktiojn aŭ aliajn "_QQ_"specialajn"_QQ_" signojn en la nomo. Via versio estas: %s" +INSTL_DATABASE_NAME_INVALID_SPACES="Datumbazaj nomoj kaj tabelaj nomoj de MySQL ne povas komenci per spaceto." +INSTL_DATABASE_NAME_INVALID_CHAR="Neniu MySQL-identigilo povas enhavi NULL ASCII(0x00)." +INSTL_DATABASE_FILE_DOES_NOT_EXIST="Dosiero %s ne ekzistas" + +;controllers +INSTL_COOKIES_NOT_ENABLED="Kukoj supozeble ne estas ebligitaj en via retesplorilo. Vi ne povos instali la aplikaĵon dum la funkcio estas malebligita. Alternative, povus ankaŭ esti problemo kun la session.save_path de la servilo. Se jes, bonvolu diskuti kun via reteja gastiganto se vi ne mem scias kiel funkciigi tion ĉi." +INSTL_HEADER_ERROR="Eraro" + +;Helpers +INSTL_PAGE_TITLE="Joomla! Reteja instalilo" + +;Configuration model +INSTL_ERROR_CONNECT_DB="Ne povis konekti al lla datumbazo. Konektilo redonis numeron: %s" +INSTL_STD_OFFLINE_MSG="Tiu ĉi retejo estas malaktiva pro administrado kaj mastrumado.
    Bonvolu viziti nin baldaŭ denove." + +;FTP model +INSTL_FTP_INVALIDROOT="La specificita FTP-dosierujo ne estas la dosierujo de tiu ĉi Joomla! instalo" +INSTL_FTP_NOCONNECT="Ne povis konekti al la FTP-servilo" +INSTL_FTP_NODELE="La funkcio "_QQ_"DELE"_QQ_" fiaskis." +INSTL_FTP_NODIRECTORYLISTING="Ne povis retrovi dosierujan listigon de la FTP servilo." +INSTL_FTP_NOLIST="La funkcio "_QQ_"LIST"_QQ_" fiaskis." +INSTL_FTP_NOLOGIN="Ne povis ensaluti al la FTPa servilo." +INSTL_FTP_NOMKD="La funkcio "_QQ_"MKD"_QQ_" fiaskis." +INSTL_FTP_NONLST="La funkcio "_QQ_"NLST"_QQ_" fiaskis." +INSTL_FTP_NOPWD="La funkcio "_QQ_"PWD"_QQ_" fiaskis." +INSTL_FTP_NORETR="La funkcio "_QQ_"RETR"_QQ_" fiaskis." +INSTL_FTP_NORMD="La funkcio "_QQ_"RMD"_QQ_" fiaskis." +INSTL_FTP_NOROOT="Ne povis aliri la specifitan FTP-dosierujon." +INSTL_FTP_NOSTOR="La funkcio "_QQ_"STOR"_QQ_" fiaskis." +INSTL_FTP_NOSYST="La funkcio "_QQ_"SYST"_QQ_" fiaskis." +INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Neeble aŭto-detekti la FTPan radikan dosierujon." + +;others +INSTL_CONFPROBLEM="Via agorda dosiero aŭ dosierujo ne estas skribebla aŭ okazis problemon kreante la agordan dosieron. Vi devas alŝuti la jenan kodon permane. Elekti en la tekstareo por marki ĉiun kodon kaj poste glui ĝin en novan tekstdosieron. Nomigu la dosieron 'configuration.php' kaj alŝutu ĝin al la radika dosierujo de via retejo." +INSTL_DATABASE_EMPTY_NAME="" +INSTL_DATABASE_SUPPORT="Datumbaza subteno:" +INSTL_DISPLAY_ERRORS="Montri erarojn" +INSTL_ERROR_DB="Kelkaj eraroj okazis dum plenigo de la datumbazo: %s" +INSTL_ERROR_INITIALISE_SCHEMA="Ne povas iniciati datumbazan skemon" +INSTL_FILE_UPLOADS="Alŝutoj de dosieroj" +INSTL_GNU_GPL_LICENSE="GNU Ĝenerala Publika Permesilo" +INSTL_JSON_SUPPORT_AVAILABLE="JSON subteno" +INSTL_MAGIC_QUOTES_GPC="Magiaj citiloj GPC Dee" +INSTL_MAGIC_QUOTES_RUNTIME="Vivdaŭro de Magiaj Citiloj" +INSTL_MB_LANGUAGE_IS_DEFAULT="MB Lingvo estas defaŭlto" +INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Dee" +INSTL_NOTICEMBLANGNOTDEFAULT="Lingvo de PHP mbstring ne estas neŭtrala. Tio povas esti ŝanĝita loke per enigo de php_value mbstring.language neutral en via dosiero.htaccess." +INSTL_NOTICEMBSTRINGOVERLOAD="PHP mbstring funkcia superŝarĝo estas ŝaltita. Tio povas esti malŝaltita per enigo de php_value mbstring.func_overload 0 en via dosiero .htaccess." +INSTL_NOTICEYOUCANSTILLINSTALL="
    Vi ankoraŭ povas daŭrigi la instalon ĉar la agordoj estos montrataj en la fino. Vi devas alŝuti la kodon permane. Elekti en la tekstareo por marki ĉiun kodon por glui ĝin en novan tekstdosieron. Nomigu la dosieron 'configuation.php' kaj alŝutu ĝin al la radika dosierujo de via retejo." +INSTL_OUTPUT_BUFFERING="Eliga bufrado" +INSTL_PARSE_INI_FILE_AVAILABLE="INI sintaksa analizila subteno" +INSTL_PHP_VERSION="PHP-versio" +INSTL_PHP_VERSION_NEWER="PHP-versio >= %s" +INSTL_REGISTER_GLOBALS="Register Globals dee" +INSTL_SAFE_MODE="Sekura reĝimo (Safe mode)" +INSTL_SESSION_AUTO_START="Aŭtolanĉo de seanco" +INSTL_WRITABLE="%s skribebla" +INSTL_XML_SUPPORT="XML subteno" +INSTL_ZIP_SUPPORT_AVAILABLE="Indiĝena subteno por ZIP" +INSTL_ZLIB_COMPRESSION_SUPPORT="Zlib kompaktiga subteno" +INSTL_PROCESS_BUSY="Procezo progresas. Bonvolu atendi..." + + +;Global strings +JADMINISTRATOR="Administrejo" +JCHECK_AGAIN="Kontroli denove" +JERROR="Eraro" +JEMAIL="Retpoŝto" +JGLOBAL_ISFREESOFTWARE="%s estas libera kodo eldonata sub la %s." +JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="Lingva pakaĵo ne kongruas kun tiu ĉi versio de Joomla!. Kelkaj ĉenoj eble mankas." +JGLOBAL_SELECT_AN_OPTION="Elekti opcion" +JGLOBAL_SELECT_NO_RESULTS_MATCH="Neniu kongrua rezulto" +JGLOBAL_SELECT_SOME_OPTIONS="Elekti kelkajn opciojn" +JINVALID_TOKEN="La plej lasta peto estis malakceptita ĉar ĝi enhavis nevalidan sekuran ĵetonon. Bv. aktualigi la paĝon kaj provi denove." +JNEXT="Sekva" +JNO="Ne" +JNOTICE="Rimarko" +JOFF="Dee" +JON="Ale" +JPREVIOUS="Antaŭa" +JSITE="Fronto" +JUSERNAME="Salutnomo" +JYES="Jes" + +; Framework strings necessary when no lang pack is available +JLIB_DATABASE_ERROR_CONNECT_MYSQL="Ne povis konekti al MySQL." +JLIB_DATABASE_ERROR_DATABASE="Datumbaza eraro okazis." +JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Ne-ebla ŝargi Datumbazan pelilon: %s" +JLIB_ENVIRONMENT_SESSION_EXPIRED="Via seanco eksvalidiĝis, bonvolu reŝargi la paĝon." +JLIB_FILESYSTEM_ERROR_COPY_FAILED="Kopiado fiaskis" +JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :files: Vojo ne estas dosierujo. Vojo: %s" +JLIB_FORM_FIELD_INVALID="Nevalida kampo: " +JLIB_FORM_VALIDATE_FIELD_INVALID="Nevalida kampo: %s" +JLIB_FORM_VALIDATE_FIELD_REQUIRED="Postulata kampo: %s" +JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Fiaskis kopii dosieron %1$s al %2$s." +JLIB_INSTALLER_NOT_ERROR="Se la eraro rilatas al la instalo de lingvaj dosieroj de TinyMCE tio ne influas la instaladon de la lingvo(j). Kelkaj lingvopakaĵoj kreitaj antaŭ Joomla! 3.2.0 povas provi instali apartajn lingvodosierojn por TinyMCE. Ĉar tiuj nun estas parto de la kerno ili ne plu devas esti instalitaj." +JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Ne povis konekti kun datumbazo
    joomla.library: %1$s - %2$s" + +; Strings for the language debugger +JDEBUG_LANGUAGE_UNTRANSLATED_STRING="Netradukitaj ĉenoj" +JDEBUG_LANGUAGE_FILES_IN_ERROR="Sintaksaj eraroj en lingvaj dosieroj" +JNONE="Neniu" + +; Necessary for errors +ADMIN_EMAIL="Retpoŝto de administranto" +ADMIN_PASSWORD="Administranta pasvorto" +ADMIN_PASSWORD2="Konfirmi pasvorton de administranto" +SITE_NAME="Reteja nomo" + +; Database types (allows for a more descriptive label than the internal name) +MYSQL="MySQL" +MYSQLI="MySQLi" +ORACLE="Oracle" +PDOMYSQL="MySQL (PDO)" +POSTGRESQL="PostgreSQL" +SQLAZURE="Microsoft SQL Azure" +SQLITE="SQLite" +SQLSRV="Microsoft SQL Servilo" diff --git a/installation/language/eo-XX/eo-XX.xml b/installation/language/eo-XX/eo-XX.xml new file mode 100644 index 0000000000000..3b89dd2565ced --- /dev/null +++ b/installation/language/eo-XX/eo-XX.xml @@ -0,0 +1,20 @@ + + + Esperanto + 3.5.0 + Aŭgusto 2015 + EsperantoSverige, Svedio + Kopirajto (C) 2005 - 2016 Open Source Matters. Ĉiuj rajtoj rezervitaj. + GNU General Public License version 2 or later; see LICENSE.txt + + eo-XX.ini + + + Esperanto + eo-XX + 0 + + + diff --git a/installation/language/es-ES/es-ES.ini b/installation/language/es-ES/es-ES.ini index d391018606996..8df83ae622cc9 100644 --- a/installation/language/es-ES/es-ES.ini +++ b/installation/language/es-ES/es-ES.ini @@ -1,8 +1,9 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. -; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php -; Note: All the ini files need to be saved as UTF-8 - NO BOM! +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; License GNU General Public License version 2 or later; see LICENSE.txt +; Note : All ini files need to be saved as UTF-8 +;Stepbar INSTL_STEP_COMPLETE_LABEL="Finalizar" INSTL_STEP_DATABASE_LABEL="Base de datos" INSTL_STEP_DEFAULTLANGUAGE_LABEL="Elija el idioma predeterminado" @@ -86,7 +87,7 @@ INSTL_SAMPLE_LEARN_SET=" Datos de ejemplo: Learn Joomla English (GB)" INSTL_SAMPLE_TESTING_SET=" Datos de ejemplo: Test English (GB)" INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Instala Joomla solo con un menú y un formulario de acceso, sin ningún contenido." INSTL_SAMPLE_BLOG_SET_DESC="Instala Joomla con algunos artículos y módulos relacionados con sitios tipo blog como el de 'Temas antiguos', 'Blog en el rollo' 'Temas más leídos'." -INSTL_SAMPLE_BROCHURE_SET_DESC="Instala Joomla con algunas páginas (un menú con las páginas 'Inicio', 'Sobre nosotros', 'Noticias de actualidad', 'Contáctenos') y algunos módulos como el de 'Buscar', 'HTML personalizado' y 'Datos de acceso'." +INSTL_SAMPLE_BROCHURE_SET_DESC="Instala Joomla con algunas páginas (un menú con las páginas 'Inicio', 'Sobre nosotros', 'Noticias de actualidad', 'Contáctenos') y algunos módulos como el de 'Buscar', 'Personalizado' y 'Datos de acceso'." INSTL_SAMPLE_DATA_SET_DESC="Instala Joomla con una página (un menú con un enlace) y módulos como el de 'Últimos artículos' y 'Datos de acceso'." INSTL_SAMPLE_LEARN_SET_DESC="Instala Joomla con artículos de ejemplo que describen cómo funciona Joomla." INSTL_SAMPLE_TESTING_SET_DESC="Instala Joomla con todos los elementos de menú posibles para ayudar a testear Joomla." @@ -115,14 +116,20 @@ INSTL_EMAIL_NOT_SENT="No se ha podido enviar el correo electrónico." ;Complete view INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Detalles de acceso a la administración" +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="El directorio de instalación ya ha sido eliminado." +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_ERROR_FOLDER_DELETE="No se ha podido eliminar el directorio de instalación. Por favor, elimínelo manualmente." +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_FOLDER_REMOVED="La carpeta de instalación ha sido eliminada correctamente" INSTL_COMPLETE_LANGUAGE_1="Joomla! en su propio idioma o creación de un sitio multiidioma básico" -INSTL_COMPLETE_LANGUAGE_DESC="Antes de borrar la carpeta de instalación puede instalar más idiomas. Si desea añadir más idiomas, haga clic en el siguiente botón." +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_LANGUAGE_DESC="Antes de borrar la carpeta de instalación puede instalar más idiomas. Si desea añadir más idiomas, seleccione el siguiente botón." INSTL_COMPLETE_LANGUAGE_DESC2="Nota: necesitará conexión a internet para que Joomla pueda descargar e instalar los nuevos idiomas.
    Algunas configuraciones del servidor no permiten que Joomla pueda instalar los idiomas. Si este fuera su caso, no se preocupe, los podrá instalar después desde la administración del CMS." +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_REMOVE_FOLDER="Eliminar carpeta de instalación" -INSTL_COMPLETE_REMOVE_INSTALLATION="POR FAVOR, ACUÉRDESE DE ELIMINAR COMPLETAMENTE EL DIRECTORIO DE INSTALACIÓN.
    No podrá continuar usando Joomla! con normalidad hasta que el directorio de instalación sea eliminado. Es una característica de seguridad de Joomla!" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_REMOVE_INSTALLATION="POR FAVOR, ACUÉRDESE DE ELIMINAR COMPLETAMENTE EL DIRECTORIO DE INSTALACIÓN.
    No podrá continuar usando Joomla! con normalidad hasta que la carpeta de instalación sea eliminada. Es una característica de seguridad de Joomla!" INSTL_COMPLETE_TITLE="¡Felicidades! Ahora Joomla! ya está instalado." INSTL_COMPLETE_INSTALL_LANGUAGES="Pasos extra: Instalar idiomas" @@ -130,7 +137,7 @@ INSTL_COMPLETE_INSTALL_LANGUAGES="Pasos extra: Instalar idiomas" INSTL_LANGUAGES="Instalar paquetes del idioma" INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Idioma" INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Versión" -INSTL_LANGUAGES_DESC="La interfaz de Joomla está disponible en varios idiomas. Seleccione los idiomas que desee haciendo clic sobre su casilla de selección y luego pulse el botón 'Siguiente'.
    Nota: esta operación puede tardar unos diez segundos por idioma seleccionado a descargar e instalar. Por favor, no seleccione más de 3 idiomas a instalar." +INSTL_LANGUAGES_DESC="La interfaz de Joomla está disponible en varios idiomas. Elija los idiomas que desee seleccionando su casilla de selección y luego pulse el botón 'Siguiente'.
    Nota: esta operación puede tardar unos diez segundos por idioma seleccionado a descargar e instalar. Por favor, no seleccione más de 3 idiomas a instalar." INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Esta operación puede tomar más de 10 segundos por idioma para completarse
    Por favor, espera a que se descarguen e instalen los idiomas..." INSTL_LANGUAGES_MORE_LANGUAGES="Si necesita instalar más idiomas pulse el botón 'Anterior'." INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="No se han seleccionado idiomas a instalar. Si necesita instalar más idiomas pulse el botón 'Anterior' y seleccione los idiomas que desee desde la lista" @@ -138,7 +145,7 @@ INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! no se ha podido conectar al servido INSTL_LANGUAGES_WARNING_NO_INTERNET2="Nota: Después también podrá instalar otros idiomas desde la administración de Joomla!" INSTL_LANGUAGES_WARNING_BACK_BUTTON="Volver al último paso de instalación" -;Defaultlanguage view +;Default language view INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE="Activar las características multiidioma" INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="Si se activa, su sitio Joomla dispondrá de las características multiidioma activadas, incluyendo los menús correspondientes para cada idioma instalado" INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN="Habilitar el plugin 'Código del idioma'" @@ -177,6 +184,7 @@ INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Español" ;Database Model INSTL_DATABASE_COULD_NOT_CONNECT="No se puede conectar con la base de datos. Número de conector devuelto: %s" +INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="El instalador no se pudo conectar con la base de datos especificada y no se ha podido crear la base de datos. Por favor, verifique su configuración y, si fuese necesario, cree manualmente su base de datos." INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="No se ha podido actualizar la caché de manifiesto para la extensión: %s" INSTL_DATABASE_EMPTY_NAME="" INSTL_DATABASE_ERROR_BACKINGUP="Se han producido algunos errores al respaldar la base de datos." @@ -184,10 +192,13 @@ INSTL_DATABASE_ERROR_CREATE="Se ha producido un error cuando se intentaba crear INSTL_DATABASE_ERROR_DELETE="Se han producido algunos errores borrando la base de datos." INSTL_DATABASE_FIELD_VALUE_REMOVE="Borrar" INSTL_DATABASE_FIELD_VALUE_BACKUP="Respaldar" +INSTL_DATABASE_FIX_LOWERCASE="Para PostgreSQL el prefijo debe ser en minúsculas." INSTL_DATABASE_FIX_TOO_LONG="El prefijo de las tablas de MySQL debe ser como máximo de 15 caracteres." INSTL_DATABASE_INVALID_DB_DETAILS="Los detalles proporcionados de la base de datos son incorrectos o los hay que están vacíos." INSTL_DATABASE_INVALID_MYSQL_VERSION="Necesita de MySQL 5.0.4 o superior para poder continuar con la instalación. Su versión es la: %s" INSTL_DATABASE_INVALID_MYSQLI_VERSION="Neecesita de MySQL 5.0.4 o superior para continuar con la instalación. Su versión es la: %s" +INSTL_DATABASE_INVALID_PDOMYSQL_VERSION="Para continuar con la instalación necesita de MySQL 5.0.4 o superior. Su versión es la: %s" +INSTL_DATABASE_INVALID_POSTGRESQL_VERSION="Para continuar con la instalación necesita de PostgreSQL 8.3.18 o superior. Su versión es la: %s" INSTL_DATABASE_INVALID_SQLSRV_VERSION="Necesita de SQL Server 2008 R2 (10.50.1600.1) o superior para poder continuar con la instalación. Su versión es la: %s" INSTL_DATABASE_INVALID_SQLZURE_VERSION="Necesita de SQL Server 2008 R2 (10.50.1600.1) o superior para poder continuar con la instalación. Su versión es la: %s" INSTL_DATABASE_INVALID_TYPE="Por favor, seleccione el tipo de base de datos" @@ -209,10 +220,10 @@ INSTL_ERROR_CONNECT_DB="No se puede conectar con la base de datos. Número de er INSTL_STD_OFFLINE_MSG="Este sitio está cerrado por tareas de mantenimiento.
    Por favor, inténtelo nuevamente más tarde." ;FTP model -INSTL_FTP_INVALIDROOT="El directorio FTP especificado, no es el directorio raíz de Joomla!" +INSTL_FTP_INVALIDROOT="La carpeta FTP especificada no es la carpeta raíz de Joomla!" INSTL_FTP_NOCONNECT="No se puede conectar con el servidor FTP" INSTL_FTP_NODELE="La función "_QQ_"DELE"_QQ_" ha fallado." -INSTL_FTP_NODIRECTORYLISTING="No se puede recibir la lista de directorios desde el servidor FTP." +INSTL_FTP_NODIRECTORYLISTING="No se puede recibir la lista de carpetas desde el servidor FTP." INSTL_FTP_NOLIST="La función "_QQ_"LIST"_QQ_" ha fallado." INSTL_FTP_NOLOGIN="No se puede acceder al servidor FTP." INSTL_FTP_NOMKD="La función "_QQ_"MKD"_QQ_" ha fallado." @@ -220,13 +231,13 @@ INSTL_FTP_NONLST="La función "_QQ_"NLST"_QQ_" ha fallado." INSTL_FTP_NOPWD="La función "_QQ_"PWD"_QQ_" ha fallado." INSTL_FTP_NORETR="La función "_QQ_"RETR"_QQ_" ha fallado." INSTL_FTP_NORMD="La función "_QQ_"RMD"_QQ_" ha fallado." -INSTL_FTP_NOROOT="No se puede acceder al directorio FTP especificado." +INSTL_FTP_NOROOT="No se puede acceder a la carpeta FTP especificada." INSTL_FTP_NOSTOR="La función "_QQ_"STOR"_QQ_" ha fallado." INSTL_FTP_NOSYST="La función "_QQ_"SYST"_QQ_" ha fallado." INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="No se puede detectar automáticamente la carpeta raíz del FTP." ;others -INSTL_CONFPROBLEM="Su archivo de configuración o su directorio no es escribible (o se produjo un error creando el archivo de configuración). Deberá subir este código manualmente. Haga clic en el área de texto para seleccionar todo el código y luego péguelo en un nuevo archivo de texto. El nombre de este archivo debe ser 'configuration.php', luego súbalo al directorio raíz de su sitio." +INSTL_CONFPROBLEM="Su archivo de configuración o su carpeta no es escribible (o se produjo un error creando el archivo de configuración). Deberá subir este código manualmente. Seleccione en el área de texto todo el código y luego péguelo en un nuevo archivo de texto. El nombre de este archivo debe ser 'configuration.php', luego súbalo al directorio raíz de su sitio." INSTL_DATABASE_SUPPORT="Soporte para la base de datos:" INSTL_DISPLAY_ERRORS="Mostrar errores" INSTL_ERROR_DB="Se ha producido algún error mientras se cumplimentaba la base de datos: %s" @@ -240,10 +251,11 @@ INSTL_MB_LANGUAGE_IS_DEFAULT="Mbstring language predeterminado" INSTL_MB_STRING_OVERLOAD_OFF="Mbstring overload desactivado" INSTL_NOTICEMBLANGNOTDEFAULT="La función de PHP 'mbstring language' no está configurada en neutral. Esto se puede cambiar localmente, introduciendo en su archivo .htaccess la instrucción php_value mbstring.language neutral." INSTL_NOTICEMBSTRINGOVERLOAD="La función de PHP 'mbstring function overload' está habilitada. Esto se puede deshabilitar localmente, introduciendo en su archivo .htaccess la instrucción php_value mbstring.func_overload 0" -INSTL_NOTICEYOUCANSTILLINSTALL="
    Aún puede continuar con la instalación, porque los datos del archivo de configuración se podrán ver al final del proceso de instalación. Una vez que lo pueda ver, tendrá que subir manualmente ese código que se ha generado. Cuando aparezca, haga clic en el área de texto para seleccionar todo el código y luego péguelo en un nuevo archivo de texto. El nombre de este archivo debe ser 'configuration.php', luego súbalo al directorio raíz de su sitio." +INSTL_NOTICEYOUCANSTILLINSTALL="
    Aún puede continuar con la instalación, porque los datos del archivo de configuración se podrán ver al final del proceso de instalación. Una vez que lo pueda ver, tendrá que subir manualmente ese código que se ha generado. Cuando aparezca, seleccione en el área de texto todo el código y luego péguelo en un nuevo archivo de texto. El nombre de este archivo debe ser 'configuration.php', luego súbalo al directorio raíz de su sitio." INSTL_OUTPUT_BUFFERING="Área de intercambio ('buffer') de salida" INSTL_PARSE_INI_FILE_AVAILABLE="Soporte para análisis INI" INSTL_PHP_VERSION="Versión de PHP" +INSTL_PHP_VERSION_NEWER="Versión de PHP >= %s" INSTL_REGISTER_GLOBALS="Registros globales desactivado" INSTL_SAFE_MODE="Modo seguro" INSTL_SESSION_AUTO_START="Inicio automático de sesión" @@ -303,13 +315,17 @@ SITE_NAME="Nombre del sitio" MYSQL="MySQL" MYSQLI="MySQLi" ORACLE="Oracle" +PDOMYSQL="MySQL (PDO)" POSTGRESQL="PostgreSQL" SQLAZURE="Microsoft SQL Azure" SQLITE="SQLite" SQLSRV="Microsoft SQL Server" -;The next ones are extra strings in this language (commented keys in source, extra plural cases, etc) + +[New Strings] + INSTL_SAMPLE_BLOG_ES_SET="Datos de ejemplo tipo blog en español (ES)." INSTL_SAMPLE_BROCHURE_ES_SET="Datos de ejemplo tipo folleto en español (ES)." INSTL_SAMPLE_DATA_ES_SET="Datos de ejemplo predeterminados en español (ES)." INSTL_SAMPLE_LEARN_ES_SET="Datos de ejemplo 'Aprender Joomla' en español (ES)." INSTL_SAMPLE_TESTING_ES_SET="Datos de ejemplo tipo testeo en español (ES)." + diff --git a/installation/language/es-ES/es-ES.xml b/installation/language/es-ES/es-ES.xml index 8b5427a0972d5..2de244f25483d 100644 --- a/installation/language/es-ES/es-ES.xml +++ b/installation/language/es-ES/es-ES.xml @@ -1,14 +1,13 @@ Spanish (ES) - 3.2.0 + 3.5.1 2011-01-05 Spanish Translation Team - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - es-ES.ini diff --git a/installation/language/et-EE/et-EE.xml b/installation/language/et-EE/et-EE.xml index 8a1305470daa9..a8cf33de43364 100644 --- a/installation/language/et-EE/et-EE.xml +++ b/installation/language/et-EE/et-EE.xml @@ -6,10 +6,8 @@ 3.4.0 2012-09-22 Joomla! Project - eraser.ee - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - Joomla! 3.0 paigaldusprotsessi eesti keele tõlge et-EE.ini diff --git a/installation/language/eu-ES/eu-ES.ini b/installation/language/eu-ES/eu-ES.ini new file mode 100644 index 0000000000000..4fff8f5eece18 --- /dev/null +++ b/installation/language/eu-ES/eu-ES.ini @@ -0,0 +1,322 @@ +; Joomla! Project +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; License GNU General Public License version 2 or later; see LICENSE.txt +; Note : All ini files need to be saved as UTF-8 + +;Stepbar +INSTL_STEP_COMPLETE_LABEL="Amaitu" +INSTL_STEP_DATABASE_LABEL="Datu-basea" +INSTL_STEP_DEFAULTLANGUAGE_LABEL="Hautatu hizkuntza lehenetsia" +INSTL_STEP_FTP_LABEL="FTP" +INSTL_STEP_LANGUAGES_LABEL="Hizkuntzak instalatu" +INSTL_STEP_SITE_LABEL="Konfigurazioa" +INSTL_STEP_SUMMARY_LABEL="Ikuspegi orokorra" + +;Language view +INSTL_SELECT_LANGUAGE_TITLE="Hautatu hizkuntza" +INSTL_WARNJAVASCRIPT="Kontuz! JavaScript-ek gaituta egon behar du Joomla! behar bezala instalatzeko." +INSTL_WARNJSON="Zure PHP instalazioak JSON gaituta eduki behar du Joomla! instalatu ahal izateko!" + +;Preinstall view +INSTL_PRECHECK_TITLE="Instalazio aurreko egiaztatzea" +INSTL_PRECHECK_DESC="Elementu hauetakoren bat ez badago onartua, (honela markatuta Ez), hori zuzentzeko neurriak hartu behar dituzu.
    Ezingo duzu instalatu Joomla! ondorengo eskakizunak bete arte." +INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Gomendatutako ezarpenak:" +INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Ezarpen hauek gomendatzen dira PHP-rentzat, Joomla-rekiko bateragarritasun osoa bermatzeko.
    Dena dela, Joomla!-k funtzionatuko du nahiz eta ezarpenak berdin-bedinak ez izan." +INSTL_PRECHECK_DIRECTIVE="Direktiba" +INSTL_PRECHECK_RECOMMENDED="Gomendatua" +INSTL_PRECHECK_ACTUAL="Benetakoa" + +; Database view +INSTL_DATABASE="Datu-basearen konfigurazioa" +INSTL_DATABASE_HOST_DESC="Normalean hau izaten da "localhost"." +INSTL_DATABASE_HOST_LABEL="Ostalariaren izena" +INSTL_DATABASE_NAME_DESC="Ostalari batzuk datu-base izen jakin bat soilik onartzen dute gune bakoitzeko. Horrelakoetan, erabil ezazu taula-aurrizkia datu-base bera baliatzen duten Joomla! gune desberdinetarako." +INSTL_DATABASE_NAME_LABEL="Datu-basearen izena" +INSTL_DATABASE_NO_SCHEMA="Ez dago datu-base eskemarik datu-base mota honentzat." +INSTL_DATABASE_OLD_PROCESS_DESC="Joomla!-ren lehenagoko instalazioetatik geratzen diren taulen kopia guztiak ezabatu behar dira." +INSTL_DATABASE_OLD_PROCESS_LABEL="Datu-base zaharraren prozesatzea" +INSTL_DATABASE_PASSWORD_DESC="Gunearen segurtasun arrazoiengatik, nahitaezkoa da pasahitza erabiltzea datu-basearen kontuan." +INSTL_DATABASE_PASSWORD_LABEL="Pasahitza" +INSTL_DATABASE_PREFIX_DESC="Hauta ezazu taula-aurrizkia, edo erabili ausaz sortutakoa. Komeni da hiruzpalau karaktere luzekoa izatea, alfazenbakizko karaktereak soilik edukitzea, eta azpimarra batekin amaitu BEHAR DU. Ziurta ezazu aukeratutako aurrizkia ez dagoela beste taula batzuetan erabilita.." +INSTL_DATABASE_PREFIX_LABEL="Taula Aurrizkia" +INSTL_DATABASE_PREFIX_MSG="“Taula-aurrizkiak hasieran letra behar du, ondoren aukerazko karaktere alfazenbakizkoak eta amaieran azpimarra.”" +INSTL_DATABASE_TYPE_DESC="Seguruenik hau izango da: "MySQLi"." +INSTL_DATABASE_TYPE_LABEL="Datu-base mota" +INSTL_DATABASE_USER_DESC="Hauetakoren bat "root" edo ostalariak emandako erabiltzaile-izena" +INSTL_DATABASE_USER_LABEL="Erabiltzaile-izena" + +;FTP view +INSTL_AUTOFIND_FTP_PATH="Bilatu automatikoki FTP bide-izena" +INSTL_FTP="FTP Konfigurazioa" +INSTL_FTP_DESC="

    Zenbait zerbitzaritan FTP kredentzialak eman beharko dituzu instalazioa burutzeko. Kredentzialik gabe ezin baduzu instalazioa amaitu, begiratu ea zure ostalariak kredentzialak eskatzen dituen.

    Segurtasun-arrazoiengatik, onena da aparteko FTP erabiltzaile-kontu bat sortzea, Joomla! instalaziora soilik sarbidea duena, eta ez web zerbitzari osora. Zure ostalariak lagunduko dizu hau ezartzen.

    Oharra: Windows sistema eragilean ari bazara instalatzen, FTP geruza ez da beharrezkoa.

    " +INSTL_FTP_ENABLE_LABEL="Gaitu FTP Geruza" +INSTL_FTP_HOST_LABEL="FTP Ostalaria" +INSTL_FTP_PASSWORD_LABEL="FTP pasahitza" +INSTL_FTP_PORT_LABEL="FTP Portua" +INSTL_FTP_ROOT_LABEL="FTP Erroko bide-izena" +INSTL_FTP_SAVE_LABEL="Gorde FTP Pasahitza" +INSTL_FTP_TITLE="FTP Konfigurazioa (Aukerakoa - Erabiltzaile gehienek salta dezakete urrats hau - Sakatu Hurrengoa saltatzeko)" +INSTL_FTP_USER_LABEL="FTP Erabiltzaile-izena" +INSTL_VERIFY_FTP_SETTINGS="Egiaztatu FTP ezarpenak" +INSTL_FTP_SETTINGS_CORRECT="Ezarpenak ongi" +INSTL_FTP_USER_DESC="Kontuz! Gomendatzen da hau zurian uztea, eta zure FTP erabiltzaile-izena idaztea fitxategien transferentzia egiten duzun bakoitzean." +INSTL_FTP_PASSWORD_DESC="Kontuz! Gomendatzen da hau zurian uztea, eta zure FTP pasahitza idaztea fitxategien transferentzia egiten duzun bakoitzean." + +;Site View +INSTL_SITE="Konfigurazio nagusia" +INSTL_ADMIN_EMAIL_LABEL="Administratzailearen posta elektronikoa" +INSTL_ADMIN_EMAIL_DESC="Sartu posta helbidea. Hau izango da webguneko Super erabiltzailearen helbide elektronikoa." +INSTL_ADMIN_PASSWORD_LABEL="Administratzailearen pasahitza" +INSTL_ADMIN_PASSWORD_DESC="Idatzi Super erabiltzailearen konturako pasahitza, eta egiaztatu bera azpiko eremuan." +INSTL_ADMIN_PASSWORD2_LABEL="Egiaztatu Administratzaile pasahitza" +INSTL_ADMIN_USER_LABEL="Administratzailearen erabiltzaile-izena" +INSTL_ADMIN_USER_DESC="Idatzi zure Super erabiltzaile konturako erabiltzaile-izena." +INSTL_SITE_NAME_LABEL="Gunearen izena" +INSTL_SITE_NAME_DESC="Idatzi zure Joomla! gunearen izena." +INSTL_SITE_METADESC_LABEL="Deskribapena" +INSTL_SITE_METADESC_TITLE_LABEL="Idatzi webgunearen deskribapen orokor bat bilaketa-motorrek erabil dezaten. Normalean, gehienez 20 hitz idatzita ondo dago." +INSTL_SITE_OFFLINE_LABEL="Gunea lineaz kanpo" +INSTL_SITE_OFFLINE_TITLE_LABEL="Gunearen aurreko interfazea lineaz kanpo ezartzen du instalazioa amaitzean. Gunea linean jar daiteke geroago Konfigurazio Orokorraren bitartez." +INSTL_SITE_INSTALL_SAMPLE_LABEL="Instalatu adibide-datuak" +INSTL_SITE_INSTALL_SAMPLE_DESC="Biziki gomendatzen da adibide-datuak instalatzea hasiberrientzat.
    Joomla! Instalazio-paketean dauden adibide-edukiak instalatuko dira." +INSTL_SITE_INSTALL_SAMPLE_NONE="Bat ere ez (Beharrezkoa hizkuntza anitzeko gune natiboa instalatu nahi bada)" +INSTL_SAMPLE_BLOG_SET="Blog motako Adibide-datuak ingelesez (GB)" +INSTL_SAMPLE_BROCHURE_SET="Liburuxka motako Adibide-datuak ingelesez (GB)" +INSTL_SAMPLE_DATA_SET="Lehenetsitako Adibide-datuak ingelesez (GB)" +INSTL_SAMPLE_LEARN_SET="Ikasi Joomla Adibide-datuak ingelesez (GB)" +INSTL_SAMPLE_TESTING_SET="Probatzeko Adibide-datuak ingelesez (GB)" +INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Instalatu Joomla menu bakar batekin eta saio-hasierako formularioarekin, inolako daturik gabe." +INSTL_SAMPLE_BLOG_SET_DESC="Instalatu Joomla artikulu batzuekin, eta blog motako gunerako moduluekin, hala nola, Artikulu zaharrak, Blog erroilua, Artikulu irakurrienak." +INSTL_SAMPLE_BROCHURE_SET_DESC="Instalatu Joomla orrialde batzuekin (menu bat 'Hasiera', 'Guri buruz', 'Berriak' eta 'Kontaktatu gurekin' orrialdeak dituena) eta modulu batzuk (adibidez, 'Bilatu', 'Pertsonalizatua', 'Saioa hasteko formularioa')." +INSTL_SAMPLE_DATA_SET_DESC="Instalatu Joomla orrialde batekin (menu bat link batekin) eta moduluak, adibidez, 'Azken artikuluak', 'Saio hasierako formularioa'." +INSTL_SAMPLE_LEARN_SET_DESC="Instalatu Joomla nola funtzionatzen duen Joomla-k erakusten duten adibide-artikuluekin." +INSTL_SAMPLE_TESTING_SET_DESC="Instalatu Joomla bere menu-aukera guztiekin, Joomla probatzeko laguntza gisa." + +;Summary view +INSTL_FINALISATION="Amaiera" +INSTL_SUMMARY_INSTALL="Instalatu" +INSTL_SUMMARY_EMAIL_LABEL="Posta elektronikoaren konfigurazioa" +INSTL_SUMMARY_EMAIL_DESC="Bidali konfigurazio-ezarpenak honi %s posta elektronikoz instalazioa amaitzean." +INSTL_SUMMARY_EMAIL_PASSWORDS_LABEL="Gehitu Pasahitzak ere posta elektronikoan." +INSTL_SUMMARY_EMAIL_PASSWORDS_DESC="Kontuz! Ez da komeni pasahitzak posta elektronikoetan gorde edo bidaltzea." + +;Installing view +INSTL_INSTALLING="Instalatzen ..." +INSTL_INSTALLING_DATABASE_BACKUP="Datu-baseko taula zaharren babeskopia egiten" +INSTL_INSTALLING_DATABASE_REMOVE="Datu-baseko taula zaharrak ezabatzen" +INSTL_INSTALLING_DATABASE="Datu-baseko taulak sortzen" +INSTL_INSTALLING_SAMPLE="Adibide-datuak instalatzen" +INSTL_INSTALLING_CONFIG="Konfigurazio-fitxategia sortzen" +INSTL_INSTALLING_EMAIL="Honi %s posta elektronikoa bidaltzen" + +;Email +INSTL_EMAIL_SUBJECT="Konfigurazio xehetasunak: %s" +INSTL_EMAIL_HEADING="Ondoren dauzkazu berriki eraiki duzun Joomla! webgunearen konfigurazio ezarpenak:" +INSTL_EMAIL_NOT_SENT="Posta elektronikoa ezin izan da bidali." + +;Complete view +INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Administrazioaren saio-hasierako xehetasunak" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Ezabatu da installation karpeta." +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_ERROR_FOLDER_DELETE="Ezin da installation karpeta ezabatu. Mesedez, ezaba ezazu eskuz." +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_FOLDER_REMOVED="installation karpeta ongi ezabatu da." +INSTL_COMPLETE_LANGUAGE_1="Joomla! zeure hizkuntzan eta/edo oinarrizko gune hizkuntza anitzeko natiboaren sortze automatikoa." +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_LANGUAGE_DESC="installation karpeta ezabatu aurretik, hizkuntza gehiago instala ditzakezu. Joomla! aplikazioan hizkuntza gehiago nahi badituzu, hautatu hurrengo botoia." +INSTL_COMPLETE_LANGUAGE_DESC2="Oharra: internet konexioa behar duzu Joomla!-k hizkuntza berriak deskargatu eta instalatzeko.
    Zenbait zerbitzariren konfigurazioak ez dio uzten Joomla!-ri hizkuntza berriak instalatzen. Hau gertatzen bazaizu, lasai, geroago instalatuko dituzu Administraziotik." +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_REMOVE_FOLDER="Ezabatu installation karpeta" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_REMOVE_INSTALLATION="EZ AHAZTU installation KARPETA OSORIK EZABATZEA.
    Ezingo duzu aurrera segitu karpeta hori ezabatu gabe. Hau Joomla!-ren segurtasun neurri bat da." +INSTL_COMPLETE_TITLE="Zorionak! Joomla! instalatuta dago." +INSTL_COMPLETE_INSTALL_LANGUAGES="Urrats gehigarriak: Hizkuntzak instalatu" + +;Languages view +INSTL_LANGUAGES="Instalatu Hizkuntza-paketeak" +INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Hizkunzta" +INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Bertsioa" +INSTL_LANGUAGES_DESC="Joomla interfazea hizkuntza askotan dago eskuragarri. Hautatu nahi dituzun hizkuntzak kontrol-laukiak aukeratuz, eta ondoren instalatu 'Hurrengoa' botoia sakatuz.
    Oharra: Hizkuntza bakoitza deskargatzen eta instalatzen 10 bat segundo igaro daiteke. Denbora-muga ez gainditzeko, ez aukeratu aldi bakoitzean 3 hizkuntza baino gehiago." +INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Eragiketa honek 10 bat segundo iraun dezake hizkuntza bakoitzean.
    Itxaron guk hizkuntza deskargatu eta instalatu bitartean..." +INSTL_LANGUAGES_MORE_LANGUAGES="Sakatu 'Aurrekoa' botoia hizkuntza gehiago instalatu nahi badituzu." +INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Ez da aukeratu hizkuntzarik instalatzeko. Hizkuntza gehiago instalatu nahi badituzu, sakatu 'Aurrekoa' botoia eta aukeratu nahi dituzun hizkuntzak zerrendatik." +INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! ezin izan da konektatu hizkuntzen zerbitzariarekin. Mesedez, utzi bertan behera instalazioa." +INSTL_LANGUAGES_WARNING_NO_INTERNET2="Oharra: Geroago izango duzu aukera hizkuntzak instalatzeko Joomla! Administratzailea erabiliz." +INSTL_LANGUAGES_WARNING_BACK_BUTTON="Itzuli instalazioko azken urratsera." + +;Default language view +INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE="Aktibatu hizkuntza anitzeko eginbidea" +INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="Hau aktibatuta dagoenean, zure Joomla guneak hizkuntza anitzeko eginbidea aktibatua izango du, instalatutako hizkuntzetara lokalizatutako menuekin." +INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN="Gaitu Hizkuntza kode plugina." +INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN_DESC="Hau gaituta dagoenean, pluginak hizkuntza kodea aldatzeko gaitasuna gehitzen die sortutako HTML dokumentuei SEO hobetzeko." +INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Administratzailearen hizkuntza lehenetsia" +INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Joomla-k ezin izan du hizkuntza hori lehenetsi gisa ezarri. Ingelesa ezarriko da lehenetsi gisa administrazioko atzealdean." +INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Joomla-k %s ezarri du ADMINISTRATZAILE hizkuntza lehenetsia." +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Hautatu" +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Hizkuntza" +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="Etiketa" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CONTENT_LANGUAGE="Joomla-k ezin izan du automatikoki sortu %s eduki hizkuntza" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU="Joomla-k ezin izan du automatikoki sortu %s menua" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_ITEM="Joomla-k ezin izan du automatikoki sortu %s hasierako menu elementua" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_MODULE="Joomla-k ezin izan du automatikoki sortu %s menu modulua" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CATEGORY="Joomla-k ezin izan du automatikoki sortu %s eduki kategoria" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_ARTICLE="Joomla-k ezin izan du automatikoki sortu %s itzulitako artikulua" +INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_MODULESWHITCHER_LANGUAGECODE="Joomla-k ezin izan du automatikoki argitaratu Hizkuntza aukeratzeko modulua" +INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGECODE="Joomla-k ezin izan du automatikoki gaitu Hizkuntza kodearen plugina" +INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGEFILTER="Joomla-k ezin izan du automatikoki gaitu Hizkuntza iragazkia plugina" +INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Joomla-k ezin izan du instalatu %s hizkuntza." +INSTL_DEFAULTLANGUAGE_COULD_NOT_PUBLISH_MOD_MULTILANGSTATUS="Joomla-k ezin izan du automatikoki argitaratu Hizkuntza anitzeko gunearen egoera modulua" +INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="Joomla-k ezin izan du automatikoki desargitaratu Menu lehenetsiaren modulua" +INSTL_DEFAULTLANGUAGE_DESC="Joomla-k ondorengo hizkuntzak instalatu ditu. Hauta ezazu hizkuntza lehenetsia Joomla Administratzailearentzat." +INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla-k ondorengo hizkuntzak instalatu ditu. Hauta ezazu hizkuntza lehenetsia Joomla gunearen aurreko interfazerako." +INSTL_DEFAULTLANGUAGE_FRONTEND="Gunearen hizkuntza lehenetsia" +INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla-k ezin izan du hizkuntza lehenetsi ezarri. Ingelesa izango da gunearen aurreko interfazerako hizkuntza lehenetsia." +INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Joomla-k %s hizkuntza ezarri du gunearen aurreko interfazerako hizkuntza lehenetsi gisa." +INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Instalatu eduki lokalizatuak" +INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Aktibatuta dagoenean, Joomla-k automatikoki sortuko du eduki kategoria bat instalatutako hizkuntza bakoitzeko. Gainera, adibide-edukia duen artikulu nabarmendu bat sortuko du kategoria bakoitzean." +INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Hizkuntza anitzekoa" +INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Sekzio honekin automatikoki aktibatzen da Joomla!-ren hizkuntza anitzeko eginbidea." +INSTL_DEFAULTLANGUAGE_TRY_LATER="Geroago ere instala dezakezu Joomla! Administrazio aldetik." + +; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español +INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Euskara" + +;Database Model +INSTL_DATABASE_COULD_NOT_CONNECT="Ezin da datu-basea konektatu. Konektoreak zenbaki hau itzuli du: %s" +INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="Instalatzailea ezin izan da konektatu adierazitako datu-basera eta ezin izan da datu-basea sortu. Begiratu zure ezarpenak, eta behar izanez gero, sortu datu-basea eskuz." +INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Ezin da freskatu manifestu-cachea hedapen honentzat: %s" +INSTL_DATABASE_EMPTY_NAME="" +INSTL_DATABASE_ERROR_BACKINGUP="Erroreak gertatu dira datu-basearen babeskopia egitean." +INSTL_DATABASE_ERROR_CREATE="Errorea gertatu da datu-basea sortzean: %s.
    Erabiltzaileak ez dauka aski pribilegio datu-basea sortzeko. Datu-basea aparte sortu behar da Joomla instalatu aurretik." +INSTL_DATABASE_ERROR_DELETE="Erroreak gertatu dira datu-basea ezabatzean." +INSTL_DATABASE_FIELD_VALUE_REMOVE="Ezabatu" +INSTL_DATABASE_FIELD_VALUE_BACKUP="Babeskopia" +INSTL_DATABASE_FIX_LOWERCASE="Taula aurrizkian minuskulaz egon behar du PostgreSQL dela eta." +INSTL_DATABASE_FIX_TOO_LONG="MySQL taula aurrizkiak gehienez 15 karaktere behar ditu." +INSTL_DATABASE_INVALID_DB_DETAILS="Emandako datu-basearen xehetasunak ez dira zuzenak eta/edo hutsik daude." +INSTL_DATABASE_INVALID_MYSQL_VERSION="Behar duzu MySQL 5.0.4 edo berriagoa instalazioarekin jarraitzeko. Hau da zure bertsioa: %s" +INSTL_DATABASE_INVALID_MYSQLI_VERSION="Behar duzu MySQL 5.0.4 edo berriagoa instalazioarekin jarraitzeko. Hau da zure bertsioa: %s" +INSTL_DATABASE_INVALID_PDOMYSQL_VERSION="Behar duzu MySQL 5.0.4 edo berriagoa instalazioarekin jarraitzeko. Hau da zure bertsioa: %s" +INSTL_DATABASE_INVALID_POSTGRESQL_VERSION="Behar duzu PostgreSQL 8.3.18 edo berriagoa instalazioarekin jarraitzeko. Hau da zure bertsioa: %s" +INSTL_DATABASE_INVALID_SQLSRV_VERSION="Behar duzu SQL Server 2008 R2 (10.50.1600.1) edo berriagoa instalazioarekin jarraitzeko. Hau da zure bertsioa: %s" +INSTL_DATABASE_INVALID_SQLZURE_VERSION="Behar duzu SQL Server 2008 R2 (10.50.1600.1) edo berriagoa instalazioarekin jarraitzeko. Hau da zure bertsioa: %s" +INSTL_DATABASE_INVALID_TYPE="Hauta ezazu datu-base mota" +INSTL_DATABASE_NAME_TOO_LONG="MySQL datu-base izenak gehienez 64 karaktere behar ditu." +INSTL_DATABASE_INVALID_NAME="5.1.6 baino lehenagoko MySQL bertsioek ezin dute eduki beren izenean punturik edo beste karaktere "berezirik". Hau da zure bertsioa: %s" +INSTL_DATABASE_NAME_INVALID_SPACES="MySQL datu-baseen izenak ezin dira hasi edo amaitu zuriunearekin." +INSTL_DATABASE_NAME_INVALID_CHAR="MySQL identifikadoreak ezin du eduki NULL karakterea ASCII(0x00)." +INSTL_DATABASE_FILE_DOES_NOT_EXIST="%s fitxategia ez da existitzen" + +;controllers +INSTL_COOKIES_NOT_ENABLED="Ez dirudi Cookie-ak gaituta daudenik zure arakatzaile bezeroan. Ezingo duzu instalatu aplikazioa ezaugarri hau desgaituta. Bestela, arazoa egon daiteke zerbitzariaren session.save_path delakoan. Arazoa hau bada, kontsultatu zure ostatu-emaileari, zeuk konpondu ezin baduzu." +INSTL_HEADER_ERROR="Errorea" + +;Helpers +INSTL_PAGE_TITLE="Joomla! Web Instalatzailea" + +;Configuration model +INSTL_ERROR_CONNECT_DB="Ezin da konektatu datu-basera. Konektoreak zenbaki hau itzuli du: %s" +INSTL_STD_OFFLINE_MSG="Gunea itxita dago mantentze-lanengatik.
    Saia zaitez geroago." + +;FTP model +INSTL_FTP_INVALIDROOT="Adierazitako FTP karpeta ez da Joomla! honen instalazioan ezarritakoa." +INSTL_FTP_NOCONNECT="Ezin da konektatu FTP zerbitzariarekin" +INSTL_FTP_NODELE=""DELE" funtzioak huts egin du." +INSTL_FTP_NODIRECTORYLISTING="Ezin da eskuratu karpeta-zerrenda FTP zerbitzaritik." +INSTL_FTP_NOLIST=""LIST" funtzioak huts egin du." +INSTL_FTP_NOLOGIN="Ezin da saioa hasi FTP zerbitzarian." +INSTL_FTP_NOMKD=""MKD" funtzioak huts egin du." +INSTL_FTP_NONLST=""NLST" funtzioak huts egin du." +INSTL_FTP_NOPWD=""PWD" funtzioak huts egin du." +INSTL_FTP_NORETR=""RETR" funtzioak huts egin du." +INSTL_FTP_NORMD=""RMD" funtzioak huts egin du." +INSTL_FTP_NOROOT="Ezin da sartu FTP karpetara." +INSTL_FTP_NOSTOR=""STOR" funtzioak huts egin du." +INSTL_FTP_NOSYST=""SYST" funtzioak huts egin du." +INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Ezin izan da automatikoki detektatu FTP erro karpet" + +;others +INSTL_CONFPROBLEM="Zure konfigurazio-fitxategia edo karpeta ez da idazgarria edo arazoren bat gertatu da konfigurazio-fitxategia sortzean. Ondoko kodea eskuz kargatu beharko duzu: Egin klik testu-arean eduki osoa kopiatuz eta itsatsi gero testu-fitxategi berri batean. Gorde 'configuration.php' izenarekin, eta kargatu zure guneko erro karpetara." +INSTL_DATABASE_SUPPORT="Datu-base Laguntza:" +INSTL_DISPLAY_ERRORS="Bistaratu erroreak" +INSTL_ERROR_DB="Zenbait errore gertatu da datu-basea betetzean: %s" +INSTL_ERROR_INITIALISE_SCHEMA="Ezin da hasieratu datu-base eskema" +INSTL_FILE_UPLOADS="Fitxategien kargatzeak" +INSTL_GNU_GPL_LICENSE="GNU General Public License" +INSTL_JSON_SUPPORT_AVAILABLE="JSON laguntza" +INSTL_MAGIC_QUOTES_GPC="GPC komatxo magikoak desgaituta" +INSTL_MAGIC_QUOTES_RUNTIME="Komatxo magikoak exekuzio-denboran" +INSTL_MB_LANGUAGE_IS_DEFAULT="Hizkuntza lehenetsia da MB hizkuntza" +INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload desgaituta" +INSTL_NOTICEMBLANGNOTDEFAULT="PHP mbstring language ez dago jarrita neutral gisa jarrita. Hau ezar daiteke gunean bertan idatziz php_value mbstring.language neutral zure .htaccess fitxategian." +INSTL_NOTICEMBSTRINGOVERLOAD="PHP 'mbstring function overload' gaituta dago. Hau desgaitu daiteke gunean bertan idatziz php_value mbstring.func_overload 0 zure .htaccess fitxategian." +INSTL_NOTICEYOUCANSTILLINSTALL="
    Instalazioarekin jarraitu dezakezu, konfigurazio-ezarpenak amaieran ikusiko baitira. Orduan, kodea eskuz kargatu beharko duzu: egin klik testu-arean eduki osoa kopiatuz eta itsatsi testu-fitxategi berri batean. Gorde 'configuration.php' izenarekin, eta kargatu zure gunearen erro karpetan." +INSTL_OUTPUT_BUFFERING="Output Buffering" +INSTL_PARSE_INI_FILE_AVAILABLE="INI Parser laguntza" +INSTL_PHP_VERSION="PHP Bertsioa" +INSTL_PHP_VERSION_NEWER="PHP bertsioa >= %s" +INSTL_REGISTER_GLOBALS="Erregistro Globalak desaktibatuta" +INSTL_SAFE_MODE="Modu seguruan" +INSTL_SESSION_AUTO_START="Saio hasiera automatikoa" +INSTL_WRITABLE="%s Idazgarria" +INSTL_XML_SUPPORT="XML Laguntza" +INSTL_ZIP_SUPPORT_AVAILABLE="ZIP natiboaren laguntza" +INSTL_ZLIB_COMPRESSION_SUPPORT="Zlib konpresioaren Laguntza" +INSTL_PROCESS_BUSY="Prozesua martxan dago. Itxaron, mesedez ..." + +;Global strings +JADMINISTRATOR="Administratzailea" +JCHECK_AGAIN="Egiaztatu berriro" +JERROR="Errorea" +JEMAIL="Posta elektronikoa" +JGLOBAL_ISFREESOFTWARE="%s software librea da, honen arabera aske utzia %s." +JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="Hizkuntza-paketea ez dator bat Joomla! honen bertsioarekin. Zenbait esaldi falta daiteke." +JGLOBAL_SELECT_AN_OPTION="Hautatu aukera bat" +JGLOBAL_SELECT_NO_RESULTS_MATCH="Ez dago bilaketarekin bat datorren emaitzarik" +JGLOBAL_SELECT_SOME_OPTIONS="Hautatu aukera batzuk" +JINVALID_TOKEN="Azken eskaera ukatua izan da, segurtasun-token baliogabe bat zeukalako. Mesedez, freskatu orria eta saiatu berriro." +JNEXT="Hurrengoa" +JNO="Ez" +JNOTICE="Oharra" +JOFF="Desaktibatua" +JON="Aktibatuta" +JPREVIOUS="Aurrekoa" +JSITE="Gunea" +JUSERNAME="Erabiltzaile-izena" +JYES="Bai" + +; Framework strings necessary when no lang pack is available +JLIB_DATABASE_ERROR_CONNECT_MYSQL="Ezin da MySQL-ra konektatu." +JLIB_DATABASE_ERROR_DATABASE="Datu-base errorea gertatu da." +JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Ezin da kargatu datu-base kontrolatzailea: %s" +JLIB_ENVIRONMENT_SESSION_EXPIRED="Zure saioa iraungi da, kargatu berriro orria." +JLIB_FILESYSTEM_ERROR_COPY_FAILED="Kopiak huts egin du" +JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :files: Bide-izena ez karpeta bat. Bide-izena: %s" +JLIB_FORM_FIELD_INVALID="Eremu baliogabea: " +JLIB_FORM_VALIDATE_FIELD_INVALID="Eremu baliogabea: %s" +JLIB_FORM_VALIDATE_FIELD_REQUIRED="Nahitaezko eremua: %s" +JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Huts egin da fitxategia kopiatzean %1$s hona %2$s." +JLIB_INSTALLER_NOT_ERROR="Errorea baldin bada TinyMCE hizkuntza-fitxategiena, ez du eraginik hizkuntzen instalazioan. Joomla! 3.2.0 baino lehenagoko hizkuntza-pakete batzuk saia daitezke aparte instalatzen TinyMCE hizkuntza fitxategiak. Hauek gaur egun nukleoan daudenez, ez dago aparte instalatu beharrik." +JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Ezin da konektatu datu-basearekin
    joomla.library: %1$s - %2$s" + +; Strings for the language debugger +JDEBUG_LANGUAGE_FILES_IN_ERROR="Analisi-erroreak hizkuntza-fitxategietan" +JDEBUG_LANGUAGE_UNTRANSLATED_STRING="Itzuli gabeko kateak" +JNONE="Bat ere ez" + +; Necessary for errors +ADMIN_EMAIL="Administratzailearen posta elektronikoa" +ADMIN_PASSWORD="Administratzailearen pasahitza" +ADMIN_PASSWORD2="Berretsi Administratzailearen pasahitza" +SITE_NAME="Gunearen izena" + +; Database types (allows for a more descriptive label than the internal name) +MYSQL="MySQL" +MYSQLI="MySQLi" +ORACLE="Oracle" +PDOMYSQL="MySQL (PDO)" +POSTGRESQL="PostgreSQL" +SQLAZURE="Microsoft SQL Azure" +SQLITE="SQLite" +SQLSRV="Microsoft SQL Server" diff --git a/installation/language/eu-ES/eu-ES.xml b/installation/language/eu-ES/eu-ES.xml new file mode 100644 index 0000000000000..cd265b4d9c941 --- /dev/null +++ b/installation/language/eu-ES/eu-ES.xml @@ -0,0 +1,21 @@ + + + Basque + 3.5.0 + August 2015 + Miel Loinaz + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + GNU General Public License version 2 or later; see LICENSE.txt + Basque language installation language file for Joomla + + eu-ES.ini + + + Basque + eu-ES + 0 + + + diff --git a/installation/language/fa-IR/fa-IR.ini b/installation/language/fa-IR/fa-IR.ini index 2cf6fe1f19f15..7858ddec6867f 100644 --- a/installation/language/fa-IR/fa-IR.ini +++ b/installation/language/fa-IR/fa-IR.ini @@ -1,5 +1,6 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; Copyright (C) Translation 2010 - 2016 Joomla Farsi www.JoomlaFarsi.com. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 @@ -16,14 +17,14 @@ INSTL_STEP_SUMMARY_LABEL="چکیده" ;Language view INSTL_SELECT_LANGUAGE_TITLE="انتخاب زبان" INSTL_WARNJAVASCRIPT="اخطار! برای نصب كامل جوملا، فعال بودن جاوا اسكریپت الزامیست !" -INSTL_WARNJSON="برای نصب جوملا نیاز است JSON روی پی اچ پی فعال باشد" +INSTL_WARNJSON="برای نصب جوملا نیاز است JSON روی PHP فعال باشد" ;Preinstall view INSTL_PRECHECK_TITLE="کنترل مراحل نصب " INSTL_PRECHECK_DESC="برای نصب باید تمام گزینه های روبرو پشتیبانی شوند. در صورتی که هر یک از گزینه ها با خیر نمایش داده شوند، ممکن است برای نصب و استفاده از جوملا با مشکل روبرو شوید." INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="تنظیمات سفارشی:" INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="این تنظیمات تعیین می کند که آیا PHP شما تطابق کامل با جوملا دارد یا خیر .
    هر چند، جوملا! بر این عملیات ناظر بوده و تنظیمات مورد نیاز برای تطابق را انجام می دهد." -INSTL_PRECHECK_DIRECTIVE=" دستور" +INSTL_PRECHECK_DIRECTIVE="دستور" INSTL_PRECHECK_RECOMMENDED="پیشنهادی" INSTL_PRECHECK_ACTUAL="واقعی" @@ -31,16 +32,16 @@ INSTL_PRECHECK_ACTUAL="واقعی" INSTL_DATABASE="تنظیمات پایگاه داده" INSTL_DATABASE_HOST_DESC="این گزینه معمولا "localhost" است" INSTL_DATABASE_HOST_LABEL="نام هاست" -INSTL_DATABASE_NAME_DESC="بعضی از هاست ها تنها برخی از نام پایگاه داده در سایت را اجازه می دهند . استفاده از پیشوند جدول برای مشخص کردن جوملا! سایت ها." +INSTL_DATABASE_NAME_DESC="بعضی از هاست ها تنها برخی از نام پایگاه داده در سایت را اجازه می دهند. استفاده از پیشوند جدول برای مشخص کردن جوملا! سایت ها." INSTL_DATABASE_NAME_LABEL="نام پایگاه داده " INSTL_DATABASE_NO_SCHEMA="هیچ شمای پایگاه داده ای برای این نوع پایگاه داده موجود نیست." INSTL_DATABASE_OLD_PROCESS_DESC="همه جداول بانک اطلاعاتی، با جداول جدید جایگزین خواهند شد" -INSTL_DATABASE_OLD_PROCESS_LABEL="فرایند پایگاه داده قدیم " +INSTL_DATABASE_OLD_PROCESS_LABEL="فرآیند پایگاه داده قدیم " INSTL_DATABASE_PASSWORD_DESC="به دلایل امنیتی، استفاده از رمز عبور برای حساب پایگاه داده اجباری می باشد" INSTL_DATABASE_PASSWORD_LABEL="رمز عبور" -INSTL_DATABASE_PREFIX_DESC="پیشوند پایگاه داده را بنویسید و یا به صورت تصادفی انتخاب کنید. معمولا، سه، یا چهار کاراکتر کافی است. تنها از حروف انگلیسی و اعداد استفاده کنید و در انتها از آندرلاین (زیر خط) استفاده کنید از وارد کردن پیشوند پایگاه داده مربوط به پایگاه داده دیگر خودداری کنید." +INSTL_DATABASE_PREFIX_DESC="پیشوند پایگاه داده را بنویسید و یا به صورت تصادفی انتخاب کنید. معمولا، سه، یا چهار کاراکتر کافی است. تنها از حروف انگلیسی و اعداد استفاده کنید و در انتها از زیر خط استفاده کنید از وارد کردن پیشوند پایگاه داده مربوط به پایگاه داده دیگر خودداری کنید." INSTL_DATABASE_PREFIX_LABEL="پیشوند جداول " -INSTL_DATABASE_PREFIX_MSG="پیشوند جدول باید با یک حرف آغاز گردد، سپس با مجموعه ای از کاراکترهای الفبایی-عدیی و یک زیرخط(_) ادامه یابد." +INSTL_DATABASE_PREFIX_MSG="پیشوند جدول باید با یک حرف آغاز گردد، سپس با مجموعه ای از کاراکترهای الفبایی - عددیی و یک زیرخط(_) ادامه یابد." INSTL_DATABASE_TYPE_DESC="معمولا "MySQLi" است" INSTL_DATABASE_TYPE_LABEL="نوع پایگاه داده" INSTL_DATABASE_USER_DESC="در هر دو صورت چیزی به عنوان "_QQ_"root"_QQ_" یا یک نام کاربری توسط هاست داده" @@ -49,11 +50,11 @@ INSTL_DATABASE_USER_LABEL="نام کاربری" ;FTP view INSTL_AUTOFIND_FTP_PATH="یافتن خودکار مسیر FTP" INSTL_FTP="تنظیمات FTP" -INSTL_FTP_DESC="

    این بخش مربوط به تنظیمات لایه FTP می باشد.لایه FTP به لایه ای که امکان انتقال فایل ها از سمت کاربر به سمت سرور را می دهد.اگر این تنظیمات این بخش را بدرستی وارد و تایید کرده باشید ، در نصب افزونه ها (امکانات اضافی ) به مشکل بر نمی خورید. همچنین از نظر امنیتی با تنظیم این لایه ، امنیت بیشتری بدست خواهید آورد. در صورتی که تمایل به مطالعه بیشتر و نحوه فعال سازی این بخش دارید ، می توانید لایه FTP را در گوگل جستجو کنید.

    توجه: اگر شما در حال نصب جوملا بر روی لوکال هاست یا ویندوز هستید ، نیاز نیست این بخش را فعال کنید.

    " +INSTL_FTP_DESC="

    این بخش مربوط به تنظیمات لایه FTP می باشد.لایه FTP به لایه ای که امکان انتقال فایل ها از سمت کاربر به سمت سرور را می دهد.اگر این تنظیمات این بخش را بدرستی وارد و تایید کرده باشید، در نصب افزونه ها (امکانات اضافی) به مشکل بر نمی خورید. همچنین از نظر امنیتی با تنظیم این لایه، امنیت بیشتری بدست خواهید آورد. در صورتی که تمایل به مطالعه بیشتر و نحوه فعال سازی این بخش دارید، می توانید لایه FTP را در گوگل جستجو کنید.

    توجه: اگر شما در حال نصب جوملا بر روی لوکال هاست یا ویندوز هستید، نیاز نیست این بخش را فعال کنید.

    " INSTL_FTP_ENABLE_LABEL="فعال سازی لایه FTP" INSTL_FTP_HOST_LABEL="هاست FTP" INSTL_FTP_PASSWORD_LABEL="رمز عبور FTP" -INSTL_FTP_PASSWORD_DESC="اخطار! توصیه می شود اینجا را خالی بگذارید و در هر بار انتقال فایلهایتان رمز عبور FTPرا وارد کنید." +INSTL_FTP_PASSWORD_DESC="اخطار! توصیه می شود اینجا را خالی بگذارید و در هر بار انتقال فایل های خود رمز عبور FTP را وارد کنید." INSTL_FTP_PORT_LABEL="پورت FTP" INSTL_FTP_ROOT_LABEL="مسیر اصلی FTP" INSTL_FTP_SAVE_LABEL="ذخیره ی رمز عبور FTP" @@ -67,7 +68,7 @@ INSTL_VERIFY_FTP_SETTINGS="تایید تنظیمات FTP" INSTL_SITE="تنظیمات اصلی " INSTL_SITE_NAME_LABEL="نام سایت" INSTL_ADMIN_EMAIL_LABEL="ایمیل مدیر ارشد" -INSTL_ADMIN_EMAIL_DESC="آدرس ایمیل خود را وارد نمایید ، این ایمیل به عنوان ایمیل مدیر می باشد." +INSTL_ADMIN_EMAIL_DESC="آدرس ایمیل خود را وارد نمایید، این ایمیل به عنوان ایمیل مدیر می باشد." INSTL_ADMIN_PASSWORD_LABEL="رمز عبور مدیر ارشد" INSTL_ADMIN_PASSWORD_DESC="رمز عبور مدیر را وارد نمایید." INSTL_ADMIN_PASSWORD2_LABEL="تکرار رمز عبور مدیر ارشد" @@ -75,7 +76,7 @@ INSTL_ADMIN_USER_LABEL="نام کاربری مدیر ارشد" INSTL_ADMIN_USER_DESC="نام کاربری مدیر ارشد را وارد کنید." INSTL_SITE_NAME_DESC="لطفا نام سایت جوملایی خود را وارد نمایید." INSTL_SITE_METADESC_LABEL="توضیحات متا" -INSTL_SITE_METADESC_TITLE_LABEL="توضیحاتی را که توسط همه موتورهای جستجو مورد استفاده قرار خواهند گرفت وارد کنید ." +INSTL_SITE_METADESC_TITLE_LABEL="توضیحاتی را که توسط همه موتورهای جستجو مورد استفاده قرار خواهند گرفت وارد کنید." INSTL_SITE_OFFLINE_LABEL="غیر فعال" INSTL_SITE_OFFLINE_TITLE_LABEL="قرار دادن سایت به صورت غیر فعال. بعداً امکان فعال کردن سایت از قسمت تنظیمات کلی را خواهید داشت." INSTL_SITE_INSTALL_SAMPLE_LABEL="نصب اطلاعات نمونه" @@ -85,9 +86,9 @@ INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="جوملا را با یک منو و فرم INSTL_SAMPLE_BLOG_SET="وبلاگ فارسی (IR)" INSTL_SAMPLE_BLOG_SET_DESC="جوملا را با چند مطلب و ماژول های مرتبط به وبلاگ مانند پست های قدیم تر، نظرسنجی، و مطالب بیشتری نصب می کند." INSTL_SAMPLE_BROCHURE_SET="بورشور فارسی (IR)" -INSTL_SAMPLE_BROCHURE_SET_DESC="جوملا را با چند صفحه (منو با صفحه اصلی ، درباره ما ، اخبار ، تماس با ما) و ماژول های جستجو، HTML سفارشی ، فرم ورود ، نصب می کند." +INSTL_SAMPLE_BROCHURE_SET_DESC="جوملا را با چند صفحه (منو با صفحه اصلی، درباره ما، اخبار، تماس با ما) و ماژول های جستجو، سفارشی، فرم ورود، نصب می کند." INSTL_SAMPLE_DATA_SET="اطلاعات نمونه پیش فرض فارسی (IR)" -INSTL_SAMPLE_DATA_SET_DESC="جوملا را با یک صفحه (یک منو با یک لینک) و ماژول ها مانند آخرین مطالب ، فرم ورود نصب می کند." +INSTL_SAMPLE_DATA_SET_DESC="جوملا را با یک صفحه (یک منو با یک لینک) و ماژول ها مانند آخرین مطالب، فرم ورود نصب می کند." INSTL_SAMPLE_LEARN_SET="اطلاعات نمونه آموزش جوملا فارسی (IR)" INSTL_SAMPLE_LEARN_SET_DESC="نصب جوملا را با مطالب نمونه نشان می دهد که چگونه جوملا کار می کند." INSTL_SAMPLE_TESTING_SET="اطلاعات نمونه آزمایشی فارسی (IR)" @@ -110,7 +111,7 @@ INSTL_SUMMARY_INSTALL="نصب" INSTL_SUMMARY_EMAIL_LABEL="پیکربندی ایمیل" INSTL_SUMMARY_EMAIL_DESC="انتخاب ایمیل زیر برای استفاده در پیکربندی بعد از نصب %s." INSTL_SUMMARY_EMAIL_PASSWORDS_LABEL="شامل رمزهای عبور در ایمیل" -INSTL_SUMMARY_EMAIL_PASSWORDS_DESC="هشدار! پیشنهاد می شود رمزهای عبور را در ایمیل ذخیره ننمایید.." +INSTL_SUMMARY_EMAIL_PASSWORDS_DESC="هشدار! پیشنهاد می شود رمزهای عبور را در ایمیل ذخیره ننمایید." ;Installing view INSTL_INSTALLING="در حال نصب..." @@ -131,7 +132,7 @@ INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="اطلاعات ورود مدیر " INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="پوشه ی installation حذف شده است." INSTL_COMPLETE_ERROR_FOLDER_DELETE="پوشه ی installation قابل حذف کردن نیست. لطفا به صورت دستی این پوشه را حذف کنید." INSTL_COMPLETE_FOLDER_REMOVED="پوشه Installation بدرستی حذف شده است." -INSTL_COMPLETE_LANGUAGE_1="جوملا به زبان شما و/یا بصورت خودکار ایجاد یک سایت چند زبانه را میسر می سازد" +INSTL_COMPLETE_LANGUAGE_1="جوملا به زبان شما و/ یا بصورت خودکار ایجاد یک سایت چند زبانه را میسر می سازد" INSTL_COMPLETE_LANGUAGE_DESC="قبل از حذف پوشه installation شما می توانید زبان های جدیدی را نصب کنید. اگر شما می خواهید زبان های جدیدی روی جوملا! نصب کنید دکمه زیر را انتخاب کنید." INSTL_COMPLETE_LANGUAGE_DESC2="توجه: شما برای دانلود و نصب زبان های جدید نیاز دارید تا به اینترنت دسترسی داشته باشید.
    تنظیمات برخی از سرورها اجازه دسترسی به سایت جوملا برای نصب زبان را نمی دهد. نگران این موضوع نباشید زیرا می توانید پس از نصب جوملا در مدیریت جوملا زبان های جدید را نصب کنید." INSTL_COMPLETE_REMOVE_FOLDER="حذف پوشه نصب جوملا" @@ -147,7 +148,7 @@ INSTL_LANGUAGES_DESC="رابط جوملا برای چندین زبان در دس INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="این عملیات برای هر زبان به مدت 10 ثانیه طول خواهد کشید
    لطفا برای دانلود و نصب زبان ها منتظر بمانید..." INSTL_LANGUAGES_MORE_LANGUAGES="اگر می خواهید زبان های بیشتری نصب کنید روی دکمه 'قبلی' کلیک کنید." INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="هیچ زبانی برای نصب انتخاب نشده است. اگر شما به زبان های بیشتری برای نصب نیاز دارید روی دکمه 'قبلی' کلیک کنید و زبان های مورد نظر را از لیست انتخاب نمایید." -INSTL_LANGUAGES_WARNING_NO_INTERNET="جوملا1 قادر به اتصال به سرور زبان ها نیست. لطفا برای پایان عملیات نصب دکمه پایان را کلیک کنید." +INSTL_LANGUAGES_WARNING_NO_INTERNET="جوملا قادر به اتصال به سرور زبان ها نیست. لطفا برای پایان عملیات نصب دکمه پایان را کلیک کنید." INSTL_LANGUAGES_WARNING_NO_INTERNET2="توجه: شما می توانید برای نصب زبان ها بعدا از طریق مدیریت جوملا اقدام کنید" INSTL_LANGUAGES_WARNING_BACK_BUTTON="بازگشت به آخرین مرحله نصب" @@ -197,21 +198,22 @@ INSTL_DATABASE_ERROR_CREATE="خطای رخ داده در زمان ایجاد پ INSTL_DATABASE_ERROR_DELETE="برخی از خطاهای رخ داده در هنگام پاک کردن پایگاه داده." INSTL_DATABASE_FIELD_VALUE_REMOVE="حذف" INSTL_DATABASE_FIELD_VALUE_BACKUP="پشتیبان" -INSTL_DATABASE_FIX_TOO_LONG="خروجی پیشوند جدول mysql حداکثر 15 کاراکتر باشد." +INSTL_DATABASE_FIX_LOWERCASE="پیشوند جداول برای بانک اطلاعاتی PostgreSQL باید کوچک باشد." +INSTL_DATABASE_FIX_TOO_LONG="خروجی پیشوند جدول MySQL حداکثر 15 کاراکتر باشد." INSTL_DATABASE_INVALID_DB_DETAILS="جزئیات پایگاه داده ارائه شده نادرست و یا خالی است." INSTL_DATABASE_INVALID_MYSQL_VERSION="شما برای ادامه نصب به MySQL 5.0.4 یا بالاتر نیاز دارید. نسخه ی شما است: %s" INSTL_DATABASE_INVALID_MYSQLI_VERSION="شما برای ادامه نصب به MySQL 5.0.4 یا بالاتر نیاز دارید. نسخه ی شما است: %s" INSTL_DATABASE_INVALID_SQLSRV_VERSION="شما برای ادامه نصب به SQL Server 2008 R2 (10.50.1600.1) یا بالاتر نیاز دارید. نسخه ی شما است: %s" INSTL_DATABASE_INVALID_SQLZURE_VERSION="شما برای ادامه نصب به SQL Server 2008 R2 (10.50.1600.1) یا بالاتر نیاز دارید. نسخه ی شما است: %s" INSTL_DATABASE_INVALID_TYPE="لطفا نوع پایگاه داده را انتخاب کنید" -INSTL_DATABASE_NAME_TOO_LONG="نام پایگاه داده mysqlحداکثر64 کارکتر باید باشد." -INSTL_DATABASE_INVALID_NAME="نسخه های قبلی mysql 5.1.6 ممکن است دوره ها یا کارکتر های دیگر را شامل نشود "_QQ_"special"_QQ_" . نسخه شما هست: %s" -INSTL_DATABASE_NAME_INVALID_SPACES="نام های پایگاه داده mysql و جداول با فاصله شروع نمی شود ." +INSTL_DATABASE_NAME_TOO_LONG="نام پایگاه داده MySQL حداکثر 64 کارکتر باید باشد." +INSTL_DATABASE_INVALID_NAME="نسخه های قبلی MySQL 5.1.6 ممکن است دوره ها یا کارکتر های دیگر را شامل نشود "_QQ_"special"_QQ_" . نسخه شما هست: %s" +INSTL_DATABASE_NAME_INVALID_SPACES="نام های پایگاه داده MySQL و جداول با فاصله شروع نمی شود ." INSTL_DATABASE_NAME_INVALID_CHAR="شناسه ی MySQL نمی تواند شامل یک کاراکتر NULL ASCII(0x00) باشد." INSTL_DATABASE_FILE_DOES_NOT_EXIST="فایل %s وجود ندارد" ;controllers -INSTL_COOKIES_NOT_ENABLED="در مرورگر کامپیوتر شما، سیستم کوکی ها فعال نمی باشد. در صورتی که این تنظیم غیر فعال باشد شما نمی توانید جوملا را نصب کنید. متناوبا، هچنین می تواند یک مشکل با سرور وجود داشته باشد session.save_path. اگر این مورد است، اگر شما نمی دانید که چگونه مشکلتان را بررسی یا حل کنید لطفا با هاست قبلیتان مشورت کنید ." +INSTL_COOKIES_NOT_ENABLED="در مرورگر کامپیوتر شما، سیستم کوکی ها فعال نمی باشد. در صورتی که این تنظیم غیر فعال باشد شما نمی توانید جوملا را نصب کنید. متناوبا، هچنین می تواند یک مشکل با سرور وجود داشته باشد session.save_path. اگر این مورد است، شما نمی دانید که چگونه مشکل را بررسی یا حل کنید لطفا با هاست قبلی خود مشورت کنید ." INSTL_HEADER_ERROR="خطا" ;Helpers @@ -239,8 +241,8 @@ INSTL_FTP_NOSYST="تابع "_QQ_"SYST"_QQ_" با شکست مواجه شد." INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="قادر به شناسایی خودکار پوشه ی اصلی FTP نیست." ;others -INSTL_CONFPROBLEM="نمی تواند فایل configuration.php را برای نوشتن باز کندیا یک مشکل در ایجاد فایل configuration وجود دارد. شما بایستی بصورت دستی کد های داده شده در مرحله نهایی را آپلود کنید. شما بایستی یک فایل configuration.php در انتهای مرحله نصب ایجاد کرده و کد هایی که در انتهای نصب به شما داده می شود را درون آن قرار داده و سپس در پوشه ای که جوملا در ان نصب است، آپلود کنید." -INSTL_DATABASE_SUPPORT="پشتیبانی پایگاه داده :" +INSTL_CONFPROBLEM="نمی تواند فایل configuration.php را برای نوشتن باز کند یا یک مشکل در ایجاد فایل configuration وجود دارد. شما بایستی بصورت دستی کد های داده شده در مرحله نهایی را آپلود کنید. شما بایستی یک فایل configuration.php در انتهای مرحله نصب ایجاد کرده و کد هایی که در انتهای نصب به شما داده می شود را درون آن قرار داده و سپس در پوشه ای که جوملا در آن نصب شده است، آپلود کنید." +INSTL_DATABASE_SUPPORT="پشتیبانی پایگاه داده:" INSTL_DISPLAY_ERRORS="نمایش پیام های خطا" INSTL_ERROR_DB="برخی از خطاهای رخ داده زمان جمع شدن پایگاه داده: %s" INSTL_ERROR_INITIALISE_SCHEMA="شمای اولیه پایگاه داده نیست" @@ -250,20 +252,20 @@ INSTL_JSON_SUPPORT_AVAILABLE="پشتیبانی از JSON" INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC" INSTL_MAGIC_QUOTES_RUNTIME="زمان اجرا" INSTL_MB_LANGUAGE_IS_DEFAULT="زبان اصلی موجود می باشد" -INSTL_MB_STRING_OVERLOAD_OFF="میزان سر ریزی رشته با حسب مگابایت خاموش است" -INSTL_NOTICEMBLANGNOTDEFAULT="زبان متغییر MB پی اچ پی نظیم نشده است . این می تواند به صورت محلی با وارد کردن php_value متغییر MB تنظیم شود.زبان خنثی .htaccess در فایل." -INSTL_NOTICEMBSTRINGOVERLOAD="تابع متغییر MBپی اچ پی اضافی تنظیم شده است. این می تواند بطور محلی خاموش شود با وارد کردن php_value mbstring.func_overload 0 .htaccessدر فایل ." -INSTL_NOTICEYOUCANSTILLINSTALL="
    شما هنوز می توانید نصب را ادامه دهید بطوریکه تنظیمات پیکربندی در پایان نمایش داده خواهد شد. شما بایستی بصورت دستی کد های داده شده در مرحله نهایی را آپلود کنید. شما بایستی یک فایل configuration.php در انتهای مرحله نصب ایجاد کرده و کد هایی که در انتهای نصب به شما داده می شود را درون آن قرار داده و سپس در پوشه ای که جوملا در آن نصب است ، آپلود کنید." +INSTL_MB_STRING_OVERLOAD_OFF="میزان سر ریزی رشته با حسب مگا بایت خاموش است" +INSTL_NOTICEMBLANGNOTDEFAULT="زبان متغییر MB PHP نظیم نشده است . این می تواند به صورت محلی با وارد کردن php_value متغییر MB تنظیم شود.زبان خنثی .htaccess در فایل." +INSTL_NOTICEMBSTRINGOVERLOAD="تابع متغییر MB PHP اضافی تنظیم شده است. این می تواند بطور محلی خاموش شود با وارد کردن php_value mbstring.func_overload 0 .htaccessدر فایل ." +INSTL_NOTICEYOUCANSTILLINSTALL="
    شما هنوز می توانید نصب را ادامه دهید بطوریکه تنظیمات پیکربندی در پایان نمایش داده خواهد شد. شما بایستی بصورت دستی کد های داده شده در مرحله نهایی را آپلود کنید. شما بایستی یک فایل configuration.php در انتهای مرحله نصب ایجاد کرده و کد هایی که در انتهای نصب به شما داده می شود را درون آن قرار داده و سپس در پوشه ای که جوملا در آن نصب است، آپلود کنید." INSTL_OUTPUT_BUFFERING="میانگیری خروجی" INSTL_PARSE_INI_FILE_AVAILABLE="پشتیبانی از فشرده سازی" -INSTL_PHP_VERSION="نسخه php" +INSTL_PHP_VERSION="نسخه PHP" INSTL_REGISTER_GLOBALS="ثبت نام سراسری" INSTL_SAFE_MODE="حالت ایمن" INSTL_SESSION_AUTO_START="شروع خودکار نشست" INSTL_WRITABLE="%s قابل نوشتن" -INSTL_XML_SUPPORT="پشتیبانی از xml" +INSTL_XML_SUPPORT="پشتیبانی از XML" INSTL_ZIP_SUPPORT_AVAILABLE="پشتیبانی از ZIP" -INSTL_ZLIB_COMPRESSION_SUPPORT="پشتیبانی از فشرده سازی zlib" +INSTL_ZLIB_COMPRESSION_SUPPORT="پشتیبانی از فشرده سازی Zlib" INSTL_PROCESS_BUSY="پردازش در حال پیشرفت است. لطفا صبر کنید..." ;Global strings diff --git a/installation/language/fa-IR/fa-IR.xml b/installation/language/fa-IR/fa-IR.xml index 7d8c0a14e76c4..a192078985eb7 100644 --- a/installation/language/fa-IR/fa-IR.xml +++ b/installation/language/fa-IR/fa-IR.xml @@ -1,14 +1,13 @@ - + Persian (پارسی) - 3.4.4 - 2012-09-24 - Joomla Farsi Team - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + 3.5.0 + 2016-01-30 + JoomlaFarsi.Com Team + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - fa-IR.ini diff --git a/installation/language/fi-FI/fi-FI.ini b/installation/language/fi-FI/fi-FI.ini index 856d12bacc801..4c50bc5fbe553 100644 --- a/installation/language/fi-FI/fi-FI.ini +++ b/installation/language/fi-FI/fi-FI.ini @@ -1,6 +1,6 @@ ; $Id: fi_FI.ini ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/fi-FI/fi-FI.xml b/installation/language/fi-FI/fi-FI.xml index 3c0cf14143966..078dda509fef0 100644 --- a/installation/language/fi-FI/fi-FI.xml +++ b/installation/language/fi-FI/fi-FI.xml @@ -6,9 +6,8 @@ 3.4.2 September 2012 Sami Haaranen - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - Asennusohjelman kielitiedosto / Finnish language file for installation to Joomla 3.0 version. fi-FI.ini diff --git a/installation/language/fr-CA/fr-CA.ini b/installation/language/fr-CA/fr-CA.ini index 0be916c5b2c1f..a19a865ef5849 100644 --- a/installation/language/fr-CA/fr-CA.ini +++ b/installation/language/fr-CA/fr-CA.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 @@ -201,7 +201,7 @@ INSTL_DEFAULTLANGUAGE_TABLE_HEADER="Sélectionner la langue par défaut" INSTL_DEFAULTLANGUAGE_TRY_LATER="Vous pourrez l'installer plus tard depuis l'administration de Joomla!" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español -INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Français" +INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Français (CA)" ;Database Model INSTL_DATABASE_COULD_NOT_CONNECT="Impossible de se connecter à la base de données. Le connecteur a renvoyé le numéro : %s" @@ -213,6 +213,7 @@ INSTL_DATABASE_ERROR_DELETE="Des erreurs sont apparues lors de la suppression de INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Erreur dans l'initialisation du numéro de version du schema" INSTL_DATABASE_FIELD_VALUE_BACKUP="Sauvegarder" INSTL_DATABASE_FIELD_VALUE_REMOVE="Supprimer" +INSTL_DATABASE_FIX_LOWERCASE="Le préfixe des tables doit être en bas de casse pour PostgreSQL." INSTL_DATABASE_FIX_TOO_LONG="Le préfixe des tables MySQL ne peut pas dépasser 15 caractères" INSTL_DATABASE_INVALID_DB_DETAILS="Les détails fournis pour la base de données sont incorrects et/ou vides." INSTL_DATABASE_INVALID_MYSQL_VERSION="Votre version de MySQL doit être 5.0.4 ou supérieure pour que l'installation puisse se poursuivre. Votre version est : %s" diff --git a/installation/language/fr-CA/fr-CA.xml b/installation/language/fr-CA/fr-CA.xml index 305018a1b554c..de64dc0bbb04a 100644 --- a/installation/language/fr-CA/fr-CA.xml +++ b/installation/language/fr-CA/fr-CA.xml @@ -6,9 +6,8 @@ 3.2.0 2014-04-12 Martin Lamothe - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - fr-CA.ini diff --git a/installation/language/fr-FR/fr-FR.ini b/installation/language/fr-FR/fr-FR.ini index 9e9ca0fc67cf6..8b9f130a43790 100644 --- a/installation/language/fr-FR/fr-FR.ini +++ b/installation/language/fr-FR/fr-FR.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 @@ -187,6 +187,7 @@ INSTL_DATABASE_ERROR_CREATE="Une erreur s'est produite lors de la création de l INSTL_DATABASE_ERROR_DELETE="Des erreurs sont apparues lors de la suppression de la base de données" INSTL_DATABASE_FIELD_VALUE_REMOVE="Supprimer" INSTL_DATABASE_FIELD_VALUE_BACKUP="Sauvegarder" +INSTL_DATABASE_FIX_LOWERCASE="Le préfixe des tables doit être en bas de casse pour PostgreSQL." INSTL_DATABASE_FIX_TOO_LONG="Le préfixe des tables MySQL ne peut pas dépasser 15 caractères" INSTL_DATABASE_INVALID_DB_DETAILS="Les détails fournis pour la base de données sont incorrects et/ou vides." INSTL_DATABASE_INVALID_MYSQL_VERSION="Votre version de MySQL doit être 5.0.4 ou supérieure pour que l'installation puisse se poursuivre. Votre version est : %s" diff --git a/installation/language/fr-FR/fr-FR.xml b/installation/language/fr-FR/fr-FR.xml index ce48b6d946d6a..052fe816108cd 100644 --- a/installation/language/fr-FR/fr-FR.xml +++ b/installation/language/fr-FR/fr-FR.xml @@ -1,14 +1,13 @@ French (Fr) - 3.4.2 - September 2012 + 3.5.0 + January 2016 Joomla.fr - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - fr-FR.ini diff --git a/installation/language/ga-IE/ga-IE.ini b/installation/language/ga-IE/ga-IE.ini new file mode 100644 index 0000000000000..bf8e72ab20d01 --- /dev/null +++ b/installation/language/ga-IE/ga-IE.ini @@ -0,0 +1,322 @@ +; Joomla! Project +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; License GNU General Public License version 2 or later; see LICENSE.txt +; Note : All ini files need to be saved as UTF-8 + +;Stepbar +INSTL_STEP_COMPLETE_LABEL="Críochnaigh" +INSTL_STEP_DATABASE_LABEL="Bunachar Sonraí" +INSTL_STEP_DEFAULTLANGUAGE_LABEL="Roghnaigh Teanga Réamhshocraithe" +INSTL_STEP_FTP_LABEL="FTP" +INSTL_STEP_LANGUAGES_LABEL="Suiteáil Teangacha" +INSTL_STEP_SITE_LABEL="Cumraíocht" +INSTL_STEP_SUMMARY_LABEL="Foramharc" + +;Language view +INSTL_SELECT_LANGUAGE_TITLE="Roghnaigh Teanga" +INSTL_WARNJAVASCRIPT="Rabhadh! Ní mór duit JavaScript a chumasú chun Joomla! a shuiteáil" +INSTL_WARNJSON="Ní mór duit JSON a chumasú i do shuiteáil PHP chun Joomla! a shuiteáil" + +;Preinstall view +INSTL_PRECHECK_TITLE="Deimhniú Réamhshuiteála" +INSTL_PRECHECK_DESC="Má tá aon cheann de na gnéithe seo ar iarraidh (marcáilte Níl), ní mór duit iad a shuiteáil i dtosach báire.
    Ní bheidh tú in ann Joomla! a shuiteáil go dtí go mbeidh na riachtanais go léir ar do chóras." +INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Socruithe molta:" +INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Moltar na socruithe PHP seo sa chaoi go mbeidh sé go hiomlán comhoiriúnach le Joomla.
    É sin ráite, feidhmeoidh Joomla! fiú mura bhfuil an chumraíocht go hiomlán mar a mholtar." +INSTL_PRECHECK_DIRECTIVE="Treo" +INSTL_PRECHECK_RECOMMENDED="Molta" +INSTL_PRECHECK_ACTUAL="Séard atá ann" + +; Database view +INSTL_DATABASE="Cumraíocht Bhunachair Sonraí" +INSTL_DATABASE_HOST_DESC=""localhost", de ghnáth." +INSTL_DATABASE_HOST_LABEL="Óstainm" +INSTL_DATABASE_NAME_DESC="Ní cheadaíonn roinnt óstach agus bunachar sonraí amháin ar gach suíomh. Sa chás seo, is féidir réimír thábla a úsáid le haghaidh suíomhanna éagsúla Joomla!." +INSTL_DATABASE_NAME_LABEL="Ainm an Bhunachair Sonraí" +INSTL_DATABASE_NO_SCHEMA="Níl aon scéimre bunachair sonraí le haghaidh an chineáil seo bunachair sonraí." +INSTL_DATABASE_OLD_PROCESS_DESC="Forscríobhfar aon táblaí cúltaca atá ann ó sheanleaganacha Joomla!." +INSTL_DATABASE_OLD_PROCESS_LABEL="Seanphróiseas an Bhunachair Sonraí" +INSTL_DATABASE_PASSWORD_DESC="Chun an suíomh a chosaint, caithfidh tú focal faire a úsáid do chuntas an bhunachair sonraí." +INSTL_DATABASE_PASSWORD_LABEL="Focal faire" +INSTL_DATABASE_PREFIX_DESC="Roghnaigh réimír thábla nó úsáid réimír randamach. An rud is fearr ná réimír trí nó ceithre charactar, carachtair alfa-uimhriúla amháin, agus caithfear fostríoc a bheith ag an deireadh. Deimhnigh nach bhfuil an réimír in úsáid ag aon tábla eile." +INSTL_DATABASE_PREFIX_LABEL="Réimír Thábla" +INSTL_DATABASE_PREFIX_MSG="Ní mór litir a bheith ag tús na réimíre, ansin carachtair (roghnacha) alfa-uimhriúla, agus fostríoc ag an deireadh" +INSTL_DATABASE_TYPE_DESC=""MySQLi" is dócha." +INSTL_DATABASE_TYPE_LABEL="Cineál an Bhunachair Sonraí" +INSTL_DATABASE_USER_DESC="Is éard atá ann ná "root" nó ainm úsáideora ón óstach." +INSTL_DATABASE_USER_LABEL="Ainm Úsáideora" + +;FTP view +INSTL_AUTOFIND_FTP_PATH="Aimsigh an Cosán FTP go huathoibríoch" +INSTL_FTP="Cumraíocht FTP" +INSTL_FTP_DESC="

    On some servers you may need to provide FTP credentials for installation to complete. If you have difficulties completing installation without these credentials, check with your host to determine if this is necessary.

    For security reasons, it is best to create a separate FTP user account with access to the Joomla! installation only and not the entire web server. Your host can assist you with this.

    Note: If you are installing on a Windows Operating System, the FTP layer is not required.

    " +INSTL_FTP_ENABLE_LABEL="Cumasaigh an tSraith FTP" +INSTL_FTP_HOST_LABEL="Óstríomhaire FTP" +INSTL_FTP_PASSWORD_LABEL="Focal faire FTP" +INSTL_FTP_PORT_LABEL="Port FTP" +INSTL_FTP_ROOT_LABEL="Fréamhfhillteán FTP" +INSTL_FTP_SAVE_LABEL="Sábháil an focal faire FTP" +INSTL_FTP_TITLE="Cumraíocht FTP (Roghnach - Is dócha nach gá duit bacadh leis an gcéim seo - brúigh Ar Aghaidh más mian leat)" +INSTL_FTP_USER_LABEL="Ainm Úsáideora FTP" +INSTL_VERIFY_FTP_SETTINGS="Deimhnigh na Socruithe FTP" +INSTL_FTP_SETTINGS_CORRECT="Tá mé sásta leis na socruithe" +INSTL_FTP_USER_DESC="Rabhadh! Moltar duit an réimse seo a fhágáil folamh agus d'ainm úsáideora FTP a sholáthar gach uair a n-aistríonn tú comhaid." +INSTL_FTP_PASSWORD_DESC="Rabhadh! Moltar duit an réimse seo a fhágáil folamh agus d'fhocal faire FTP a sholáthar gach uair a n-aistríonn tú comhaid." + +;Site View +INSTL_SITE="Príomhchumraíocht" +INSTL_ADMIN_EMAIL_LABEL="Seoladh R-Phoist an Riarthóra" +INSTL_ADMIN_EMAIL_DESC="Cuir isteach seoladh ríomhphoist. Is é seo an seoladh ríomhphoist atá ag Forúsáideoir an tSuímh." +INSTL_ADMIN_PASSWORD_LABEL="Focal Faire an Riarthóra" +INSTL_ADMIN_PASSWORD_DESC="Tabhair focal faire an Fhorúsáideora, agus deimhnigh sa réimse thíos é." +INSTL_ADMIN_PASSWORD2_LABEL="Dearbhaigh Focal Faire an Riarthóra" +INSTL_ADMIN_USER_LABEL="Ainm Úsáideora an Riarthóra" +INSTL_ADMIN_USER_DESC="Tabhair ainm chuntas an Fhorúsáideora." +INSTL_SITE_NAME_LABEL="Ainm an tSuímh" +INSTL_SITE_NAME_DESC="Cuir isteach ainm do shuímh Jooma!." +INSTL_SITE_METADESC_LABEL="Cur Síos" +INSTL_SITE_METADESC_TITLE_LABEL="Déan cur síos ar an suíomh iomlán a mbainfear innill chuardaigh úsáid as. An rud is fearr ná cur síos gairid, níos lú ná 20 focal." +INSTL_SITE_OFFLINE_LABEL="Suíomh As Líne" +INSTL_SITE_OFFLINE_TITLE_LABEL="Nuair a bheidh an tsuiteáil críochnaithe, cuir Comhéadan an tsuímh as líne. Is féidir an suíomh a chur ar líne ar ball tríd an gCumraíocht Dhomhanda." +INSTL_SITE_INSTALL_SAMPLE_LABEL="Suiteáil Sonraí Samplacha" +INSTL_SITE_INSTALL_SAMPLE_DESC="Moltar go láidir sonraí samplacha a shuiteáil, go háirithe do thosaitheoirí.
    Suiteálfar ábhar samplach atá ar fáil mar chuid den phacáiste suiteála Joomla!." +INSTL_SITE_INSTALL_SAMPLE_NONE="Dada (Riachtanach le bunsuíomh ilteangach a chruthú)" +INSTL_SAMPLE_BLOG_SET="Blag - Sonraí Samplacha Béarla (RA)" +INSTL_SAMPLE_BROCHURE_SET="Leabhrán - Sonraí Samplacha Béarla (RA)" +INSTL_SAMPLE_DATA_SET="Réamhshocrú - Sonraí Samplacha Béarla (RA)" +INSTL_SAMPLE_LEARN_SET="Foghlaim Joomla - Sonraí Samplacha Béarla (RA)" +INSTL_SAMPLE_TESTING_SET="Tástáil - Sonraí Samplacha Béarla (RA)" +INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Suiteáil Joomla le roghchlár amháin agus foirm logála isteach, gan ábhar ar bith." +INSTL_SAMPLE_BLOG_SET_DESC="Suiteáil Joomla le roinnt altanna agus modúil a bhaineann leis an mblagadóireacht: Postálacha Níos Sine, Blagrolla, Postálacha Is Mó Tóir Orthu" +INSTL_SAMPLE_BROCHURE_SET_DESC="Suiteáil Joomla le roinnt leathanach (roghchlár le leathanaigh Baile, Fúinn, Nuacht, Teagmháil) agus modúil Cuardach, Saincheaptha, Foirm Logála Isteach." +INSTL_SAMPLE_DATA_SET_DESC="Suiteáil Joomla le leathanach amháin (roghchlár le nasc amháin) agus modúil Alt Is Déanaí, Foirm Logála Isteach." +INSTL_SAMPLE_LEARN_SET_DESC="Suiteáil Joomla le haltanna samplacha a dhéanann cur síos ar Joomla." +INSTL_SAMPLE_TESTING_SET_DESC="Suiteáil Joomla le gach ar féidir de mhíreanna, chun tástáil a dhéanamh ar Joomla." + +;Summary view +INSTL_FINALISATION="Dlaoi Mullaigh" +INSTL_SUMMARY_INSTALL="Suiteáil" +INSTL_SUMMARY_EMAIL_LABEL="Cumraíocht Ríomhphoist" +INSTL_SUMMARY_EMAIL_DESC="Seol an chumraíocht chuig %s tar éis suiteála." +INSTL_SUMMARY_EMAIL_PASSWORDS_LABEL="Cuir Focail Fhaire sa Ríomhphost" +INSTL_SUMMARY_EMAIL_PASSWORDS_DESC="Rabhadh! Moltar duit gan focail fhaire a sheoladh ná a shábháil i ríomhphost." + +;Installing view +INSTL_INSTALLING="Á Shuiteáil..." +INSTL_INSTALLING_DATABASE_BACKUP="Cúltaca de sheantáblaí bunachair sonraí á dhéanamh" +INSTL_INSTALLING_DATABASE_REMOVE="Seantáblaí bunachair sonraí á scriosadh" +INSTL_INSTALLING_DATABASE="Táblaí bunachair sonraí á gcruthú" +INSTL_INSTALLING_SAMPLE="Sonraí samplacha á suiteáil" +INSTL_INSTALLING_CONFIG="Comhad cumraíochta á chruthú" +INSTL_INSTALLING_EMAIL="Ríomhphost á sheoladh chuig %s" + +;Email +INSTL_EMAIL_SUBJECT="Mionsonraí na Cumraíochta: %s" +INSTL_EMAIL_HEADING="Anseo gheobhaidh tú an chumraíocht ar shuíomh nua Joomla!:" +INSTL_EMAIL_NOT_SENT="Níorbh fhéidir an ríomhphost a sheoladh." + +;Complete view +INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Sonraí Logála Isteach an Riarthóra" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Scriosadh an fillteán installation cheana." +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_ERROR_FOLDER_DELETE="Níorbh fhéidir an fillteán installation a scriosadh. Ba chóir duit é a scriosadh de láimh." +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_FOLDER_REMOVED="Scriosadh an fillteán installation." +INSTL_COMPLETE_LANGUAGE_1="Joomla! i do theanga féin, agus/nó bunsuíomh ilteangach a chruthú go huathoibríoch" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_LANGUAGE_DESC="Sula scriofaidh tú an fillteán installation, is féidir teangacha eile a shuiteáil. Más mian leat teangacha sa bhreis a chur le d'fheidhmchlár Joomla!, cliceáil an cnaipe seo a leanas." +INSTL_COMPLETE_LANGUAGE_DESC2="Nóta: ní mór duit a bheidh ceangailte leis an Idirlíon sa chaoi go mbeidh Joomla! in ann na teangacha nua a íoslódáil agus a shuiteáil.
    Ní bheidh tú in ann na teangacha a shuiteáil le cumraíochtaí áirithe. Má tá fadhb agat, ná buair do cheann, beidh tú in ann iad a shuiteáil ar ball trí Riarthóir Joomla!." +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_REMOVE_FOLDER="Scrios an fillteán installation" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_REMOVE_INSTALLATION="NÁ DEARMAD AN FILLTEÁN INSTALLATION A SCRIOSADH GO hIOMLÁN.
    Ní bheidh tú in ann dul ar aghaidh go dtí go mbeidh an fillteán installation scriosta. Is gné slándála de chuid Joomla! é seo" +INSTL_COMPLETE_TITLE="Comhghairdeas! Tá Joomla! suiteáilte anois." +INSTL_COMPLETE_INSTALL_LANGUAGES="Céimeanna eile: Suiteáil teangacha" + +;Languages view +INSTL_LANGUAGES="Suiteáil pacáistí teanga" +INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Teanga" +INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Leagan" +INSTL_LANGUAGES_DESC="Tá comhéadan Joomla ar fáil i roinnt teangacha éagsúla. Cuir ticeanna sna boscaí in aice le do rogha teangacha, ansin suiteáil iad tríd an cnaipe 'Ar Aghaidh' a chliceáil.
    Nóta: tógfaidh sé timpeall is 10 soicind chun na teangacha go léir a íoslódáil agus a shuiteáil. Sa chaoi nach rachaidh sé thar am, ná roghnaigh níos mó ná trí theanga le suiteáil." +INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Tógfaidh sé suas le 10 soicind chun gach teanga a chur i gcrích
    Fan nóiméad go dtí go mbeidh na teangacha íoslódáilte agus suiteáilte..." +INSTL_LANGUAGES_MORE_LANGUAGES="Brúigh an cnaipe 'Roimhe Seo' más mian leat tuilleadh teangacha a shuiteáil." +INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Níor roghnaigh tú aon teanga le suiteáil. Más mian leat níos mó teangacha a shuiteáil, brúigh an cnaipe 'Roimhe Seo' agus roghnaigh na teangacha ón liosta." +INSTL_LANGUAGES_WARNING_NO_INTERNET="Ní raibh Joomla! in ann ceangal a bhunú le freastalaí na dteangacha. Cuir an tsuiteáil i gcrích anois." +INSTL_LANGUAGES_WARNING_NO_INTERNET2="Beidh tú in ann teangacha a shuiteáil ar ball trí Riarthóir Joomla!" +INSTL_LANGUAGES_WARNING_BACK_BUTTON="Fill ar an gcéim shuiteála roimhe seo" + +;Default language view +INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE="Cuir ilteangachas i ngníomh" +INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="Leis an rogha seo, beidh do shuíomh Joomla ilteangach, le roghchláir ar fáil i ngach teanga atá suiteáilte." +INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN="Cumasaigh an breiseán cóid teanga" +INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN_DESC="Leis an rogha seo, athrófar an cód teanga san HTML chun SEO a fheabhsú." +INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Teanga Réamhshocraithe an Riarthóra" +INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Níorbh fhéidir le Joomla an teanga a úsáid mar réamhshocrú. Is é Béarla an teanga réamhshocraithe don Riarthóir." +INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Shocraigh Joomla %s mar an teanga réamhshocraithe RIARACHÁIN." +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Roghnaigh" +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Teanga" +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="Clib" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CONTENT_LANGUAGE="Níorbh fhéidir le Joomla an teanga ábhair %s a chruthú go huathoibríoch" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU="Níorbh fhéidir le Joomla an roghchlár %s a chruthú go huathoibríoch" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_ITEM="Níorbh fhéidir le Joomla an mhír %s sa roghchlár baile a chruthú go huathoibríoch" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_MODULE="Níorbh fhéidir le Joomla an modúl roghchláir %s a chruthú go huathoibríoch" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CATEGORY="Níorbh fhéidir le Joomla an chatagóir ábhair %s a chruthú go huathoibríoch" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_ARTICLE="Níorbh fhéidir le Joomla an t-alt logánaithe %s a chruthú go huathoibríoch" +INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_MODULESWHITCHER_LANGUAGECODE="Níorbh fhéidir le Joomla an roghnóir teanga %s a chruthú go huathoibríoch" +INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGECODE="Níorbh fhéidir le Joomla an Breiseán Cóid Teanga %s a chruthú go huathoibríoch" +INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGEFILTER="Níorbh fhéidir le Joomla an Breiseán Scagaire Teanga %s a chruthú go huathoibríoch" +INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Níorbh fhéidir le Joomla teanga %s a shuiteáil." +INSTL_DEFAULTLANGUAGE_COULD_NOT_PUBLISH_MOD_MULTILANGSTATUS="Níorbh fhéidir le Joomla an modúl stádais teanga a fhoilsiú go huathoibríoch" +INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="Níorbh fhéidir le Joomla an modúl roghchláir réamhshocraithe a dhífhoilsiú go huathoibríoch" +INSTL_DEFAULTLANGUAGE_DESC="Shuiteáil Joomla na teangacha seo a leanas. Roghnaigh teanga réamhshocraithe don Riarthóir Joomla." +INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Shuiteáil Joomla na teangacha seo a leanas. Roghnaigh teanga réamhshocraithe don Chomhéadan Joomla." +INSTL_DEFAULTLANGUAGE_FRONTEND="Teanga Réamhshocraithe an tSuímh" +INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Níorbh fhéidir le Joomla an teanga a úsáid mar réamhshocrú. Is é Béarla an teanga réamhshocraithe don SUÍOMH." +INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Shocraigh Joomla %s mar an teanga réamhshocraithe don SUÍOMH." +INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Suiteáil ábhar logánaithe" +INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Leis an rogha seo, cruthóidh Joomla catagóir ábhair amháin go huathoibríoch le haghaidh gach teanga atá suiteáilte. Agus cruthóidh sé gné-alt amháin ina mbeidh ábhar bréige i ngach catagóir." +INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Ilteangach" +INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Sa rannán seo, is féidir leagan ilteangacha de Joomla! a chumasú go huathoibríoch." +INSTL_DEFAULTLANGUAGE_TRY_LATER="Beidh tú in ann é a shuiteáil ar ball trí Riarthóir Joomla!" + +; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español +INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Gaeilge" + +;Database Model +INSTL_DATABASE_COULD_NOT_CONNECT="Ní fhéadfaí ceangal leis an mbunachar sonraí. Fuarthas an cód %s" +INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="Níorbh fhéidir leis an suiteálaí ceangal leis an mbunachar sonraí ná an bunachar sonraí a chruthú. Deimhnigh na socruithe agus cruthaigh an bunachar sonraí de láimh más gá." +INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Níorbh fhéidir taisce lastliosta na heisínteachta a athnuachan: %s" +INSTL_DATABASE_EMPTY_NAME="" +INSTL_DATABASE_ERROR_BACKINGUP="Tharla earráidí agus cúltaca á dhéanamh." +INSTL_DATABASE_ERROR_CREATE="Tharla earráid agus bunachar sonraí %s á chruthú.
    Seans nach bhfuil cead ag an úsáideoir bunachar sonraí a chruthú. Sa chás sin, caithfidh tú an bunachar sonraí a chruthú ar dtús sula mbeidh tú in ann Joomla! a shuiteáil." +INSTL_DATABASE_ERROR_DELETE="Tharla earráidí agus an bunachar sonraí á scriosadh." +INSTL_DATABASE_FIELD_VALUE_REMOVE="Bain" +INSTL_DATABASE_FIELD_VALUE_BACKUP="Cúltaca" +INSTL_DATABASE_FIX_LOWERCASE="Ní mór do réimír an tábla a bheith sa chás íochtair in PostgreSQL." +INSTL_DATABASE_FIX_TOO_LONG="Ní cheadaítear níos mó ná 15 carachtar sa réimír thábla MySQL." +INSTL_DATABASE_INVALID_DB_DETAILS="Tá mionsonraí an bhunachair sonraí mícheart nó folamh." +INSTL_DATABASE_INVALID_MYSQL_VERSION="Teastaíonn MySQL 5.0.4 nó níos airde uait chun dul ar aghaidh leis an tsuiteáil. An leagan atá agat faoi láthair: %s" +INSTL_DATABASE_INVALID_MYSQLI_VERSION="Teastaíonn MySQL 5.0.4 nó níos airde uait chun dul ar aghaidh leis an tsuiteáil. An leagan atá agat faoi láthair: %s" +INSTL_DATABASE_INVALID_PDOMYSQL_VERSION="Teastaíonn MySQL 5.0.4 nó níos airde uait chun dul ar aghaidh leis an tsuiteáil. An leagan atá agat faoi láthair: %s" +INSTL_DATABASE_INVALID_POSTGRESQL_VERSION="Teastaíonn PostgreSQL 8.3.18 nó níos airde uait chun dul ar aghaidh leis an tsuiteáil. An leagan atá agat faoi láthair: %s" +INSTL_DATABASE_INVALID_SQLSRV_VERSION="Teastaíonn SQL Server R2 (10.50.1600.1) nó níos airde uait chun dul ar aghaidh leis an tsuiteáil. An leagan atá agat faoi láthair: %s" +INSTL_DATABASE_INVALID_SQLZURE_VERSION="Teastaíonn SQL Server R2 (10.50.1600.1) nó níos airde uait chun dul ar aghaidh leis an tsuiteáil. An leagan atá agat faoi láthair: %s" +INSTL_DATABASE_INVALID_TYPE="Roghnaigh cineál an bhunachair sonraí" +INSTL_DATABASE_NAME_TOO_LONG="Ní cheadaítear níos mó ná 64 carachtar in ainm an bhunachair sonraí MySQL." +INSTL_DATABASE_INVALID_NAME="Ní cheadaítear poncanna ná carachtair speisialta eile san ainm i leaganacha de MySQL roimh 5.1.6. Seo é do leagansa: %s" +INSTL_DATABASE_NAME_INVALID_SPACES="Ní cheadaítear spás ag tús nó ag deireadh an ainm atá ar thábla nó ar bhunachar sonraí MySQL." +INSTL_DATABASE_NAME_INVALID_CHAR="Ní cheadaítear carachtar NUL (ASCII 0x00) in aitheantóir MySQL." +INSTL_DATABASE_FILE_DOES_NOT_EXIST="Níl comhad %s ann" + +;controllers +INSTL_COOKIES_NOT_ENABLED="Cookies do not appear to be enabled on your browser client. You will not be able to install the application with this feature disabled. Alternatively, there could also be a problem with the server's session.save_path. If this is the case, please consult your hosting provider if you don't know how to check or fix this yourself." +INSTL_HEADER_ERROR="Earráid" + +;Helpers +INSTL_PAGE_TITLE="Suiteálaí Gréasáin Joomla!" + +;Configuration model +INSTL_ERROR_CONNECT_DB="Ní fhéadfaí ceangal leis an mbunachar sonraí. Fuarthas cód %s" +INSTL_STD_OFFLINE_MSG="Tá an suíomh seo as líne le haghaidh cothabhála.
    Bain triail eile as go luath." + +;FTP model +INSTL_FTP_INVALIDROOT="The specified FTP Folder is not the folder of this Joomla! installation" +INSTL_FTP_NOCONNECT="Ní fhéadfaí ceangal leis an bhfreastalaí FTP" +INSTL_FTP_NODELE="Theip ar an bhfeidhm "DELE"." +INSTL_FTP_NODIRECTORYLISTING="Níorbh fhéidir liostáil na bhfillteán a fháil ón bhfreastalaí FTP." +INSTL_FTP_NOLIST="Theip ar an bhfeidhm "LIST"." +INSTL_FTP_NOLOGIN="Níorbh fhéidir logáil isteach san fhreastalaí FTP." +INSTL_FTP_NOMKD="Theip ar an bhfeidhm "MKD"." +INSTL_FTP_NONLST="Theip ar an bhfeidhm "NLST"." +INSTL_FTP_NOPWD="Theip ar an bhfeidhm "PWD"." +INSTL_FTP_NORETR="Theip ar an bhfeidhm "RETR"." +INSTL_FTP_NORMD="Theip ar an bhfeidhm "RMD"." +INSTL_FTP_NOROOT="Níorbh fhéidir teacht ar an bhfillteán roghnaithe FTP." +INSTL_FTP_NOSTOR="Theip ar an bhfeidhm "STOR"." +INSTL_FTP_NOSYST="Theip ar an bhfeidhm "SYST"." +INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Níorbh fhéidir an fréamhfhillteán FTP a bhrath go huathoibríoch." + +;others +INSTL_CONFPROBLEM="Your configuration file or folder is not writable or there was a problem creating the configuration file. You will have to upload the following code by hand. Select in the text area to highlight all of the code and then paste into a new text file. Name this file 'configuration.php' and upload it to your site root folder." +INSTL_DATABASE_SUPPORT="Tacaíocht do Bhunachar Sonraí:" +INSTL_DISPLAY_ERRORS="Taispeáin Earráidí" +INSTL_ERROR_DB="Tharla earráidí agus an bunachar sonraí á líonadh: %s" +INSTL_ERROR_INITIALISE_SCHEMA="Ní féidir scéimre an bhunachair sonraí a thúsú" +INSTL_FILE_UPLOADS="Uaslódálacha" +INSTL_GNU_GPL_LICENSE="Ceadúnas Ginearálta Poiblí GNU" +INSTL_JSON_SUPPORT_AVAILABLE="Tacaíocht JSON" +INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC Off" +INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime" +INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language is Default" +INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Off" +INSTL_NOTICEMBLANGNOTDEFAULT="PHP mbstring language is not set to neutral. This can be set locally by entering php_value mbstring.language neutral in your .htaccess file." +INSTL_NOTICEMBSTRINGOVERLOAD="PHP mbstring function overload is set. This can be turned off locally by entering php_value mbstring.func_overload 0 in your .htaccess file." +INSTL_NOTICEYOUCANSTILLINSTALL="
    You can still continue the installation as the configuration settings will be displayed at the end. You will have to manually upload the code. Select in the text area to highlight all of the code and then paste into a new text file. Name this file 'configuration.php' and upload it to your site root folder." +INSTL_OUTPUT_BUFFERING="Maolánú Aschuir" +INSTL_PARSE_INI_FILE_AVAILABLE="Parsálaí INI" +INSTL_PHP_VERSION="Leagan PHP" +INSTL_PHP_VERSION_NEWER="Leagan PHP >= %s" +INSTL_REGISTER_GLOBALS="Register Globals Off" +INSTL_SAFE_MODE="Mód Slán" +INSTL_SESSION_AUTO_START="Uath-thosú Seisiún" +INSTL_WRITABLE="%s Inscríofa" +INSTL_XML_SUPPORT="Tacaíocht XML" +INSTL_ZIP_SUPPORT_AVAILABLE="Tacaíocht Dhúchasach ZIP" +INSTL_ZLIB_COMPRESSION_SUPPORT="Tacaíocht Zlib" +INSTL_PROCESS_BUSY="Tá an próiseas ar siúl. Fan nóiméad..." + +;Global strings +JADMINISTRATOR="Riarthóir" +JCHECK_AGAIN="Seiceáil Arís" +JERROR="Earráid" +JEMAIL="Ríomhphost" +JGLOBAL_ISFREESOFTWARE="Is saorbhogearra é %s, ar fáil de réir an %s." +JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="Ní mheaitseálann an pacáiste teanga an leagan seo de Joomla!. Seans go mbeidh roinnt teaghrán ar iarraidh." +JGLOBAL_SELECT_AN_OPTION="Roghnaigh rogha" +JGLOBAL_SELECT_NO_RESULTS_MATCH="Toradh ar bith" +JGLOBAL_SELECT_SOME_OPTIONS="Roghnaigh roinnt roghanna" +JINVALID_TOKEN="Diúltaíodh an t-iarratas is déanaí toisc go raibh ceadchomhartha slándála neamhbhailí ann. Athlódáil an leathanach agus bain triail eile as." +JNEXT="Ar Aghaidh" +JNO="Níl" +JNOTICE="Fógra" +JOFF="As" +JON="Ann" +JPREVIOUS="Roimhe Seo" +JSITE="Suíomh" +JUSERNAME="Ainm Úsáideora" +JYES="Tá" + +; Framework strings necessary when no lang pack is available +JLIB_DATABASE_ERROR_CONNECT_MYSQL="Ní fhéadfaí ceangal le MySQL." +JLIB_DATABASE_ERROR_DATABASE="Tharla earráid leis an mbunachar sonraí." +JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Níorbh fhéidir Tiománaí an Bhunachair Shonraí a lodáil: %s" +JLIB_ENVIRONMENT_SESSION_EXPIRED="Tá an seisiún imithe as feidhm, lódáil an leathanach arís." +JLIB_FILESYSTEM_ERROR_COPY_FAILED="Theip ar an gcóipeáil." +JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :files: Ní fillteán an cosán. Path: %s" +JLIB_FORM_FIELD_INVALID="Réimse neamhbhailí: " +JLIB_FORM_VALIDATE_FIELD_INVALID="Réimse neamhbhailí: %s" +JLIB_FORM_VALIDATE_FIELD_REQUIRED="Réimse ag teastáil: %s" +JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Theip ar chomhad %1$s a chóipeáil go %2$s." +JLIB_INSTALLER_NOT_ERROR="Má bhaineann an earráid le suiteáil na gcomhad teanga TinyMCE ní bhíonn aon tionchar aige ar shuiteáil na teanga/dteangacha. Is féidir go ndéanfaidh roinnt pacáistí teanga a cruthaíodh roimh Joomla! 3.2.0 iarracht comhaid teanga TinyMCE ar leith a shuiteáil. Mar go bhfuil siad seo sa chroíchuid anois níl gá a suiteáil a thuilleadh." +JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Ní fhéadfaí ceangal le bunachar sonraí
    joomla.library: %1$s - %2$s" + +; Strings for the language debugger +JDEBUG_LANGUAGE_FILES_IN_ERROR="Earráidí parsála i gcomhaid teanga" +JDEBUG_LANGUAGE_UNTRANSLATED_STRING="Teaghráin gan aistriúchán" +JNONE="Dada" + +; Necessary for errors +ADMIN_EMAIL="Seoladh R-Phoist an Riarthóra" +ADMIN_PASSWORD="Focal Faire an Riarthóra" +ADMIN_PASSWORD2="Dearbhaigh Focal Faire an Riarthóra" +SITE_NAME="Ainm an tSuímh" + +; Database types (allows for a more descriptive label than the internal name) +MYSQL="MySQL" +MYSQLI="MySQLi" +ORACLE="Oracle" +PDOMYSQL="MySQL (PDO)" +POSTGRESQL="PostgreSQL" +SQLAZURE="Microsoft SQL Azure" +SQLITE="SQLite" +SQLSRV="Microsoft SQL Server" diff --git a/installation/language/ga-IE/ga-IE.xml b/installation/language/ga-IE/ga-IE.xml new file mode 100644 index 0000000000000..b98bd08600c71 --- /dev/null +++ b/installation/language/ga-IE/ga-IE.xml @@ -0,0 +1,16 @@ + + + Irish (ga-IE) + 3.5.0.2 + 2016-02-05 + Irish translation team + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + GNU General Public License version 2 or later; see LICENSE.txt + ga-IE.ini + + Gaeilge (Éire) + ga-IE + 0 + + + diff --git a/installation/language/gl-ES/gl-ES.ini b/installation/language/gl-ES/gl-ES.ini index e7b4ab980c810..7b84fff2d57dc 100644 --- a/installation/language/gl-ES/gl-ES.ini +++ b/installation/language/gl-ES/gl-ES.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/gl-ES/gl-ES.xml b/installation/language/gl-ES/gl-ES.xml index 2fc0f289510df..08124e853f3ee 100644 --- a/installation/language/gl-ES/gl-ES.xml +++ b/installation/language/gl-ES/gl-ES.xml @@ -6,9 +6,8 @@ 3.2.0 July 2014 damufo - trasno.net - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - gl-ES.ini diff --git a/installation/language/he-IL/he-IL.ini b/installation/language/he-IL/he-IL.ini index 74d7ae4af87be..02f3eb0aea179 100644 --- a/installation/language/he-IL/he-IL.ini +++ b/installation/language/he-IL/he-IL.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/he-IL/he-IL.xml b/installation/language/he-IL/he-IL.xml index 90de0e29771d4..4b02e32a1831c 100644 --- a/installation/language/he-IL/he-IL.xml +++ b/installation/language/he-IL/he-IL.xml @@ -6,10 +6,8 @@ 3.2.0 September 2010 Joomla Israeli Community - www.joomla.org - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - Hebrew language pack for Joomla! 3.0 Installation he-IL.ini diff --git a/installation/language/hi-IN/hi-IN.ini b/installation/language/hi-IN/hi-IN.ini index ca55670572715..72d323f104ae8 100644 --- a/installation/language/hi-IN/hi-IN.ini +++ b/installation/language/hi-IN/hi-IN.ini @@ -1,5 +1,5 @@ ; @author Joomla! Project -; @copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; @copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; @license GNU General Public License version 2 or later; see LICENSE.txt ; @note Client Installation ; @note All ini files need to be saved as UTF-8 - No BOM diff --git a/installation/language/hi-IN/hi-IN.xml b/installation/language/hi-IN/hi-IN.xml index 88dd5231a0f8b..3244d9dbf7ebe 100644 --- a/installation/language/hi-IN/hi-IN.xml +++ b/installation/language/hi-IN/hi-IN.xml @@ -4,11 +4,10 @@ client="installation"> hi-IN Hindi-हिंदी (India) - Hindi language for Joomla installation 3.2.0 2014-12-11 Hindi Translation Team - BhavyaSoft.com - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt Hindi-हिंदी (India) diff --git a/installation/language/hr-HR/hr-HR.ini b/installation/language/hr-HR/hr-HR.ini index a31773f70d774..bde875d4b823c 100644 --- a/installation/language/hr-HR/hr-HR.ini +++ b/installation/language/hr-HR/hr-HR.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 @@ -55,7 +55,7 @@ INSTL_FTP_PASSWORD_LABEL="FTP Lozinka" INSTL_FTP_PORT_LABEL="FTP Port" INSTL_FTP_ROOT_LABEL="FTP Root direktorij" INSTL_FTP_SAVE_LABEL="Sačuvaj FTP lozinku" -INSTL_FTP_TITLE="FTP Konfiguracija (Opcionalno - većina korisnika može preskočiti ovaj korak - Kliknite na "_QQ_"Dalje"_QQ_" za preskakanje ovog dijela)" +INSTL_FTP_TITLE="FTP Konfiguracija (Opcionalno - većina korisnika može preskočiti ovaj korak - Pritisnite na "_QQ_"Dalje"_QQ_" za preskakanje ovog dijela)" INSTL_FTP_USER_LABEL="FTP korisničko ime" INSTL_VERIFY_FTP_SETTINGS="Provjeri FTP postavke" INSTL_FTP_SETTINGS_CORRECT="Postavke ispravne" @@ -87,7 +87,7 @@ INSTL_SAMPLE_LEARN_SET="Upoznaj Joomlu - Engleski (GB) primjeri podataka" INSTL_SAMPLE_TESTING_SET="Test - Engleski (GB) primjeri podataka" INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Instaliranje Joomle samo s jednim izbornikom i obrascem za prijavu, bez ikakvog sadržaja." INSTL_SAMPLE_BLOG_SET_DESC="Instalacija Joomle s nekoliko članaka i modulima povezanim s blogom, poput Starije objave, Blog Roll, Najčitanije objave." -INSTL_SAMPLE_BROCHURE_SET_DESC="Instalacija Joomle s nekoliko stranica (izbornik sa stranicama Naslovnica, O nama, Novosti, Kontaktirajte nas) i modulima poput Pretraživanje, Proizvoljan HTML, Obrazac za prijavu." +INSTL_SAMPLE_BROCHURE_SET_DESC="Instalacija Joomle s nekoliko stranica (izbornik sa stranicama Naslovnica, O nama, Novosti, Kontaktirajte nas) i modulima poput Pretraživanje, Proizvoljno, Obrazac za prijavu." INSTL_SAMPLE_DATA_SET_DESC="Instalacija Joomle s jednom stranicom (izbornik s jednim linkom) i modulima poput Posljednji članak, Obrazac za prijavu." INSTL_SAMPLE_LEARN_SET_DESC="Instalacija Joomle s primjerima članaka koji opisuju kako Joomla radi." INSTL_SAMPLE_TESTING_SET_DESC="Instalacija Joomle sa svim mogućim izborničkim stavkama da bi se pomoglo s testiranjem Joomle." @@ -124,7 +124,7 @@ INSTL_COMPLETE_ERROR_FOLDER_DELETE="Installation direktorij ne može biti obrisa INSTL_COMPLETE_FOLDER_REMOVED="Installation direktorij je uspješno izbrisan" INSTL_COMPLETE_LANGUAGE_1="Joomla! na vašem jeziku?" ; The word 'installation' should not be translated as it is a physical folder. -INSTL_COMPLETE_LANGUAGE_DESC="Prije brisanja installation direktorija možete instalirati dodatne jezike. Ako želite instalirati dodatne jezike u vašu Joomlu odaberite sljedeću tipku" +INSTL_COMPLETE_LANGUAGE_DESC="Prije uklanjanja installation direktorija možete instalirati dodatne jezike. Ako želite instalirati dodatne jezike u vašu Joomla aplikaciju odaberite sljedeću tipku" INSTL_COMPLETE_LANGUAGE_DESC2="Opaska: trebat će vam pristup internetu kako bi mogli skinuti i instalirati nove jezike.
    Neke konfiguracije servera neće dozvoliti Joomli da instalira jezike. U tom slučaju ne brinite, moći ćete ih instalirati kasnije koristeći Joomla administratorsko sučelje." ; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_REMOVE_FOLDER="Izbrišite installation direktorij" @@ -168,12 +168,12 @@ INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGEFILTER="Joomla nije uspjela a INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Joomla nije uspjela instalirati %s jezik." INSTL_DEFAULTLANGUAGE_COULD_NOT_PUBLISH_MOD_MULTILANGSTATUS="Joomla nije uspjela automatski objaviti modul statusa jezika" INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="Joomla nije uspjela automatski odjaviti osnovni modul izbornika" -INSTL_DEFAULTLANGUAGE_DESC="Joomla je instalirala sljedeće jezike. Molimo odaberite osnovni jezik za administratorsko sučelje po želji i kliknite tipku dalje." -INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla je instalirala sljedeće jezike. Molimo odaberite vaš željeni jezik za Joomla korisničko sučelje i kliknite tipku dalje." +INSTL_DEFAULTLANGUAGE_DESC="Joomla je instalirala sljedeće jezike. Molimo odaberite osnovni jezik za administratorsko sučelje." +INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla je instalirala sljedeće jezike. Molimo odaberite vaš željeni jezik za Joomla korisničko sučelje." INSTL_DEFAULTLANGUAGE_FRONTEND="Osnovni jezik sitea" INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla nije uspjela postaviti jezik kao osnovni. Engleski će se koristiti kao osnovni jezik za SITE." INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Joomla je postavila %s kao osnovni jezik za SITE." -INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Instaliraj lokalizirani sadržaj" +INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Instalacija lokaliziranog sadržaja" INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Ako je uključeno, Joomla će autimatski kreirati jednu kategoriju za svaki instalirani jezik. Također će biti kreiran po jedan istaknuti članak s nekim tekstom u svakoj kategoriji." INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Višejezičnost" INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Ovo omogućuje automatsko uključivanje opcije Joomla! višejezičnosti" @@ -192,6 +192,7 @@ INSTL_DATABASE_ERROR_CREATE="Pojavila se greška prilikom izrade baze %s.
    K INSTL_DATABASE_ERROR_DELETE="Pojavile su se greške prilikom brisanja baze." INSTL_DATABASE_FIELD_VALUE_REMOVE="Izbriši" INSTL_DATABASE_FIELD_VALUE_BACKUP="Sigurnosna kopija" +INSTL_DATABASE_FIX_LOWERCASE="Prefiks tablice mora biti malim slovima za PostgreSQL." INSTL_DATABASE_FIX_TOO_LONG="Prefiks MySQL tablice smije imati najviše 15 znaka" INSTL_DATABASE_INVALID_DB_DETAILS="Sadržaj baze je pogrešan i/ili prazan." INSTL_DATABASE_INVALID_MYSQL_VERSION="Potreban je MySQL 5.0.4 ili više za nastavak instalacije. Vaša verzija je: %s" diff --git a/installation/language/hr-HR/hr-HR.xml b/installation/language/hr-HR/hr-HR.xml index 01189a65b3b46..53fafead926be 100644 --- a/installation/language/hr-HR/hr-HR.xml +++ b/installation/language/hr-HR/hr-HR.xml @@ -1,13 +1,12 @@ + version="3.5" client="installation"> Croatian (Hrvatski) - 3.4.4 + 3.5.0 August 2015 Joomla! Hrvatska team - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - hr-HR.ini diff --git a/installation/language/hu-HU/hu-HU.ini b/installation/language/hu-HU/hu-HU.ini index 229920162e312..9b53b87919580 100644 --- a/installation/language/hu-HU/hu-HU.ini +++ b/installation/language/hu-HU/hu-HU.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 @@ -87,7 +87,7 @@ INSTL_SAMPLE_LEARN_SET="Tanuld a Joomla!-t angol (GB) mintaadatok" INSTL_SAMPLE_TESTING_SET="Teszt angol (GB) mintaadatok" INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="A Joomla telepítése csak egy menüvel és egy bejelentkezés űrlappal, semmilyen tartalom nélkül." INSTL_SAMPLE_BLOG_SET_DESC="A Joomla telepítése néhány cikkel és a bloggal kapcsolatos modulokkal, mint a Régebbi bejegyzések, Blogajánló, Legolvasottabb bejegyzések." -INSTL_SAMPLE_BROCHURE_SET_DESC="A Joomla telepítése néhány oldallal (menü Főlap, Rólunk, Hírek, Kapcsolat oldallal) és modulokkal, mint a Keresés, Egyéni HTML, Bejelentkezés űrlap." +INSTL_SAMPLE_BROCHURE_SET_DESC="A Joomla telepítése néhány oldallal (menü Főlap, Rólunk, Hírek, Kapcsolat oldallal) és modulokkal, mint a Keresés, Egyéni, Bejelentkezés űrlap." INSTL_SAMPLE_DATA_SET_DESC="A Joomla telepítése egy oldallal (menü egy hivatkozással) és modulokkal, mint a Legújabb cikkek, Bejelentkezés űrlap." INSTL_SAMPLE_LEARN_SET_DESC="A Joomla telepítése a Joomla működését bemutató példacikkekkel." INSTL_SAMPLE_TESTING_SET_DESC="A Joomla telepítése az összes lehetséges menüponttal a Joomla tesztelésének elősegítése céljából." @@ -116,13 +116,19 @@ INSTL_EMAIL_NOT_SENT="Nem lehetett elküldeni az e-mailt." ;Complete view INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Adminisztráció bejelentkezési adatai" +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Az installation mappa törlése megtörtént már." +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_ERROR_FOLDER_DELETE="Nem lehetett törölni az installation mappát. Kérjük, távolítsa el kézzel a mappát." +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_FOLDER_REMOVED="Az installation mappa eltávolítása sikerült" INSTL_COMPLETE_LANGUAGE_1="A Joomla! az Ön nyelvén és/vagy alapszintű natív többnyelvű hely automatikus létrehozása" +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_LANGUAGE_DESC="Az installation mappa eltávolítása előtt további nyelveket telepíthet. Ha további nyelveket akar hozzáadni a Joomla! alkalmazáshoz, akkor kattintson a következő gombra." INSTL_COMPLETE_LANGUAGE_DESC2="Megjegyzés: Az új nyelvek letöltésének és telepítésének a Joomla! számára való lehetővé tételéhez internethozzáférésre lesz szükség.
    Néhány kiszolgáló konfigurációja nem fogja megengedni a Joomla!-nak a nyelvek telepítését. Ha ez az eset áll fönn, ne csüggedjen el, a Joomla! adminisztrációban később tudja majd telepíteni őket." +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_REMOVE_FOLDER="Az installation mappa eltávolítása" +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_REMOVE_INSTALLATION="NE FELEDJE EL TELJESEN ELTÁVOLÍTANI AZ INSTALLATION MAPPÁT.
    Az installation mappa eltávolításáig nem tudja ettől a ponttól folytatni. Ez a Joomla! biztonsági specialitása." INSTL_COMPLETE_TITLE="Gratulálunk! A Joomla! telepítése ezzel megtörtént." INSTL_COMPLETE_INSTALL_LANGUAGES="További lépések: Nyelvek telepítése" @@ -186,6 +192,7 @@ INSTL_DATABASE_ERROR_CREATE="Hiba történt a(z) %s adatbázis létrehozásának INSTL_DATABASE_ERROR_DELETE="Az adatbázis törlésekor néhány hiba történt." INSTL_DATABASE_FIELD_VALUE_REMOVE="Eltávolítás" INSTL_DATABASE_FIELD_VALUE_BACKUP="Biztonsági mentés" +INSTL_DATABASE_FIX_LOWERCASE="A táblanév előtag csak kisbetűs lehet PostgreSQL használata esetén." INSTL_DATABASE_FIX_TOO_LONG="A MySQL táblanév előtagnak legfeljebb 15 karakterből kell állnia." INSTL_DATABASE_INVALID_DB_DETAILS="Az adatbázis megadott adatai hibásak és/vagy üresek." INSTL_DATABASE_INVALID_MYSQL_VERSION="A telepítés folytatásához MySQL 5.0.4 vagy újabb szükséges. Az Ön verziója: %s" @@ -312,4 +319,4 @@ PDOMYSQL="MySQL (PDO)" POSTGRESQL="PostgreSQL" SQLAZURE="Microsoft SQL Azure" SQLITE="SQLite" -SQLSRV="Microsoft SQL Server" \ No newline at end of file +SQLSRV="Microsoft SQL Server" diff --git a/installation/language/hu-HU/hu-HU.xml b/installation/language/hu-HU/hu-HU.xml index 69bd15044cb26..fd5048d23fa9f 100644 --- a/installation/language/hu-HU/hu-HU.xml +++ b/installation/language/hu-HU/hu-HU.xml @@ -1,14 +1,13 @@ Hungarian (Magyar) - 3.4.2 - April 2013 - Hungarian Translation Team - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + 3.5.0 + January 2016 + Joomla! Magyarország + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - hu-HU.ini diff --git a/installation/language/hy-AM/hy-AM.ini b/installation/language/hy-AM/hy-AM.ini index d3eba53e34a30..cb51a1e27e0fd 100644 --- a/installation/language/hy-AM/hy-AM.ini +++ b/installation/language/hy-AM/hy-AM.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note ։ All ini files need to be saved as UTF-8 @@ -20,7 +20,7 @@ INSTL_WARNJSON="Ձեր սպասարկչի PHP կարգավորումներում ;Preinstall view INSTL_PRECHECK_TITLE="Նախնական ստուգում" INSTL_PRECHECK_DESC="Եթե ստորև նշված կայանքներից որևէ մեկը չի աջակցվում (կողքը ցուցարդվում է Ոչ պիտակը), խնդրում ենք կատարել անհրաժեշտ գործողություններ՝ հայտնաբերված խնդիրները վերացնելու համար։
    Դուք չեք կարողանա տեղակայել Joomla-ն մինչև բոլոր այս պահանջները չբավարարվեն։" -INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Հանձնարարելի կայանքները՝" +INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Հանձնարարելի կայանքներ" INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Այս կայանքները հանձնարարելի են PHP-ի համար՝ Joomla-ի հետ ամբողջական համատեղելիությունը ապահովելու նպատակով։
    Սակայն, Joomla-ն կգործի անգամ եթե ձեր կայանքները ամբողջությամբ չեն համապատասխանում հանձնարարելի կազմաձևմանը։" INSTL_PRECHECK_DIRECTIVE="Հրահանգ" INSTL_PRECHECK_RECOMMENDED="Հանձնարարելի" @@ -87,7 +87,7 @@ INSTL_SAMPLE_LEARN_SET="Joomla-ի ուսուցման նմուշային տվյա INSTL_SAMPLE_TESTING_SET="Փորձակրկման նմուշային տվյալները (Անգլերեն)" INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Տեղակայել Joomla-ն միայն մեկ ընտրացանկով և մուտքի ձևով, առանց որևէհավելյալ բովանդակության։" INSTL_SAMPLE_BLOG_SET_DESC="Տեղակայել Joomla-ն մի քանի հոդվածով և բլոգերում կիրառվող հանգույցներով (Վերջին հոդվածներ, Առավել ընթերցվող հոդվածներ և այլն)։" -INSTL_SAMPLE_BROCHURE_SET_DESC="Տեղակայել Joomla-ն մի քանի էջերով (Գլխավոր, Մեր մասին, Նորություններ, Հետադարձ կապ) և հանգույցներով (Որոնում, Ընտելեկան HTML, Մուտքի ձև)։" +INSTL_SAMPLE_BROCHURE_SET_DESC="Տեղակայել Joomla-ն մի քանի էջերով (Գլխավոր, Մեր մասին, Նորություններ, Հետադարձ կապ) և հանգույցներով (Որոնում, Ընտելեկան, Մուտքի ձև)։" INSTL_SAMPLE_DATA_SET_DESC="Տեղակայել Joomla-ն մեկ էջով (Գլխավոր) և հանգույցներով (Վերջին հոդվածներ, Մուտքի ձև)։" INSTL_SAMPLE_LEARN_SET_DESC="Տեղակայել Joomla-ն՝ դրա հետ աշխատանքը նկարագրող մի քանի նմուշային հոդվածով։" INSTL_SAMPLE_TESTING_SET_DESC="Տեղակայել Joomla-ն բոլոր առկա ընտրացանկերի տարրերով՝ այն փորձարկելու համար։" @@ -131,12 +131,12 @@ INSTL_COMPLETE_INSTALL_LANGUAGES="Լեզվային փաթեթների տեղակ INSTL_LANGUAGES="Լեզվային փաթեթների տեղակայում" INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Լեզու" INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Տարբերակ" -INSTL_LANGUAGES_DESC="Joomla-ի միջերեսը առկա է բազմաթիվ լեզուներով։ Նշեք ձեր նախընտրելոի լեզուները նշատուփերի օգնությամբ և տեղակայեք դրանք՝ կտտացնելով 'Հաջորդ' կոճակը։
    Տեղեկացում՝ այս գործողությունը կտևի մոտ 10 վարկյան՝ ամեն լեզվի ներբեռման և տեղակայման մասով։ Ժամասպառումից խուսափելու համար խնդրում ենք տեղակայման համար ընտրել առավելագույնը 3 լեզու։" -INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Այս գործողությունը կտևի մոտ 10 վարկյան՝ ամեն լեզվի մասով։
    Խնդրում ենք սպասել մինչև լեզուները ներբեռնվեն և տեղակայվեն …" +INSTL_LANGUAGES_DESC="Joomla-ի միջերեսը առկա է բազմաթիվ լեզուներով։ Նշեք ձեր նախընտրելի լեզուները նշատուփերի օգնությամբ և տեղակայեք դրանք՝ կտտացնելով 'Հաջորդ' կոճակը։
    Տեղեկացում՝ այս գործողությունը կտևի մոտ 10 վայրկյան՝ ամեն լեզվի ներբեռման և տեղակայման մասով։ Ժամասպառումից խուսափելու համար խնդրում ենք տեղակայման համար ընտրել առավելագույնը 3 լեզու։" +INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Այս գործողությունը կտևի մոտ 10 վայրկյան՝ ամեն լեզվի մասով։
    Խնդրում ենք սպասել լեզուների ներբեռմանը և տեղակայմանը …" INSTL_LANGUAGES_MORE_LANGUAGES="Կտտացրեք 'Նախորդ' կոճակը, եթե ցանկանում եք տեղակայել ավել լեզուներ։" INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Տեղակայման համար որևէ լեզու չի ընտրվել։ Եթե ցանկանում եք տեղակայել ավել լեզուներ, կտտացրեք 'Նախորդ' կոճակը և նշեք նախընտրելի լեզուները՝ ցանկից։" INSTL_LANGUAGES_WARNING_NO_INTERNET="Չհաջողվեց միանալ լեզվային սպասարկչին։ Խնդրում ենք ավարտել տեղակայման գործընթացը։" -INSTL_LANGUAGES_WARNING_NO_INTERNET2="Տեղեկացում՝ դուք հետագայում հնարավորություն կունենաք տեղակայել լեզուները՝ Joomla-ի վարչական մասում։" +INSTL_LANGUAGES_WARNING_NO_INTERNET2="Տեղեկացում՝ դուք հետագայում հնարավորություն կունենաք տեղակայել լեզուները՝ Joomla-ի վարչական մասից։" INSTL_LANGUAGES_WARNING_BACK_BUTTON="Վերադառնալ տեղակայման վերջին քայլին" ;Default language view @@ -145,8 +145,8 @@ INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="Ակտիվացնելու դե INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN="Միացնել լեզվային կոդի խրվակը" INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN_DESC="Միացնելու դեպքում, լեզվային կոդի խրվակը կապահովի ձեր էջերի լեզվային կոդը փոխելու հնարավորությունը՝ SEO-ն լավացնելու նպատակով։" INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Լռելյայն վարչական լեզուն" -INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Չհաջողվեց կայել այս լեզուն որպես լռելյայն։ Կայքի վարչական մասում որպես լռելյայն լեզու դրա փոխարեն կկիրառվի Անգլերենը։" -INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Joomla-ում %s-ը կայված է որպես ձեր լռելյայն ՎԱՐՉԱԿԱՆ լեզուն։" +INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Չհաջողվեց նշանակել այս լեզուն որպես լռելյայն։ Կայքի վարչական մասում որպես լռելյայն լեզու դրա փոխարեն կկիրառվի Անգլերենը։" +INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Joomla-ում %s-ը նշանակված է որպես ՎԱՐՉԱԿԱՆ մասի ձեր լռելյայն լեզուն։" INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Ընտրել" INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Լեզու" INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="Պիտակ" @@ -165,7 +165,7 @@ INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="Չհաջողվեց ա INSTL_DEFAULTLANGUAGE_DESC="Հետևյալ լեզուները հաջողությամբ տեղակայվեցին։ Խնդրում ենք նշել ձեր նախընտրելի լեզուն Joomla-ի վարչական մասի համար։" INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Հետևյալ լեզուները հաջողությամբ տեղակայվեցին։ Խնդրում ենք նշել ձեր նախընտրելի լեզուն Joomla-ի ճակատային մասի համար։" INSTL_DEFAULTLANGUAGE_FRONTEND="Կայքի լռելյայն լեզուն" -INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Չհաջողվեց կայել այս լեզուն որպես լռելյայն։ Կայքի ճակատային մասում որպես լռելյայն լեզու դրա փոխարեն կկիրառվի Անգլերենը։" +INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Չհաջողվեց նշանակել այս լեզուն որպես լռելյայն։ Կայքի ճակատային մասում որպես լռելյայն լեզու դրա փոխարեն կկիրառվի Անգլերենը։" INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="%s լեզուն նշված է որպես ձեր լռելյայն լեզու։" INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Տեղակայել բազմալեզու բովանդակությունը" INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Ակտիվացնելու դեպքում, Joomla-ն ինքնաբար կստեղծի ամեն տեղակայված լեզվի համար մեկ բովանդակության կարգ։ Բացի այդ, ամեն կարգում կստեղծվի նմուշային պարունակությամբ մեկ ընտրյալ հոդված։" @@ -186,6 +186,7 @@ INSTL_DATABASE_ERROR_CREATE="%s ՏԲ-ի ստեղծումը ձախողվեց։
    Armenian (hy-AM) - 3.4.2 - 2015-07-08 + 3.5.0 + 2016-01-20 Andrey Aleksanyants - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - hy-AM installation language hy-AM.ini diff --git a/installation/language/id-ID/id-ID.ini b/installation/language/id-ID/id-ID.ini index 4682ffe670b42..1aaf775732368 100644 --- a/installation/language/id-ID/id-ID.ini +++ b/installation/language/id-ID/id-ID.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/id-ID/id-ID.xml b/installation/language/id-ID/id-ID.xml index 1eeff20960d5c..7324dd59c93d1 100644 --- a/installation/language/id-ID/id-ID.xml +++ b/installation/language/id-ID/id-ID.xml @@ -6,10 +6,8 @@ 3.2.0 January 2013 Tim Hanacaraka Joomla Indonesia - www.joomla.org - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - id-ID.ini diff --git a/installation/language/it-IT/it-IT.ini b/installation/language/it-IT/it-IT.ini index 1e940cefc5675..e87ad9856b9f4 100644 --- a/installation/language/it-IT/it-IT.ini +++ b/installation/language/it-IT/it-IT.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 @@ -87,7 +87,7 @@ INSTL_SAMPLE_LEARN_SET="Dati di esempio Inglesi (GB) Learn Joomla" INSTL_SAMPLE_TESTING_SET="Dati di esempio Inglesi (GB) Test" INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Installa Joomla con un solo menu ed un modulo login, senza alcun contenuto." INSTL_SAMPLE_BLOG_SET_DESC="Installa Joomla con alcuni articoli e relativi moduli in stile blog. Questi dati di esempio sono in lingua inglese." -INSTL_SAMPLE_BROCHURE_SET_DESC="Installa Joomla con alcune pagine (un menu con le voci Home, About Us, News, Contact Us) e moduli come Search, Custom HTML, Login Form. Questi dati di esempio sono in lingua inglese." +INSTL_SAMPLE_BROCHURE_SET_DESC="Installa Joomla con alcune pagine (un menu con le voci Home, About Us, News, Contact Us) e moduli come Search, Custom, Login Form. Questi dati di esempio sono in lingua inglese." INSTL_SAMPLE_DATA_SET_DESC="Installa Joomla con una pagina (un menu con un link) e moduli come Latest Article, Login Form. Questi dati di esempio sono in lingua inglese." INSTL_SAMPLE_LEARN_SET_DESC="Installa Joomla con articoli di esempio che descrivono come funziona. Questi dati di esempio sono in lingua inglese." INSTL_SAMPLE_TESTING_SET_DESC="Installa Joomla con tutte le possibili voci di menu per aiutarti a testare la piattaforma. Questi dati di esempio sono in lingua inglese." @@ -192,6 +192,7 @@ INSTL_DATABASE_ERROR_CREATE="Si è verificato un errore durante la creazione del INSTL_DATABASE_ERROR_DELETE="Si sono verificati alcuni errori durante la cancellazione del database." INSTL_DATABASE_FIELD_VALUE_REMOVE="Elimina" INSTL_DATABASE_FIELD_VALUE_BACKUP="Salva" +INSTL_DATABASE_FIX_LOWERCASE="Il prefisso delle tabelle dev'essere in lettere minuscole per Postgresql." INSTL_DATABASE_FIX_TOO_LONG="Il prefisso delle tabelle MySQL deve essere al massimo di 15 caratteri." INSTL_DATABASE_INVALID_DB_DETAILS="I dettagli del database fornito non sono corretti e/o vuoti." INSTL_DATABASE_INVALID_MYSQL_VERSION="Devi avere la versione di MySQL 5.0.4 o superiore per continuare l'installazione. La tua versione è: %s" diff --git a/installation/language/it-IT/it-IT.xml b/installation/language/it-IT/it-IT.xml index 4dca8cd3250b2..b7c0cd0993458 100644 --- a/installation/language/it-IT/it-IT.xml +++ b/installation/language/it-IT/it-IT.xml @@ -1,14 +1,13 @@ Italian -Italy - 3.4.4 + 3.5.0 August 2015 Italian Translation team - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - Italian language installation for Joomla it-IT.ini diff --git a/installation/language/ja-JP/ja-JP.ini b/installation/language/ja-JP/ja-JP.ini index 889b497b36a65..2d39118417d96 100644 --- a/installation/language/ja-JP/ja-JP.ini +++ b/installation/language/ja-JP/ja-JP.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 @@ -87,7 +87,7 @@ INSTL_SAMPLE_LEARN_SET="Joomlaを学ぶ 英語(GB)" INSTL_SAMPLE_TESTING_SET="テスト 英語(GB)" INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="メニュー1つとログインフォーム、コンテンツなしのサンプルです。" INSTL_SAMPLE_BLOG_SET_DESC="いくつかの記事と過去の記事、ブログロール、最も読まれた記事などを表示したブログのサンプルです。" -INSTL_SAMPLE_BROCHURE_SET_DESC="いくつかのページ（ホーム・私たちについて・ニュース・お問い合わせで構成されるメニュー）と検索、カスタムHTML、ログインフォームモジュールを表示したサンプルです。" +INSTL_SAMPLE_BROCHURE_SET_DESC="いくつかのページ（ホーム・私たちについて・ニュース・お問い合わせで構成されるメニュー）と検索、カスタム、ログインフォームモジュールを表示したサンプルです。" INSTL_SAMPLE_DATA_SET_DESC="1ページ（1リンクのみのメニュー）と最新の記事、ログインフォームモジュールを表示したサンプルです。" INSTL_SAMPLE_LEARN_SET_DESC="どのようにJoomla!が動作するかの解説記事を表示したサンプルです。" INSTL_SAMPLE_TESTING_SET_DESC="Joomla!の動作テストに役立つすべてのメニューアイテムを表示したサンプルです。" @@ -130,7 +130,7 @@ INSTL_COMPLETE_LANGUAGE_DESC2="（注）言語のダウンロードとインス INSTL_COMPLETE_REMOVE_FOLDER="installationディレクトリを削除" ; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_REMOVE_INSTALLATION="必ずinstallationディレクトリを削除してください。
    installationフォルダを削除するまではシステムを利用できません。" -INSTL_COMPLETE_TITLE="Joomla! は無事にインストールされました。" +INSTL_COMPLETE_TITLE="Joomla! は正常にインストールされました。" INSTL_COMPLETE_INSTALL_LANGUAGES="言語の追加インストール" ;Languages view @@ -192,6 +192,7 @@ INSTL_DATABASE_ERROR_CREATE="データベース %s の作成中にエラーが INSTL_DATABASE_ERROR_DELETE="データベースの削除中にいくつかのエラーが発生しました。" INSTL_DATABASE_FIELD_VALUE_REMOVE="削除" INSTL_DATABASE_FIELD_VALUE_BACKUP="バックアップ" +INSTL_DATABASE_FIX_LOWERCASE="PostgreSQLではテーブルプレフィックスは小文字にする必要があります。" INSTL_DATABASE_FIX_TOO_LONG="The MySQLテーブルのプレフィックスは最大15文字まで入力できます。" INSTL_DATABASE_INVALID_DB_DETAILS="提供されたデータベース情報に誤りがあるか、または空です。" INSTL_DATABASE_INVALID_MYSQL_VERSION="インストールを続行するにはMySQL 5.0.4以上が必要です。お使いのバージョンは %s です。" @@ -237,13 +238,13 @@ INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="FTPルートフォルダを自動検出で ;others INSTL_CONFPROBLEM="設定ファイルの生成中に問題が発生しました。設定ファイルまたはフォルダが書き込み可能でないため、手動で次のコードをアップロードする必要があります。テキストエリアを選択してすべてのコードを選択状態にしてコピーし、新規テキストファイルに貼り付けて、ファイル名を「configuration.php」とし、サイトのルートフォルダにアップロードしてください。" -INSTL_DATABASE_SUPPORT="Database Support:" -INSTL_DISPLAY_ERRORS="Display Errors" +INSTL_DATABASE_SUPPORT="データベース サポート:" +INSTL_DISPLAY_ERRORS="エラーの表示" INSTL_ERROR_DB="データベース %s の作成中にいくつかのエラーが発生しました" INSTL_ERROR_INITIALISE_SCHEMA="データベーススキーマを初期化できません" INSTL_FILE_UPLOADS="File Uploads" INSTL_GNU_GPL_LICENSE="GNU一般公衆利用許諾契約" -INSTL_JSON_SUPPORT_AVAILABLE="JSON Support" +INSTL_JSON_SUPPORT_AVAILABLE="JSONのサポート" INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC Off" INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime" INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language is Default" @@ -254,14 +255,14 @@ INSTL_NOTICEYOUCANSTILLINSTALL="
    このままインストールを続行す INSTL_OUTPUT_BUFFERING="Output Buffering" INSTL_PARSE_INI_FILE_AVAILABLE="INI Parser Support" INSTL_PHP_VERSION="PHPのバージョン" -INSTL_PHP_VERSION_NEWER="PHP Version >= %s" +INSTL_PHP_VERSION_NEWER="PHPのバージョン >= %s" INSTL_REGISTER_GLOBALS="Register Globals Off" INSTL_SAFE_MODE="Safe Mode" INSTL_SESSION_AUTO_START="Session Auto Start" INSTL_WRITABLE="%sは書き込み可能" -INSTL_XML_SUPPORT="XML Support" -INSTL_ZIP_SUPPORT_AVAILABLE="Native ZIP support" -INSTL_ZLIB_COMPRESSION_SUPPORT="Zlib Compression Support" +INSTL_XML_SUPPORT="XMLのサポート" +INSTL_ZIP_SUPPORT_AVAILABLE="Native ZIPのサポート" +INSTL_ZLIB_COMPRESSION_SUPPORT="Zlib 圧縮のサポート" INSTL_PROCESS_BUSY="プロセスが進行中です。しばらくお待ちください・・・" ;Global strings diff --git a/installation/language/ja-JP/ja-JP.xml b/installation/language/ja-JP/ja-JP.xml index 5c1fcbba97fc2..4ec11f059a477 100644 --- a/installation/language/ja-JP/ja-JP.xml +++ b/installation/language/ja-JP/ja-JP.xml @@ -1,15 +1,11 @@ - + Japanese 日本語 (Japan) - 3.4.4 - 2015-09-07 - JOOMLA.JP - admin@joomla.org - www.joomla.org - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + 3.5.0 + March 2016 + Joomla.jp + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - ja-JP.ini @@ -19,4 +15,4 @@ 0     -     +     \ No newline at end of file diff --git a/installation/language/ka-GE/ka-GE.ini b/installation/language/ka-GE/ka-GE.ini new file mode 100644 index 0000000000000..7b5a353eb7ea2 --- /dev/null +++ b/installation/language/ka-GE/ka-GE.ini @@ -0,0 +1,322 @@ +; Joomla! Project +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; License GNU General Public License version 2 or later; see LICENSE.txt +; Note : All ini files need to be saved as UTF-8 + +;Stepbar +INSTL_STEP_COMPLETE_LABEL="დასრულება" +INSTL_STEP_DATABASE_LABEL="მონაცემთა ბაზა" +INSTL_STEP_DEFAULTLANGUAGE_LABEL="ნაგულისხმები ენის არჩევა" +INSTL_STEP_FTP_LABEL="FTP" +INSTL_STEP_LANGUAGES_LABEL="ენების დაყენება" +INSTL_STEP_SITE_LABEL="საიტი კონფიგურაცია" +INSTL_STEP_SUMMARY_LABEL="ზოგადი მიმოხილვა" + +;Language view +INSTL_SELECT_LANGUAGE_TITLE="აირჩიეთ ენა" +INSTL_WARNJAVASCRIPT="ყურადღება! ჯუმლას! სწორად ინსტალაციისთვის ჩართული უნდა იყოს JavaScript!" +INSTL_WARNJSON="ჯუმლას! ინსტალაციისთვის აუცილებელია ჩართული იყოს PHP-ში JSON-ის მხარდაჭერა!" + +;Preinstall view +INSTL_PRECHECK_TITLE="წინა-საინსტალაციო შემოწმება" +INSTL_PRECHECK_DESC="იმ შემთხვევაში, თუ რომელიმე ამ ელემენტებიდან არ არის მხარდაჭერილი (აღინიშნება, როგორც არა) გთხოვთ მიიღოთ ზომები მის აღმოსაფხვრელად.
    თქვენ ვერ დააინსტალირებთ ჯუმლას! მანამ, სანამ სისტემის პარამეტრები არ დააკმაყოფილებენ მითითებულ მოთხოვნებს." +INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="რეკომენდებული პარამეტრები:" +INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="ეს პარამეტრები რეკომენდებულია PHP-ს ჯუმლასთან! სრულფასოვანი თავსებადობისთვის.
    მიუხედავად ამისა, ჯუმლას! შეუძლია იმუშაოს იმ შემთხვევაშიც კი, თუ თქვენი არსებული პარამეტრები სრულად არ ემთხვევა რეკომენდებულებს." +INSTL_PRECHECK_DIRECTIVE="დირექტივა" +INSTL_PRECHECK_RECOMMENDED="რეკომენდებულია" +INSTL_PRECHECK_ACTUAL="აქტუალური" + +; Database view +INSTL_DATABASE="მონაცემთა ბაზის კონფიგურაცია" +INSTL_DATABASE_HOST_DESC="როგორც წესი ეს არის "localhost"." +INSTL_DATABASE_HOST_LABEL="ჰოსტის სახელი" +INSTL_DATABASE_NAME_DESC="ზოგიერთ ჰოსტზე დაწესებულია შეზღუდვა გამოსაყენებელი მონაცემთა ბაზების რაოდენობაზე. ცხრილის პრეფიქსის გამოყენება საშუალებას იძლევა ერთ მონაცემთა ბაზაში ჯუმლაზე! დააყენოთ რამოდენიმე საიტი" +INSTL_DATABASE_NAME_LABEL="მონაცემთა ბაზის სახელი" +INSTL_DATABASE_NO_SCHEMA="ამ მონაცემთა ბაზის ტიპისთვის მონაცემთა ბაზის სქემა არ არსებობს." +INSTL_DATABASE_OLD_PROCESS_DESC="ჯუმლას! წინა დაყენების დროს არსებული ცხრილების სათადარიგო ასლი შეიცვლება." +INSTL_DATABASE_OLD_PROCESS_LABEL="ძველი მონაცემთა ბაზის დამუშავება" +INSTL_DATABASE_PASSWORD_DESC="შეიყვანეთ მონაცემთა ბაზის მომხმარებლის პაროლი. ანგარიშის გამოყენება პაროლის გარეშე რეკომენდებული არ არის" +INSTL_DATABASE_PASSWORD_LABEL="პაროლი" +INSTL_DATABASE_PREFIX_DESC="მიუთითეთ ცხრილის პრეფიქსი ან გამოიყენეთ ავტომატურად გენერირებული. პრეფიქსის რეკომენდებული სიგრძეა 3-4 სიმბოლო (ლათინური ასოებით და ციფრებით) და აუცილებლად უნდა მთავრდებოდეს ქვედა ტირეთი. დარწმუნდით, რომ არჩეული პრეფიქსი არ გამოიყენება არსებული მონაცემთა ბაზის ცხრილების სახელებში." +INSTL_DATABASE_PREFIX_LABEL="ცხრილის პრეფიქსი" +INSTL_DATABASE_PREFIX_MSG="ცხრილის პრეფიქსი უნდა იწყებოდეს ლათინური ასოთი და შეიცავდეს მხოლოდ ლათინურ ასოებს, ციფრებს ან ქვედა ტირეს (A-Z,a-z,0-9,_)." +INSTL_DATABASE_TYPE_DESC="როგორც წესი ეს არის "MySQLi"." +INSTL_DATABASE_TYPE_LABEL="მონაცემთა ბაზის ტიპი" +INSTL_DATABASE_USER_DESC="შეიყვანეთ ჰოსტის მიერ მოწოდებული მონაცემთა ბაზის მომხმარებლის სახელი. ლოკალურ სერვერზე როგორც წესი ეს არის "root" პაროლის გარეშე." +INSTL_DATABASE_USER_LABEL="მომხმარებლის სახელი" + +;FTP view +INSTL_AUTOFIND_FTP_PATH="FTP მისამართის ავტომატური ძებნა" +INSTL_FTP="FTP კონფიგურაციები" +INSTL_FTP_DESC="

    იმის გამო, რომ სერვერების უმეტესობაზე ფაილებთან დაკავშირებული ოპერაციების შესრულება შეზღუდულია წვდომის უფლებით ან სერვისის Safe Mode ჩართვით, ჯუმლაში! გათვალისწინებულია შესაძლებლობა გამოიყენოს ამ მიზნისთვის FTP პროტოკოლი. ამისთვის, ინსტალაციის მიმდინარე საფეხურზე, აუცილებელია მიეთითოს FTP წვდომის ანგარიშის პარამეტრები.

    უსაფრთხოების მიზნით, რეკომენდებულია შეიქმნას სპეციალური ანგარიში, რომელსაც წვდომის უფლება ექნება საიტის ძირეულ საქაღალდესთან, და არა მთელ სერვერთან.

    შენიშვნა: თუ ჯუმლას! სერვერზე ინსტალაციის დროს გამოიყენება ვინდოუსის ოპერაციული სისტემა, FTP-ს ამოქმედება საჭირო არ არის.

    " +INSTL_FTP_ENABLE_LABEL="FTP წვდომის ჩართვა" +INSTL_FTP_HOST_LABEL="FTP ჰოსტი" +INSTL_FTP_PASSWORD_LABEL="FTP პაროლი" +INSTL_FTP_PORT_LABEL="FTP პორტი" +INSTL_FTP_ROOT_LABEL="FTP Root მისამართი" +INSTL_FTP_SAVE_LABEL="FTP პაროლის შენახვა" +INSTL_FTP_TITLE="FTP კონფიგურაციები (არასავალდებულო - ეს საფეხური შეგიძლიათ გამოტოვოთ - გამოტოვებისთვის დააჭირეთ შემდეგს)" +INSTL_FTP_USER_LABEL="FTP მომხმარებლის სახელი" +INSTL_VERIFY_FTP_SETTINGS="FTP პარამეტრების შემოწმება" +INSTL_FTP_SETTINGS_CORRECT="FTP პარამეტრები სწორია" +INSTL_FTP_USER_DESC="ყურადღება! რეკომენდებულია დატოვოთ ეს ველი ცარიელი და შეიყვანეთ FTP მომხმარებლის სახელი ფაილების გადაადგილების ყოველ ჯერზე." +INSTL_FTP_PASSWORD_DESC="ყურადღება! რეკომენდებულია დატოვოთ ეს ველი ცარიელი და შეიყვანეთ FTP პაროლი ფაილების გადაადგილების ყოველ ჯერზე." + +;Site View +INSTL_SITE="საიტის კონფიგურაციები" +INSTL_ADMIN_EMAIL_LABEL="ადმინისტრატორის ელ-ფოსტა" +INSTL_ADMIN_EMAIL_DESC="შეიყვანეთ ელ-ფოსტის მისამართი. ეს იქნება საიტის სუპერადმინისტრატორის ელ-ფოსტის მისამართი." +INSTL_ADMIN_PASSWORD_LABEL="ადმინისტრატორის პაროლი" +INSTL_ADMIN_PASSWORD_DESC="შეიყვანეთ პაროლი თქვენი სუპერადმინისტრატორის ანგარიშისთვის და გაიმეორეთ იგი ქვემოთ, დადასტურების ველში." +INSTL_ADMIN_PASSWORD2_LABEL="დაადასტურეთ (გაიმეორეთ) პაროლი" +INSTL_ADMIN_USER_LABEL="ადმინისტრატორის მომხმარებლის სახელი" +INSTL_ADMIN_USER_DESC="შეიყვანეთ მომხმარებლის სახელი თქვენი სუპერადმინისტრატორის ანგარიშისთვის." +INSTL_SITE_NAME_LABEL="საიტის სახელი" +INSTL_SITE_NAME_DESC="შეიყვანეთ თქვენი ჯუმლა! საიტის სახელი." +INSTL_SITE_METADESC_LABEL="აღწერილობა" +INSTL_SITE_METADESC_TITLE_LABEL="დაწერეთ თქვენი საიტის აღწერილობა საძიებო სისტემებისთვის. ოპტიმალურია 20 სიტყვის გამოყენება." +INSTL_SITE_OFFLINE_LABEL="საიტის გამორთვა" +INSTL_SITE_OFFLINE_TITLE_LABEL="ინსტალაციის დასრულების შემდეგ, შეგიძლიათ გამორთოთ საიტი ტექნიკური სამუშაოების დასრულებამდე. მოგვიანებით შეგიძლიათ კვლავ ჩართოთ საიტი ადმინისტრირების პანელში არსებულ საერთო პარამეტრებიდან." +INSTL_SITE_INSTALL_SAMPLE_LABEL="დემო-მონაცემების ინსტალაცია" +INSTL_SITE_INSTALL_SAMPLE_DESC="დემო-მონაცემების ინსტალაცია რეკომენდებულია დამწყები ვებმასტერებისთვის.
    ის დაგეხმარებათ უფრო იოლად აითვისოთ სისტემის ფუნქციები." +INSTL_SITE_INSTALL_SAMPLE_NONE="არცერთი (საჭიროა მრავალენოვანი საიტის შექმნის დროს)" +INSTL_SAMPLE_BLOG_SET="ბლოგი English (GB) დემო-მონაცემები" +INSTL_SAMPLE_BROCHURE_SET="ბროშურა English (GB) დემო-მონაცემები" +INSTL_SAMPLE_DATA_SET="ნაგულისხმები English (GB) დემო-მონაცემები" +INSTL_SAMPLE_LEARN_SET="ვსწავლობთ ჯუმლას English (GB) დემო-მონაცემები" +INSTL_SAMPLE_TESTING_SET="ტესტი English (GB) დემო-მონაცემები" +INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="ჯუმლას ინსტალაცია ერთი მენიუთი და ავტორიზაციის ფორმით (დამატებითი კონტენტის გარეშე)." +INSTL_SAMPLE_BLOG_SET_DESC="ჯუმლას ინსტალაცია რამოდენიმე სტატიით და მოდულებით, გამოიყენება ბლოგებში (პოპულარული სტატიები, ახალი სტატიები და ა.შ.)." +INSTL_SAMPLE_BROCHURE_SET_DESC="ჯუმლას ინსტალაცია რამოდენიმე გვერდით (მენიუ პუნქტებით მთავარი, ჩვენ შესახებ, სიახლეები, კონტაქტები) და მოდულებით ძებნა, ავტორიზაცია, HTML-კოდი." +INSTL_SAMPLE_DATA_SET_DESC="ჯუმლას ინსტალაცია ერთი გვერდით (მენიუ ერთი ბმულით) და მოდულები ახალი სტატიები, ავტორიზაცია." +INSTL_SAMPLE_LEARN_SET_DESC="ჯუმლას ინსტალაცია სტატიების ნაკრებით, რომელიც აღწერს ჯუმლას! მუშაობის პრინციპებს." +INSTL_SAMPLE_TESTING_SET_DESC="ჯუმლას ინსტალაცია ყველანაირი მენიუს პუნქტებით სისტემის შესაძლებლობების ტესტირებისთვის." + +;Summary view +INSTL_FINALISATION="ინსტალაციის დასრულება" +INSTL_SUMMARY_INSTALL="ინსტალაცია" +INSTL_SUMMARY_EMAIL_LABEL="კონფიგურაციების გაგზავნა ელ-ფოსტაზე" +INSTL_SUMMARY_EMAIL_DESC="საშუალებას იძლევა ინსტალაციის დასრულების შემდეგ ელ-ფოსტით გაეგზავნოს კონფიგურაციის პარამეტრები: %s ." +INSTL_SUMMARY_EMAIL_PASSWORDS_LABEL="პაროლი ეწეროს წერილში" +INSTL_SUMMARY_EMAIL_PASSWORDS_DESC="ყურადღება! უსაფრთხოების მიზნით რეკომენდებულია არ გაიგზავნოს/შეგინახოს პაროლი წერილში." + +;Installing view +INSTL_INSTALLING="მიმდინარეობს ინსტალაცია ..." +INSTL_INSTALLING_DATABASE_BACKUP="მონაცემთა ბაზის ცხრილების სათადარიგო ასლის შექმნა" +INSTL_INSTALLING_DATABASE_REMOVE="მონაცემთა ბაზის ძველი ცხრილების წაშლა" +INSTL_INSTALLING_DATABASE="მონაცემთა ბაზის ცხრილების შექმნა" +INSTL_INSTALLING_SAMPLE="დემო-მონაცემების ინსტალაცია" +INSTL_INSTALLING_CONFIG="კონფიგურაციის ფაილის შექმნა" +INSTL_INSTALLING_EMAIL="ელ-ფოსტის გაგზავნა %s" + +;Email +INSTL_EMAIL_SUBJECT="კონფიგურაციის დეტალები: %s" +INSTL_EMAIL_HEADING="საიტის კონფიგურაციის პარამეტრები:" +INSTL_EMAIL_NOT_SENT="ელ-ფოსტა ვერ გაიგზავნა." + +;Complete view +INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="ადმინისტრატორის ანგარიშის დეტალები" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="საქაღალდე 'installation' უკვე წაშლილია." +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_ERROR_FOLDER_DELETE="საქაღალდის 'Installation' წაშლა ვერ მოხერხდა. გთხოვთ წაშალოთ იგი ხელით." +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_FOLDER_REMOVED="საქაღალდე 'Installation' წარმატებით წაიშალა." +INSTL_COMPLETE_LANGUAGE_1="გსურთ გადართოთ ჯუმლას! ინტერფეისი თქვენ მშობლიურ ენაზე?" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_LANGUAGE_DESC="საქაღალდე 'Installation'-ის წაშლამდე შეგიძლიათ დააყენოთ ენის დამატებითი პაკეტები. თუ გსურთ დამატებითი ენების დაყენება თქვენი ჯუმლა! საიტისთვის დააჭირეთ ღილაკს 'ენების პაკეტების დაყენება'." +INSTL_COMPLETE_LANGUAGE_DESC2="შენიშვნა: ენების დამატებითი პაკეტების დასაყენებლად თქვენ დაგჭირდებათ კავშირი ინტერნეტთან.
    ზოგ შემთხვევაში, სერვერის პარამეტრებია არ აძლევს ჯუმლას! საშუალებას, რომ დააყენოს ენების დამატებითი პაკეტები. თქვენ შეძლებთ დააყენოთ სასურველი ენების პაკეტები მოგვიანებით, ჯუმლას! ადმინისტრირების პანელიდან" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_REMOVE_FOLDER="საქაღალდე 'Installation'-ის წაშლა" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_REMOVE_INSTALLATION="ყურადღება: არ დაგავიწყდეთ სრულად წაშალოთ საქაღალდე INSTALLATION.
    ჯუმლას! ინსტალაცია არ ჩაითვლება დასრულებულად თუ არ წაშლით ამ საქაღალდეს. ეს ჯუმლას! უსაფრთხოების მოთხოვნაა" +INSTL_COMPLETE_TITLE="გილოცავთ! თქვენ დააყენეთ ჯუმლა!." +INSTL_COMPLETE_INSTALL_LANGUAGES="დამატებითი ნაბიჯები: ენების პაკეტების დაყენება" + +;Languages view +INSTL_LANGUAGES="ენების პაკეტების დაყენება" +INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="ენა" +INSTL_LANGUAGES_COLUMN_HEADER_VERSION="ვერსია" +INSTL_LANGUAGES_DESC="ჯუმლას! ინტერფეისი ხელმისაწვდომია მრავალ ენაზე. მონიშნეთ სასურველი ენები და განაგრძეთ ინსტალაცია ღილაკზე 'შემდეგი' დაჭერით.
    შენიშვნა: ენის ერთი პაკეტის ინსტალაციას ესაჭიროება დაახლოებით 10 წამი. ერთდროულად სამი ენის პაკეტზე მეტის დაყენება რეკომენდებული არ არის." +INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="ეს ოპერაცია იკავებს დაახლოებით 10 წამს ენის თითოეულ პაკეტზე
    გთხოვთ დაელოდოთ სანამ ენის პაკეტები ჩაიტვირთება და დაყენდება..." +INSTL_LANGUAGES_MORE_LANGUAGES="დააჭირეთ ღილაკს 'უკან' თუ გსურთ დააყენოთ დამატებითი ენის პაკეტები." +INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="გთხოვთ აირჩიოთ ენა. დამატებითი ენის პაკეტების ინსტალაციისთვის დააჭირეთ ღილაკს 'უკან' და სიიდან აირჩიეთ ენის პაკეტები." +INSTL_LANGUAGES_WARNING_NO_INTERNET="ჯუმლას! ენის პაკეტების სერვერთან დაკავშირების დროს წარმოიშვა შეცდომა. გთხოვთ დაასრულოთ ინსტალაციის პროცესი." +INSTL_LANGUAGES_WARNING_NO_INTERNET2="შენიშვნა: თქვენ შეძლებთ დააყენოთ სასურველი ენების პაკეტები მოგვიანებით, ჯუმლას! ადმინისტრირების პანელიდან" +INSTL_LANGUAGES_WARNING_BACK_BUTTON="წინა საფეხურზე დაბრუნება" + +;Default language view +INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE="მრავალენიანი ფუნქციის გააქტიურება" +INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="ჯუმლას! მრავალენიანი ფუნქცია საშუალებას იძლევა შეიქმნას ლოკალიზებული მენიუს პუნქტები და შინაარსი ყველა დაყენებული ენისათვის." +INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN="გააქტიურეთ პლაგინი language code plugin" +INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN_DESC="გააქტიურეთ პლაგინი language code plugin ენის კოდის შეცვლისთვის HTML დოკუმენტში SEO პარამეტრების გასაუმჯობესებლად." +INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="ადმინისტრირების პანელის ენა" +INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="ადმინისტრირების პანელის ნაგულისხმები ენის შეცვლა ვერ ხერხდება. ადმინისტრირების პანელის ნაგულისხმები ენა იქნება ინგლისური." +INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="ენა %s მოინიშნა ჯუმლას! ადმინისტრირების პანელის ნაგულისხმებ ენად." +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="არჩევა" +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="ენა" +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="თეგი" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CONTENT_LANGUAGE="ჯუმლა! ვერ ახერხებს ავტომატურად შექმნას კონტენტის ენა %s " +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU="ჯუმლა! ვერ ახერხებს ავტომატურად შექმნას მენიუ %s " +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_ITEM="ჯუმლა! ვერ ახერხებს ავტომატურად შექმნას მენიუს პუნქტი %s " +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_MODULE="ჯუმლა! ვერ ახერხებს ავტომატურად შექმნას მენიუს მოდული %s " +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CATEGORY="ჯუმლა! ვერ ახერხებს ავტომატურად შექმნას კატეგორია %s " +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_ARTICLE="ჯუმლა! ვერ ახერხებს ავტომატურად შექმნას ლოკალიზებული სტატია %s " +INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_MODULESWHITCHER_LANGUAGECODE="ჯუმლა! ვერ ახერხებს ავტომატურად გამოაქვეყნოს მოდული 'ენის გადართვა' (language switcher module)" +INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGECODE="ჯუმლა! ვერ ახერხებს ავტომატურად გააქტიუროს პლაგინი - Language Code Plugin" +INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGEFILTER="ჯუმლა! ვერ ახერხებს ავტომატურად გააქტიუროს პლაგინი - Language Filter Plugin" +INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="შეუძლებელია ენის პაკეტის %s დაყენება." +INSTL_DEFAULTLANGUAGE_COULD_NOT_PUBLISH_MOD_MULTILANGSTATUS="ჯუმლა! ვერ ახერხებს ავტომატურად გამოაქვეყნოს ადმინისტრირების პანელის მოდული - language status module" +INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="ჯუმლა! ვერ ახერხებს ავტომატურად გამორთოს ნაგულისხმები მთავარი მენიუს მოდული" +INSTL_DEFAULTLANGUAGE_DESC="ენის პაკეტები დაყენებულია. გთხოვთ აირჩიოთ ნაგულისხმები ენის პაკეტი ადმინისტრირების პანელისთვის და დააჭირეთ ღილაკს 'შემდეგი'." +INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="ენის პაკეტები დაყენებულია. გთხოვთ აირჩიოთ ნაგულისხმები ენის პაკეტი საიტისთვის და დააჭირეთ ღილაკს 'შემდეგი'." +INSTL_DEFAULTLANGUAGE_FRONTEND="საიტის ნაგულისხმები ენა" +INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="ჯუმლა! ვერ ახერხებს საიტის ნაგულისხმები ენის შეცვლას. საიტის ნაგულისხმებ ენად დარჩება ინგლისური." +INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="ენის პაკეტი %s დაყენებულია თქვენი საიტის ნაგულისხმებ ენად." +INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="ლოკალიზებული კონტენტის დაყენება" +INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="საშუალებას იძლევა ავტომატურად შეიქმნას სტატიები თითო კატეგორია ყოველი დაყენებული ენის პაკეტისთვის. ყოველ კატეგორიაში განთავსდება თითო სატესტო სტატია." +INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="მრავალენოვანი" +INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="ეს განყოფილება საშუალებას გაძლევთ ავტომატურად გააქტიუროთ ჯუმლას! მრავალენოვანი ფუნქცია." +INSTL_DEFAULTLANGUAGE_TRY_LATER="მოგვიანებით ეს შეგიძლიათ შეცვალოთ ჯუმლას! ადმინისტრირების პანელიდან" + +; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español +INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="ქართული (GE)" + +;Database Model +INSTL_DATABASE_COULD_NOT_CONNECT="მონაცემთა ბაზასთან დაკავშირება ვერ მოხერხდა. დაბრუნებული შეცდომის ტექსტი: %s" +INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="ინსტალატორი ვერ უკავშირდება მითითებულ მონაცემთა ბაზას და ვერ ხერხდება მონაცემთა ბაზის შექმნა. გთხოვთ, გადაამოწმოთ პარამეტრები და საჭიროების შემთხვევაში ხელით შექმნათ თქვენი მონაცემთა ბაზა." +INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="ვერ მოხერხდა მანიფესტის ქეშის განახლება შემდეგი გაფართოებისთვის: %s" +INSTL_DATABASE_EMPTY_NAME="" +INSTL_DATABASE_ERROR_BACKINGUP="მონაცემთა ბაზის სათადარიგო ასლის შექმნის დროს წარმოიშვა შეცდომები." +INSTL_DATABASE_ERROR_CREATE="მონაცემთა ბაზის სათადარიგო ასლის შექმნის დროს წარმოიშვა შეცდომები: %s.
    შესაძლებელია, ამ მომხმარებელს არ გააჩნია სათანადო უფლებები, რომ შექმნას ახალი მონაცემთა ბაზა. ასეთ შემთხვევაში, მონაცემთა ბაზა შესაძლოა შეიქმნას ხელით, ჯუმლას! ინსტალაციის დაწყებამდე." +INSTL_DATABASE_ERROR_DELETE="მონაცემთა ბაზის წაშლის დროს წარმოიშვა სხვადასხვა შეცდომები." +INSTL_DATABASE_FIELD_VALUE_REMOVE="წაშლა" +INSTL_DATABASE_FIELD_VALUE_BACKUP="Backup" +INSTL_DATABASE_FIX_LOWERCASE="ცხრილების პრეფიქსი PostgreSQL-ისთვის უნდა იყოს ქვედა რეგისტრში." +INSTL_DATABASE_FIX_TOO_LONG=" MySQL-ის ცხრილების პრეფიქსი უნდა შეიცავდეს არა უმეტეს 15 სიმბოლოს." +INSTL_DATABASE_INVALID_DB_DETAILS="მონაცემთა ბაზის პარამეტრები მითითებული არ არის ან მითითებულია არასწორად." +INSTL_DATABASE_INVALID_MYSQL_VERSION="ინსტალაციის გასაგრძელებლად საჭიროა MySQL 5.0.4 ან მეტი. თქვენი ვერსია არის: %s" +INSTL_DATABASE_INVALID_MYSQLI_VERSION="ინსტალაციის გასაგრძელებლად საჭიროა MySQL 5.0.4 ან მეტი. თქვენი ვერსია არის: %s" +INSTL_DATABASE_INVALID_PDOMYSQL_VERSION="ინსტალაციის გასაგრძელებლად საჭიროა MySQL 5.0.4 ან მეტი. თქვენი ვერსია არის: %s" +INSTL_DATABASE_INVALID_POSTGRESQL_VERSION="ინსტალაციის გასაგრძელებლად საჭიროა PostgreSQL 8.3.18 ან მეტი. თქვენი ვერსია არის: %s" +INSTL_DATABASE_INVALID_SQLSRV_VERSION="ინსტალაციის გასაგრძელებლად საჭიროა SQL Server 2008 R2 (10.50.1600.1) ან მეტი. თქვენი ვერსია არის: %s" +INSTL_DATABASE_INVALID_SQLZURE_VERSION="ინსტალაციის გასაგრძელებლად საჭიროა SQL Server 2008 R2 (10.50.1600.1) ან მეტი. თქვენი ვერსია არის: %s" +INSTL_DATABASE_INVALID_TYPE="გთხოვთ მიუთითეთ მონაცემთა ბაზის ტიპი" +INSTL_DATABASE_NAME_TOO_LONG="MySQL მონაცემთა ბაზის სახელი უნდა შეიცავდეს არა უმეტეს 64 სიმბოლოს." +INSTL_DATABASE_INVALID_NAME="MySQL ვერსიებში, ნაკლები 5.1.6-ისა აკრძალულია სახელში წერტილების და სხვა "სპეციალური" სიმბოლოების გამოყენება. თქვენი ვერსია არის: %s" +INSTL_DATABASE_NAME_INVALID_SPACES="MySQL მონაცემთა ბაზის და ცხრილების სახელი არ შეიძლება იწყებოდეს ან თავდებოდეს სიცარიელით." +INSTL_DATABASE_NAME_INVALID_CHAR="MySQL მონაცემთა ბაზის და ცხრილების სახელებში არ შეიძლება NULL ASCII(0x00) სიმბოლოების გამოყენება." +INSTL_DATABASE_FILE_DOES_NOT_EXIST="ფაილი %s არ არსებობს" + +;controllers +INSTL_COOKIES_NOT_ENABLED="თქვენ ბრაუზერში გამორთულია Cookies მიღების შესაძლებლობა. თქვენ ვერ შეძლებთ პროგრამის დაყენებას, თუ ეს ფუნქცია ჩართული არ იქნება. გარდა ამისა, არსებობს საშიშროება, რომ შეექმნას პრობლემა სერვერს session.save_path. თუ თქვენ არ იცით ეს როგორ შემოწმდეს და გასწორდეს, დახმარებისთვის მიმართეთ სერვერის ადმინისტრაციას (ჰოსტერს)." +INSTL_HEADER_ERROR="შეცდომა" + +;Helpers +INSTL_PAGE_TITLE="ჯუმლას! ვებ ინსტალატორი" + +;Configuration model +INSTL_ERROR_CONNECT_DB="მონაცემთა ბაზასთან დაკავშირება ვერ მოხერხდა. ქვემოთ მოყვანილია შეცდომის აღწერა: %s" +INSTL_STD_OFFLINE_MSG="ეს საიტი ტექნიკური მიზეზების გამო დროებით დახურულია.
    გთხოვთ შემოხვიდეთ მოგვიანებით." + +;FTP model +INSTL_FTP_INVALIDROOT="მითითებული FTP საქაღალდე არ წარმოადგენს ჯუმლას! საინსტალაციო საქაღალდეს" +INSTL_FTP_NOCONNECT="FTP სერვერთან კავშირი ვერ ხერხდება" +INSTL_FTP_NODELE="ვერ შესრულდა ბრძანება "DELE"." +INSTL_FTP_NODIRECTORYLISTING="ვერ ხერხდება FTP სერვერიდან ფაილების სიის მიღება." +INSTL_FTP_NOLIST="ვერ შესრულდა ბრძანება "LIST"." +INSTL_FTP_NOLOGIN="FTP სერვერზე შესვლა ვერ ხერხდება." +INSTL_FTP_NOMKD="ვერ შესრულდა ბრძანება "MKD"." +INSTL_FTP_NONLST="ვერ შესრულდა ბრძანება "NLST"." +INSTL_FTP_NOPWD="ვერ შესრულდა ბრძანება "PWD"." +INSTL_FTP_NORETR="ვერ შესრულდა ბრძანება "RETR"." +INSTL_FTP_NORMD="ვერ შესრულდა ბრძანება "RMD"." +INSTL_FTP_NOROOT="მითითებულ FTP-ს საქაღალდეზე წვდომა ვერ მოხერხდა." +INSTL_FTP_NOSTOR="ვერ შესრულდა ბრძანება "STOR"." +INSTL_FTP_NOSYST="ვერ შესრულდა ბრძანება "SYST"." +INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="შეუძლებელია FTP-ს ძირეული საქაღალდის ავტომატური ამოცნობა." + +;others +INSTL_CONFPROBLEM="თქვენი კონფიგურაციის ფაილი ან საქაღალდე არ არის ჩაწერადი ან კონფიგურაციის ფაილის შექმნისას წარმოიშვა პრობლემა. აუცილებელია საიტის ძირეულ საქაღალდეში ხელოვნურად შექმნათ ტექსტური ფაილი 'configuration.php' და ჩასვათ მასში ტექსტური ველის შინაარსი." +INSTL_DATABASE_SUPPORT="მონაცემთა ბაზის მხარდაჭერა:" +INSTL_DISPLAY_ERRORS="შეცდომების ჩვენება" +INSTL_ERROR_DB="მონაცემთა ბაზის შევსების დროს წარმოიშვა რამოდენიმე შეცდომა: %s" +INSTL_ERROR_INITIALISE_SCHEMA="მონაცემთა ბაზის სქემის ინიციალიზაციის შეცდომა" +INSTL_FILE_UPLOADS="ფაილების ატვირთვა" +INSTL_GNU_GPL_LICENSE="GNU საერთო სახალხო ლიცენზია" +INSTL_JSON_SUPPORT_AVAILABLE="JSON მხარდაჭერა" +INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC Off" +INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime" +INSTL_MB_LANGUAGE_IS_DEFAULT="MB ენა არის ნაგულისხმები" +INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload გამორთულია" +INSTL_NOTICEMBLANGNOTDEFAULT="PHP mbstring ენა არ არის "neutral"-ში. ამის გამოსწორება შესაძლებელია სტროფის: php_value mbstring.language neutral დამატებით .htaccess ფაილში." +INSTL_NOTICEMBSTRINGOVERLOAD="დადასტურებულია PHP mbstring ფუნქციის გადატვირთვა. ამის გამოსწორება შესაძლებელია ლოკალურად, სტროფის php_value mbstring.func_overload 0 დამატებით .htaccess ფაილში." +INSTL_NOTICEYOUCANSTILLINSTALL="
    თქვენ შეგიძლიათ განაგრძოთ ინსტალაცია, რომლის დასრულების შემდეგ გამოჩდება კონფიგურაციის პარამეტრები. თქვენ დაგჭირდებათ კიდევ ერთი დამატებითი ნაბიჯის გადადგმა - შეიყვანეთ კოდი ხელით. მონიშნეთ მთლიანი კოდი, გააკეთეთ მისი ასლი და ჩასვით სრულიად ახალ ტექსტურ ფაილში. დაარქვით ამ ფაილს 'configuration.php' და ატვირთეთ თქვენ სერვერზე, საიტის ძირეულ საქაღალდეში." +INSTL_OUTPUT_BUFFERING="გამოყვანის ბუფერიზაცია" +INSTL_PARSE_INI_FILE_AVAILABLE="INI Parser მხარდაჭერა" +INSTL_PHP_VERSION="PHP ვერსია" +INSTL_PHP_VERSION_NEWER="PHP ვერსია >= %s" +INSTL_REGISTER_GLOBALS="Register Globals გამორთულია" +INSTL_SAFE_MODE="Safe Mode" +INSTL_SESSION_AUTO_START="Session Auto Start" +INSTL_WRITABLE="%s ჩაწერადია" +INSTL_XML_SUPPORT="XML მხარდაჭერა" +INSTL_ZIP_SUPPORT_AVAILABLE="Native ZIP მხარდაჭერა" +INSTL_ZLIB_COMPRESSION_SUPPORT="Zlib Compression მხარდაჭერა" +INSTL_PROCESS_BUSY="მიმდინარეობს დაყენების პროცესი. გთხოვთ მოიცადოთ ..." + +;Global strings +JADMINISTRATOR="ადმინისტრირების პანელი" +JCHECK_AGAIN="კიდევ შეამოწმეთ" +JERROR="შეცდომა" +JEMAIL="ელ-ფოსტა" +JGLOBAL_ISFREESOFTWARE="%s ვრცელდება ლიცენზიით %s." +JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="ენის პაკეტი არ არის თავსებადი ჯუმლას! ვერსიასთან. ზოგიერთი სტრიქონი შეიძლება არ გამოჩნდეს." +JGLOBAL_SELECT_AN_OPTION="აირჩიეთ ოპცია" +JGLOBAL_SELECT_NO_RESULTS_MATCH="შედეგები არ დაემთხვა" +JGLOBAL_SELECT_SOME_OPTIONS="აირჩიეთ რამოდენიმე ოპცია" +JINVALID_TOKEN="უკანასკნელი მოთხოვნა უარყოფილი იქნა რადგან შეიცავდა არასწორ უსაფრთხოების კოდს. გთხოვთ განაახლოთ გვერდი და სცადოთ კიდევ ერთხელ." +JNEXT="შემდეგი" +JNO="არა" +JNOTICE="შეტყობინება" +JOFF="გამორთვა" +JON="ჩართვა" +JPREVIOUS="უკან" +JSITE="საიტი" +JUSERNAME="მომხმარებლის სახელი" +JYES="კი" + +; Framework strings necessary when no lang pack is available +JLIB_DATABASE_ERROR_CONNECT_MYSQL="MySQL-თან დაკავშირება ვერ მოხერხდა." +JLIB_DATABASE_ERROR_DATABASE="მონაცემთა ბაზის შეცდომა" +JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="მონაცემთა ბაზის დრაივერის ჩატვირთვა ვერ მოხერხდა: %s" +JLIB_ENVIRONMENT_SESSION_EXPIRED="თქვენი სესიისთვის განკუთვნილი დრო ამოიწურა, გთხოვთ განაახლოთ გვერდი." +JLIB_FILESYSTEM_ERROR_COPY_FAILED="ასლი ვერ შეიქმნა" +JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :files: მითითებული მისამართი არ წარმოადგენს საქაღალდეს. მისამართი: %s" +JLIB_FORM_FIELD_INVALID="ველი არასწორად არის შევსებული: " +JLIB_FORM_VALIDATE_FIELD_INVALID="ველი არასწორად არის შევსებული: %s" +JLIB_FORM_VALIDATE_FIELD_REQUIRED="აუცილებელია შეივსოს ველი: %s" +JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: ფაილის %1$s ასლის შექმნის დროს წარმოიშვა შეცდომა %2$s -ში." +JLIB_INSTALLER_NOT_ERROR="ენის ფაილების TinyMCE დაყენების დროს მომხდარი შეცდომები არანაირად არ აისახება ენის პაკეტის ინსტალაციაზე. ენის ზოგიერთი პაკეტი, რომელიც შექმნილია ჯუმლა! 3.2.0 -ზე ქვედა ვერსიებისთვის, შესაძლოა შეეცადოს დააყენოს TinyMCE ენის ფაილები. თუმცა, TinyMCE ენის ფაილები უკვე გათვალისწინებულია და შედის ძირითად ბირთვში, ამიტომ მისი დამატებით დაყენება საჭირო არ არის." +JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: ვერ უკავშირდება მონაცემთა ბაზას
    joomla.library: %1$s - %2$s" + +; Strings for the language debugger +JDEBUG_LANGUAGE_FILES_IN_ERROR="შეცდომები ენის ფაილებში" +JDEBUG_LANGUAGE_UNTRANSLATED_STRING="სათარგმნი სტრიქონები" +JNONE="არცერთი" + +; Necessary for errors +ADMIN_EMAIL="ადმინისტრატორის ელ-ფოსტა" +ADMIN_PASSWORD="ადმინისტრატორის პაროლი" +ADMIN_PASSWORD2="დაადასტურეთ ადმინისტრატორის პაროლი" +SITE_NAME="საიტის სახელი" + +; Database types (allows for a more descriptive label than the internal name) +MYSQL="MySQL" +MYSQLI="MySQLi" +ORACLE="Oracle" +PDOMYSQL="MySQL (PDO)" +POSTGRESQL="PostgreSQL" +SQLAZURE="Microsoft SQL Azure" +SQLITE="SQLite" +SQLSRV="Microsoft SQL Server" diff --git a/installation/language/ka-GE/ka-GE.xml b/installation/language/ka-GE/ka-GE.xml new file mode 100644 index 0000000000000..18d743b4fd692 --- /dev/null +++ b/installation/language/ka-GE/ka-GE.xml @@ -0,0 +1,20 @@ + + + Georgian (ქართული) + 3.5.0 + March 2016 + Besik Ruseishvili + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + GNU General Public License version 2 or later; see LICENSE.txt + + ka-GE.ini + + + Georgian (ქართული) + ka-GE + 0 + + + diff --git a/installation/language/km-KH/km-KH.ini b/installation/language/km-KH/km-KH.ini index a65baadf7388e..723da8de9b172 100644 --- a/installation/language/km-KH/km-KH.ini +++ b/installation/language/km-KH/km-KH.ini @@ -1,9 +1,9 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 - ; Stepbar + INSTL_STEP_COMPLETE_LABEL="បញ្ចប់" INSTL_STEP_DATABASE_LABEL="ឃ្លាំង​ទិន្នន័យ" INSTL_STEP_DEFAULTLANGUAGE_LABEL="ជ្រើស​ភាសា​លំនាំដើម" @@ -82,7 +82,7 @@ INSTL_SAMPLE_LEARN_SET="ទិន្នន័យ​គំរូ​ស្វែ INSTL_SAMPLE_TESTING_SET="ទិន្នន័យ​គំរូ​សាកល្បង​ជា​ភាសា​អង់គ្លេស" INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="ដំឡើង​ Joomla ដែល​មាន​តែ​ម៉ឺនុយ​ និង ទម្រង់​កត់​ចូល​មួយ​ដែល​គ្មាន​មាតិកា​ឡើយ ។" INSTL_SAMPLE_BLOG_SET_DESC="ដំឡើង Joomla ដែល​មាន​អត្ថបទ​មួយ​ចំនួន និង ម៉ូឌុល​ដែល​ទាក់ទង​ប្លក់​ដូចជា៖ ប្រកាស​ចាស់ៗ តំណ​ប្លក់ ប្រកាស​អាន​ច្រើន ។" -INSTL_SAMPLE_BROCHURE_SET_DESC="ដំឡើង Joomla ដែល​មាន​ទំព័រ​មួយ​ចំនួន (ម៉ឺនុយ​ដែល​មាន​ទំព័រ ទំព័រ​ដើម, អំពី​យើង, ដំណឹង, ទាក់ទង​យើង) និង​ម៉ូឌុល​មួយ​ចំនួន​ដូច​ជា ស្វែងរក, HTML តាម​បំណង, ទម្រង់​កត់​ចូល ។" +INSTL_SAMPLE_BROCHURE_SET_DESC="ដំឡើង Joomla ដែល​មាន​ទំព័រ​មួយ​ចំនួន (ម៉ឺនុយ​ដែល​មាន​ទំព័រ ទំព័រ​ដើម, អំពី​យើង, ដំណឹង, ទាក់ទង​យើង) និង​ម៉ូឌុល​មួយ​ចំនួន​ដូច​ជា ស្វែងរក, តាម​បំណង, ទម្រង់​កត់​ចូល ។" INSTL_SAMPLE_DATA_SET_DESC="ដំឡើង Joomla ដែល​មាន​មួយ​ទំព័រ (ម៉ឺនុយ​មាន​តំណ​មួយ) និង ម៉ូឌុល​មួយ​ចំនួន​ដូចជា​អត្ថបទ​ថ្មី, ទម្រង់​កត់​ចូល ។" INSTL_SAMPLE_LEARN_SET_DESC="ដំឡើង Joomla មាន​អត្ថបទ​គំរូ​ពិពណ៌នា​អំពី​របៀប​ដែល Joomla ដំណើរការ ។" INSTL_SAMPLE_TESTING_SET_DESC="ដំឡើង Joomla មាន​ម៉ឺនុយ​ច្រើន​យ៉ាង​ដែល​ជួយ​ក្នុង​ការ​សាកល្បង Joomla ។" @@ -115,12 +115,12 @@ INSTL_COMPLETE_ERROR_FOLDER_DELETE="ថត​ឯកសារ​ដំឡើង INSTL_COMPLETE_FOLDER_REMOVED="ថត​ឯកសារ​ដំឡើង​លុប​ចេញ​បាន​ដោយ​ជោគជ័យ ។" INSTL_COMPLETE_LANGUAGE_1="Joomla! ក្នុង​ភាសា​ផ្ទាល់​ខ្លួន​អ្នក និង/ឬ ការ​បង្កើត​ស្ថាន​បណ្ដាញ​ពហុ​ភាសា​កំណើត​មូលដ្ឋាន" ; The word 'installation' should not be translated as it is a physical folder. -INSTL_COMPLETE_LANGUAGE_DESC="មុន​នឹង​លុប​ថត​ដំឡើង​ចេញ អ្នក​អាច​ដំឡើង​ភាសា​បន្ថែម​បាន។ ប្រសិនបើ​អ្នក​ចង់​បន្ថែម​ភាសា​ផ្សេង​ចូល​ក្នុង​កម្មវិធី Joomla! សូម​ជ្រើសរើស​ប៊ូតុង​ខាងក្រោម ។" -INSTL_COMPLETE_LANGUAGE_DESC2="ចំណាំ៖ អ្នក​ត្រូវការ​ចូល​ដំណើរការ​អ៊ីនធឺណិត​សម្រាប់ Joomla! ទាញ​យក និង​ដំឡើង​ភាសា​ថ្មីៗ។
    ការកំណត់​រចនាសម្ព័ន្ធ​របស់​ម៉ាស៊ីន​បម្រើ​មួយចំនួន​ពុំ​អនុញ្ញាត Joomla! ឲ្យ​ដំឡើង​ភាសា​បាន​ឡើយ។ ប្រសិនបើ អ្នក​ស្ថិត​ក្នុង​ករណី​នេះ ពុំ​បារម្ភ​អ្វី អ្នក​នឹង​អាច​ដំឡើង​ភាសា​ទាំង​នោះ​ ក្រោយ​ប្រើប្រាស់​កម្មវិធី​គ្រប់គ្រង Joomla! ឆាក​ក្រោយ ។" +INSTL_COMPLETE_LANGUAGE_DESC="មុន​នឹង​លុប​ថត​ដំឡើង installation ចេញ អ្នក​អាច​ដំឡើង​ភាសា​បន្ថែម​បាន។ ប្រសិនបើ​អ្នក​ចង់​បន្ថែម​ភាសា​ផ្សេង​ចូល​ក្នុង​កម្មវិធី Joomla! សូម​ជ្រើសរើស​ប៊ូតុង​ខាងក្រោម ។" +INSTL_COMPLETE_LANGUAGE_DESC2="ចំណាំ៖ អ្នក​ត្រូវការ​ចូល​ដំណើរការ​អ៊ីនធឺណិត​សម្រាប់ Joomla! ទាញ​យក និង​ដំឡើង​ភាសា​ថ្មីៗ។
    ការកំណត់​រចនាសម្ព័ន្ធ​របស់​ម៉ាស៊ីន​បម្រើ​មួយចំនួន​ពុំ​អនុញ្ញាត Joomla! ឲ្យ​ដំឡើង​ភាសា​បាន​ឡើយ។ ប្រសិនបើ អ្នក​ស្ថិត​ក្នុង​ករណី​នេះ កុំ​បារម្ភ​អ្វី អ្នក​នឹង​អាច​ដំឡើង​ភាសា​ទាំង​នោះ​ ក្រោយ​ប្រើប្រាស់​កម្មវិធី​គ្រប់គ្រង Joomla! ឆាក​ក្រោយ ។" ; The word 'installation' should not be translated as it is a physical folder. -INSTL_COMPLETE_REMOVE_FOLDER="លុប​ថត​ដំឡើង​" +INSTL_COMPLETE_REMOVE_FOLDER="លុប​ថត​ដំឡើង​ installation" ; The word 'installation' should not be translated as it is a physical folder. -INSTL_COMPLETE_REMOVE_INSTALLATION="សូម​ចាំ​ថា​ត្រូវ​​លុប​ថត​ឯកសារ​ដំឡើង​ (installation) ចេញ ។
    អ្នក​នឹង​ពុំ​អាច​បន្ត​ផុត​ពី​ចំណុច​នេះ​ទេ លុះត្រា​តែ​ថត​ដំឡើង​ installation នេះ​ត្រូវ​បាន​លុប​ចេញ ។ នេះ​ជា​មុខងារ​សុវត្ថិភាព​របស់ Joomla! ។" +INSTL_COMPLETE_REMOVE_INSTALLATION="សូម​ចាំ​ថា​ត្រូវ​​លុប​ថត​ឯកសារ​ដំឡើង​ installation ចេញ ។
    អ្នក​នឹង​ពុំ​អាច​បន្ត​ផុត​ពី​ចំណុច​នេះ​ទេ លុះត្រា​តែ​ថត​ដំឡើង​ installation នេះ​ត្រូវ​បាន​លុប​ចេញ ។ នេះ​ជា​មុខងារ​សុវត្ថិភាព​របស់ Joomla! ។" INSTL_COMPLETE_TITLE="អបអរ​សាទរ​លោក​អ្នក! ឥឡូវនេះ Joomla! បាន​ដំឡើង​រួចរាល់​ហើយ ។" INSTL_COMPLETE_INSTALL_LANGUAGES="ជំហាន​បន្ថែម៖ ដំឡើង​ភាសា" ; Languages view @@ -179,6 +179,7 @@ INSTL_DATABASE_ERROR_CREATE="មាន​កំហុស​កើត​ឡើង INSTL_DATABASE_ERROR_DELETE="មាន​កំហុស​ពេល​លុប​ឃ្លាំង​ទិន្នន័យ​នេះ ។" INSTL_DATABASE_FIELD_VALUE_REMOVE="លុប​ចោល" INSTL_DATABASE_FIELD_VALUE_BACKUP="បម្រុង​ទុក" +INSTL_DATABASE_FIX_LOWERCASE="បុព្វបទ​តារាង​ត្រូវតែ​ជា​អក្សរ​តូច​សម្រាប់ PostgreSQL ។" INSTL_DATABASE_FIX_TOO_LONG="បុព្វបទ​តារាង​ MySQL ​ត្រូវ​តែ​ច្រើន​បំផុត​បាន​ត្រឹម​តែ​១៥​តួអក្សរ ។" INSTL_DATABASE_INVALID_DB_DETAILS="សេចក្ដី​លម្អិត​ឃ្លាំង​ទិន្នន័យ​ដែល​បាន​ផ្ដល់​ពុំ​ត្រឹម​ត្រូវ​ហើយ​/ឬ​ទទេ ។" INSTL_DATABASE_INVALID_MYSQL_VERSION="អ្នក​ត្រូវការ MySQL 5.0.4 ឬ​កំណែ​ខ្ពស់​ជាង​នេះ​ដើម្បី​បន្ត​ការ​ដំឡើង​នេះ ។ កំណែ​របស់​អ្នក៖ %s" diff --git a/installation/language/km-KH/km-KH.xml b/installation/language/km-KH/km-KH.xml index d02bdf8173675..456b913626226 100644 --- a/installation/language/km-KH/km-KH.xml +++ b/installation/language/km-KH/km-KH.xml @@ -1,14 +1,11 @@ - + Khmer ភាសាខ្មែរ (Cambodia) - 3.4.4 + 3.5.0 August 2015 Khmer Translation Team - info@km-kh.org - www.km-kh.org - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - km-KH.ini diff --git a/installation/language/ko-KR/ko-KR.ini b/installation/language/ko-KR/ko-KR.ini index c047cd79844b9..abb44a2f5398b 100644 --- a/installation/language/ko-KR/ko-KR.ini +++ b/installation/language/ko-KR/ko-KR.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -89,7 +89,7 @@ INSTL_SAMPLE_LEARN_SET="Joomla 배우기 영어(GB) 샘플 데이터" INSTL_SAMPLE_TESTING_SET="테스트 영어(GB) 샘플 데이터" INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="다른 컨텐츠 없이 로그인 양식과 하나의 메뉴만 줌라에 설치합니다." INSTL_SAMPLE_BLOG_SET_DESC="지난 포스트, 블로그 규칙, 가장 많이 읽은 포스트 등과 같은 몇개의 아티클만 줌라에 설치합니다." -INSTL_SAMPLE_BROCHURE_SET_DESC="몇개의 페이지(Home과 같은 메뉴, About us, 뉴스, 연락처)와 검색, Custom HTML, 로그인 양식과 같은 모듈만 줌라에 설치합니다." +INSTL_SAMPLE_BROCHURE_SET_DESC="몇 개의 페이지(Home과 같은 메뉴, About us, 뉴스, 연락처)와 검색, 사용자 정의, 로그인 폼과 같은 모듈만 줌라에 설치합니다." INSTL_SAMPLE_DATA_SET_DESC="하나의 페이지(링크와 같은 메뉴)와 최신 아티클, 로그인 양식과 같은 모듈을 줌라에 설치합니다." INSTL_SAMPLE_LEARN_SET_DESC="줌라가 어떻게 작동하는지를 알려주는 예제 아티클을 줌라에 설치합니다." INSTL_SAMPLE_TESTING_SET_DESC="줌라를 테스트하는데 도움을 주는 가능한 모든 메뉴 아이템을 줌라에 설치합니다." @@ -193,7 +193,8 @@ INSTL_DATABASE_ERROR_CREATE="데이터베이스 %s를 생성하는 동안 에러 INSTL_DATABASE_ERROR_DELETE="데이터베이스를 삭제하는 동안 몇가지 에러가 발생했습니다." INSTL_DATABASE_FIELD_VALUE_REMOVE="제거" INSTL_DATABASE_FIELD_VALUE_BACKUP="백업" -INSTL_DATABASE_FIX_TOO_LONG="MySQL테이블 접두사는 최대 15문자이어야 합니다." +INSTL_DATABASE_FIX_LOWERCASE="테이블 접두사는 PostgreSQL을 고려하여 소문자여야 합니다." +INSTL_DATABASE_FIX_TOO_LONG="MySQL 테이블 접두사는 최대 15문자이어야 합니다." INSTL_DATABASE_INVALID_DB_DETAILS="데이터베이스 세부항목이 올바르지 않거나 비워있습니다." INSTL_DATABASE_INVALID_MYSQL_VERSION="MySQL 5.0.4 또는 더 높은 버전의 데이터베이스가 있어야 설치를 계속할 수 있습니다. 현재 버전: %s" INSTL_DATABASE_INVALID_MYSQLI_VERSION="MySQL 5.0.4 또는 더 높은 버전의 데이터베이스가 있어야 설치를 계속할 수 있습니다. 현재 버전: %s" diff --git a/installation/language/ko-KR/ko-KR.xml b/installation/language/ko-KR/ko-KR.xml index 67d7cd2e7a387..575c942e96f00 100644 --- a/installation/language/ko-KR/ko-KR.xml +++ b/installation/language/ko-KR/ko-KR.xml @@ -1,14 +1,13 @@ Korean (Republic of Korea) - 3.4.4 + 3.5.0 August 2015 Korean translation team - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - ko-KR.ini diff --git a/installation/language/lv-LV/lv-LV.ini b/installation/language/lv-LV/lv-LV.ini index 92883b88ab240..4844ec17aa053 100644 --- a/installation/language/lv-LV/lv-LV.ini +++ b/installation/language/lv-LV/lv-LV.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/lv-LV/lv-LV.xml b/installation/language/lv-LV/lv-LV.xml index 8588bf758938c..2638d2317910d 100644 --- a/installation/language/lv-LV/lv-LV.xml +++ b/installation/language/lv-LV/lv-LV.xml @@ -6,9 +6,8 @@ 3.4.4 August 2015 Latvian Translation Team - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - Latvian language installation for Joomla 3.0 lv-LV.ini diff --git a/installation/language/mk-MK/mk-MK.ini b/installation/language/mk-MK/mk-MK.ini index 238472f660eeb..95493894f6b5b 100644 --- a/installation/language/mk-MK/mk-MK.ini +++ b/installation/language/mk-MK/mk-MK.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 @@ -97,7 +97,7 @@ INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Инсталирање Joomla со само INSTL_SAMPLE_BLOG_SET="Англиски (GB) блог примери" INSTL_SAMPLE_BLOG_SET_DESC="Инсталирање Joomla со неколку артикли и блог ориентирани модули како Постари постови, Блогрол, Најчитани." INSTL_SAMPLE_BROCHURE_SET="Англиски (GB) примери за брошури" -INSTL_SAMPLE_BROCHURE_SET_DESC="Инсталирање Joomla со неколку страници (мени со деловите Почетна, За нас, Новости, Контакт) и модули како Барај, HTML по желба, Најавна форма." +INSTL_SAMPLE_BROCHURE_SET_DESC="Инсталирање Joomla со неколку страници (мени со деловите Почетна, За нас, Новости, Контакт) и модули како Барај, Код по желба, Најавна форма." INSTL_SAMPLE_DATA_SET="Англиски (GB) основни примери" INSTL_SAMPLE_DATA_SET_DESC="Инсталирање Joomla со една страница (мени со еден дел) и модули како Најнови артикли, Најавна форма." INSTL_SAMPLE_LEARN_SET="Англиски (GB) примери учење Joomla" @@ -247,6 +247,7 @@ INSTL_DATABASE_ERROR_BACKINGUP="Се појави грешка при праве INSTL_DATABASE_ERROR_CREATE="Се појави грешка при обидот за создавање база на податоци %s.
    Можеби корисникот нема доволно привилегии за создавање база на податоци. Потребната база на податоци можеби ќе треба да биде создадена посебно пред да може да се продолжи со инсталација на Joomla!." INSTL_DATABASE_ERROR_DELETE="Се појави грешка при бришење на базата на податоци." +INSTL_DATABASE_FIX_LOWERCASE="За Postgresql префиксот на табелата мора да биде со мали букви." INSTL_DATABASE_FIELD_VALUE_REMOVE="Избриши" INSTL_DATABASE_FIELD_VALUE_BACKUP="Копија" INSTL_DATABASE_FIX_TOO_LONG="Префиксот на MySQL табелата мора да е најмногу до 15 карактери." diff --git a/installation/language/mk-MK/mk-MK.xml b/installation/language/mk-MK/mk-MK.xml index be8d542fc19e5..b57f97f8f9480 100644 --- a/installation/language/mk-MK/mk-MK.xml +++ b/installation/language/mk-MK/mk-MK.xml @@ -1,14 +1,13 @@ Macedonian Македонски (MК) - 3.4.4 + 3.5.0 August 2015 Macedonian Translation Team - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - mk-MK.ini diff --git a/installation/language/ms-MY/ms-MY.ini b/installation/language/ms-MY/ms-MY.ini index 66c5f280df524..feb933b74977b 100644 --- a/installation/language/ms-MY/ms-MY.ini +++ b/installation/language/ms-MY/ms-MY.ini @@ -1,6 +1,6 @@ ; translator : MU DOT MY (http://mu.my) ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/ms-MY/ms-MY.xml b/installation/language/ms-MY/ms-MY.xml index 085b52eeaca2e..8c0736a8da1ba 100644 --- a/installation/language/ms-MY/ms-MY.xml +++ b/installation/language/ms-MY/ms-MY.xml @@ -6,9 +6,8 @@ 3.2.0 2013-10-01 MU DOT MY - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - ms-MY.ini diff --git a/installation/language/nb-NO/nb-NO.ini b/installation/language/nb-NO/nb-NO.ini index 5944a4e9de87a..7b042dee57361 100644 --- a/installation/language/nb-NO/nb-NO.ini +++ b/installation/language/nb-NO/nb-NO.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 @@ -87,7 +87,7 @@ INSTL_SAMPLE_LEARN_SET="Engelsk eksempeldata - Lær Joomla!" INSTL_SAMPLE_TESTING_SET="Engelsk eksempeldata - Test" INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Installer Joomla med bare en meny og et innloggingsskjema, uten noe innhold." INSTL_SAMPLE_BLOG_SET_DESC="Installer Joomla med noen få artikler og blogg-relaterte moduler som 'Eldre innlegg', 'Bloggrull' og 'Mest lest'." -INSTL_SAMPLE_BROCHURE_SET_DESC="Installer Joomla med noen få sider (en meny med sidene 'Hjem', 'Om oss', 'Nyheter' og 'Kontakt oss'), samt moduler som 'Søk', 'Egendfinert HTML' og 'Innlogging'." +INSTL_SAMPLE_BROCHURE_SET_DESC="Installer Joomla med noen få sider (en meny med sidene 'Hjem', 'Om oss', 'Nyheter' og 'Kontakt oss'), samt moduler som 'Søk', 'Egendefinert' og 'Innlogging'." INSTL_SAMPLE_DATA_SET_DESC="Installer Joomla med en side (en meny med en lenke), samt moduler som 'Siste nyheter' og 'Innlogging'." INSTL_SAMPLE_LEARN_SET_DESC="Installer Joomla med eksempelartikler som forklarer hvordan systemet fungerer." INSTL_SAMPLE_TESTING_SET_DESC="Installer Joomla med alle mulige menytyper, for rask og enkel hjelp til testing av hele systemet." @@ -116,19 +116,19 @@ INSTL_EMAIL_NOT_SENT="E-post kunne ikke sendes." ;Complete view INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Innloggingsdetaljer for administrasjonspanelet" -; The word 'installation' should not be translated as it is a physical folder. Wtf do you know ... +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Installasjonsmappen er allerede slettet." -; The word 'installation' should not be translated as it is a physical folder. Wtf do you know ... +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_ERROR_FOLDER_DELETE="Installasjonsmappen kunne ikke slettes, du må slette denne manuelt." -; The word 'installation' should not be translated as it is a physical folder. Wtf do you know ... +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_FOLDER_REMOVED="Installasjonsmappen ble slettet" INSTL_COMPLETE_LANGUAGE_1="Joomla! i ditt eget språk?" -; The word 'installation' should not be translated as it is a physical folder. Wtf do you know ... +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_LANGUAGE_DESC="Før du sletter installasjonsmappen kan du installere ekstra språk. Klikk følgende knapp dersom du ønsker å legge til ekstra språk for Joomla-installasjonen." INSTL_COMPLETE_LANGUAGE_DESC2="Merk: Installasjonsskriptet vil behøve tilgang til Internett for å kunne laste ned og installere flere språk.
    Noen serverkonfigurasjoner sperrer dessverre for dette. Dersom dette er tilfellet for deg er det ingen fare, du vil kunne installere flere språk senere via administrasjonspanelet." -; The word 'installation' should not be translated as it is a physical folder. Wtf do you know ... +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_REMOVE_FOLDER="Slett installasjonsmappen" -; The word 'installation' should not be translated as it is a physical folder. Wtf do you know ... +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_REMOVE_INSTALLATION="HUSK Å SLETTE INSTALLASJONSMAPPEN
    Du vil ikke kunne bruke nettstedet før installasjonsmappen er slettet. Dette er en sikkerhetsfunksjon for Joomla!." INSTL_COMPLETE_TITLE="Gratulerer! Joomla! er nå installert." INSTL_COMPLETE_INSTALL_LANGUAGES="Ekstra steg: Installer språk" @@ -319,3 +319,4 @@ POSTGRESQL="PostgreSQL" SQLAZURE="Microsoft SQL Azure" SQLITE="SQLite" SQLSRV="Microsoft SQL Server" + diff --git a/installation/language/nb-NO/nb-NO.xml b/installation/language/nb-NO/nb-NO.xml index 92a41c91a724e..e446ab00480a2 100644 --- a/installation/language/nb-NO/nb-NO.xml +++ b/installation/language/nb-NO/nb-NO.xml @@ -1,14 +1,13 @@ Norwegian bokmål (nb-NO) - 3.4.4 + 3.5.0 August 2015 Norsk Joomla! - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - nb-NO.ini diff --git a/installation/language/nl-NL/nl-NL.ini b/installation/language/nl-NL/nl-NL.ini index 8fc89c9bd9b7f..a6f6d5569a90b 100644 --- a/installation/language/nl-NL/nl-NL.ini +++ b/installation/language/nl-NL/nl-NL.ini @@ -1,10 +1,8 @@ -; nl-NL.ini 3.4 ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 - ;Stepbar INSTL_STEP_COMPLETE_LABEL="Voltooien" INSTL_STEP_DATABASE_LABEL="Database" @@ -30,7 +28,7 @@ INSTL_PRECHECK_ACTUAL="Huidige waarde" ; Database view INSTL_DATABASE="Database configuratie" -INSTL_DATABASE_HOST_DESC="Dit is meestal "localhost"" +INSTL_DATABASE_HOST_DESC="Dit is meestal "_QQ_"localhost"_QQ_"" INSTL_DATABASE_HOST_LABEL="Naam host" INSTL_DATABASE_NAME_DESC="Sommige hostingproviders staan slechts één databasenaam toe per account. In dat geval kunt u een ander tabelvoorvoegsel gebruiken om onderscheid te maken tussen verschillende Joomla! installaties." INSTL_DATABASE_NAME_LABEL="Naam database" @@ -42,7 +40,7 @@ INSTL_DATABASE_PASSWORD_LABEL="Wachtwoord" INSTL_DATABASE_PREFIX_DESC="Kies een tabelvoorvoegsel voor de database of gebruik het willekeurig gegenereerde. Bij voorkeur drie of vier tekens lang, alleen alfanumerieke tekens en het MOET eindigen met een onderstrepingsteken. Zorg dat het gekozen voorvoegsel niet door andere tabellen wordt gebruikt." INSTL_DATABASE_PREFIX_LABEL="Tabelvoorvoegsel" INSTL_DATABASE_PREFIX_MSG="Het voorvoegsel van de database moet beginnen met een letter gevolgd door optioneel alfanumerieke tekens en een onderstrepingsteken" -INSTL_DATABASE_TYPE_DESC="Dit is waarschijnlijk "MySQLi"" +INSTL_DATABASE_TYPE_DESC="Dit is waarschijnlijk "_QQ_"MySQLi"_QQ_"" INSTL_DATABASE_TYPE_LABEL="Databasetype" INSTL_DATABASE_USER_DESC="Dit kan de standaard MySQL gebruikersnaam "_QQ_"root"_QQ_" zijn of een gebruikersnaam die de hostingprovider heeft opgegeven" INSTL_DATABASE_USER_LABEL="Gebruikersnaam" @@ -89,7 +87,7 @@ INSTL_SAMPLE_LEARN_SET="Leer Joomla Engelse (GB) voorbeelddata" INSTL_SAMPLE_TESTING_SET="Test Engelse (GB) voorbeelddata" INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Installeer Joomla met slechts één menu en inlogformulier en zonder verdere content." INSTL_SAMPLE_BLOG_SET_DESC="Installeer Joomla met enkele artikelen en blog gerelateerde modules zoals Oudere artikelen, Bloglijst, Meest gelezen artikelen." -INSTL_SAMPLE_BROCHURE_SET_DESC="Installeer Joomla met enkele pagina's (een menu met de pagina's Home, Over ons, Nieuws, Contact) en modules zoals Zoeken, Aangepaste HTML, Inlogformulier." +INSTL_SAMPLE_BROCHURE_SET_DESC="Installeer Joomla met enkele pagina's (een menu met de pagina's Home, Over ons, Nieuws, Contact) en modules zoals Zoeken, Aangepast, Inlogformulier." INSTL_SAMPLE_DATA_SET_DESC="Installeer Joomla met één pagina (een menu met een link) en modules zoals Nieuwste artikel, Inlogformulier." INSTL_SAMPLE_LEARN_SET_DESC="Installeer Joomla met voorbeeldartikelen die beschrijven hoe Joomla werkt." INSTL_SAMPLE_TESTING_SET_DESC="Installeer Joomla met alle mogelijke menu-items om te helpen met het testen van Joomla." @@ -147,7 +145,7 @@ INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! kan geen verbinding maken met de ta INSTL_LANGUAGES_WARNING_NO_INTERNET2="Let op: Taalpakketten kunnen later vanaf het beheergedeelte geïnstalleerd worden" INSTL_LANGUAGES_WARNING_BACK_BUTTON="Ga terug naar de laatste installatiestap" -;Defaultlanguage view +;Default language view INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE="Activeer de meertalige functionaliteit" INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="Indien geactiveerd wordt de meertalige finctionaliteit van de Joomla website ingeschakeld met voor iedere geïnstalleerde taal een bijbehorend menu." INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN="Inschakelen taalcodeplugin" @@ -188,12 +186,12 @@ INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Nederlands" INSTL_DATABASE_COULD_NOT_CONNECT="Er kan geen verbinding worden gemaakt met de database. Foutnummer: %s" INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="De installatie kan niet met de gespecificeerde database verbinden en kan geen database aanmaken. Controleer uw instellingen en maak, indien nodig, handmatig de database aan." INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Kan de manifest cache niet verversen van extensie: %s" -INSTL_DATABASE_EMPTY_NAME="" INSTL_DATABASE_ERROR_BACKINGUP="Er deden zich enkele fouten voor tijdens de back-up van de database." INSTL_DATABASE_ERROR_CREATE="Er deed zich een fout voor bij het aanmaken van de database %s.
    De gebruiker heeft mogelijk niet voldoende rechten voor het aanmaken van een database. De vereiste database moet mogelijk apart aangemaakt worden voordat u Joomla! kunt installeren." INSTL_DATABASE_ERROR_DELETE="Er deden zich enkele fouten voor tijdens het verwijderen van de database." INSTL_DATABASE_FIELD_VALUE_REMOVE="Verwijderen" INSTL_DATABASE_FIELD_VALUE_BACKUP="Back-up" +INSTL_DATABASE_FIX_LOWERCASE="Het tabelvoorvoegsel moet met kleine letters voor PostgreSQL." INSTL_DATABASE_FIX_TOO_LONG="Het MySQL tabelvoorvoegsel mag maximaal 15 tekens bevatten." INSTL_DATABASE_INVALID_DB_DETAILS="De ingevoerde databasegegevens zijn onjuist en/of leeg." INSTL_DATABASE_INVALID_MYSQL_VERSION="MySQL 5.0.4 of hoger is vereist om de installatie te vervolgen. Uw versie is: %s" @@ -306,7 +304,7 @@ JDEBUG_LANGUAGE_FILES_IN_ERROR="Pars-fouten in taalbestanden" JDEBUG_LANGUAGE_UNTRANSLATED_STRING="Onvertaalde strings" JNONE="Geen" -;Necessary for errors +; Necessary for errors ADMIN_EMAIL="E-mailadres administrator" ADMIN_PASSWORD="Wachtwoord administrator" ADMIN_PASSWORD2="Bevestig wachtwoord administrator" @@ -316,7 +314,9 @@ SITE_NAME="Websitenaam" MYSQL="MySQL" MYSQLI="MySQLi" ORACLE="Oracle" +PDOMYSQL="MySQL (PDO)" POSTGRESQL="PostgreSQL" SQLAZURE="Microsoft SQL Azure" SQLITE="SQLite" -SQLSRV="Microsoft SQL Server" \ No newline at end of file +SQLSRV="Microsoft SQL Server" + diff --git a/installation/language/nl-NL/nl-NL.xml b/installation/language/nl-NL/nl-NL.xml index 8a8ee39a814a4..e72ab1da7a728 100644 --- a/installation/language/nl-NL/nl-NL.xml +++ b/installation/language/nl-NL/nl-NL.xml @@ -1,19 +1,18 @@ - Dutch nl-NL - 3.4.4 - September 2012 + Nederlands nl-NL + 3.5.0 + February 2016 Dutch Translation Team - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - Dutch language installation for Joomla 3.0 nl-NL.ini - Dutch nl-NL + Nederlands nl-NL nl-NL 0 diff --git a/installation/language/nn-NO/nn-NO.ini b/installation/language/nn-NO/nn-NO.ini index 70f22b9f99fdb..fe4da7b68a194 100644 --- a/installation/language/nn-NO/nn-NO.ini +++ b/installation/language/nn-NO/nn-NO.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 @@ -87,7 +87,7 @@ INSTL_SAMPLE_LEARN_SET="Engelsk dømedata - Lær Joomla!" INSTL_SAMPLE_TESTING_SET="Engelsk dømedata - Test" INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Installer Joomla med berre ein meny og et innloggingsskjema, utan noko innhald." INSTL_SAMPLE_BLOG_SET_DESC="Installer Joomla med nokre få artiklar og blogg-relaterte modular som 'Eldre innlegg', 'Bloggrull' og 'Mest lest'." -INSTL_SAMPLE_BROCHURE_SET_DESC="Installer Joomla med nokre få sider (ein meny med sidene 'Heim', 'Om oss', 'Nyhende' og 'Kontakt oss'), og dessutan modular som 'Søk', 'Egendfinert HTML' og 'Innlogging'." +INSTL_SAMPLE_BROCHURE_SET_DESC="Installer Joomla med nokre få sider (ein meny med sidene 'Heim', 'Om oss', 'Nyhende' og 'Kontakt oss'), og dessutan modular som 'Søk', 'Egendefinert' og 'Innlogging'." INSTL_SAMPLE_DATA_SET_DESC="Installer Joomla med ei side (ein meny med ei lenkje), og dessutan modular som 'Siste nyhende' og 'Innlogging'." INSTL_SAMPLE_LEARN_SET_DESC="Installer Joomla med dømeartiklar som forklarer korleis systemet fungerer." INSTL_SAMPLE_TESTING_SET_DESC="Installer Joomla med alle moglege menytypar, for rask og enkel hjelp til testing av heile systemet." @@ -116,13 +116,19 @@ INSTL_EMAIL_NOT_SENT="E-post kunne ikkje sendast." ;Complete view INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Innloggingsdetaljer for administrasjonspanelet" +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Installasjonsmappa er allereie slettet." +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_ERROR_FOLDER_DELETE="Installasjonsmappa kunne ikkje slettes, du må sletta denne manuelt." +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_FOLDER_REMOVED="Installasjonsmappa vart slettet" INSTL_COMPLETE_LANGUAGE_1="Joomla! i ditt eige språk?" +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_LANGUAGE_DESC="Før du slettar installasjonsmappa kan du installera ekstra språk. Klikkar følgjande knapp dersom du ynskjer å leggja til ekstra språk for Joomla-installasjonen." INSTL_COMPLETE_LANGUAGE_DESC2="Merk: Installasjonsskriptet vil trenga tilgjenge til Internett for å kunne lasta ned og installera fleire språk.
    Nokre serverkonfigurasjoner sperrar di verre for dette. Dersom dette er tilfellet for deg er det ingen fare, du vil kunna installera fleire språk seinare via administrasjonspanelet." +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_REMOVE_FOLDER="Slett installasjonsmappa" +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_REMOVE_INSTALLATION="HUGS Å SLETTA INSTALLASJONSMAPPA
    Du vil ikkje kunna bruka nettstaden før installasjonsmappa er slettet. Dette er ein tryggleiksfunksjon for Joomla!." INSTL_COMPLETE_TITLE="Gratulerer! Joomla! er no installert." INSTL_COMPLETE_INSTALL_LANGUAGES="Ekstra steg: Installer språk" @@ -312,4 +318,4 @@ PDOMYSQL="MySQL (PDO)" POSTGRESQL="PostgreSQL" SQLAZURE="Microsoft SQL Azure" SQLITE="SQLite" -SQLSRV="Microsoft SQL Servar" \ No newline at end of file +SQLSRV="Microsoft SQL Servar" diff --git a/installation/language/nn-NO/nn-NO.xml b/installation/language/nn-NO/nn-NO.xml index 1e2f34b0b23fc..52d11ab9e700f 100644 --- a/installation/language/nn-NO/nn-NO.xml +++ b/installation/language/nn-NO/nn-NO.xml @@ -1,14 +1,13 @@ Norwegian Nynorsk (nn-NO) - 3.4.2 + 3.5.0 2015-04-14 Norsk Joomla and Skolelinux - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - nn-NO.ini diff --git a/installation/language/pl-PL/pl-PL.ini b/installation/language/pl-PL/pl-PL.ini index 9021dbfd627e8..a2e85b6892162 100644 --- a/installation/language/pl-PL/pl-PL.ini +++ b/installation/language/pl-PL/pl-PL.ini @@ -1,5 +1,5 @@ ; version ; 2013-10-29 15:05:47 ~0 -; author ; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; author ; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; copyright ; License GNU General Public License version 2 or later; see LICENSE.txt ; license ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/pl-PL/pl-PL.xml b/installation/language/pl-PL/pl-PL.xml index e7281b73846e6..55eaf09e1952b 100644 --- a/installation/language/pl-PL/pl-PL.xml +++ b/installation/language/pl-PL/pl-PL.xml @@ -6,9 +6,8 @@ 3.4.2 15/10/2012 Polskie Centrum Joomla!: joomla.pl - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - pl-PL.ini diff --git a/installation/language/prs-AF/prs-AF.ini b/installation/language/prs-AF/prs-AF.ini index ed13c15a08e4c..6cbbc24193552 100644 --- a/installation/language/prs-AF/prs-AF.ini +++ b/installation/language/prs-AF/prs-AF.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 - No BOM diff --git a/installation/language/prs-AF/prs-AF.xml b/installation/language/prs-AF/prs-AF.xml index 266bd4e5792f1..b2de9420bbeb7 100644 --- a/installation/language/prs-AF/prs-AF.xml +++ b/installation/language/prs-AF/prs-AF.xml @@ -6,9 +6,8 @@ 3.4.2 2015-04-21 Joomla! Project - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - Dari language for Joomla! installation. prs-AF.ini diff --git a/installation/language/pt-BR/pt-BR.ini b/installation/language/pt-BR/pt-BR.ini index ff2920e2dd10b..17243efabd012 100644 --- a/installation/language/pt-BR/pt-BR.ini +++ b/installation/language/pt-BR/pt-BR.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 @@ -87,7 +87,7 @@ INSTL_SAMPLE_LEARN_SET="Conteúdo de exemplo Aprenda Joomla, em inglês (GB)" INSTL_SAMPLE_TESTING_SET="Conteúdo de exemplo Teste, em inglês (GB)" INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Instale o Joomla com apenas um menu e um formulário de acesso, sem qualquer conteúdo." INSTL_SAMPLE_BLOG_SET_DESC="Instalar o Joomla com alguns artigos e módulos relacionados a blogs, como Posts mais antigos, Lista de Blogs, Posts mais lidos." -INSTL_SAMPLE_BROCHURE_SET_DESC="Instale o Joomla com algumas páginas (um menu com páginas Home, Sobre, Notícias, Fale Conosco) e módulos como Busca, HTML personalizado, Formulário de Acesso." +INSTL_SAMPLE_BROCHURE_SET_DESC="Instale o Joomla com algumas páginas (um menu com páginas Home, Sobre, Notícias, Fale Conosco) e módulos como Busca, HTML personalizado e Formulário de Acesso." INSTL_SAMPLE_DATA_SET_DESC="Instale o Joomla com uma página (um menu com um link) e módulos como Últimos Artigos, Formulário de Acesso." INSTL_SAMPLE_LEARN_SET_DESC="Instale o Joomla com conteúdo de exemplo que descrevem como o Joomla funciona." INSTL_SAMPLE_TESTING_SET_DESC="Instale o Joomla com todos os itens de menu possíveis para ajudar a testar o Joomla." @@ -116,13 +116,19 @@ INSTL_EMAIL_NOT_SENT="O email não pôde ser enviado." ;Complete view INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Detalhes de Acesso ao Administrador" +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="O diretório installation já foi removido." +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_ERROR_FOLDER_DELETE="O diretório installation não pôde ser removido. Remova-o manualmente." +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_FOLDER_REMOVED="Diretório installation removida com sucesso." INSTL_COMPLETE_LANGUAGE_1="Joomla! em seu idioma e/ou criação básica de um site multi-idioma" +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_LANGUAGE_DESC="Antes de remover o diretório installation, você pode instalar outros idiomas. Se deseja adicionar outros idiomas em seu aplicativo Joomla!, clique no botão a seguir." INSTL_COMPLETE_LANGUAGE_DESC2="Obs.: você precisará de acesso à internet para que o Joomla! baixe e instale novas idiomas.
    Algumas configurações de servidor não vão permitir que o Joomla! instale os idiomas. Se este for seu caso, não se preocupe, você poderá instalá-los depois pelo Administrador." +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_REMOVE_FOLDER="Remover o diretório installation" +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_REMOVE_INSTALLATION="LEMBRE DE REMOVER O DIRETÓRIO installation.
    Não será possível prosseguir até que o diretório installation seja removido. Este é um recurso de segurança do Joomla!" INSTL_COMPLETE_TITLE="Parabéns! O Joomla foi instalado com sucesso." INSTL_COMPLETE_INSTALL_LANGUAGES="Etapas extras: instalar idiomas" @@ -135,7 +141,7 @@ INSTL_LANGUAGES_DESC="A interface do Joomla está disponível em vários idiomas INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Esta operação levará até 10 segundos por idioma para completar
    Aguarde enquanto baixamos e instalamos os idiomas..." INSTL_LANGUAGES_MORE_LANGUAGES="Pressione o botão 'Anterior', se quiser instalar mais idiomas." INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Nenhum idioma foi selecionado para instalação. Se você precisa instalar mais idiomas, clique em 'Anterior' e selecione os idiomas desejados da lista." -INSTL_LANGUAGES_WARNING_NO_INTERNET="O Joomla não conseguiu conectar ao servidor de idiomas. Por favor, encerre o processo de instalação." +INSTL_LANGUAGES_WARNING_NO_INTERNET="O Joomla não conseguiu conectar com o servidor de idiomas. Conclua o processo de instalação." INSTL_LANGUAGES_WARNING_NO_INTERNET2="Obs.: Você poderá instalar idiomas a qualquer momento pelo Administrador" INSTL_LANGUAGES_WARNING_BACK_BUTTON="Voltar a última etapa de instalação" @@ -180,12 +186,12 @@ INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Inglês (UK)" INSTL_DATABASE_COULD_NOT_CONNECT="Não foi possível conectar ao Banco de Dados. Número retornado: %s" INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="O instalador não pôde se conectar ao banco de dados especificado para seguir com o processo. Verifique suas configurações e, caso necessário, crie o banco de dados manualmente." INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Não foi possível atualizar o cache do manifesto da extensão: %s" -INSTL_DATABASE_EMPTY_NAME="" INSTL_DATABASE_ERROR_BACKINGUP="Alguns erros ocorreram durante o backup do banco de dados." INSTL_DATABASE_ERROR_CREATE="Ocorreu um erro ao tentar criar o banco de dados %s.
    O usuário pode não ter privilégios suficientes para criar um banco de dados. O banco de dados deve ser criado para poder instalar o Joomla!" INSTL_DATABASE_ERROR_DELETE="Ocorreram alguns erros ao apagar o banco de dados." INSTL_DATABASE_FIELD_VALUE_REMOVE="Remover" INSTL_DATABASE_FIELD_VALUE_BACKUP="Cópia de Segurança" +INSTL_DATABASE_FIX_LOWERCASE="O prefixo de tabelas em PostgreSQL deve ser em minúsculas." INSTL_DATABASE_FIX_TOO_LONG="O prefixo de tabelas do banco de dados MySQL deve ter no máximo 15 caracteres." INSTL_DATABASE_INVALID_DB_DETAILS="Os detalhes fornecidos para o banco de dados estão incorretos e/ou vazios." INSTL_DATABASE_INVALID_MYSQL_VERSION="Você precisa do MySQL 5.0.4 ou superior para continuar a Instalação. Sua versão é: %s" @@ -313,3 +319,4 @@ POSTGRESQL="PostgreSQL" SQLAZURE="Microsoft SQL Azure" SQLITE="SQLite" SQLSRV="Microsoft SQL Server" + diff --git a/installation/language/pt-BR/pt-BR.xml b/installation/language/pt-BR/pt-BR.xml index 385dd828bf596..c92373890f9ab 100644 --- a/installation/language/pt-BR/pt-BR.xml +++ b/installation/language/pt-BR/pt-BR.xml @@ -1,21 +1,20 @@ - Português Brasileiro (pt-BR) - 3.4.4 - Junho 2015 + Português do Brasil (pt-BR) + 3.5.0 + 2016-01-20 Equipe de Tradução Português Brasileiro - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005-2015 Open Source Matters. Todos os direitos reservados. GNU General Public License version 2 or later; see LICENSE.txt - Português Brasileiro (pt-BR) 3.4.4 pt-BR.ini - Português Brasileiro (pt-BR) + Português do Brasil (pt-BR) pt-BR 0 - \ No newline at end of file +     diff --git a/installation/language/pt-PT/pt-PT.ini b/installation/language/pt-PT/pt-PT.ini index e276d3f7e9768..5fd4b2fce51bd 100644 --- a/installation/language/pt-PT/pt-PT.ini +++ b/installation/language/pt-PT/pt-PT.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 @@ -87,7 +87,7 @@ INSTL_SAMPLE_LEARN_SET="Treino Joomla - Dados em Inglês" INSTL_SAMPLE_TESTING_SET="Testes - Dados em Inglês" INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Instalar o Joomla com um só menu e um formulário de autenticação, sem qualquer conteúdo." INSTL_SAMPLE_BLOG_SET_DESC="Instalar o Joomla com alguns artigos e módulos relacionados com a visualização em blogue, tais como Artigos/Mensagens antigas, Lista de blogues, Artigos mais lidos." -INSTL_SAMPLE_BROCHURE_SET_DESC="Instalar o Joomla com algumas páginas (um menu com as páginas Entrada, Sobre Nós, Noticias, Contactos) e módulos como Pesquisar, HTML personalizado, Autenticação." +INSTL_SAMPLE_BROCHURE_SET_DESC="Instalar o Joomla com algumas páginas de exemplo (um menu com as páginas Entrada, Sobre nós, Noticias, Contactos) e módulos como Pesquisar, Personalizado e Autenticação." INSTL_SAMPLE_DATA_SET_DESC="Instalar o Joomla com uma página (um menu com uma ligação) e módulos como Últimos Artigos e Formulário de Autenticação." INSTL_SAMPLE_LEARN_SET_DESC="Instalar o Joomla com artigos de exemplo que descrevam como funciona o Joomla." INSTL_SAMPLE_TESTING_SET_DESC="Instalar o Joomla como todos os itens de menu possíveis para ajudar a testar o Joomla." @@ -116,13 +116,19 @@ INSTL_EMAIL_NOT_SENT="Não foi possível enviar o email." ;Complete view INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Dados para autenticação na administração" +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="A pasta de instalação já tinha sido removida" +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_ERROR_FOLDER_DELETE="Não foi possível remover a pasta de instalação. Por favor elimine manualmente a pasta INSTALLATION" +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_FOLDER_REMOVED="Pasta de instalação removida com sucesso" INSTL_COMPLETE_LANGUAGE_1="Joomla! no seu Idioma e/ou criação automática de sítios Multi-idioma básico" +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_LANGUAGE_DESC="Antes de remover a pasta de instalação pode instalar idiomas adicionais carregando no seguinte botão." INSTL_COMPLETE_LANGUAGE_DESC2="Nota: a instalação de idiomas requer acesso à internet.
    Algumas configurações de servidores impedem essa instalação pelo Joomla. Se for este o seu caso não se preocupe pois posteriormente pode fazer essa instalação no painel de administração do Joomla." +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_REMOVE_FOLDER="Remover a pasta de instalação" +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_REMOVE_INSTALLATION="Por favor não se esqueça de REMOVER POR COMPLETO A PASTA DE INSTALAÇÃO
    Não poderá continuar para além deste ponto enquanto o diretório INSTALLATION não for eliminado. Este é um procedimento de segurança do Joomla." INSTL_COMPLETE_TITLE="Parabéns, o Joomla foi instalado com sucesso." INSTL_COMPLETE_INSTALL_LANGUAGES="Adicional: Instalar idiomas" @@ -139,7 +145,7 @@ INSTL_LANGUAGES_WARNING_NO_INTERNET="Não foi possível ligar ao servidor de idi INSTL_LANGUAGES_WARNING_NO_INTERNET2="Nota: posteriormente poderá instalar idiomas no painel de administração do Joomla!" INSTL_LANGUAGES_WARNING_BACK_BUTTON="Voltar ao último passo da instalação" -;Defaultlanguage view +;Default language view INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE="Ativar a funcionalidade multi-idioma" INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="Se estiver ativo, o seu sítio Joomla terá a funcionalidade multi-idioma ativa com menus localizados para cada idioma instalado" INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN="Ativar o plugin do código da língua" @@ -178,6 +184,7 @@ INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Português (pt-PT)" ;Database Model INSTL_DATABASE_COULD_NOT_CONNECT="Não foi possível ligar à base de dados. A ligação devolveu o número: %s" +INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="O instalador não conseguiu ligar-se à base de dados especificada pelo que não foi criada a base de dados, o que era necessário. Por favor, verifique as suas configurações ou, se necessário, crie manualmente a base de dados." INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Não foi possível atualizar a cache do manifesto para a extensão: %s" INSTL_DATABASE_EMPTY_NAME="" INSTL_DATABASE_ERROR_BACKINGUP="Ocorreram alguns erros ao efetuar a cópia de segurança da base de dados." @@ -185,10 +192,13 @@ INSTL_DATABASE_ERROR_CREATE="Ocorreu um erro ao criar a base de dados %s.
    O INSTL_DATABASE_ERROR_DELETE="Ocorreram alguns erros ao eliminar a base de dados" INSTL_DATABASE_FIELD_VALUE_REMOVE="Remover" INSTL_DATABASE_FIELD_VALUE_BACKUP="Cópia de segurança" +INSTL_DATABASE_FIX_LOWERCASE="O prefixo de tabelas para PostgreSQL deve ser em minúsculas." INSTL_DATABASE_FIX_TOO_LONG="O prefixo da tabela MySQL não pode ter mais do que 15 caracteres" INSTL_DATABASE_INVALID_DB_DETAILS="As informações fornecidas relativas à base de dados estão incorretos e ou vazios." INSTL_DATABASE_INVALID_MYSQL_VERSION="Precisa do MySQL 5.0.4 ou superior para continuar a instalação. A sua versão é: %s" INSTL_DATABASE_INVALID_MYSQLI_VERSION="Precisa do MySQL 5.0.4 ou superior para continuar a instalação. A sua versão é: %s" +INSTL_DATABASE_INVALID_PDOMYSQL_VERSION="Precisa do MySQL 5.0.4 ou superior para continuar a instalação. A sua versão é: %s" +INSTL_DATABASE_INVALID_POSTGRESQL_VERSION="Precisa do PostgreSQL 8.3.18 ou superior para continuar a instalação. A sua versão é: %s" INSTL_DATABASE_INVALID_SQLSRV_VERSION="Precisa do SQL Server 2008 R2 (10.50.1600.1) ou superior para continuar a instalação. A sua versão é: %s" INSTL_DATABASE_INVALID_SQLZURE_VERSION="Precisa do SQL Server 2008 R2 (10.50.1600.1) ou superior para continuar a instalação. A sua versão é: %s" INSTL_DATABASE_INVALID_TYPE="Escolha o tipo de base de dados" @@ -245,6 +255,7 @@ INSTL_NOTICEYOUCANSTILLINSTALL="
    Apesar do problema pode continuar a instal INSTL_OUTPUT_BUFFERING="Memória intermédia de saída" INSTL_PARSE_INI_FILE_AVAILABLE="Permite INI Parser" INSTL_PHP_VERSION="Versão de PHP" +INSTL_PHP_VERSION_NEWER="Versão PHP >= %s" INSTL_REGISTER_GLOBALS="Registos globais desligados" INSTL_SAFE_MODE="Modo de segurança" INSTL_SESSION_AUTO_START="Início automático de sessão" @@ -304,7 +315,9 @@ SITE_NAME="Nome do sítio" MYSQL="MySQL" MYSQLI="MySQLi" ORACLE="Oracle" +PDOMYSQL="MySQL (PDO)" POSTGRESQL="PostgreSQL" SQLAZURE="Microsoft SQL Azure" SQLITE="SQLite" SQLSRV="Microsoft SQL Server" + diff --git a/installation/language/pt-PT/pt-PT.xml b/installation/language/pt-PT/pt-PT.xml index 519e871743863..f7c1f108bdd3c 100644 --- a/installation/language/pt-PT/pt-PT.xml +++ b/installation/language/pt-PT/pt-PT.xml @@ -1,14 +1,13 @@ Português (pt-PT) - 3.3.3 - 2014-08-06 - Comunidade JoomlaPT! Portugal - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + 3.5.0.1 + 2016-02-22 + Joomla! Project + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - Idioma de instalação Joomla v3.x - português europeu pt-PT pt-PT.ini diff --git a/installation/language/ro-RO/ro-RO.ini b/installation/language/ro-RO/ro-RO.ini index cfe13e670ad5f..e85b9f96713d3 100644 --- a/installation/language/ro-RO/ro-RO.ini +++ b/installation/language/ro-RO/ro-RO.ini @@ -1,12 +1,8 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt -; Romanian Joomla! Translation Team -; Author : Horia Negura, Quanta, fakemoth@gmail.com ; Note : All ini files need to be saved as UTF-8 - - ;Stepbar INSTL_STEP_COMPLETE_LABEL="Finalizare" INSTL_STEP_DATABASE_LABEL="Baza de date" @@ -120,13 +116,19 @@ INSTL_EMAIL_NOT_SENT="Emailul nu a putut fi trimis." ;Complete view INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Detalii de autentificare pentru Administrare" +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Directorul de instalare a fost deja șters." +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_ERROR_FOLDER_DELETE="Directorul de instalare nu a putut fi șters. Vă rugăm să ștergeți directorul manual." +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_FOLDER_REMOVED="Directorul de instalare a fost șters cu succes" INSTL_COMPLETE_LANGUAGE_1="Joomla! în limba dvs și/sau creare automată site nativ multilingvistic de bază" +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_LANGUAGE_DESC="Înainte de a șterge directorul de instalare puteți instala limbi suplimentare. Dacă doriți acest lucru apăsați butonul următor pentru mai multe limbi în instalarea dvs Joomla!." INSTL_COMPLETE_LANGUAGE_DESC2="Observație: aveți nevoie de conexiune la internet pentru a putea descărca și instala limbi.
    Unele configurări ale serverului nu vor permite instalarea de limbi Joomla. Dacă este cazul, nu vă ingrijorați, veți putea instala limbi mai tarziu folosind interfața de administrare Joomla!" +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_REMOVE_FOLDER="Ștergere director de instalare" +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_REMOVE_INSTALLATION="NU UITAŢI SĂ STERGEŢI DIRECTORUL DE INSTALARE.
    Veţi putea continua doar în momentul în care directorul ce conţine fişierele de instalare a fost eliminat. Aceasta este o măsură de securitate Joomla!" INSTL_COMPLETE_TITLE="Felicitări! Site-ul Joomla a fost instalat." INSTL_COMPLETE_INSTALL_LANGUAGES="Pași suplimentari: Instalare Limbi" @@ -143,7 +145,7 @@ INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! nu a reușit să se conecteze la se INSTL_LANGUAGES_WARNING_NO_INTERNET2="Observație: Veți putea instala mai tarziu limbile folosind secțiunea de administrare Joomla!" INSTL_LANGUAGES_WARNING_BACK_BUTTON="Înapoi la ultimul pas de instalare" -;Defaultlanguage view +;Default language view INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE="Activați funcționalitatea multilingvistică" INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="Dacă este activată, site-ul dvs Joomla va avea funcționalitatea multilingvistică activată cu meniurile localizate pentru fiecare limbă instalată" INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN="Activare plugin Cod lingvisitic" @@ -182,6 +184,7 @@ INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Română (RO)" ;Database Model INSTL_DATABASE_COULD_NOT_CONNECT="Nu s-a putut efectua conectarea la baza de date. Conectorul a returnat: %s" +INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="Sistemul de instalare nu s-a putut conecta la baza de date specificată și nu a putut crea baza de date. Vă rugăm sa verificați setările și dacă este necesar sa creați manual baza de date." INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Nu s-a putut reîmprospăta cache-ul pentru extensia: %s" INSTL_DATABASE_EMPTY_NAME="" INSTL_DATABASE_ERROR_BACKINGUP="Au apărut erori în timpul creării copiei de siguranţă a bazei de date." @@ -189,10 +192,13 @@ INSTL_DATABASE_ERROR_CREATE="A apărut o eroare în timpul creării bazei de dat INSTL_DATABASE_ERROR_DELETE="Au apărut erori în timpul ştergerii bazei de date." INSTL_DATABASE_FIELD_VALUE_REMOVE="Eliminare" INSTL_DATABASE_FIELD_VALUE_BACKUP="Copie de siguranță" +INSTL_DATABASE_FIX_LOWERCASE="Prefixul de tabel trebuie sa fie cu litere mici pentru PostgreSQL." INSTL_DATABASE_FIX_TOO_LONG="Prefixul de tabel MySQL trebuie să aibă o lungime maximă de 15 caractere." INSTL_DATABASE_INVALID_DB_DETAILS="Detaliile bazei de date introduse sunt incorecte şi/sau goale." INSTL_DATABASE_INVALID_MYSQL_VERSION="Pentru a continua instalarea aveți nevoie de versiunea MySQL 5.0.4 sau mai mare. Versiunea actuală este: %s" INSTL_DATABASE_INVALID_MYSQLI_VERSION="Pentru a continua instalarea aveți nevoie de versiunea MySQL 5.0.4 sau mai mare. Versiunea actuală este: %s" +INSTL_DATABASE_INVALID_PDOMYSQL_VERSION="Pentru a continua instalarea aveți nevoie de versiunea MySQL 5.0.4 sau mai mare. Versiunea actuală este: %s" +INSTL_DATABASE_INVALID_POSTGRESQL_VERSION="Pentru a continua instalarea aveți nevoie de versiunea PostgreSQL 8.3.18 sau mai mare. Versiunea actuală este: %s" INSTL_DATABASE_INVALID_SQLSRV_VERSION="Pentru a continua instalarea aveți nevoie de versiunea SQL Server 2008 R2 (10.50.1600.1) sau mai mare. Versiunea actuală este: %s" INSTL_DATABASE_INVALID_SQLZURE_VERSION="Pentru a continua instalarea aveți nevoie de versiunea SQL Server 2008 R2 (10.50.1600.1) sau mai mare. Versiunea actuală este: %s" INSTL_DATABASE_INVALID_TYPE="Alegeți tipul bazei de date" @@ -249,6 +255,7 @@ INSTL_NOTICEYOUCANSTILLINSTALL="
    Puteţi continua instalarea, deoarece con INSTL_OUTPUT_BUFFERING="Output Buffering" INSTL_PARSE_INI_FILE_AVAILABLE="Suport INI Parser" INSTL_PHP_VERSION="Versiune PHP" +INSTL_PHP_VERSION_NEWER="Versiune PHP >= %s" INSTL_REGISTER_GLOBALS="Register Globals Off" INSTL_SAFE_MODE="Safe Mode" INSTL_SESSION_AUTO_START="Auto Start Sesiune" @@ -308,6 +315,7 @@ SITE_NAME="Nume site" MYSQL="MySQL" MYSQLI="MySQLi" ORACLE="Oracle" +PDOMYSQL="MySQL (PDO)" POSTGRESQL="PostgreSQL" SQLAZURE="Microsoft SQL Azure" SQLITE="SQLite" diff --git a/installation/language/ro-RO/ro-RO.xml b/installation/language/ro-RO/ro-RO.xml index 19fac81b04d9e..21a65c4bb4241 100644 --- a/installation/language/ro-RO/ro-RO.xml +++ b/installation/language/ro-RO/ro-RO.xml @@ -1,14 +1,13 @@ Română (România) - 3.2.0 - 2013-11-26 + 3.5.1 + 27-03-2016 Horia Negura - Quanta - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - ro-RO.ini diff --git a/installation/language/ru-RU/ru-RU.ini b/installation/language/ru-RU/ru-RU.ini index 3ec51c785cdd1..740ea7d2b2f49 100644 --- a/installation/language/ru-RU/ru-RU.ini +++ b/installation/language/ru-RU/ru-RU.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/ru-RU/ru-RU.xml b/installation/language/ru-RU/ru-RU.xml index 7554b1e99bf33..24724604e3133 100644 --- a/installation/language/ru-RU/ru-RU.xml +++ b/installation/language/ru-RU/ru-RU.xml @@ -6,9 +6,8 @@ 3.2.0 2012-09-27 Joomlaportal.ru - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - Русский языковой файл для мастера установки Joomla ru-RU.ini diff --git a/installation/language/si-LK/si-LK.ini b/installation/language/si-LK/si-LK.ini index efaeffdf1a6ba..e641a8954b50e 100644 --- a/installation/language/si-LK/si-LK.ini +++ b/installation/language/si-LK/si-LK.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/si-LK/si-LK.xml b/installation/language/si-LK/si-LK.xml index abdcd18e5ea00..12f0b00a4b2fc 100644 --- a/installation/language/si-LK/si-LK.xml +++ b/installation/language/si-LK/si-LK.xml @@ -6,9 +6,8 @@ 3.2.0 July 2014 Denuwan Wijewardena (Sri Lanka) - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - si-LK.ini diff --git a/installation/language/sk-SK/sk-SK.ini b/installation/language/sk-SK/sk-SK.ini index 5d837bdd40def..4d4d794c69edd 100644 --- a/installation/language/sk-SK/sk-SK.ini +++ b/installation/language/sk-SK/sk-SK.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 @@ -29,6 +29,7 @@ INSTL_PHP_VERSION_NEWER="Verzia PHP >= %s" ; Database view INSTL_DATABASE="Nastavenie databázy" +INSTL_DATABASE_FIX_LOWERCASE="Pre PostgreSQL musí byť predpona tabuľky zadaná malými písmenami." INSTL_DATABASE_HOST_DESC="Zvyčajne to je "localhost"" INSTL_DATABASE_HOST_LABEL="Meno hostiteľa" INSTL_DATABASE_NAME_DESC="Niektoré hostingové spoločnosti umožňujú vytvorenie len niekoľkých databáz na serveri. V takomto prípade môžete použiť predponu tabuľky, čím odlíšite rôzne weby." diff --git a/installation/language/sk-SK/sk-SK.xml b/installation/language/sk-SK/sk-SK.xml index 572773e0c5393..9c36103c33c08 100644 --- a/installation/language/sk-SK/sk-SK.xml +++ b/installation/language/sk-SK/sk-SK.xml @@ -1,15 +1,13 @@ Slovak (Slovenčina) - 3.4.4 + 3.5.0 August 2015 Joomla! Project - www.joomla.org - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - Slovak language file for Joomla! 3.x installation sk-SK.ini diff --git a/installation/language/sl-SI/sl-SI.ini b/installation/language/sl-SI/sl-SI.ini new file mode 100644 index 0000000000000..a541c01da2806 --- /dev/null +++ b/installation/language/sl-SI/sl-SI.ini @@ -0,0 +1,323 @@ +; Joomla! Project +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; License GNU General Public License version 2 or later; see LICENSE.txt +; Note : All ini files need to be saved as UTF-8 + +;Stepbar +INSTL_STEP_COMPLETE_LABEL="Končano" +INSTL_STEP_DATABASE_LABEL="Baza podatkov" +INSTL_STEP_DEFAULTLANGUAGE_LABEL="Izberite privzeti jezik" +INSTL_STEP_FTP_LABEL="FTP" +INSTL_STEP_LANGUAGES_LABEL="Namestite jezike" +INSTL_STEP_SITE_LABEL="Nastavitve" +INSTL_STEP_SUMMARY_LABEL="Pregled" + +;Language view +INSTL_SELECT_LANGUAGE_TITLE="Izberite jezik" +INSTL_WARNJAVASCRIPT="Opozorilo! Javascript mora biti omogočen za pravilno namestitev Joomla!" +INSTL_WARNJSON="Vaša PHP namestitev mora imeti JSON omogočeno, za namestitev Joomla!" + +;Preinstall view +INSTL_PRECHECK_TITLE="Pre-namestitev preverjanje" +INSTL_PRECHECK_DESC="Če katerega koli od teh elementov niso podprta (označena kot ne) potem prosim sprejeti ukrepe za njihovo odpravljanje. < br / > ne morete namestiti Joomla! dokler vaš setup izpolnjuje spodaj navedene zahteve." +INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Zahtevane nastavitve:" +INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Te nastavitve se priporočajo za PHP, da bi zagotovili popolno združljivost z Joomla.
    Vendar bo Joomla! še vedno delovala, če se vaše nastavitve povsem ne ujemajo priporočeno konfiguracijo." +INSTL_PRECHECK_DIRECTIVE="Direktiva" +INSTL_PRECHECK_RECOMMENDED="Zahtevano" +INSTL_PRECHECK_ACTUAL="Dejansko" + +; Database view +INSTL_DATABASE="Nastavitev baze podatkov" +INSTL_DATABASE_HOST_DESC="To je običajno "_QQ_"localhost"_QQ_"." +INSTL_DATABASE_HOST_LABEL="Ime gostitelja" +INSTL_DATABASE_NAME_DESC="Nekateri gostitelji omogočajo le določeno DB ime na stran. Uporaba predpone tabele v tem primeru za izrazito Joomla! strani." +INSTL_DATABASE_NAME_LABEL="Ime baze podatkov" +INSTL_DATABASE_NO_SCHEMA="Ne obstaja baza shema za ta tip baze podatkov." +INSTL_DATABASE_OLD_PROCESS_DESC="Vse obstoječe varnostne tabele iz nekdanje Joomla! naprav bo treba zamenjati." +INSTL_DATABASE_OLD_PROCESS_LABEL="Stara baza podatkov proces" +INSTL_DATABASE_PASSWORD_DESC="Za varnost strani, uporabite geslo za zbirko podatkov, račun je obvezno." +INSTL_DATABASE_PASSWORD_LABEL="Geslo" +INSTL_DATABASE_PREFIX_DESC="Izberite predpono tabelo ali uporabite naključno generiran. V idealnem primeru, treh ali štirih znakov, vsebuje samo alfanumerične znake in se mora končati v podčrtaj. Prepričajte se, da predpona izbrali ne uporablja drugih tabel." +INSTL_DATABASE_PREFIX_LABEL="Predpona tabele" +INSTL_DATABASE_PREFIX_MSG="Predpona tabela mora začeti s črko lahko sledijo poljubne črke in številke in podčrtaj" +INSTL_DATABASE_TYPE_DESC="To je verjetno "_QQ_"MySQLi"_QQ_"." +INSTL_DATABASE_TYPE_LABEL="Tip baze podatkov" +INSTL_DATABASE_USER_DESC="Bodisi nekaj kot "_QQ_"root"_QQ_" ali uporabniško ime, ki ga gostiteljice." +INSTL_DATABASE_USER_LABEL="Uporabniško ime" + +;FTP view +INSTL_AUTOFIND_FTP_PATH="Samodejno Najdi FTP pot" +INSTL_FTP="FTP nastavitev" +INSTL_FTP_DESC="

    Na nekaterih strežnikih, boste morda morali zagotoviti FTP poverilnice za dokončanje namestitve. Če imate težave pri končani namestitvi brez teh mandatov, se posvetujte s svojim gostiteljem, da ugotovi, če je to potrebno.

    Iz varnostnih razlogov, je najbolje, da ustvarite ločeno FTP uporabniški račun z dostopom do Joomla! namestitve, ne pa celotnega spletnega strežnika. Vaš gostitelj vam lahko pomagajo pri tem

    Opomba:.. Če želite namestiti na operacijski sistem Windows, FTP plast ni zahtevano " +INSTL_FTP_ENABLE_LABEL="Omogočite FTP postavitev" +INSTL_FTP_HOST_LABEL="FTP gostitelj" +INSTL_FTP_PASSWORD_LABEL="FTP Geslo" +INSTL_FTP_PORT_LABEL="FTP Vrata" +INSTL_FTP_ROOT_LABEL="FTP Korenska pot" +INSTL_FTP_SAVE_LABEL="Shrani FTP geslo" +INSTL_FTP_TITLE="FTP nastavitve ( Neobvezno - Večina uporabnikov lahko ta korak preskoči - Pritisniti Naprej za Preskoči )" +INSTL_FTP_USER_LABEL="FTP uporabniško ime" +INSTL_VERIFY_FTP_SETTINGS="Preverite FTP nastavitev" +INSTL_FTP_SETTINGS_CORRECT="Korekcija nastavitev" +INSTL_FTP_USER_DESC="OPOZORILO! Priporočljivo je, da pustite to prazno in vnesite FTP uporabniško ime vsakič, ko prenašate datoteke." +INSTL_FTP_PASSWORD_DESC="OPOZORILO! Priporočljivo je, da pustite to prazno in vnesite FTP uporabniško ime vsakič, ko prenašate datoteke." + +;Site View +INSTL_SITE="Glavna nastavitev" +INSTL_ADMIN_EMAIL_LABEL="E-mail skrbnika" +INSTL_ADMIN_EMAIL_DESC="Vnesite e-poštni naslov. To bo e-poštni naslov na spletni strani Super uporabnik." +INSTL_ADMIN_PASSWORD_LABEL="Geslo skrbnika" +INSTL_ADMIN_PASSWORD_DESC="Nastavi geslo za Super uporabniški račun in potrdite v spodnje polje." +INSTL_ADMIN_PASSWORD2_LABEL="Potrdite geslo skrbnika" +INSTL_ADMIN_USER_LABEL="Uporabniško ime skrbnika" +INSTL_ADMIN_USER_DESC="Nastavite uporabniško ime za vaš Super uporabnik račun." +INSTL_SITE_NAME_LABEL="Ime strani" +INSTL_SITE_NAME_DESC="Vpišite ime vaše Joomla! strani." +INSTL_SITE_METADESC_LABEL="Opis" +INSTL_SITE_METADESC_TITLE_LABEL="Vnesite opis celotne spletne strani, ki se uporablja z iskalniki. Na splošno, največ 20 besed je optimalno." +INSTL_SITE_OFFLINE_LABEL="Stran nedosegljiva" +INSTL_SITE_OFFLINE_TITLE_LABEL="Nastavite ospredje strani brez povezave, ko je namestitev dokončana. Stran lahko nastavite spletne kasneje skozi globalno konfiguracijo." +INSTL_SITE_INSTALL_SAMPLE_LABEL="Namesti vzorčne podatke" +INSTL_SITE_INSTALL_SAMPLE_DESC="Namestitev vzorčnih podatkov je zelo priporočljiva za začetnike.
    To bo namestilo vzorce vsebine, ki je vključeni v Joomla! namestitvenem paketu." +INSTL_SITE_INSTALL_SAMPLE_NONE="Nobeden (potrebne za ustvarjanje osnovno native večjezično spletno stran)" +INSTL_SAMPLE_BLOG_SET="Blog English (GB) Vzorčni podatki" +INSTL_SAMPLE_BROCHURE_SET="Brošura English (GB) Vzorčni podatki" +INSTL_SAMPLE_DATA_SET="Privzeto English (GB) Vzorčni podatki" +INSTL_SAMPLE_LEARN_SET="Učenje Joomle English (GB) vzorčni podatki" +INSTL_SAMPLE_TESTING_SET="Test English (GB) Vzorčni podatki" +INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Namestite Joomla z enim menijem in obrazcem za prijavo, brez vsebine." +INSTL_SAMPLE_BLOG_SET_DESC="Namestite Joomla z nekaj prispevkov in blog povezanih modulom, kot so starejše objave, blog roll, največ prebrane objave." +INSTL_SAMPLE_BROCHURE_SET_DESC="Namestite Joomla z nekaj strani (meni s strani domov, o nas, novice, pišite nam) in modulov, kot iskanje, po meri, prijavni obrazec." +INSTL_SAMPLE_DATA_SET_DESC="Namestite Joomla z eno stranjo (meni z eno povezavo) in modulom, kot so Najnovejši prispevki, Prijavni obrazec." +INSTL_SAMPLE_LEARN_SET_DESC="Namestite Joomla z vzorčnimi prispevki, ki opisujejo, kako Joomla dela." +INSTL_SAMPLE_TESTING_SET_DESC="Namestite Joomla z vsemi možnimi meniji za pomoč pri testiranju Joomla." + +;Summary view +INSTL_FINALISATION="Dokončanje" +INSTL_SUMMARY_INSTALL="Namestitev" +INSTL_SUMMARY_EMAIL_LABEL="Nastavitev e-maila" +INSTL_SUMMARY_EMAIL_DESC="Pošlji nastavitve za %s po e-pošti po namestitvi." +INSTL_SUMMARY_EMAIL_PASSWORDS_LABEL="Vključi gesla v e-pošti" +INSTL_SUMMARY_EMAIL_PASSWORDS_DESC="OPOZORILo! Priporočljivo je, da ne pošiljate in shranjujete gesel v e-pošti." + +;Installing view +INSTL_INSTALLING="Nameščam...." +INSTL_INSTALLING_DATABASE_BACKUP="Varnostno kopiranje stare tabele zbirke podatkov" +INSTL_INSTALLING_DATABASE_REMOVE="Odstrani stare tabele zbirke podatkov" +INSTL_INSTALLING_DATABASE="Ustvari tabele zbirke podatkov" +INSTL_INSTALLING_SAMPLE="Nameščanje vzorčnih podatkov" +INSTL_INSTALLING_CONFIG="Ustvarjanje konfiguracijske datoteke" +INSTL_INSTALLING_EMAIL="Pošiljanje e-pošte za %s" + +;Email +INSTL_EMAIL_SUBJECT="Konfiguracija Podrobnosti: %s" +INSTL_EMAIL_HEADING="Spodaj lahko najdete nastavitve za novo namestitev Joomla! Spletna stran:" +INSTL_EMAIL_NOT_SENT="E-pošte ni bilo mogoče poslati." + +;Complete view +INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Podatki Administrativne prijave" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Mapa installation je že izbrisana." +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_ERROR_FOLDER_DELETE="Mapo installation ni bilo mogoče izbrisati. Prosimo, ročno izbrišite mapo." +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_FOLDER_REMOVED="Mapa installation je uspešno odstranjena." +INSTL_COMPLETE_LANGUAGE_1="Joomla! v vašem jeziku in/ali ustvarjanje samodejno osnovne native večjezične strani" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_LANGUAGE_DESC="Preden odstranite installation mapo, lahko namestite dodatne jezike. Če želite dodati dodatne jezike za vašo Joomla! Uporaba izberite gumb naslednje." +INSTL_COMPLETE_LANGUAGE_DESC2="Opomba: potrebovali boste dostop do interneta za Joomla! prenesti in namestiti nove jezike. < br / > nekaterih strežnika konfiguracije ne dovoli Joomla! namestite na jezike. Če je to vaš primer, ne skrbite, boste lahko namestite pozneje z Joomla! Skrbnik." +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_REMOVE_FOLDER="Odstrani mapo installation" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_REMOVE_INSTALLATION="PROSIM NE POZABITE POPOLNOMA ODSTRANITI INSTALLATION MAPO. < br / > ne boste mogli nadaljevati po tej točki, dokler ni namestitvena mapa je odstranjena. To je varnostna funkcija, Joomla!" +INSTL_COMPLETE_TITLE="Čestitamo! Joomla! je zdaj nameščena." +INSTL_COMPLETE_INSTALL_LANGUAGES="Dodatni koraki: Namestitev jezikov" + +;Languages view +INSTL_LANGUAGES="Namestite jezikovni paket" +INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Jezik" +INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Različica" +INSTL_LANGUAGES_DESC="Joomla vmesnik je na voljo v več jezikih. Izberite svoje priljubljene jezike tako, da izberete potrditvena polja in nato namestite tako, da izberete naslednji gumb. < br / > Opomba: Ta operacija bo trajalo približno 10 sekund prenesti in namestiti vsak jezik. Da bi se izognili časovne omejitve, izberite največ 3 jeziki umestiti." +INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Operacija bo traja do 10 sekund na jezik za dokončanje < br / > Počakajte, smo prenesti in namestiti jezikov..." +INSTL_LANGUAGES_MORE_LANGUAGES="Pritisnite gumb »Nazaj«, če želite namestiti več jezikov." +INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Nobena jeziku so bila izbrana za nameščanje. Če želite namestiti več jezikov, pritisnite gumb »Nazaj« in izberite želene jezike s seznama." +INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! se ne more povezati s strežnikom jezikov. Prosimo, dokončajte namestitev." +INSTL_LANGUAGES_WARNING_NO_INTERNET2="Opomba: Lahko namestite jezike, pozneje z Joomla! Skrbnik" +INSTL_LANGUAGES_WARNING_BACK_BUTTON="Vrni se na zadnji korak namestitve" + +;Default language view +INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE="Aktivirajte Večjezično funkcijo" +INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="Če je aktiven, vaše spletne strani Joomla so večjezično funkcijo aktivne s lokaliziranih meniji za vsak nameščeni jezik." +INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN="Omogoči vtičnik kode jezika" +INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN_DESC="Če omogočeno, bo jezik zbornik čep dodati možnost, da spremenite šifro jezika v ustvarjeni HTML dokumenta za izboljšanje SEO." +INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Privzeti jezik skrbništva" +INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Joomla ni mogel nastaviti jezik kot privzeto. Angleščina se uporabijo kot privzeti jezik za Backend Administrator." +INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Joomla je določila za %s privzeti jezik SKRBNIKA." +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Izbor" +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Jezik" +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="Oznaka" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CONTENT_LANGUAGE="Joomla ni mogel samodejno ustvariti vsebine jezik %s" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU="Joomla ne more samodejno ustvariti %s meni" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_ITEM="Joomla ne more samodejno ustvariti menija domov %s" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_MODULE="Joomla ne more samodejno ustvariti v %s meniju modula" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CATEGORY="Joomla ne more samodejno ustvariti %s vsebinske kategorije" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_ARTICLE="Joomla ne more samodejno ustvariti lokaliziranih prispevkov %s" +INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_MODULESWHITCHER_LANGUAGECODE="Joomla ne more samodejno objaviti, modul preklopnik jezika" +INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGECODE="Joomla ne more samodejno omogočiti vtičnik kode jezika" +INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGEFILTER="Joomla ne more samodejno omogočiti vtičnik filter jezika" +INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Joomla ne more namestiti %s jezika." +INSTL_DEFAULTLANGUAGE_COULD_NOT_PUBLISH_MOD_MULTILANGSTATUS="Joomla ne more samodejno objaviti, modul status jezika" +INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="Joomla ne more samodejno objaviti privzeti meni modul" +INSTL_DEFAULTLANGUAGE_DESC="Joomla je nameščen v teh jezikih. Izberite želeni jezik za Joomla Administrator." +INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla je nameščen v teh jezikih. Izberite želeni jezik za Joomla Ospredje." +INSTL_DEFAULTLANGUAGE_FRONTEND="Privzeti jezik strani" +INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla ni mogel nastaviti jezik kot privzeto. Angleški bo uporabljen kot privzeti jezik za Ospredje strani." +INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Joomla je določila za %s privzeti jezik STRANI." +INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Namestiti lokalizirane vsebine" +INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Če je aktiven, Joomla samodejno ustvari eno kategorijo vsebine na vsak nameščeni jezik. Tudi, en Priporočeni izdelek, ki vsebuje lutke vsebino bo ustvaril na vsaki kategoriji." +INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Večjezično" +INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Ta oddelek vam omogoča, da samodejno aktivirate Joomla! Večjezične funkcije." +INSTL_DEFAULTLANGUAGE_TRY_LATER="Morda ne boste mogli namestiti pozneje preko Joomla! Skrbništva" + +; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español +INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Slovenščina (SL)" + +;Database Model +INSTL_DATABASE_COULD_NOT_CONNECT="Ne morem se povezati z bazo podatkov. Povezava je vrnila številko: %s" +INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="Namestitveni program ni mogel vzpostaviti določeno zbirko podatkov in ni uspel ustvariti zbirke podatkov. Preverite nastavitve in če je potrebno ročno ustvarite zbirko podatkov." +INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Ne morem osvežiti manifest predpomnilnika za razširitev: %s" +INSTL_DATABASE_EMPTY_NAME="511" +INSTL_DATABASE_ERROR_BACKINGUP="Prišlo je do nekaj napak pri varnostnem kopiranju baze podatkov." +INSTL_DATABASE_ERROR_CREATE="Prišlo je do napake pri poskusu ustvarjanja zbirke podatkov %s. < br / > uporabnik morda nima dovolj privilegijev ustvariti bazo podatkov. Zahtevana zbirka podatkov morda morali posebej ustvarjena, preden namestite Joomla!" +INSTL_DATABASE_ERROR_DELETE="Prišlo je do napake pri brisanju baze podatkov." +INSTL_DATABASE_FIELD_VALUE_REMOVE="Odstrani" +INSTL_DATABASE_FIELD_VALUE_BACKUP="Varnostno kopiranje" +INSTL_DATABASE_FIX_LOWERCASE="Predpona tabela z malimi črkami za PostgreSQL." +INSTL_DATABASE_FIX_TOO_LONG="Tabela predpona MySQL mora imeti največ 15 znakov." +INSTL_DATABASE_INVALID_DB_DETAILS="Podrobnosti baze podatkov, predvideni so napačni in / ali prazni." +INSTL_DATABASE_INVALID_MYSQL_VERSION="Potrebovali boste MySQL 5.0.4 ali višje za nadaljevanje namestitve. Vaša različica je: %s" +INSTL_DATABASE_INVALID_MYSQLI_VERSION="Potrebovali boste MySQL 5.0.4 ali višje za nadaljevanje namestitve. Vaša različica je: %s" +INSTL_DATABASE_INVALID_PDOMYSQL_VERSION="Potrebovali boste MySQL 5.0.4 ali višje za nadaljevanje namestitve. Vaša različica je: %s" +INSTL_DATABASE_INVALID_POSTGRESQL_VERSION="Morate PostgreSQL 8.3.18 ali višjo želite nadaljevati namestitev. Je vaša verzija: %s" +INSTL_DATABASE_INVALID_SQLSRV_VERSION="Potrebujete SQL Server 2008 R2 (10.50.1600.1) ali višje za nadaljevanje z namestitvijo. Vaša različica je: %s" +INSTL_DATABASE_INVALID_SQLZURE_VERSION="Potrebujete SQL Server 2008 R2 (10.50.1600.1) ali višje za nadaljevanje z namestitvijo. Vaša različica je: %s" +INSTL_DATABASE_INVALID_TYPE="Prosimo izberite vrsto baze podatkov" +INSTL_DATABASE_NAME_TOO_LONG="Ime MySQL baze podatkov mora biti največ 64 znakov." +INSTL_DATABASE_INVALID_NAME="MySQL različice do 5.1.6, ne smejo vsebovati obdobij ali drugih 'posebnih' znakov v imenu. Vaša različica je: %s" +INSTL_DATABASE_NAME_INVALID_SPACES="MySQL ime baze in imena tabele se ne sme začeti ali končati s presledki." +INSTL_DATABASE_NAME_INVALID_CHAR="MySQL indifikator lahko vsebujejo NULL ASCII(0x00)." +INSTL_DATABASE_FILE_DOES_NOT_EXIST="Datoteka %s ne obstaja" + +;controllers +INSTL_COOKIES_NOT_ENABLED="Zdi se da Piškotki niso omogočeni v vašem brskalniku. Ne boste mogli namestiti aplikacijo če je ta funkcija onemogočena. Druga možnost je, da bi lahko bil tudi problem s strežnikom session.save_path. Če je temu tako, se obrnite na svojega ponudnika gostovanja, če ne veste, sami kako to preveriti ali popraviti." +INSTL_HEADER_ERROR="Napaka" + +;Helpers +INSTL_PAGE_TITLE="Joomla! spletna namestitev" + +;Configuration model +INSTL_ERROR_CONNECT_DB="Ne morem se povezati z bazo podatkov. Povezava je vrnila številko: %s" +INSTL_STD_OFFLINE_MSG="Stran je v vzdrževanju.
    Prosimo pridite kmalu nazaj." + +;FTP model +INSTL_FTP_INVALIDROOT="Določena FTP mapa ni mapa to Joomla! namestitev" +INSTL_FTP_NOCONNECT="Ne morem se povezati s FTP strežnikom" +INSTL_FTP_NODELE="Funkcija "_QQ_"DELE"_QQ_" ni uspela." +INSTL_FTP_NODIRECTORYLISTING="Seznam iz strežnika FTP mapo ni bilo mogoče pridobiti." +INSTL_FTP_NOLIST="Funkcija "_QQ_"LIST"_QQ_" ni uspela." +INSTL_FTP_NOLOGIN="Ne morem se prijaviti v FTP strežnik." +INSTL_FTP_NOMKD="Funkcija "_QQ_"MKD"_QQ_" ni uspela." +INSTL_FTP_NONLST="Funkcija "_QQ_"NLST"_QQ_" ni uspela." +INSTL_FTP_NOPWD="Funkcija "_QQ_"PWD"_QQ_" ni uspela." +INSTL_FTP_NORETR="Funkcija "_QQ_"RETR"_QQ_" ni uspela." +INSTL_FTP_NORMD="Funkcija "_QQ_"RMD"_QQ_" ni uspela." +INSTL_FTP_NOROOT="Ne morem dostopati do določene mape FTP." +INSTL_FTP_NOSTOR="Funkcija "_QQ_"STOR"_QQ_" ni uspela." +INSTL_FTP_NOSYST="Funkcija "_QQ_"SYST"_QQ_" ni uspela." +INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Ne morem samodejno zaznati FTP korensko mapo." + +;others +INSTL_CONFPROBLEM="Konfiguracijska datoteka ali mapa ni zapisljiv ali je prišlo do težave, ustvarjanje konfiguracijske datoteke. Morate naložiti naslednjo kodo z roko. Izberite na področju besedila izpostaviti vse kode in nato prilepite v novo besedilno datoteko. Ime te datoteke "_QQ_"configuration.php"_QQ_" in naložite vašo stran korensko mapo." +INSTL_DATABASE_SUPPORT="Baza podatkov Podpora:" +INSTL_DISPLAY_ERRORS="Prikaz napak" +INSTL_ERROR_DB="Prišlo je do nekaj napak pri selitvi baza podatkov: %s" +INSTL_ERROR_INITIALISE_SCHEMA="Ne morem zagnati sheme baze podatkov" +INSTL_FILE_UPLOADS="Naložene datoteke" +INSTL_GNU_GPL_LICENSE="Objavljeno pod GNU Splošno Javno Licenco" +INSTL_JSON_SUPPORT_AVAILABLE="JSON Podpora" +INSTL_MAGIC_QUOTES_GPC="Čarobni Citati GPC izklopljeni" +INSTL_MAGIC_QUOTES_RUNTIME="Čarobne Citati čas trajanja" +INSTL_MB_LANGUAGE_IS_DEFAULT="MB Jezik je privzeti" +INSTL_MB_STRING_OVERLOAD_OFF="MB Niz preobremenitve izklopljen" +INSTL_NOTICEMBLANGNOTDEFAULT="PHP mbstring jezik ni nastavljen v nevtralni položaj. To je mogoče nastaviti na lokalni ravni z vnosom php_value mbstring.language neutral v vaši .htaccess datoteki." +INSTL_NOTICEMBSTRINGOVERLOAD="PHP mbstring preobremenitev funkcija je nastavljena. To je mogoče izklopiti lokalno z vnosom php_value mbstring.func_overload 0 v vaši .htaccess datoteki." +INSTL_NOTICEYOUCANSTILLINSTALL="< br / > lahko še vedno nadaljujete namestitev kot nastavitev bo prikazan na koncu. Boste morali ročno nalaganje kodo. Izberite na področju besedila izpostaviti vse kode in nato prilepite v novo besedilno datoteko. Ime te datoteke "_QQ_"configuration.php"_QQ_" in naložite vašo stran korensko mapo." +INSTL_OUTPUT_BUFFERING="Izhodno medpomnjenje" +INSTL_PARSE_INI_FILE_AVAILABLE="INI Razčlenjevalnik Podpora" +INSTL_PHP_VERSION="PHP različica" +INSTL_PHP_VERSION_NEWER="PHP različice > = %s" +INSTL_REGISTER_GLOBALS="Registrirajte se GLOBALS Off" +INSTL_SAFE_MODE="Varni način" +INSTL_SESSION_AUTO_START="Samodejni začetek seje" +INSTL_WRITABLE="%s Zapisljivo" +INSTL_XML_SUPPORT="XML Podpora" +INSTL_ZIP_SUPPORT_AVAILABLE="Native ZIP podpora" +INSTL_ZLIB_COMPRESSION_SUPPORT="Zlib stiskanje podpora" +INSTL_PROCESS_BUSY="Postopek je v teku. počakajte, prosim..." + +;Global strings +JADMINISTRATOR="Skrbnik" +JCHECK_AGAIN="Preverite znova" +JERROR="Napaka" +JEMAIL="E-naslov" +JGLOBAL_ISFREESOFTWARE="%s je brezplačna programska oprema izdana pod %s." +JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="Jezikovni paket se ne ujema s to Joomla! različico. Mogoče manjkajo nekateri nizi." +JGLOBAL_SELECT_AN_OPTION="Izberite možnost" +JGLOBAL_SELECT_NO_RESULTS_MATCH="Ni zadetkov" +JGLOBAL_SELECT_SOME_OPTIONS="Izberite nekaj možnosti" +JINVALID_TOKEN="Najnovejša zahteva zavrnjena, ker je vsebovala neveljaven varnostni žeton. Prosimo, osvežite stran in poskusite znova." +JNEXT="Naprej" +JNO="Ne" +JNOTICE="Obvestilo" +JOFF="Izključeno" +JON="Vklopljeno" +JPREVIOUS="Nazaj" +JSITE="Stran" +JUSERNAME="Uporabniško ime" +JYES="Da" + +; Framework strings necessary when no lang pack is available +JLIB_DATABASE_ERROR_CONNECT_MYSQL="Ne morem se povezati na MySQL." +JLIB_DATABASE_ERROR_DATABASE="Prišlo je do napake zbirke podatkov." +JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Ne morem naložiti gonilnika zbirke podatkov: %s" +JLIB_ENVIRONMENT_SESSION_EXPIRED="Vaša seja je potekla, prosimo ponovno naložite stran." +JLIB_FILESYSTEM_ERROR_COPY_FAILED="Kopiranje ni uspelo" +JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :datoteke: Pot ni mapa. Pot: %s" +JLIB_FORM_FIELD_INVALID="Neveljavno polje: " +JLIB_FORM_VALIDATE_FIELD_INVALID="Neveljavno polje: %s" +JLIB_FORM_VALIDATE_FIELD_REQUIRED="Polja so obvezna: %s" +JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Namestitev: Napaka kopiranja datoteke %1$s v %2$s." +JLIB_INSTALLER_NOT_ERROR="Če se napaka povezana z namestitvijo TinyMCE jezikovnih datotek nima vpliva na namestitev jezika (-ov). Nekatere jezikovne pakete, ustvarjeni pred Joomla! 3.2.0 lahko poskusite namestiti ločene TinyMCE jezikovnih datotek. Ker so ti zdaj vključene v jedru jih ni več treba namestiti." +JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Ne morem se povezati z bazo podatkov
    joomla.library: %1$s - %2$s" + +; Strings for the language debugger +JDEBUG_LANGUAGE_FILES_IN_ERROR="Razčlenjevanje napak v jezikovnih datotekah" +JDEBUG_LANGUAGE_UNTRANSLATED_STRING="Neprevedeni nizi" +JNONE="Noben" + +; Necessary for errors +ADMIN_EMAIL="E-mail skrbnika" +ADMIN_PASSWORD="Geslo skrbnika" +ADMIN_PASSWORD2="Potrdite geslo skrbnika" +SITE_NAME="Ime strani" + +; Database types (allows for a more descriptive label than the internal name) +MYSQL="MySQL " +MYSQLI="MySQLi" +ORACLE="Oracle" +PDOMYSQL="MySQL (PDO)" +POSTGRESQL="PostgreSQL" +SQLAZURE="Microsoft SQL Azure" +SQLITE="SQLite" +SQLSRV="Microsoft SQL Server" + diff --git a/installation/language/sl-SI/sl-SI.xml b/installation/language/sl-SI/sl-SI.xml new file mode 100644 index 0000000000000..c0f2ee75f7f30 --- /dev/null +++ b/installation/language/sl-SI/sl-SI.xml @@ -0,0 +1,21 @@ + + + Slovenian (Slovenia) + 3.5.0 + 2016-01-22 + + Copyright (C) 2005 - 2016 Open Source Matters. Vse pravice pridržane. + http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL + sl-SI jezik namestitve + + sl-SI.ini + + + Slovenian (Slovenia) + sl-SI + 0 + + + diff --git a/installation/language/sr-RS/sr-RS.ini b/installation/language/sr-RS/sr-RS.ini index 14ee3ef75c810..0a717a13385eb 100644 --- a/installation/language/sr-RS/sr-RS.ini +++ b/installation/language/sr-RS/sr-RS.ini @@ -1,6 +1,5 @@ -; @date 2015-01-30 -; @author Joomla! Project -; @copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; @author Joomla! Project +; @copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; @license GNU General Public License version 2 or later; see LICENSE.txt ; @note Client Installation ; @note All ini files need to be saved as UTF-8 @@ -90,7 +89,7 @@ INSTL_SAMPLE_LEARN_SET="Научите Joomla English (GB) пример" INSTL_SAMPLE_TESTING_SET="Тест English (GB) пример" INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Joomla! инсталација са само једним менијем и формом за пријављивање, без примера садржаја." INSTL_SAMPLE_BLOG_SET_DESC="Joomla инсталација са неколико чланака и одговарајућим блог модулима као што су модули за старе или најчитаније текстове и сл." -INSTL_SAMPLE_BROCHURE_SET_DESC="Joomla инсталација са неколико страна (мени са ставкама: Home, About Us, News, Contact Us) и модулима за претрагу, пријаву или Custom HTML." +INSTL_SAMPLE_BROCHURE_SET_DESC="Joomla инсталација са неколико страна (мени са ставкама: Home, About Us, News, Contact Us) и модулима за претрагу, пријаву." INSTL_SAMPLE_DATA_SET_DESC="Joomla инсталација са једном страном (мени са једним линком) и модулима као што су најновији чланци или форма за пријаву." INSTL_SAMPLE_LEARN_SET_DESC="Joomla инсталација са чланцима који описују како ради Joomla." INSTL_SAMPLE_TESTING_SET_DESC="Инсталација Joomle са свим могућим ставкама да би се помогло тестирање Joomle." @@ -119,14 +118,15 @@ INSTL_EMAIL_NOT_SENT="Ел. пошта не може бити послата." ;Complete view INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Детаљи администраторске пријаве" -INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Инсталациони директоријум је већ обрисан." -INSTL_COMPLETE_ERROR_FOLDER_DELETE="Инсталациони директоријум не може бити обрисан. Молим, обришите га ручно." -INSTL_COMPLETE_FOLDER_REMOVED="Инсталациони директоријум је успешно обрисан" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="installation директоријум је већ обрисан." +INSTL_COMPLETE_ERROR_FOLDER_DELETE="installation директоријум не може бити обрисан. Молим, обришите га ручно." +INSTL_COMPLETE_FOLDER_REMOVED="installation директоријум је успешно обрисан" INSTL_COMPLETE_LANGUAGE_1="Joomla! на вашем језику и/или аутоматско инсталирање основног вишејезичког сајта" -INSTL_COMPLETE_LANGUAGE_DESC="Пре него што обришете инсталациони директоријум можете инсталирати додатне језике. Ако желите да додате језик за ваш сајт кликните на дугме." +INSTL_COMPLETE_LANGUAGE_DESC="Пре него што обришете installation директоријум можете инсталирати додатне језике. Ако желите да додате језик за ваш сајт кликните на дугме." INSTL_COMPLETE_LANGUAGE_DESC2="Напомена: потребан вам је приступ интернету да би Joomla! могла преузети инсталирати нове језике.
    Неке конфигурације сервера, неће дозволити да Joomla! инсталира језике. У том случају, не брините, можете инсталирати језике касније из администраторског дела сајта." -INSTL_COMPLETE_REMOVE_FOLDER="Обришите инсталациони директоријум" -INSTL_COMPLETE_REMOVE_INSTALLATION="НЕМОЈТЕ ЗАБОРАВИТИ ДА ОБРИШЕТЕ ИНСТАЛАЦИОНИ ДИРЕКТОРИЈУМ
    Нећете моћи да радите даље док се не уклони инсталациони директоријум. Ово је безбедносни корак." +INSTL_COMPLETE_REMOVE_FOLDER="Обришите installation директоријум" +INSTL_COMPLETE_REMOVE_INSTALLATION="НЕМОЈТЕ ЗАБОРАВИТИ ДА ОБРИШЕТЕ installation ДИРЕКТОРИЈУМ
    Нећете моћи да радите даље док се не уклони installation директоријум. Ово је безбедносни корак." INSTL_COMPLETE_TITLE="Честитам! Joomla! је инсталирана." INSTL_COMPLETE_INSTALL_LANGUAGES="Додатни кораци: Инсталација језика" @@ -189,6 +189,7 @@ INSTL_DATABASE_ERROR_CREATE="Грешка приликом прављења ба INSTL_DATABASE_ERROR_DELETE="Појавиле су се грешке приликом брисања базе." INSTL_DATABASE_FIELD_VALUE_REMOVE="Обриши" INSTL_DATABASE_FIELD_VALUE_BACKUP="Резервна копија" +INSTL_DATABASE_FIX_LOWERCASE="Префикс табела Postgresql базе мора бити написан малим словима." INSTL_DATABASE_FIX_TOO_LONG="Префикс MySQL табеле мора имати највише 15 карактера" INSTL_DATABASE_INVALID_DB_DETAILS="Садржај базе је погрешан и/или празан." INSTL_DATABASE_INVALID_MYSQL_VERSION="Потребан је MySQL 5.0.4 или новији за наставак инсталације. Ваша верзија је: %s" diff --git a/installation/language/sr-RS/sr-RS.xml b/installation/language/sr-RS/sr-RS.xml index 4a182ff5349c4..6379838f707b5 100644 --- a/installation/language/sr-RS/sr-RS.xml +++ b/installation/language/sr-RS/sr-RS.xml @@ -1,14 +1,13 @@ Serbian Cyrillic - 3.4.2 - 17-9-2012 + 3.5.0 + 2016 joomla-serbia.com - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - sr-RS.ini diff --git a/installation/language/sr-YU/sr-YU.ini b/installation/language/sr-YU/sr-YU.ini index d2382deea203b..9489e921df8fe 100644 --- a/installation/language/sr-YU/sr-YU.ini +++ b/installation/language/sr-YU/sr-YU.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 @@ -89,7 +89,7 @@ INSTL_SAMPLE_LEARN_SET="Naučite Joomla English (GB) primer" INSTL_SAMPLE_TESTING_SET="Test English (GB) primer" INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Joomla! instalacija sa samo jednim menijem i formom za prijavljivanje, bez primera sadržaja." INSTL_SAMPLE_BLOG_SET_DESC="Joomla instalacija sa nekoliko članaka i odgovarajućim blog modulima kao što su moduli za stare ili najčitanije tekstove i sl." -INSTL_SAMPLE_BROCHURE_SET_DESC="Joomla instalacija sa nekoliko strana (meni sa stavkama: Home, About Us, News, Contact Us) i modulima za pretragu, prijavu ili Custom HTML." +INSTL_SAMPLE_BROCHURE_SET_DESC="Joomla instalacija sa nekoliko strana (meni sa stavkama: Home, About Us, News, Contact Us) i modulima za pretragu, prijavu." INSTL_SAMPLE_DATA_SET_DESC="Joomla instalacija sa jednom stranom (meni sa jednim linkom) i modulima kao što su najnoviji članci ili forma za prijavu." INSTL_SAMPLE_LEARN_SET_DESC="Joomla instalacija sa člancima koji opisuju kako radi Joomla." INSTL_SAMPLE_TESTING_SET_DESC="Instalacija Joomle sa svim mogućim stavkama da bi se pomoglo testiranje Joomle." @@ -118,14 +118,15 @@ INSTL_EMAIL_NOT_SENT="El. pošta ne može biti poslata." ;Complete view INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Detalji administratorske prijave" -INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Instalacioni direktorijum je već obrisan." -INSTL_COMPLETE_ERROR_FOLDER_DELETE="Instalacioni direktorijum ne može biti obrisan. Molim, obrišite ga ručno." -INSTL_COMPLETE_FOLDER_REMOVED="Instalacioni direktorijum je uspešno obrisan" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="installation direktorijum je već obrisan." +INSTL_COMPLETE_ERROR_FOLDER_DELETE="installation direktorijum ne može biti obrisan. Molim, obrišite ga ručno." +INSTL_COMPLETE_FOLDER_REMOVED="installation direktorijum je uspešno obrisan" INSTL_COMPLETE_LANGUAGE_1="Joomla! na vašem jeziku i/ili automatsko instaliranje osnovnog višejezičkog sajta" -INSTL_COMPLETE_LANGUAGE_DESC="Pre nego što obrišete instalacioni direktorijum možete instalirati dodatne jezike. Ako želite da dodate jezik za vaš sajt kliknite na dugme." +INSTL_COMPLETE_LANGUAGE_DESC="Pre nego što obrišete installation direktorijum možete instalirati dodatne jezike. Ako želite da dodate jezik za vaš sajt kliknite na dugme." INSTL_COMPLETE_LANGUAGE_DESC2="Napomena: potreban vam je pristup internetu da bi Joomla! mogla preuzeti instalirati nove jezike.
    Neke konfiguracije servera, neće dozvoliti da Joomla! instalira jezike. U tom slučaju, ne brinite, možete instalirati jezike kasnije iz administratorskog dela sajta." -INSTL_COMPLETE_REMOVE_FOLDER="Obrišite instalacioni direktorijum" -INSTL_COMPLETE_REMOVE_INSTALLATION="NEMOJTE ZABORAVITI DA OBRIŠETE INSTALACIONI DIREKTORIJUM
    Nećete moći da radite dalje dok se ne ukloni instalacioni direktorijum. Ovo je bezbednosni korak." +INSTL_COMPLETE_REMOVE_FOLDER="Obrišite installation direktorijum" +INSTL_COMPLETE_REMOVE_INSTALLATION="NEMOJTE ZABORAVITI DA OBRIŠETE installation DIREKTORIJUM
    Nećete moći da radite dalje dok se ne ukloni installation direktorijum. Ovo je bezbednosni korak." INSTL_COMPLETE_TITLE="Čestitam! Joomla! je instalirana." INSTL_COMPLETE_INSTALL_LANGUAGES="Dodatni koraci: Instalacija jezika" @@ -189,6 +190,7 @@ INSTL_DATABASE_ERROR_DELETE="Pojavile su se greške prilikom brisanja baze." INSTL_DATABASE_FIELD_VALUE_REMOVE="Obriši" INSTL_DATABASE_FIELD_VALUE_BACKUP="Rezervna kopija" INSTL_DATABASE_FIX_TOO_LONG="Prefiks MySQL tabele mora imati najviše 15 karaktera" +INSTL_DATABASE_FIX_LOWERCASE="Prefiks tabela Postgresql baze mora biti napisan malim slovima." INSTL_DATABASE_INVALID_DB_DETAILS="Sadržaj baze je pogrešan i/ili prazan." INSTL_DATABASE_INVALID_MYSQL_VERSION="Potreban je MySQL 5.0.4 ili noviji za nastavak instalacije. Vaša verzija je: %s" INSTL_DATABASE_INVALID_MYSQLI_VERSION="Potreban je MySQL 5.0.4 ili noviji za nastavak instalacije. Vaša verzija je: %s" diff --git a/installation/language/sr-YU/sr-YU.xml b/installation/language/sr-YU/sr-YU.xml index 6c513b689d63a..74bb9899a82e8 100644 --- a/installation/language/sr-YU/sr-YU.xml +++ b/installation/language/sr-YU/sr-YU.xml @@ -1,14 +1,13 @@ Serbian Latin - 3.4.2 - 17-9-2012 + 3.5.0 + 2016 joomla-serbia.com - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - sr-YU.ini diff --git a/installation/language/srp-ME/srp-ME.ini b/installation/language/srp-ME/srp-ME.ini index 5f9a0526d1a06..1f0f46a0ee156 100644 --- a/installation/language/srp-ME/srp-ME.ini +++ b/installation/language/srp-ME/srp-ME.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 diff --git a/installation/language/srp-ME/srp-ME.xml b/installation/language/srp-ME/srp-ME.xml index d3921a5d645bf..e3ead4057dd1f 100644 --- a/installation/language/srp-ME/srp-ME.xml +++ b/installation/language/srp-ME/srp-ME.xml @@ -6,9 +6,8 @@ 3.2.0 03-10-2013 Tolja - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - srp-ME.ini diff --git a/installation/language/sv-SE/sv-SE.ini b/installation/language/sv-SE/sv-SE.ini index f8b3b50f8c6d6..6f51e31fb02ac 100644 --- a/installation/language/sv-SE/sv-SE.ini +++ b/installation/language/sv-SE/sv-SE.ini @@ -1,7 +1,7 @@ -; Joomla! Swedish Translation version 3.4.0 - 2015-02-19 -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Joomla! Swedish Translation version 3.4.5 - 2015-11-09 +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php -; Copyright (C) Translation 2005 - 2015 Joomla Sweden Translator Team: Stefan Gagner, Sune Hultman, Olle Zettergeren (www.svenskjoomla.se) +; Copyright (C) Translation 2005 - 2016 Joomla Sweden Translator Team: Stefan Gagner, Sune Hultman, Olle Zettergeren (www.svenskjoomla.se) ; Note : All ini files need to be saved as UTF-8 - No BOM @@ -90,7 +90,7 @@ INSTL_SAMPLE_LEARN_SET="Lär dig Joomla engelsk (GB) exempelata" INSTL_SAMPLE_TESTING_SET="Test engelsk (GB) exempelata" INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Installera Joomla med endast en meny och loginformulär, utan något innehåll." INSTL_SAMPLE_BLOG_SET_DESC="Installera Joomla med endast några få artiklar och bloggrelaterade moduler såsom Gamla inlägg, Bloggroller, Mest lästa inlägg." -INSTL_SAMPLE_BROCHURE_SET_DESC="Installera Joomla med några få sidor (en meny med sidorna Hem, Om oss, Nyheter, Kontakta oss) och moduler såsom Sök, Egen HTML, Logga in." +INSTL_SAMPLE_BROCHURE_SET_DESC="Installera Joomla med några få sidor (en meny med sidorna Hem, Om oss, Nyheter, Kontakta oss) och moduler såsom Sök, Egen, Logga in." INSTL_SAMPLE_DATA_SET_DESC="Installera Joomla med en sida (en meny med en länk) och moduler såsom Senaste artiklarna, Logga in." INSTL_SAMPLE_LEARN_SET_DESC="Installera Joomla med exempelartiklar som beskriver hur Joomla fungerar." INSTL_SAMPLE_TESTING_SET_DESC="Installera Joomla med alla typer av menyobjekt för hjälp att prova Joomla." diff --git a/installation/language/sv-SE/sv-SE.xml b/installation/language/sv-SE/sv-SE.xml index d31033e55406b..2d0aab70dbc59 100644 --- a/installation/language/sv-SE/sv-SE.xml +++ b/installation/language/sv-SE/sv-SE.xml @@ -1,14 +1,13 @@ Svenska (SE) - 3.4.2 + 3.5.0 2012-09-19 Swedish Translation Team - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - sv-SE.ini diff --git a/installation/language/sw-KE/sw-KE.ini b/installation/language/sw-KE/sw-KE.ini index 6605e25063cbf..d542c0a5fe8cc 100644 --- a/installation/language/sw-KE/sw-KE.ini +++ b/installation/language/sw-KE/sw-KE.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. +; Copyright (C) 2005 - 2016 Open Source Matters. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8; Note : All ini files need to be saved as UTF-8 @@ -28,6 +28,7 @@ INSTL_PRECHECK_ACTUAL="Halisi" ; Mtazamo wa hifadthidata INSTL_DATABASE="Usanidi wa hifadhidata" +INSTL_DATABASE_FIX_LOWERCASE="Prefix ya jedwali lazima iwe na herufi ndogo ndogo kwa PostgreSQL." INSTL_DATABASE_HOST_DESC="Hii ni ya kawaida "localhost"" INSTL_DATABASE_HOST_LABEL="Jina la hosti" INSTL_DATABASE_NAME_DESC="Baadhi ya hosti zinaruhusu jina mmoja la hifadhidata pekee kwa tovuti moja. Katika hali hii, tumia prefix ya jedwali kwa tovuti tofauti za Joomla!" @@ -86,8 +87,8 @@ INSTL_SAMPLE_DATA_SET="Data za mfano Default English (GB)" INSTL_SAMPLE_LEARN_SET="Data za mfano Learn Joomla English (GB)" INSTL_SAMPLE_TESTING_SET="Data za mfano Test English (GB)" INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Sakinisha Joomla pamoja na menyu moja pekee na fomu ya kuingia, bila yaliomo yoyote." -INSTL_SAMPLE_BLOG_SET_DESC="Sakinisha Joomla pamoja na makala machache na moduli zinazolingana na blogi, kama zilizotumwa za zamani, mwenendo wa blogi, zilizotumwa ambazo zimesomwa sana." -INSTL_SAMPLE_BROCHURE_SET_DESC="Sakinisha Joomla pamoja na kurasa chache (menyu na kurasa za Nyumbani, Kuhusu Sisi, Habari, Wasiliana Nasi) na moduli kama tafuta, HTML ya desturi, fomu ya kuingia." +INSTL_SAMPLE_BLOG_SET_DESC="Sakinisha Joomla pamoja na makala machache na moduli zinazolingana na blogu, kama vile Zilizotumwa za zamani, Mwenendo wa blogu, na Zilizotumwa ambazo zimesomwa sana." +INSTL_SAMPLE_BROCHURE_SET_DESC="Sakinisha Joomla pamoja na kurasa chache (menyu na kurasa za Nyumbani, Kuhusu Sisi, Habari, Wasiliana Nasi) na moduli kama vile Tafuta, Desturi, na Fomu ya kuingia." INSTL_SAMPLE_DATA_SET_DESC="Sakinisha Joomla pamoja na ukurasa mmoja (menyu na kiungo kimoja) na moduli kama makala ya hivi karibuni, fomu ya kuingia." INSTL_SAMPLE_LEARN_SET_DESC="Sakinisha Joomla pamoja na makala za mfano ambazo zitaeleza vile Joomla inafanya kazi." INSTL_SAMPLE_TESTING_SET_DESC="Sakinisha Joomla pamoja na vitu vyote vya menyu vinavyowezekana kwa kusaidia kujaribu Joomla." @@ -124,7 +125,7 @@ INSTL_COMPLETE_ERROR_FOLDER_DELETE="Folda ya installation haiwezi kufutwa. Tafad INSTL_COMPLETE_FOLDER_REMOVED="Folda ya installation imetolewa vizuri" INSTL_COMPLETE_LANGUAGE_1="Joomla! kwa lugha yako au/ama kujitengezea tovuti ya kawaida ya lugha nyingi za asili" ; neno 'installation' halitafsiriwi kwa sababu ni folda ya kimwili. -INSTL_COMPLETE_LANGUAGE_DESC="Kabla ya kutoa folda ya installation, unaweza kusakinisha lugha zingine. Ikiwa unataka kuongeza lugha zingine kwa maombi yako ya Joomla!, chagua kibonyezo kinachofwata." +INSTL_COMPLETE_LANGUAGE_DESC="Kabla ya kutoa folda ya installation, unaweza kusakinisha lugha zingine. Ikiwa unataka kuongeza lugha zingine kwa maombi yako ya Joomla!, teua kibonyezo kinachofwata." INSTL_COMPLETE_LANGUAGE_DESC2="Kumbuka: Itakupasa uwe na online kwa kuruhusu Joomla! kwa kushusha na kusakinisha lugha mpya.
    Baadhi ya usanidi wa seva hautaruhusu Joomla! kusakinisha lugha. Ikiwa matokeo yako ni hayo, usijali. Utaweza kusakinisha baadaye kwa kutumia msimamizi wa Joomla!" ; neno 'installation' halitafsiriwi kwa sababu ni folda ya kimwili. INSTL_COMPLETE_REMOVE_FOLDER="Ondoa folda ya kusakinisha" @@ -137,7 +138,7 @@ INSTL_COMPLETE_INSTALL_LANGUAGES="Hatua za ziada: Kusakinisha lugha" INSTL_LANGUAGES="Sakinisha paketi za lugha" INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Lugha" INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Toleo" -INSTL_LANGUAGES_DESC="Kusano la Joomla linapatikana katika lugha tofauti. Chagua lugha yako unayopendelea kwa kuchagua vijisanduku vya tiki na sakinisha kwa kuchagua kibonyezo 'Ifuatayo'.
    Kumbuka: Uendeshaji huu utachukua muda wa sekunde kumi kwa kushusha na kusakinisha kila lugha. Kwa kutopoteza muda ulionao, tafadhali usichague lugha zaidi ya tatu kwa kusakinisha." +INSTL_LANGUAGES_DESC="Kusano la Joomla linapatikana katika lugha tofauti. Chagua lugha yako unayopendelea kwa kuteua vijisanduku vya tiki na sakinisha kwa kuteua kibonyezo Ifuatayo.
    Kumbuka: Uendeshaji huu utachukua muda wa sekunde kumi kwa kushusha na kusakinisha kila lugha. Kwa kutopoteza muda ulionao, tafadhali usichague lugha zaidi ya tatu kwa kusakinisha." INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Uendeshaji huu utachukua muda wa sekunde kumi kwa kumaliza kila lugha.
    Tafadhali ngojea wakati inashusha na kunasakinisha lugha..." INSTL_LANGUAGES_MORE_LANGUAGES="Bofya kibonyezo 'Iliopita' ikiwa unataka kusakinisha lugha nyingi" INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Hakuna lugha zilizochaguliwa kwa kusakinisha. Ikiwa unataka kusakinisha lugha nyingi, bofya kibonyezo 'Iliopita' na chagua lugha unayopenda kutoka kwa orodha." @@ -236,7 +237,7 @@ INSTL_FTP_NOSYST="Imekataa jukumu la "_QQ_"SYST"_QQ_"." INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Haiwezi kujigundua kwa folda ya enzi ya FTP." ;Wengineo -INSTL_CONFPROBLEM="Faili au folda yako ya usanidi haiandikiki au kulikuwa na matatizo katika kutengeza faili ya usanidi. Itakubidi upakie kodi ifuatayo kwa mkono. Chagua ndani ya eneo la maandishi kwa kualamisha kodi zote, na ubandike ndani ya faili mpya ya maandishi. Ipatie jina faili hii 'configuration.php' na pakia katika folda ya enzi ya tovuti yako." +INSTL_CONFPROBLEM="Faili au folda yako ya usanidi haiandikiki au kulikuwa na matatizo katika kutengeza faili ya usanidi. Itakubidi upakie kodi ifuatayo kwa mkono. Teua eneo la maandishi kwa kualamisha kodi zote, na ubandike ndani ya faili mpya ya maandishi. Ipatie jina faili hii 'configuration.php' na pakia katika folda ya enzi ya tovuti yako." INSTL_DATABASE_SUPPORT="Usaidizi wa hifadhidata:" INSTL_DISPLAY_ERRORS="Onyesha makosa" INSTL_ERROR_DB="Baadhi ya makosa yalitokea wakati wa kuweka data ndani ya hifadhidata: %s" @@ -250,7 +251,7 @@ INSTL_MB_LANGUAGE_IS_DEFAULT="Lugha ya MB ni difoti" INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload zima" INSTL_NOTICEMBLANGNOTDEFAULT="PHP mbstring language haijawekwa upande wowote. Yaweza kuwekwa kwa kawaida kwa kuingiza php_value mbstring.language neutral ndani ya faili yako .htaccess." INSTL_NOTICEMBSTRINGOVERLOAD="PHP mbstring function overload imewekwa. Yaweza kuzimwa kwa kawaida kwa kuingiza php_value mbstring.func_overload 0 ndani ya faili yako .htaccess." -INSTL_NOTICEYOUCANSTILLINSTALL="
    Unaweza kuendelea na usakinishaji kama matayarisho ya usanidi yataonyeshwa mwishoni. Itakubidi upakie kodi ifwatayo kwa mkono. Chagua ndani ya eneo la maandishi kwa kualamisha kodi zote, na ubandike ndani ya faili mpya ya maandishi. Ipatie jina faili hii 'configuration.php' na pakia katika folda ya enzi kwa tovuti yako." +INSTL_NOTICEYOUCANSTILLINSTALL="
    Unaweza kuendelea na usakinishaji kama matayarisho ya usanidi yataonyeshwa mwishoni. Itakubidi upakie kodi ifwatayo kwa mkono. Teua eneo la maandishi kwa kualamisha kodi zote, na ubandike ndani ya faili mpya ya maandishi. Ipatie jina faili hii 'configuration.php' na pakia katika folda ya enzi kwa tovuti yako." INSTL_OUTPUT_BUFFERING="Kinga ya pato" INSTL_PARSE_INI_FILE_AVAILABLE="Usaidizi wa uchanganuaji wa INI" INSTL_PHP_VERSION="Toleo la PHP" diff --git a/installation/language/sw-KE/sw-KE.xml b/installation/language/sw-KE/sw-KE.xml index af6590a55d2f9..69733491dd164 100644 --- a/installation/language/sw-KE/sw-KE.xml +++ b/installation/language/sw-KE/sw-KE.xml @@ -1,14 +1,13 @@ Swahili (East Africa) - 3.4.4 - August 2015 + 3.5.0 + January 2016 Hassan Abdalla - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - sw-KE.ini diff --git a/installation/language/sy-IQ/sy-IQ.ini b/installation/language/sy-IQ/sy-IQ.ini index f2f214321c3d4..e1403c1cef827 100644 --- a/installation/language/sy-IQ/sy-IQ.ini +++ b/installation/language/sy-IQ/sy-IQ.ini @@ -1,4 +1,4 @@ -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt see LICENSE.php ; Note : All ini files need to be saved as UTF-8 - No BOM @@ -87,7 +87,7 @@ INSTL_SAMPLE_LEARN_SET="ܠܘܦ ܓ̰ܘܡܐ ܐܢܓܠܣ (GB) ܛܘܦ̮ܣ̈ܐ ܕܡܘ INSTL_SAMPLE_TESTING_SET="ܨܚܨܝ ܠܐܢܓܠܣ (GB) ܛܘܦ̮ܣܐ ܕܡܘܕܥܢܘܢܘܬܐ" INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="ܢܨܘܒ݂ ܓ̰ܘܡܠܐ ܐܚܟ̰ܝ ܒܚܕܐ ܠܘܚܝܬܐ ܘ ܩܠܒ݂ܐ ܕܥܒ݂ܪܬܐ, ܕܠܐ ܚܕ ܚܘܫܒܘܢܐ." INSTL_SAMPLE_BLOG_SET_DESC="ܢܨܘܒ݂ ܓ̰ܘܡܠܐ ܥܡ ܚܕܟܡܐ ܡܐܡܪ̈ܐ ܘ ܡܘܕܘܠ̈ܐ ܠܒܝܬܘܬܐ ܕܒܠܘܓܐ ܐܝܟ݂ ܫܕܪ̈ܝܬܐ ܥܬܝܩ̈ܐ, ܓܪܐ ܕܒܠܘܓܐ, ܐܢܝ ܫܕܪ̈ܝܬܐ ܒܫ ܩܪ̈ܝܐ." -INSTL_SAMPLE_BROCHURE_SET_DESC="ܢܨܘܒ݂ ܓ̰ܘܡܠܐ ܥܡ ܚܕܟܡܐ ܦܬܘܬ̈ܐ (ܚܕܐ ܠܘܚܝܬܐ ܥܡ ܒܝܬܐ ܕܦܬܘܬ̈ܐ, ܒܘܬ ܕܝܢ, ܛܒ̈ܐ, ܡܘܛܝܐ ܥܡܢ) ܘܡܘܕܘܠ̈ܐ ܐܝܟܼ ܒܨܝܐ, ܠܚܝܡܐ HTML, ܩܠܒ݂ܐ ܕܥܒ݂ܪܬܐ." +INSTL_SAMPLE_BROCHURE_SET_DESC="ܢܨܘܒ݂ ܓ̰ܘܡܠܐ ܥܡ ܚܕܟܡܐ ܦܬܘܬ̈ܐ (ܚܕܐ ܠܘܚܝܬܐ ܥܡ ܒܝܬܐ ܕܦܬܘܬ̈ܐ, ܒܘܬ ܕܝܢ, ܛܒ̈ܐ, ܡܘܛܝܐ ܥܡܢ) ܘܡܘܕܘܠ̈ܐ ܐܝܟܼ ܒܨܝܐ, ܠܚܝܡܐ, ܩܠܒ݂ܐ ܕܥܒ݂ܪܬܐ." INSTL_SAMPLE_DATA_SET_DESC="ܢܨܘܒ݂ ܓ̰ܘܡܠܐ ܥܡ ܚܕܐ ܦܬܐ (ܚܕܐ ܠܘܚܝܬܐ ܥܡ ܚܕ ܐܣܪܐ) ܘܡܘܕܘܠܐ ܐܝܟ݂ ܡܐܡܪܐ ܚܪܝܐ، ܩܠܒ݂ܐ ܕܥܒ݂ܪܬܐ" INSTL_SAMPLE_LEARN_SET_DESC="ܢܨܘܒ݂ ܓ̰ܘܡܐ ܥܡ ܡܐܡܪ̈ܐ ܕܛܘܦ̮ܣܐ ܐܢܝ ܕܬܢܘܝܐ ܝܠܗ ܕܐܟ݂ܝ ܓ̰ܘܡܠܐ ܒܦܠܚܐ ܝܠܗ." INSTL_SAMPLE_TESTING_SET_DESC="ܢܨܘܒ݂ ܓ̰ܘܡܠܐ ܥܡ ܟܠܝܗܝ ܐܣܛܘܟ݂ܣ̈ܐ ܡܬܡܨܝܢ̈ܐ ܕܠܘܚܝܬܐ ܕܥܕܪܢ ܠܢܘܣܝܐ ܕܓ̰ܘܡܠܐ." diff --git a/installation/language/sy-IQ/sy-IQ.xml b/installation/language/sy-IQ/sy-IQ.xml index 7db41b3c9655b..46c089626f021 100644 --- a/installation/language/sy-IQ/sy-IQ.xml +++ b/installation/language/sy-IQ/sy-IQ.xml @@ -1,14 +1,13 @@ Syriac (sy-IQ) - 3.2.0 + 3.5.0 2012-09-25 East Syriac Translation Team - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - sy-IQ.ini diff --git a/installation/language/ta-IN/ta-IN.ini b/installation/language/ta-IN/ta-IN.ini index e1228df03e03e..81c732827e497 100644 --- a/installation/language/ta-IN/ta-IN.ini +++ b/installation/language/ta-IN/ta-IN.ini @@ -1,5 +1,5 @@ -; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Joomla! Project +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 @@ -89,7 +89,7 @@ INSTL_SAMPLE_LEARN_SET="கற்க Joomla! - ஆங்கிலம்/English INSTL_SAMPLE_TESTING_SET="பரிசோதனை - ஆங்கிலம்/English (GB) மாதிரித் தரவு" INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="உள்ளடக்கம் இல்லாமல், ஒரு பட்டி மற்றும் புகுபதிகை படிவம் மட்டுமே கொண்ட Joomla!-வை நிறுவுக." INSTL_SAMPLE_BLOG_SET_DESC="சில கட்டுரைகள் மற்றும் வலைப்பதிவு தொடர்பான கூறகங்கள் (உ-ம்: சமீபத்தியச் செய்திகள், செய்திச் சுருக்கம், அதிகம் படிக்கப் பெற்ற தகவல்) கொண்ட Joomla!-வை நிறுவுக." -INSTL_SAMPLE_BROCHURE_SET_DESC="சில பக்கங்கள் (உ-ம்: முகப்பு, எங்களைப் பற்றி, செய்திகள், மற்றும் தொடர்பு கொள்க போன்ற பக்கங்கள் கொண்ட பட்டி) மற்றும் கூறகங்கள் (உ-ம்: தேடுக, தனிப்பயன் HTML, புகுபதிகை படிவம்) கொண்ட Joomla!-வை நிறுவுக." +INSTL_SAMPLE_BROCHURE_SET_DESC="சில பக்கங்கள் (உ-ம்: முகப்பு, எங்களைப் பற்றி, செய்திகள், மற்றும் தொடர்பு கொள்க போன்ற பக்கங்கள் கொண்ட பட்டி) மற்றும் கூறகங்கள் (உ-ம்: தேடுக, தனிப்பயன், புகுபதிகை படிவம்) கொண்ட Joomla!-வை நிறுவுக." INSTL_SAMPLE_DATA_SET_DESC="ஒரு பக்கம் (ஒரு இணைப்பைக் கொண்ட பட்டி) மற்றும் கூறகங்கள் (உ-ம்: சமீபத்தியச் செய்திகள், புகுபதிகை படிவம்) கொண்ட Joomla!-வை நிறுவுக." INSTL_SAMPLE_LEARN_SET_DESC="Joomla! எவ்வாறு வேலை செய்கிறது என்பதை விவரிக்கும் எடுத்துக்காட்டுக் கட்டுரைகள் கொண்ட Joomla!-வை நிறுவுக." INSTL_SAMPLE_TESTING_SET_DESC="சோதனைக்கு உதவும் வகையில், சாத்தியமான அனைத்து பட்டி உருப்படிகளையும் கொண்ட Joomla!-வை நிறுவுக." @@ -194,6 +194,7 @@ INSTL_DATABASE_ERROR_CREATE="%s என்ற தரவுத்தளத்த INSTL_DATABASE_ERROR_DELETE="தரவுத்தளத்தை நீக்கும்போது சில பிழைகள் ஏற்பட்டுள்ளன." INSTL_DATABASE_FIELD_VALUE_REMOVE="நீக்குக" INSTL_DATABASE_FIELD_VALUE_BACKUP="காப்பு நகலெடுக்க" +INSTL_DATABASE_FIX_LOWERCASE="PostgreSQL-க்கு அட்டவணை முன்-ஒட்டு (Table Prefix) ஆனது சிற்றெழுத்துக்களில் (Lowercase) இருக்க வேண்டும்." INSTL_DATABASE_FIX_TOO_LONG="MySQL அட்டவணையின் முன்-ஒட்டு கட்டாயம் 15 உருக்களுக்கு மிகாமல் இருக்க வேண்டும்." INSTL_DATABASE_INVALID_DB_DETAILS="கொடுக்கப்பட்ட தரவுத்தள (Database) விவரங்கள் (details) தவறானவை மற்றும்/அல்லது வெறுமையானவை." INSTL_DATABASE_INVALID_MYSQL_VERSION="நிறுவலைத் தொடர, தங்களுக்கு MySQL 5.0.4 அல்லது அதற்கும் மேலானது தேவை. தங்கள் பதிப்பு: %s" diff --git a/installation/language/ta-IN/ta-IN.xml b/installation/language/ta-IN/ta-IN.xml index f8dad1e14ac00..ae3906be66997 100644 --- a/installation/language/ta-IN/ta-IN.xml +++ b/installation/language/ta-IN/ta-IN.xml @@ -1,14 +1,13 @@ Tamil (INDIA) - 3.4.4 + 3.5.0 August 2015 Ilagnayeru 'MIG' Manickam, Elango Samy Manim - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - Tamil (India) language installation pack for Joomla ta-IN.ini diff --git a/installation/language/th-TH/th-TH.ini b/installation/language/th-TH/th-TH.ini index f133feae636df..13ee06a167bfe 100644 --- a/installation/language/th-TH/th-TH.ini +++ b/installation/language/th-TH/th-TH.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 @@ -42,7 +42,7 @@ INSTL_DATABASE_PREFIX_LABEL="คำนำหน้าตาราง" INSTL_DATABASE_PREFIX_MSG="คำนำหน้าฐานข้อมูล ต้องเริ่มต้นด้วยตัวอักษร จากนั้นจะใส่ตัวเลขหรือเครื่องหมายใดๆ ก็ได้" INSTL_DATABASE_TYPE_DESC="ส่วนใหญ่จะเป็น "MySQLi"" INSTL_DATABASE_TYPE_LABEL="ชนิดของฐานข้อมูล" -INSTL_DATABASE_USER_DESC="ใส่ชื่อผู้ใช้ เช่น "_QQ_"root"_QQ_" หรือหากไม่ทราบให้ติดต่อผู้ดูแลโฮส" +INSTL_DATABASE_USER_DESC="ใส่ชื่อผู้ใช้ เช่น "root" หรือหากไม่ทราบให้ติดต่อผู้ดูแลโฮส" INSTL_DATABASE_USER_LABEL="ชื่อผู้ใช้ฐานข้อมูล" ;FTP view @@ -55,7 +55,7 @@ INSTL_FTP_PASSWORD_LABEL="รหัสผ่าน FTP" INSTL_FTP_PORT_LABEL="FTP พอร์ต" INSTL_FTP_ROOT_LABEL="FTP รูทพาท" INSTL_FTP_SAVE_LABEL="บันทึกรหัสผ่าน FTP" -INSTL_FTP_TITLE="การตั้งค่า FTP (ทางเลือก - ผู้ใช้ส่วนใหญ่สามารถข้ามขั้นตอนนี้ไปได้)" +INSTL_FTP_TITLE="การตั้งค่า FTP (ทางเลือก - ผู้ใช้ส่วนใหญ่สามารถข้ามขั้นตอนนี้ไปได้)" INSTL_FTP_USER_LABEL="ชื่อผู้ใช้ FTP" INSTL_VERIFY_FTP_SETTINGS="ยืนยันการตั้งค่า FTP" INSTL_FTP_SETTINGS_CORRECT="ตั้งค่าได้" @@ -74,7 +74,7 @@ INSTL_ADMIN_USER_DESC="ตั้งชื่อผู้ใช้ของคุ INSTL_SITE_NAME_LABEL="ชื่อเว็บ" INSTL_SITE_NAME_DESC="ใส่ชื่อของเว็บ
    เคล็ดลับ: คุณสามารถใส่คำอธิบายสั้นๆ ลงไปได้ด้วย เช่น ชื่อเว็บ บริการของเว็บสั้นๆ" INSTL_SITE_METADESC_LABEL="คำอธิบายเว็บ" -INSTL_SITE_METADESC_TITLE_LABEL="ใส่คำอธิบายเว็บสั้นๆ ว่าเว็บคุณให้บริการอะไร เพื่อให้ระบบค้นหาเข้าใจเว็บคุณ" +INSTL_SITE_METADESC_TITLE_LABEL="ใส่คำอธิบายเว็บสั้นๆ ว่าเว็บคุณให้บริการอะไร เพื่อให้ระบบค้นหาเข้าใจเว็บคุณ โดยทั่วไปจะใส่ไม่เกิน 20 คำ" INSTL_SITE_OFFLINE_LABEL="ออฟไลน์เว็บไซต์" INSTL_SITE_OFFLINE_TITLE_LABEL="ทำการออฟไลน์เว็บไซต์เอาไว้หลังทำการติดตั้งเสร็จ หลังจากนั้นค่อยไปเปิดออนไลน์ได้ที่การตั้งค่าหลักของเว็บไซต์" INSTL_SITE_INSTALL_SAMPLE_LABEL="ติดตั้งข้อมูลตัวอย่าง" @@ -87,7 +87,7 @@ INSTL_SAMPLE_LEARN_SET="ข้อมูลตัวอย่าง เอาไ INSTL_SAMPLE_TESTING_SET="ข้อมูลตัวอย่าง ทดสอบ ภาษาอังกฤษ (GB)" INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="ติดตั้งจูมล่า โดยมีเพียงแค่เมนู และโมดูลล๊อกอินเข้าสู่ระบบ โดยที่ไม่มีเนื้อหาต่างๆ เลย" INSTL_SAMPLE_BLOG_SET_DESC="ติดตั้งจูมล่า โดยมีเนื้อหา และการแสดงผลแบบบล็อก มีโมดูลแสดงเนื้อหาที่เกี่ยวข้อง โมดูลเนื้อหายอดนิยม" -INSTL_SAMPLE_BROCHURE_SET_DESC="ติดตั้งจูมล่า โดยมีเนื้อหาเป็นหน้าๆ (จะมีเมนู หน้าแรก, เกี่ยวกับเรา, ข่าวสาร, ติดต่อเรา) และโมดูลค้นหา, Custom HTML, โมดูลล๊อกอิน" +INSTL_SAMPLE_BROCHURE_SET_DESC="ติดตั้งจูมล่า โดยมีเนื้อหาเป็นหน้าๆ (จะมีเมนู หน้าแรก, เกี่ยวกับเรา, ข่าวสาร, ติดต่อเรา) และมีโมดูลค้นหา, โมดูลกำหนดเอง, โมดูลล๊อกอิน" INSTL_SAMPLE_DATA_SET_DESC="ติดตั้งจูมล่า โดยมีเนื้อหาหนึ่งหน้า (มีเมนูลิงก์เดียว) และโมดูลที่แสดงเนื้อหาล่าสุด, โมดูลล๊อกอิน" INSTL_SAMPLE_LEARN_SET_DESC="ติดตั้งจูมล่า โดยมีเนื้อหาตัวอย่าง โดยจะมีเนื้อหาเกี่ยวกับวิธีการใช้งานจูมล่า" INSTL_SAMPLE_TESTING_SET_DESC="ติดตั้งจูมล่า โดยมีลิงก์เมนูทั้งหมด เพื่อช่วยให้ทดสอบการทำงานของจูมล่าได้" @@ -192,6 +192,7 @@ INSTL_DATABASE_ERROR_CREATE="เกิดข้อผิดพลาดขณะ INSTL_DATABASE_ERROR_DELETE="เกิดข้อผิดพลาดการลบฐานข้อมูล" INSTL_DATABASE_FIELD_VALUE_REMOVE="ลบทิ้ง" INSTL_DATABASE_FIELD_VALUE_BACKUP="สำรองฐานข้อมูล" +INSTL_DATABASE_FIX_LOWERCASE="การใส่คำนำหน้าฐานข้อมูลด้วยอักษรตัวเล็กสำหรับ Postgresql" INSTL_DATABASE_FIX_TOO_LONG="การใส่คำนำหน้าฐานข้อมูลจำกัดไม่เกิน 15 ตัวอักษร" INSTL_DATABASE_INVALID_DB_DETAILS="ฐานข้อมูลที่ให้รายละเอียดไม่ถูกต้องหรือคุณไม่ได้ใส่ข้อมูล" INSTL_DATABASE_INVALID_MYSQL_VERSION="คุณต้องใช้ MySQL 5.0.4 หรือสูงกว่าในการติดตั้ง รุ่นที่คุณใช้คือ: %s" @@ -202,13 +203,13 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="คุณต้องใช้ SQL Server INSTL_DATABASE_INVALID_SQLZURE_VERSION="คุณต้องใช้ SQL Server 2008 R2 (10.50.1600.1) หรือสูงกว่าในการติดตั้ง รุ่นที่คุณใช้คือ: %s" INSTL_DATABASE_INVALID_TYPE="โปรดเลือกชนิดของฐานข้อมูล" INSTL_DATABASE_NAME_TOO_LONG="ชื่อฐานข้อมูล MySQL จะต้องไม่เกิน 64 ตัวอักษร" -INSTL_DATABASE_INVALID_NAME="MySQL รุ่นก่อน 5.1.6 ต้องใช้ "_QQ_"คำพิเศษ"_QQ_" รุ่นที่คุณใช้คือ: %s" +INSTL_DATABASE_INVALID_NAME="MySQL รุ่นก่อน 5.1.6 ต้องใช้ "คำพิเศษ" รุ่นที่คุณใช้คือ: %s" INSTL_DATABASE_NAME_INVALID_SPACES="MySQL ชื่อฐานข้อมูลและชื่อตารางไม่สามารถใช่หรือลงท้ายด้วยช่องว่างได้" INSTL_DATABASE_NAME_INVALID_CHAR="MySQL ไม่สามารถทำงานได้ พบ NULL ASCII(0x00)" INSTL_DATABASE_FILE_DOES_NOT_EXIST="ไฟล์ %s ไม่มีอยู่" ;controllers -INSTL_COOKIES_NOT_ENABLED="คุกกี้ไม่ได้ถูกเปิดใช้งานในเบราว์เซอร์ของคุณ คุณจะไม่สามารถติดตั้งโปรแกรมได้หากปิดการใช้งานคุกกี้ หรืออาจจะมีปัญหากับเซิร์ฟเวอร์ของในส่วนของ session.save_path ถ้าเป็นกรณีนี้โปรดปรึกษาผู้ให้บริการโฮสของคุณ หากคุณไม่ทราบวิธีการตรวจสอบ หรือแก้ไขปัญหานี้ด้วยตัวเอง" +INSTL_COOKIES_NOT_ENABLED="คุกกี้ไม่ได้ถูกเปิดใช้งานในเบราว์เซอร์ของคุณ คุณจะไม่สามารถติดตั้งโปรแกรมได้หากปิดการใช้งานคุกกี้ หรืออาจจะมีปัญหากับเซิร์ฟเวอร์ของในส่วนของ session.save_path ถ้าเป็นกรณีนี้โปรดปรึกษาผู้ให้บริการโฮสของคุณ หากคุณไม่ทราบวิธีการตรวจสอบ หรือแก้ไขปัญหานี้ด้วยตัวเอง" INSTL_HEADER_ERROR="มีข้อผิดพลาด" ;Helpers @@ -221,19 +222,19 @@ INSTL_STD_OFFLINE_MSG="ขออภัยกำลังปรับปรุง ;FTP model INSTL_FTP_INVALIDROOT="โฟลเดอร์ FTP ที่ระบุ ไม่ใช่โฟลเดอร์ที่ติดตั้งจูมล่าเอาไว้" INSTL_FTP_NOCONNECT="ไม่สามารถเชื่อมต่อไปยังเซิร์ฟเวอร์ FTP" -INSTL_FTP_NODELE="ฟังก์ชัน "_QQ_"DELE"_QQ_" ล้มเหลว" +INSTL_FTP_NODELE="ฟังก์ชัน "DELE" ล้มเหลว" INSTL_FTP_NODIRECTORYLISTING="ไม่สามารถเรียกคืนรายการโฟลเดอร์จากเซิร์ฟเวอร์ FTP" -INSTL_FTP_NOLIST="ฟังก์ชัน "_QQ_"LIST"_QQ_" ล้มเหลว" +INSTL_FTP_NOLIST="ฟังก์ชัน "LIST" ล้มเหลว" INSTL_FTP_NOLOGIN="ไม่สามารถเข้าสู่เซิร์ฟเวอร์ FTP" -INSTL_FTP_NOMKD="ฟังก์ชัน "_QQ_"MKD"_QQ_" ล้มเหลว" -INSTL_FTP_NONLST="ฟังก์ชัน "_QQ_"NLST"_QQ_" ล้มเหลว" -INSTL_FTP_NOPWD="ฟังก์ชัน "_QQ_"PWD"_QQ_" ล้มเหลว" -INSTL_FTP_NORETR="ฟังก์ชัน "_QQ_"RETR"_QQ_" ล้มเหลว" -INSTL_FTP_NORMD="ฟังก์ชัน "_QQ_"RMD"_QQ_" ล้มเหลว" +INSTL_FTP_NOMKD="ฟังก์ชัน "MKD" ล้มเหลว" +INSTL_FTP_NONLST="ฟังก์ชัน "NLST" ล้มเหลว" +INSTL_FTP_NOPWD="ฟังก์ชัน "PWD" ล้มเหลว" +INSTL_FTP_NORETR="ฟังก์ชัน "RETR" ล้มเหลว" +INSTL_FTP_NORMD="ฟังก์ชัน "RMD" ล้มเหลว" INSTL_FTP_NOROOT="ไม่สามารถเข้าถึงโฟลเดอร์ FTP ที่ระบุได้" -INSTL_FTP_NOSTOR="ฟังก์ชัน "_QQ_"STOR"_QQ_" ล้มเหลว" -INSTL_FTP_NOSYST="ฟังก์ชัน "_QQ_"SYST"_QQ_" ล้มเหลว" -INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="ไม่สามารถตรวจจับอัตโนมัติโฟลเดอร์หลักได้" +INSTL_FTP_NOSTOR="ฟังก์ชัน "STOR" ล้มเหลว" +INSTL_FTP_NOSYST="ฟังก์ชัน "SYST" ล้มเหลว" +INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="ไม่สามารถตรวจจับโฟลเดอร์ FTP หลักแบบอัตโนมัติได้" ;others INSTL_CONFPROBLEM="ไฟล์ configuration หรือโฟลเดอร์ของคุณไม่สามารถเขียนได้ หรือมีปัญหาในการสร้างไฟล์ configuration คุณจะต้องอัปโหลด Code ต่อไปนี้ด้วยตัวเอง คลิกในพื้นที่ข้อความเพื่อไฮไลต์ Code ทั้งหมดแล้ววางลงในโปรแกรม Text Edittor แล้วบันทึกเป็น ชื่อ 'configuration.php' และอัปโหลดไปยังโฟลเดอร์ที่ติดตั้งจูมล่า" @@ -248,9 +249,9 @@ INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC Off" INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime" INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language is Default" INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Off" -INSTL_NOTICEMBLANGNOTDEFAULT="PHP mbstring ไม่ได้ถูกตั้งให้เป็นกลาง คุณสามารถตั้งในประเทศโดยการใส่ค่า php_value mbstring.language ให้เป็นกลาง ในไฟล์ .htaccess " -INSTL_NOTICEMBSTRINGOVERLOAD="PHP mbstring ฟังก์ชัน นี้สามารถปิดได้โดยการใส่ค่า php_value mbstring.func_overload 0 ในไฟล์ .htaccess " -INSTL_NOTICEYOUCANSTILLINSTALL="
    คุณสามารถติดตั้งต่อไปได้ ในขั้นตอนสุดท้ายระบบจะสร้าง Code ไฟล์ที่เป็นผลจากการตั้งค่าทั้งหมด ให้คุณทำการคัดลอกไปวางลงในโปรแกรม Text Edittor โดยสร้างไฟล์ใหม่ชื่อ 'configuration.php' จากนั้นให้บันทึกด้วยการเข้ารหัสแบบ utf-8 แล้วทำการอัพโหลดไปยังตำแหน่งราก ที่คุณติดตั้งจูมล่าเอาไว้บนเซิร์ฟเวอร์" +INSTL_NOTICEMBLANGNOTDEFAULT="PHP mbstring ไม่ได้ถูกตั้งให้เป็นกลาง คุณสามารถตั้งในประเทศโดยการใส่ค่า php_value mbstring.language ให้เป็นกลาง ในไฟล์ .htaccess" +INSTL_NOTICEMBSTRINGOVERLOAD="PHP mbstring ฟังก์ชัน นี้สามารถปิดได้โดยการใส่ค่า php_value mbstring.func_overload 0 ในไฟล์ .htaccess" +INSTL_NOTICEYOUCANSTILLINSTALL="
    คุณสามารถติดตั้งต่อไปได้ ในขั้นตอนสุดท้ายระบบจะสร้าง Code ไฟล์ที่เป็นผลจากการตั้งค่าทั้งหมด ให้คุณทำการคัดลอกไปวางลงในโปรแกรม Text Edittor โดยสร้างไฟล์ใหม่ชื่อ 'configuration.php' จากนั้นให้บันทึกด้วยการเข้ารหัสแบบ utf-8 แล้วทำการอัพโหลดไปยังตำแหน่งหลัก ที่คุณติดตั้งจูมล่าเอาไว้บนเซิร์ฟเวอร์" INSTL_OUTPUT_BUFFERING="Output Buffering" INSTL_PARSE_INI_FILE_AVAILABLE="INI Parser Support" INSTL_PHP_VERSION="PHP รุ่น" diff --git a/installation/language/th-TH/th-TH.xml b/installation/language/th-TH/th-TH.xml index 67048422e4296..9bbede537490c 100644 --- a/installation/language/th-TH/th-TH.xml +++ b/installation/language/th-TH/th-TH.xml @@ -1,14 +1,13 @@ Thai ไทย (ภาษาไทย) - 3.4.4 - August 2015 + 3.5.0 + March 2016 Thai Translation Team - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - th-TH.ini diff --git a/installation/language/tk-TM/tk-TM.ini b/installation/language/tk-TM/tk-TM.ini new file mode 100644 index 0000000000000..c739a74873ce3 --- /dev/null +++ b/installation/language/tk-TM/tk-TM.ini @@ -0,0 +1,322 @@ +; Joomla! Project +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. +; License GNU General Public License version 2 or later; see LICENSE.txt +; Note : All ini files need to be saved as UTF-8 + +;Stepbar +INSTL_STEP_COMPLETE_LABEL="Tamamla" +INSTL_STEP_DATABASE_LABEL="Maglumat Bazasy" +INSTL_STEP_DEFAULTLANGUAGE_LABEL="Bellenilen Dili Saýlaň" +INSTL_STEP_FTP_LABEL="FTP Sazlama" +INSTL_STEP_LANGUAGES_LABEL="Dilleri Gurnamak" +INSTL_STEP_SITE_LABEL="Saýtyň Sazlamalary" +INSTL_STEP_SUMMARY_LABEL="Umumy syn" + +;Language view +INSTL_SELECT_LANGUAGE_TITLE="Dil Saýlaň" +INSTL_WARNJAVASCRIPT="Duýduryş! Joomla!-nyň dogry gurnamagy üçin JavaScript Administrator tarapynyň doly işleýişi üçin hökman açyk bolmaly." +INSTL_WARNJSON="Joomla-nyň dogry gurnamagy PHP-de JSON açyk bolmaly." + +;Preinstall view +INSTL_PRECHECK_TITLE="Gurnamadan Öňürti Barlag" +INSTL_PRECHECK_DESC="Eger şu görkezilen elementler goldanmaýar bolsa(Ýokşeklinde bellenen) bir şekilde düzetmegiňizi haýyş edýäris.
    Aşakdaky talaplar ýerine ýetirilmedikçe siz Joomla!-ny gurnap bilmersiňiz." +INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Maslahat berlen sazlamalar:" +INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Şu maslahat edilen sazlamalar PHP-nyň dogry Joomla bilen işleýişini kepillik edýär.
    Ýöne, Joomla! muňa garamazdan maslahat edilen sazlamalrda kiçi näsazlyklar bilenem işlär." +INSTL_PRECHECK_DIRECTIVE="Direktiwa" +INSTL_PRECHECK_RECOMMENDED="Maslahat berlen" +INSTL_PRECHECK_ACTUAL="Hakykysy" + +; Database view +INSTL_DATABASE="Bazanyň Sazlamasy" +INSTL_DATABASE_HOST_DESC="Bu köplenç "localhost"." +INSTL_DATABASE_HOST_LABEL="Hyzmat Nokadynyň Ady" +INSTL_DATABASE_NAME_DESC="Käbir hyzmat nokatlary saýt başyna belli bir baza rugsat berýär. Şol ýagdaýda Joomla! web sahypalary üçin bazada aýratyn tablitsa prefikdlerini ulanyň." +INSTL_DATABASE_NAME_LABEL="Bazanyň Ady" +INSTL_DATABASE_NO_SCHEMA="Şu baza görnüşi üçin hiç hili shema tapylmady. " +INSTL_DATABASE_OLD_PROCESS_DESC="Öňki Joomla!-dan galan ähli ätiýaç tablitsalaryň nusgalary täzelener." +INSTL_DATABASE_OLD_PROCESS_LABEL="Köne Baza Prosessi" +INSTL_DATABASE_PASSWORD_DESC="Web sahypanyň howupsyzlygy üçin bazada parol ulanmak hökman zerurdyr." +INSTL_DATABASE_PASSWORD_LABEL="Parol" +INSTL_DATABASE_PREFIX_DESC="Tablitsa üçin prefiks saýlaň ýa-da tötänleýin meýdana getirilen prefiksi ulanyň. Iň gowysy, üç we dört alfanumeriki simwol we aşakdan çyzgy HÖKMAN ulanylmalydyr. Saýlanan prefiks başga tablitslarda ulanyşda bolmaly däldir." +INSTL_DATABASE_PREFIX_LABEL="Tablitsanyň Prefiksleri" +INSTL_DATABASE_PREFIX_MSG="Tablitsanyň prefiksi harp bilen başlap yzy alfanumeriki simwollar bilen we aşakdan çyzgy gelmelidir" +INSTL_DATABASE_TYPE_DESC="Bu ähtimal "MySQLi"." +INSTL_DATABASE_TYPE_LABEL="Bazanyň Görnüşi" +INSTL_DATABASE_USER_DESC=""root" bolmaly ýada hyzmat ediş nokadyňyz tarapyndan berilen ulanyjy ady." +INSTL_DATABASE_USER_LABEL="Ulanyjy ady" + +;FTP view +INSTL_AUTOFIND_FTP_PATH="FTP-niň awto- gözbaş gözlegi" +INSTL_FTP="FTP Sazlama" +INSTL_FTP_DESC="

    Käbir serwerlerde gurnamany dogry tamamlamak üçin FTP güwenamaňyzy subut etmeli. Eger sizde güwenamany tamamlamakda kynçylyk dörän bolsa hyzmat nokadyňyzy takyklamak üçin barlap görüň.

    Howupsyzlyk sebäpli iň gowusy tutuş saýta däl diňe Joomla! gurnamasy üçin rugsatly aýratyn FTP ulanyjy hasabyny açyň. Siziň hyzmat nokadyňyz şu mesele boýunça size kömek eder.

    Ýatladma: Eger siz Windows Operasýon Ulgamyna gurnaýan bolsaňyz FTP funksýasy hökmandäl.

    " +INSTL_FTP_ENABLE_LABEL="FTP -ni Aç" +INSTL_FTP_HOST_LABEL="FTP Hyzmat Nokady" +INSTL_FTP_PASSWORD_LABEL="FTP Paroly" +INSTL_FTP_PORT_LABEL="FTP Porty" +INSTL_FTP_ROOT_LABEL="FTP Gözbaşy" +INSTL_FTP_SAVE_LABEL="FTP Paroluny Sakla" +INSTL_FTP_TITLE="FTP Sazlama (Islege görä -Ulanyjylaryň köpsi bu ädimi böküp geçip biler - Böküp geçmek üçin Indiki düwmesine basyň)" +INSTL_FTP_USER_LABEL="FTP Ulanyjy Ady" +INSTL_VERIFY_FTP_SETTINGS="FTP Sazlamalaryny Takyklaň" +INSTL_FTP_SETTINGS_CORRECT="Sazlamalar dogry" +INSTL_FTP_USER_DESC="Duýduryş! Maslahat berleni boş goýmak we her faýl geçiriminde FTP degişli ulanyjy adyňyzy täzeden girmek." +INSTL_FTP_PASSWORD_DESC="Duýduryş! Maslahat berleni boş goýmak we her faýl geçiriminde FTP degişli paroluňyzy täzeden girmek." + +;Site View +INSTL_SITE="Esasy Sazlama" +INSTL_ADMIN_EMAIL_LABEL="Adminiň Emaili" +INSTL_ADMIN_EMAIL_DESC="Email salgysyny giriň. Bu email salgysy web sahypanyň Super Ulanyjynyň email salgysy bolar." +INSTL_ADMIN_PASSWORD_LABEL="Admin Paroly" +INSTL_ADMIN_PASSWORD_DESC="Super Ulanyjy üçin parol giriň we aşakdaky meýdançada paroly gaýtalaň." +INSTL_ADMIN_PASSWORD2_LABEL="Admin Parolyny Gaýtalaň" +INSTL_ADMIN_USER_LABEL="Admin Ulanyjy Ady" +INSTL_ADMIN_USER_DESC="Super Ulanyjy hasaby üçin ulanyjy adyny belläň." +INSTL_SITE_NAME_LABEL="Web Sahypanyň Ady" +INSTL_SITE_NAME_DESC="Joomla! Web sahypanyň adyny giriň." +INSTL_SITE_METADESC_LABEL="Düşündiriş" +INSTL_SITE_METADESC_TITLE_LABEL="Web sahypa barada umumy düşündiriş giriň. Bu düşündiriş gözleg enjamlary üçindir. Köplenç 20 söz ýeterli bolýa." +INSTL_SITE_OFFLINE_LABEL="Web Sahypa Ulgamyň Daşynda" +INSTL_SITE_OFFLINE_TITLE_LABEL="Gurnama tamamlanan soň web sahypany ulgamyň daşynda belle. Web sahypa soň Global Sazlama üsti bilen ulgamyň içinde belläp bilersiňiz." +INSTL_SITE_INSTALL_SAMPLE_LABEL="Nusgalyk Maglumatlary Gurna" +INSTL_SITE_INSTALL_SAMPLE_DESC="Täze başlanlara nusgalyk maglumatlary gurnamak berk baslahat berilýär.
    Bu Jooml!-nyň gurnama bukjasyndaky içindäki nusgalyk mazmuny goýar." +INSTL_SITE_INSTALL_SAMPLE_NONE="Hiç zat( Ýönekeý köp-dilli web sahylar döretmek üçin gerek)" +INSTL_SAMPLE_BLOG_SET="Blog English (GB) Nusgalyk Maglumat" +INSTL_SAMPLE_BROCHURE_SET="Brochure English (GB) Nusgalyk Maglumat" +INSTL_SAMPLE_DATA_SET="Default English (GB) Nusgalyk Maglumat" +INSTL_SAMPLE_LEARN_SET="Learn Joomla English (GB) Nusgalyk Maglumat" +INSTL_SAMPLE_TESTING_SET="Test English (GB) Nusgalyk Maglumat" +INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Joomla-ny kontentsiz diňe bir menýu we giriş formy bilen gurnar." +INSTL_SAMPLE_BLOG_SET_DESC="Joomla-ny azyjyk makala we blog-a degişli Köne postlar, Köp okalan postlar ýaly modullary gurnar." +INSTL_SAMPLE_BROCHURE_SET_DESC="Joomla-ny azyjyk sahypalar(Baş menýu, Biz barada, Habarlar we Habarlaşma ) we Gözleg, Ýörite, Giriş Formy ýaly moduulary bilen gurnar." +INSTL_SAMPLE_DATA_SET_DESC="Joomla-ny ýeke sahypa we Iň Täze Makalalar, Giriş Formy ýaly modullary gurnar." +INSTL_SAMPLE_LEARN_SET_DESC="Joomla -nyň işleýişini tanatma üçin edilen mysal berlen makalalary gurnar." +INSTL_SAMPLE_TESTING_SET_DESC="Joomla-nyň içinde näme bar bolsa ähli menýu we elementler bilen gurnar." + +;Summary view +INSTL_FINALISATION="Tamamlama" +INSTL_SUMMARY_INSTALL="Gurna" +INSTL_SUMMARY_EMAIL_LABEL="Email Sazlama" +INSTL_SUMMARY_EMAIL_PASSWORDS_LABEL="Paroly emailde ugrat" +INSTL_SUMMARY_EMAIL_PASSWORDS_DESC="Duýduruş! Maslahat berlileni email arkaly parol ugratmak ýada saklamak bolanok." +INSTL_SUMMARY_EMAIL_DESC="Sazlama barada maglumatlary %s email salgyma gurnama gutaran soň ugrat." + +;Installing view +INSTL_INSTALLING="Gurnalýar ..." +INSTL_INSTALLING_DATABASE_BACKUP="Köne bazanyň tablitsalary ätiýaç nusgasy alynýar" +INSTL_INSTALLING_DATABASE_REMOVE="Köne bazanyň tablitsalaryny pozulýar" +INSTL_INSTALLING_DATABASE="Bazanyň tablitsalary döredilýär" +INSTL_INSTALLING_SAMPLE="Nusgalyk maglumatlar gurnalýar" +INSTL_INSTALLING_CONFIG="Sazlama faýly döredilýär" +INSTL_INSTALLING_EMAIL="%s email ugradylýar" + +;Email +INSTL_EMAIL_SUBJECT="Sazlamanyň Maglumatlary: %s" +INSTL_EMAIL_HEADING="Aşakda siz täze gurnalan Joomla! web sahypasynyň sazlamalaryny tapyp bilersiňiz:" +INSTL_EMAIL_NOT_SENT="Email ugradylyp bilinmedi." + +;Complete view +INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Administratsýanyň Giriş Maglumatlary" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Gurnama bukjasy 'installation' eýýäm pozulypdyr." +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_ERROR_FOLDER_DELETE="Gurnama bukjasy 'installation' pozulup bilinmeýär. El bilen bukjany pozmany haýyş edýäris." +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_FOLDER_REMOVED="Gurnama bukjasy 'installation' şowly pozuldy." +INSTL_COMPLETE_LANGUAGE_1="Joomla! siziň diliňizde ýa-da ýönekeý köp-dilli web saýt döretmek üçin" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_LANGUAGE_DESC="Gurnama bukjasyny 'installation' pozmanka siz artykmaçdan dil hem gurnap bilersiňiz. Eger Joomla! programmasyna dil gurnajak bolsaňyz degişli düwmäni basyň." +INSTL_COMPLETE_LANGUAGE_DESC2="Ýatladma: täze dil gurnamalaryny indirmek üçin Joomla! internet gerek bolar.
    Käbir serwerleriň sazlamalary Joomla! täze dili gurnama üçin rugsat bermeýär. Eger sizde şeýle ýagdaý bar bolsa gynanmaň soňrak Joomla! Administrator arkaly gurnap bilersiňiz." +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_REMOVE_FOLDER="Gurnama bukjasy 'installation' ýok et" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_REMOVE_INSTALLATION="GURNAMA BUKJASYNY 'INSTALLATION' DÜÝBÜNDEN ÝOK ETMELIDIGIŇIZI ÝATDA SAKLAMAGYŇYZY HAÝYŞ EDÝÄRIS.
    Gurnama bukjasy ýok edilen soň mundan soňky nokada geçip bilersiňiz. Bu Joomla!-nyň howupsyzlyk funksiýasydyr." +INSTL_COMPLETE_TITLE="Gutlaýarys! Joomla! indi gurnalandyr." +INSTL_COMPLETE_INSTALL_LANGUAGES="Artykmaç ädimler: Dilleri gurna" + +;Languages view +INSTL_LANGUAGES="Dil bukjalaryny gurna" +INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Dil" +INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Wersiýa" +INSTL_LANGUAGES_DESC="Joomla interfeýsi birnäçe dilde elýeterlidir. Siziň isleýän dilleriňizi saýlap we Soňky düwmesine basyp gurnamany başladyň.
    Ýatladma: bu iş 10 sekund ýaly her dili indirmek üçin wagt alar. Gijikmesiz bolmasyny arzuw edýän bolsaňyz 3 dilden kän ýüklemäň." +INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Bu iş tamamlamasy üçin dil başyna 10 sekund ýaly dowam eder
    Dilleri indirip gurnaýança garaşmagyňyzy haýyş edýäris..." +INSTL_LANGUAGES_MORE_LANGUAGES="Eger başgada dil gurnamak isleýän bolsaňyz 'Öňki' düwmesini basyň." +INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Gurnama üçin hiç hili dil saýlanylmady. Eger başgada dil gurnamak isleýän bolsaňyz 'Öňki' düwmesini basyp, isleýän diliňizi spisokdan saýlaň." +INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! dil serwerine baglanyp bilmedi. Gurnama prosesini tamamlamagyňyzy haýyş edýäris." +INSTL_LANGUAGES_WARNING_NO_INTERNET2="Ýatladma: Dilleri soň Joomla! Administrator girişi arkaly hem gurnap bilersiňiz" +INSTL_LANGUAGES_WARNING_BACK_BUTTON="Gurnamanyň soňky ädimine git" + +;Default language view +INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE="Köp-dilli funksýany aktiwleşdir" +INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="Eger aktiw bolanda Joomla sahypaňyz gurnalan dilde ýerli dildäki menýular bilen hyzmat berer." +INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN="Dil kody plaginini işlet" +INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN_DESC="Eger açyk bolsa, dil kody plagini dil kodyny üýtgetmäne HTML dokumentini SEO-ny gowylaşdyrmana kömek eder." +INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Bellenilen Administrator dili" +INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Joomla bellenilen dil hökmünde bellap bilmedi. Iňňlis dili bellenilen Administrator dili hökmünde belleniler." +INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Joomla %s ADMINISTRATOR dili hökmünde belledi." +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Saýlaň" +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Dil" +INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="Bellik" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CONTENT_LANGUAGE="Joomla awtomatiki usully %s mazmun dilini döredilip bilinmedi" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU="Joomla awtomatiki usully menýu %s döredip bilmedi" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_ITEM="Joomla awtomatiki usully baş menýu elementini %s döredip bilmedi" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_MODULE="Joomla awtomatiki usully menýu moduluny %s döredip bilmedi" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CATEGORY="Joomla awtomatiki usully mazmun kategorýalaryny %s döredip bilmedi" +INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_ARTICLE="Joomla awtomatiki usully ýerli makalany %s döredip bilmedi" +INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_MODULESWHITCHER_LANGUAGECODE="Joomla awtomatiki usully dil pereklýuçatel moduluny %s çap edip bilmedi" +INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGECODE="Joomla awtomatiki usully Dil Kode Plaginini %s işledip bilmedi" +INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGEFILTER="Joomla awtomatiki usully Dil Filter Plaginini %s işledip bilmedi" +INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Joomla dili %s gurnap bilmedi" +INSTL_DEFAULTLANGUAGE_COULD_NOT_PUBLISH_MOD_MULTILANGSTATUS="Joomla awtomatiki usully dil ýagdaý moduluny %s çap edip bilmedi" +INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="Joomla awtomatiki usully menýu moduluny %s çapdan aýyryp bilmedi" +INSTL_DEFAULTLANGUAGE_DESC="Joomla saýlanan dilleri gurnady. Joomla Administrator üçin islendik diliňizi saýlamaňyzy haýyş edýäris" +INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla saýlanan dilleri gurnady. Joomla web sahypalary üçin islendik diliňizi saýlamaňyzy haýyş edýäris" +INSTL_DEFAULTLANGUAGE_FRONTEND="Bellenilen Saýtyň dili" +INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla dili bellenilen dil hökmünde belläp bilmedi. Iňňlis dili bellenilen dil hökmünde Web Sahyplar üçin belleniler." +INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Joomla saýtyň dilini %s belledi." +INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Ýerli edilen mazmuny gurna" +INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Eger aktiw bolanda, Joomla awtomatiki usully her kategorýa üçin aýratyn boş bir mazmun dörediler." +INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Köp-dilli" +INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Bu bölüm size awtomatiki usully Joomla!-nyň köp-dilli funksýasyny aktiwleşdirer." +INSTL_DEFAULTLANGUAGE_TRY_LATER="Siz Joomla! Administrator arkaly hem soň gurnap bilersiňiz" + +; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español +INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Türkmençe (TK)" + +;Database Model +INSTL_DATABASE_COULD_NOT_CONNECT="Baza baglanyp bilmedi. Baglaýyjyň gaýtaran nomeri: %s" +INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="Gurnaýyjy görkezilen baza baglanyp bilmedi we baza döredip bilmedi. Sazlamalary takyklamagyňyzy ýa-da el bilen özüňiz bazany döretmegiňizi haýyş edýäris." +INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Uzaltma manifesti käşini täzeläp bilmedi: %s" +INSTL_DATABASE_EMPTY_NAME="" +INSTL_DATABASE_ERROR_BACKINGUP="Bazanyň ätiýaçlyk nusgasyny almada bir näçe näsazlyk çykdy." +INSTL_DATABASE_ERROR_CREATE="Baza %s döredilýärka näsazlyk çykdy.
    Ulanyjynyň ýeterli hak-hukugy bolmany üçin bolup biler. Gerek bolan bazanyň aýratyn Joomla! gurmazdan öň gurulmaly." +INSTL_DATABASE_ERROR_DELETE="Bazany öçürmede bir näçe näsazlyk çykdy." +INSTL_DATABASE_FIELD_VALUE_REMOVE="Aýyr" +INSTL_DATABASE_FIELD_VALUE_BACKUP="Ätiýaç Nusga" +INSTL_DATABASE_FIX_LOWERCASE="PostgreSQL üçin tablitsalaryň prefiksi hökmany suratda kiçi harply bolmaly." +INSTL_DATABASE_FIX_TOO_LONG="MySQL tablitsaň prefiks ady köpünden 15 harp bolmaly." +INSTL_DATABASE_INVALID_DB_DETAILS="Berlen bazanyň maglumatlary dogry däl ýa-da boş goýulan." +INSTL_DATABASE_INVALID_MYSQL_VERSION="Gurnamany dowam etmek üçin size MySQL 5.0.4 ýa-da ýokry wersýalary gerek. Siziň wersýaňyz: %s" +INSTL_DATABASE_INVALID_MYSQLI_VERSION="Gurnamany dowam etmek üçin size MySQL 5.0.4 ýa-da ýokry wersýalary gerek. Siziň wersýaňyz: %s" +INSTL_DATABASE_INVALID_PDOMYSQL_VERSION="Gurnamany dowam etmek üçin size MySQL 5.0.4 ýa-da ýokry wersýalary gerek. Siziň wersýaňyz: %s" +INSTL_DATABASE_INVALID_POSTGRESQL_VERSION="Gurnamany dowam etmek üçin size PostgreSQL 8.3.18 ýa-da ýokry wersýalary gerek. Siziň wersýaňyz: %s" +INSTL_DATABASE_INVALID_SQLSRV_VERSION="Gurnamany dowam etmek üçin size SQL Server 2008 R2 (10.50.1600.1) ýa-da ýokry wersýalary gerek. Siziň wersýaňyz: %s" +INSTL_DATABASE_INVALID_SQLZURE_VERSION="Gurnamany dowam etmek üçin size SQL Server 2008 R2 (10.50.1600.1) ýa-da ýokry wersýalary gerek. Siziň wersýaňyz: %s" +INSTL_DATABASE_INVALID_TYPE="Bazanyň görnüşini saýlaň" +INSTL_DATABASE_NAME_TOO_LONG="MySQL bazasynyň ady köpünden 64 harp bolmaly." +INSTL_DATABASE_INVALID_NAME="MySQL-yň 5.1.6 we ondan öňki wersýalaryndaky atlarda "special" bolmaly däl. Siziň wersýaňyz: %s" +INSTL_DATABASE_NAME_INVALID_SPACES="MySQL bazasynyň atlarynda we tablitsa atlarynda boş ýer(probel) bolmaly däl." +INSTL_DATABASE_NAME_INVALID_CHAR="Hiç hili MySQL-de NULL ASCII(0x00) içinde bolup bilmez." +INSTL_DATABASE_FILE_DOES_NOT_EXIST="Faýl %s ýok" + +;controllers +INSTL_COOKIES_NOT_ENABLED="Kukiler siziň brawzerde açyk däl ýaly. Siz programmany şu funksýasyz gurnap bilmersiňiz. Mundan başgada serwerdede session.save_path näsazlyk bolup biler. Eger bu mesele bolsa hosting beriji bilen habarlaşyp bu näsazlygy düzediň." +INSTL_HEADER_ERROR="Näsazlyk" + +;Helpers +INSTL_PAGE_TITLE="Joomla! Web Gurnaýjy" + +;Configuration model +INSTL_ERROR_CONNECT_DB="Baza baglanyp bilmedi. Baglaýyjyň gaýtaran nomeri: %s" +INSTL_STD_OFFLINE_MSG="Bu saýtda abatlaýyş işleri geçirilýär.
    Soňrak zyýarat etmegiňizi haýyş edýäris." + +;FTP model +INSTL_FTP_INVALIDROOT="Görkezilen FTP bukjasy Joomla!-nyň gurnama bukjasy däl" +INSTL_FTP_NOCONNECT="FTP serwere baglanyp bilmedi" +INSTL_FTP_NODELE=""DELE" funksýasy şowsuz boldy." +INSTL_FTP_NODIRECTORYLISTING="FTP serwerden bujlaryň spisogyny alyp bilmedi." +INSTL_FTP_NOLIST=""LIST" funksýasy şowsuz boldy." +INSTL_FTP_NOLOGIN="FTP serwere girip bilmedi." +INSTL_FTP_NOMKD=""MKD" funksýasy şowsuz boldy." +INSTL_FTP_NONLST=""NLST" funksýasy şowsuz boldy." +INSTL_FTP_NOPWD=""PWD" funksýasy şowsuz boldy." +INSTL_FTP_NORETR=""RETR" funksýasy şowsuz boldy." +INSTL_FTP_NORMD=""RMD" funksýasy şowsuz boldy." +INSTL_FTP_NOROOT="Görkezilen FTP bukjasyna girip bilmedi." +INSTL_FTP_NOSTOR=""STOR" funksýasy şowsuz boldy." +INSTL_FTP_NOSYST=""SYST" funksýasy şowsuz boldy." +INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Awtomatiki usully FTP-nyň gözbaşy bukjasyny tapyp bilmedi." + +;others +INSTL_CONFPROBLEM="Siziň sazlama faýlyňyz ýa-da bukjaňyz ýazylmana açyk däl. Siz görkezilen kody el bilen girip ýüklemeli bolarsyňyz. Tekst meýdançadaky tekst saýlap kopýalaň we taze tekst faýlynyň içine ýerleşdiriň. Tekst faýlyna 'configuration.php' adyny beriň we saýt gözbaşy bukjasyna ýükläň." +INSTL_DATABASE_SUPPORT="Bazanyň Goldawy:" +INSTL_DISPLAY_ERRORS="Näsazlyklary Görkez" +INSTL_ERROR_DB="Bazany ýerleşdirýärka käbir näsazlyklar çykdy: %s" +INSTL_ERROR_INITIALISE_SCHEMA="Bazanyň shemasyny başladyp bolmady" +INSTL_FILE_UPLOADS="Faýl Ýüklemeler" +INSTL_GNU_GPL_LICENSE="GNU Umumy Lisenziýa" +INSTL_JSON_SUPPORT_AVAILABLE="JSON Goldawy" +INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC Öçür" +INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Işleýişi" +INSTL_MB_LANGUAGE_IS_DEFAULT="MB Dili Bllenilen" +INSTL_MB_STRING_OVERLOAD_OFF="MB String Artykmaç Ýükleme Öçük" +INSTL_NOTICEMBLANGNOTDEFAULT="PHP mbstring funksýasy bitarap bellenildi. Bu funksýa ýerlikleýin .htaccess faýlynyň içinde php_value mbstring.language neutral kodyny ýazyp hem bellap bilersiňiz." +INSTL_NOTICEMBSTRINGOVERLOAD="PHP mbstring funksýasy artykmaç ýükleme bellenildi. Bu funksýa ýerlikleýin .htaccess faýlynyň içinde php_value mbstring.func_overload 0 kodyny ýazyp hem belläp bilersiňiz." +INSTL_NOTICEYOUCANSTILLINSTALL="
    Siz soňunda sazlamary görensoň gurnamany dowam edip bilersiňiz. Siz eliňiz bilen kody ýüklemeli bolarsyňyz. Tekst meýdançasyna basyp kodlary saýlap täze tekst faýlyň içine ýerleşdiriň. Faýlyň adyna 'configuration.php' goýup saýtyň gözbaş bukjasyna ýükläň." +INSTL_OUTPUT_BUFFERING="Netijäniň Buforizatsýasy" +INSTL_PARSE_INI_FILE_AVAILABLE="INI Parser Goldawy" +INSTL_PHP_VERSION="PHP Wersiýa" +INSTL_PHP_VERSION_NEWER="PHP Wersiýa >= %s" +INSTL_REGISTER_GLOBALS="Globallar Registratsýasyny Öçür" +INSTL_SAFE_MODE="Howupsyz Usul" +INSTL_SESSION_AUTO_START="Sessiýany Awtomatiki Başla" +INSTL_WRITABLE="%s Ýazylmaga açyk" +INSTL_XML_SUPPORT="XML Goldawy" +INSTL_ZIP_SUPPORT_AVAILABLE="Ýerli ZIP goldawy" +INSTL_ZLIB_COMPRESSION_SUPPORT="Zlib Kiçeltme Goldawy" +INSTL_PROCESS_BUSY="Proses ugrunda. Garaşmagyňyzy haýyş edýäris ..." + +;Global strings +JADMINISTRATOR="Administrator" +JCHECK_AGAIN="Täzeden Barla" +JERROR="Näsazlyk" +JEMAIL="E-mail" +JGLOBAL_ISFREESOFTWARE="%s %s boýunça giňden ýaýradylýan erkin programma." +JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="Dil bukjasy Joomla!-nyň su wersiýasyna gabat gelenok. Käbir setirler kem bolup biler." +JGLOBAL_SELECT_AN_OPTION="Opsiýa Saýlaň" +JGLOBAL_SELECT_NO_RESULTS_MATCH="Hiç hili netijä deň gelmedi" +JGLOBAL_SELECT_SOME_OPTIONS="Bir näçe opsiýa saýlaň" +JINVALID_TOKEN="Iň soňky haýyşyňyz kabul edilmedi sebäbi howupsyzlyk žetony dogry däl. Sahypany täzeläp täzeden sahypa girmäni haýyş edýäris." +JNEXT="Soňky" +JNO="Ýok" +JNOTICE="Bildiriş" +JOFF="Ýapyk" +JON="Açyk" +JPREVIOUS="Öňki" +JSITE="Saýt" +JUSERNAME="Ulanyjy ady" +JYES="Howa" + +; Framework strings necessary when no lang pack is available +JLIB_DATABASE_ERROR_CONNECT_MYSQL="MySQL-e baglanyp bilmedi." +JLIB_DATABASE_ERROR_DATABASE="Bazada ýalňyşlyk ýüze çykdy." +JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Bazanyň Draýwerini ýükleme başarnyksyz geçdi: %s" +JLIB_ENVIRONMENT_SESSION_EXPIRED="Siziň sessýaňyz gutardy, sahypany täzeden ýüklemäni haýyş edýäris." +JLIB_FILESYSTEM_ERROR_COPY_FAILED="Kopýalama başarnyksyz geçdi." +JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :files: Berlen ýol bukjanyň ýoly däl. Ýol: %s" +JLIB_FORM_FIELD_INVALID="Ýalňyş meýdan: " +JLIB_FORM_VALIDATE_FIELD_INVALID="Ýalňyş meýdan: %s" +JLIB_FORM_VALIDATE_FIELD_REQUIRED="Gerekli meýdan: %s" +JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Gurna: Faýly kopýalama başarnyksyz geçdi %1$s dan %2$s." +JLIB_INSTALLER_NOT_ERROR="Eger TinyMCE baglanyşykly näsazlyklar ýüze çyksa dil(leriň) gurnamasynda hiç hili täsiri ýokdyr. Käbir dil bukjalary Joomla! 3.2.0-dan öňkiler aýratyn dil faýlaryny gurnar. Mundan soňky diller içinde ýerleşýär we mundan soň gurnamak gerekdirmeýär." +JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Baza baglanyp bilmedi
    joomla.library: %1$s - %2$s" + +; Strings for the language debugger +JDEBUG_LANGUAGE_FILES_IN_ERROR="Dil faýlar derňewinde näsazlyk çykdy" +JDEBUG_LANGUAGE_UNTRANSLATED_STRING="Terjime edilmedik setirler" +JNONE="Hiç zat" + +; Necessary for errors +ADMIN_EMAIL="Administratoryň Emaily" +ADMIN_PASSWORD="Administrator Paroly" +ADMIN_PASSWORD2="Admin Parolyny Tassyklaň" +SITE_NAME="Web Sahypanyň Ady" + +; Database types (allows for a more descriptive label than the internal name) +MYSQL="MySQL" +MYSQLI="MySQLi" +ORACLE="Oracle" +PDOMYSQL="MySQL (PDO)" +POSTGRESQL="PostgreSQL" +SQLAZURE="Microsoft SQL Azure" +SQLITE="SQLite" +SQLSRV="Microsoft SQL Serwer" diff --git a/installation/language/tk-TM/tk-TM.xml b/installation/language/tk-TM/tk-TM.xml new file mode 100644 index 0000000000000..8aa6a06d91010 --- /dev/null +++ b/installation/language/tk-TM/tk-TM.xml @@ -0,0 +1,20 @@ + + + Türkmençe (Türkmenistan) + 3.5.0 + January 2016 + Shohrat Permanov + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. + GNU General Public License version 2 or later; see LICENSE.txt + + tk-TM.ini + + + Türkmençe (Türkmenistan) + tk-TM + 0 + + + diff --git a/installation/language/tr-TR/tr-TR.ini b/installation/language/tr-TR/tr-TR.ini index 0ce6a9fb99d3f..628aed1207bd6 100644 --- a/installation/language/tr-TR/tr-TR.ini +++ b/installation/language/tr-TR/tr-TR.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 @@ -116,13 +116,19 @@ INSTL_EMAIL_NOT_SENT="e-Posta gönderilemedi." ;Tamamlama görünümü INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Denetim Masası Oturum Ayrıntıları" +;Kurulum klasörü 'installation' fiziksel olarak varolan bir klasörü belirttiği için çevirilmemelidir. INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Kurulum klasörü zaten silindi." +;Kurulum klasörü 'installation' fiziksel olarak varolan bir klasörü belirttiği için çevirilmemelidir. INSTL_COMPLETE_ERROR_FOLDER_DELETE="Kurulum klasörü silinemedi. Lütfen klasörü elle silin." +;Kurulum klasörü 'installation' fiziksel olarak varolan bir klasörü belirttiği için çevirilmemelidir. INSTL_COMPLETE_FOLDER_REMOVED="Kurulum klasörü başarıyla kaldırıldı." INSTL_COMPLETE_LANGUAGE_1="Joomla! kendi dilinizde mi?" +;Kurulum klasörü 'installation' fiziksel olarak varolan bir klasörü belirttiği için çevirilmemelidir. INSTL_COMPLETE_LANGUAGE_DESC="Kurulum klasörünü kaldırmadan önce ek diller kurabilirsiniz. Eğer Joomla! uygulamanıza başka diller eklemek istiyorsanız takip eden düğmeyi tıklatın." INSTL_COMPLETE_LANGUAGE_DESC2="Not: Joomla'nın yeni dillere erişebilmesi ve kurması için internet erişimine ihtiyacınız olacaktır.
    Bazı sunucu yapılandırmaları Joomla'nın dil kurulumlarına izin vermez. Eğer sizde aynı durumdaysanız, üzülmeyin, daha sonra Joomla! yönetiminden dil kurulumlarını yapabilirsiniz." +;Kurulum klasörü 'installation' fiziksel olarak varolan bir klasörü belirttiği için çevirilmemelidir. INSTL_COMPLETE_REMOVE_FOLDER="Kurulum klasörünü kaldır" +;Kurulum klasörü 'installation' fiziksel olarak varolan bir klasörü belirttiği için çevirilmemelidir. INSTL_COMPLETE_REMOVE_INSTALLATION="LÜTFEN KURULUM KLASÖRÜNÜ
    TAMAMEN KALDIRMAYI UNURMAYINIZ.
    Kurulum klasörü kaldırılmadığız sürece, güvenliğiniz için bu noktadan ileriye gitmenize izin verilmez." INSTL_COMPLETE_TITLE="Tebrikler! Joomla! şimdi kuruldu." INSTL_COMPLETE_INSTALL_LANGUAGES="Ek Adımlar: Dilleri Kur" @@ -186,8 +192,9 @@ INSTL_DATABASE_ERROR_CREATE="%s veritabanı oluşturulmaya çalışılırken bir INSTL_DATABASE_ERROR_DELETE="Veritabanı silinirken bazı hatalar meydana geldi." INSTL_DATABASE_FIELD_VALUE_REMOVE="Kaldır" INSTL_DATABASE_FIELD_VALUE_BACKUP="Yedekle" +INSTL_DATABASE_FIX_LOWERCASE="PostgreSQL için tablo ön eki küçük harflerden oluşmalıdır." INSTL_DATABASE_FIX_TOO_LONG="MySQL tablo ön eki en fazla 15 karakter olabilir." -INSTL_DATABASE_INVALID_DB_DETAILS="Sağlanan veritabanı detayları geçersiz ve/veya boş." +INSTL_DATABASE_INVALID_DB_DETAILS="Girilen veritabanı ayrıntıları hatalı ve/veya boş." INSTL_DATABASE_INVALID_MYSQL_VERSION="Kuruluma devam etmek için MySQL 5.0.4 veya daha üstü bir sürüme ihtiyacınız var. Sizin sürümünüz: %s" INSTL_DATABASE_INVALID_MYSQLI_VERSION="Kuruluma devam etmek için MySQL 5.0.4 veya daha üstü bir sürüme ihtiyacınız var. Sizin sürümünüz: %s" INSTL_DATABASE_INVALID_PDOMYSQL_VERSION="Kuruluma devam etmek için MySQL 5.0.4 veya daha üstü bir sürüme ihtiyacınız var. Sizin sürümünüz: %s" @@ -248,6 +255,7 @@ INSTL_NOTICEYOUCANSTILLINSTALL="
    Aşağıda görüntülenen yapılandırma INSTL_OUTPUT_BUFFERING="Çıktı Tamponlama" INSTL_PARSE_INI_FILE_AVAILABLE="INI İnceleyici Desteği" INSTL_PHP_VERSION="PHP Sürümü" +INSTL_PHP_VERSION_NEWER="PHP Sürümü >= %s" INSTL_REGISTER_GLOBALS="Register Globals" INSTL_SAFE_MODE="Güvenli Kip" INSTL_SESSION_AUTO_START="Oturum Oto Başlatma" diff --git a/installation/language/tr-TR/tr-TR.xml b/installation/language/tr-TR/tr-TR.xml index e3e00669af789..0b084496cab2f 100644 --- a/installation/language/tr-TR/tr-TR.xml +++ b/installation/language/tr-TR/tr-TR.xml @@ -1,14 +1,13 @@ Türkçe (Türkiye) - 3.4.0 - September 2012 - Turkish Translation Team - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + 3.5.0 + March 2016 + Ümit Kenan Gönüllü + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - Turkish installation file tr-TR.ini diff --git a/installation/language/ug-CN/ug-CN.ini b/installation/language/ug-CN/ug-CN.ini index 1122fd265aeb0..5092dfa345833 100644 --- a/installation/language/ug-CN/ug-CN.ini +++ b/installation/language/ug-CN/ug-CN.ini @@ -1,6 +1,5 @@ -; $Id: ug-CN.ini 2013-10-08 Akber Tursun, Abdulla Bisir and Osmanjan Hesen $ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 @@ -21,7 +20,7 @@ INSTL_WARNJSON="Joomla قاچالاشنى تاماملاش ئۈچۈن، سىزن ;Preinstall view INSTL_PRECHECK_TITLE="قاچىلاش ئالدىدىكى تەكشۈرۈش" -INSTL_PRECHECK_DESC="تىزمىدىكى بەلگىسى ياق بولغان بىر مۇلازىمېتىر تەڭشەك پارامېترىنى ئوڭشاڭ. ئەگەر توغرا تەڭشەلمىسە قاچىلىشىڭىز مەغلۇپ بولۇشى مۇمكىن." +INSTL_PRECHECK_DESC="تىزمىدىكى بەلگىسى ياق بولغان بىر مۇلازىمېتىر تەڭشەك پارامېترىنى ئوڭشاڭ. ئەگەر توغرا تەڭشەلمىسە قاچىلىشىڭىز مەغلۇپ بولۇشى مۇمكىن." INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="تەۋسىيە قىلىنغان تەڭشىكى" INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="joomla نىڭ ياخشى بېجىرىلىشىگە كاپالەتلىق قىلىش ئۈچۈن، تۆۋەندىكى php تەڭشىكىنى تەۋىسسىيە قىلىمىز.
    گەرچە سىزنىڭ تەڭشىكىڭىز تەۋسىيە قىلىنغان تەڭشەك بىلەن پۈتۈنلەي ئوخشاش بولمىسىمۇ، !Joomla يەنىلا نورمال خىزمەت قىلالايدۇ." INSTL_PRECHECK_DIRECTIVE="تەڭشەش تۈرلىرى" @@ -180,6 +179,7 @@ INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Uighur (Uyghurche)" ;Database Model INSTL_DATABASE_COULD_NOT_CONNECT="ساندانغا ئۇلاشقا بولمىدى. ئۇلاش قايتۇرما كودى %s" +INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="قاچىلىغۇچ بېكىتىلگەن ساندانغا ئۇلىيالمىغاچقا، سانداننى قۇرالمىدى. تەڭشىكىڭىزنى قايتا تەكشۈرۈڭ. زۆرۈر تېپىلسا سانداننى قول ئارقىلىق قۇرۇڭ." INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="بۇ كېڭەيتمىنىڭ manifest غەملىكىنى يېڭىلشقا بولمىدى: %s" INSTL_DATABASE_EMPTY_NAME="" INSTL_DATABASE_ERROR_BACKINGUP="سانداننى زاپاسلاش جەريانىدا خاتالىق كۆرۈلدى." @@ -190,6 +190,8 @@ INSTL_DATABASE_FIELD_VALUE_BACKUP="زاپاسلاش" INSTL_DATABASE_FIX_TOO_LONG="MySQL نىڭ جەدۋەل ئالدى قوشۇلغۇچى ئەڭ كۆپ بولغاندا 15 ھەرپ-بەلگىدىن ئېشىپ كەتمەسلىكى كېرەك." INSTL_DATABASE_INVALID_DB_DETAILS="تەمىنلىگەن ساندان ماتېرىيالى توغرا ئەمەس ياكى تولۇق ئەمەس." INSTL_DATABASE_INVALID_MYSQL_VERSION="سىز MySQL 5.0.4 ياكى ئۇنىڭدىن يۇقىرى نەشر نۇسخىسىغا ئېھتىياجلىق، سىزدىكى نەشر نۇسخىسى: %s" +INSTL_DATABASE_INVALID_PDOMYSQL_VERSION="سىز MySQL 5.0.4 ياكى ئۇنىڭدىن يۇقىرى نەشر نۇسخىسىغا ئېھتىياجلىق، سىزدىكى نەشر نۇسخىسى: %s" +INSTL_DATABASE_INVALID_POSTGRESQL_VERSION="سىز PostgreSQL 8.3.18 ياكى ئۇنىڭدىن يۇقىرى نەشر نۇسخىسىغا ئېھتىياجلىق، سىزدىكى نەشر نۇسخىسى: %s" INSTL_DATABASE_INVALID_MYSQLI_VERSION="MySQL نىڭ 5.0.4 ياكى ئۇنىڭدىن يۇقىرى نەشرى بولغاندىلا، ئاندىن قاچىلاشنى داۋاملاشتۇرالايسىز. سىزدىكى MySQL نىڭ نۆۋەتتىكى نەشرى: %s" INSTL_DATABASE_INVALID_SQLSRV_VERSION="SQL Server 2008 R2 نىڭ 10.50.1600.1 ياكى ئۇنىڭدىن يۇقىرى نەشرى بولغاندىلا، ئاندىن قاچىلاشنى داۋاملاشتۇرالايسىز. سىزدىكى SQL Server نىڭ نۆۋەتتىكى نەشرى: %s" INSTL_DATABASE_INVALID_SQLZURE_VERSION="SQL Server 2008 R2 نىڭ 10.50.1600.1 ياكى ئۇنىڭدىن يۇقىرى نەشرى بولغاندىلا، ئاندىن قاچىلاشنى داۋاملاشتۇرالايسىز. سىزدىكى SQL Server نىڭ نۆۋەتتىكى نەشرى: %s" @@ -290,6 +292,11 @@ JLIB_FORM_VALIDATE_FIELD_INVALID="ئىناۋەتسىز فورما تۈرى: %s" JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install： %1$s دىكى ھۆججەتنى %2$s غا كۆچۈرۈش مەغلۇپ بولدى." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: ساندانغا ئۇلاشقا بولمىدى
    joomla.library: %1$s - %2$s" +; Strings for the language debugger +JDEBUG_LANGUAGE_FILES_IN_ERROR="تىل ھۆججىتىدە گراماتىكىلىق خاتالىق بار" +JDEBUG_LANGUAGE_UNTRANSLATED_STRING="تەرجىمە قىلىنمىغان ھەرپ-بەلگە تىزىقى" +JNONE="يوق" + ; Necessary for errors ADMIN_EMAIL="ئېلخەت ئادرېسىڭىز" ADMIN_PASSWORD="سىستېما باشقۇرغۇچىسىنىڭ پارولى" diff --git a/installation/language/ug-CN/ug-CN.xml b/installation/language/ug-CN/ug-CN.xml index d37a5095b71e6..71f376b5ba5ed 100644 --- a/installation/language/ug-CN/ug-CN.xml +++ b/installation/language/ug-CN/ug-CN.xml @@ -1,12 +1,11 @@ - + Uyghur (ئۇيغۇرچە) - 3.2.0 + 3.5.0 2012.10.28 Joomla! Uyghur Translation Team - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - !Joomla 3.0 قاچىلاش پىروگراممسىنىڭ ئۇيغۇرچە تەرجىمىسى ug-CN.ini diff --git a/installation/language/uk-UA/uk-UA.ini b/installation/language/uk-UA/uk-UA.ini index b469cff3cea01..083ef52a5fb7c 100644 --- a/installation/language/uk-UA/uk-UA.ini +++ b/installation/language/uk-UA/uk-UA.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 @@ -8,24 +8,17 @@ INSTL_STEP_COMPLETE_LABEL="Завершення" INSTL_STEP_DATABASE_LABEL="База даних" INSTL_STEP_DEFAULTLANGUAGE_LABEL="Оберіть мову за замовчуванням" INSTL_STEP_FTP_LABEL="Конфігурація FTP" -INSTL_STEP_LANGUAGE_LABEL="Мова" INSTL_STEP_LANGUAGES_LABEL="Встановити мови" -INSTL_STEP_LICENSE_LABEL="Ліцензія" -INSTL_STEP_PREINSTALL_LABEL="Параметри сервера" INSTL_STEP_SITE_LABEL="Конфігурація" INSTL_STEP_SUMMARY_LABEL="Перегляд" -INSTL_STEPS_TITLE="Кроки" ;Language view -INSTL_LANGUAGE_TITLE="Оберіть мову" -INSTL_SELECT_LANGUAGE_DESC="Будь ласка, оберіть мову для використання в наступних кроках встановлення Joomla!" INSTL_SELECT_LANGUAGE_TITLE="Оберіть мову" INSTL_WARNJAVASCRIPT="Увага! JavaScript повинен бути дозволений для правильного встановлення Joomla!" INSTL_WARNJSON="Налаштування PHP повинні підтримувати бібліотеку JSON для подальшого встановлення Joomla!" ;Preinstall view INSTL_PRECHECK_TITLE="Початкова перевірка" -INSTL_PRECHECK_FOR_VERSION="Перевірка перед встановленням %s:" INSTL_PRECHECK_DESC="Якщо будь-який з цих пунктів не підтримується (з позначкою Ні), будь ласка, зробіть усе необхідне, щоб усунути їх. Невиконання цієї вимоги може призвести до вашого некоректного встановлення Joomla!" INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Рекомендовані налаштування:" INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Ці налаштування рекомендовані для PHP, з тим, щоб забезпечити повну сумісність з Joomla. Однак, Joomla! буде, як і раніше, працювати, якщо налаштування не зовсім відповідають рекомендованим." @@ -51,8 +44,6 @@ INSTL_DATABASE_TYPE_DESC="Це, ймовірно, "MySQLi"" INSTL_DATABASE_TYPE_LABEL="Тип бази даних" INSTL_DATABASE_USER_DESC="На кшталт, як "_QQ_"root"_QQ_" або ім'я користувача визначене хостером" INSTL_DATABASE_USER_LABEL="Ім'я користувача" -INSTL_DATABASE_TITLE="Параметри з'єднання" -INSTL_DATABASE_DESC="

    Налаштування Joomla! для запуску на сервері, включає 4 простих кроки...

    Будь ласка, введіть назву хоста сервера на якому Ви встановлюєте Joomla!

    Введіть ім'я користувача MySQL, пароль та ім'я бази даних, яку збираєтесь використовувати для Joomla.

    Введіть префікс, який буде використовуватися для таблиць. Префікс таблиць повинен відрізнятись від попередньо встановленої Joomla.

    " ;FTP view INSTL_AUTOFIND_FTP_PATH="Автовизначення шляху до FTP" @@ -66,7 +57,6 @@ INSTL_FTP_ROOT_LABEL="Шлях до кореня FTP" INSTL_FTP_SAVE_LABEL="Зберегти пароль FTP" INSTL_FTP_TITLE="Конфігурація FTP (За бажанням — більшість користувачів можуть пропустити цей крок. Натисніть «Далі», щоб пропустити цей крок)" INSTL_FTP_USER_LABEL="Логін для FTP" -INSTL_SITE_NAME_LABEL="Назва сайту" INSTL_VERIFY_FTP_SETTINGS="Перевірка налаштувань FTP" INSTL_FTP_SETTINGS_CORRECT="Налаштування правильні" INSTL_FTP_USER_DESC="Увага! Рекомендується залишити це поле порожнім і вводьте Ім'я Користувача FTP кожен раз при передачі файлів." @@ -81,7 +71,7 @@ INSTL_ADMIN_PASSWORD_DESC="Впишіть пароль Супер адмініс INSTL_ADMIN_PASSWORD2_LABEL="Підтвердження пароля адміністратора" INSTL_ADMIN_USER_LABEL="Логін адміністратора" INSTL_ADMIN_USER_DESC="Встановити логін для облікового запису Суперадміністратора." -INSTL_SITE_NAME_TITLE="Назва сайту" +INSTL_SITE_NAME_LABEL="Назва сайту" INSTL_SITE_NAME_DESC="Введіть назву вашого сайту." INSTL_SITE_METADESC_LABEL="Опис" INSTL_SITE_METADESC_TITLE_LABEL="Введіть загальний опис веб-сайту, який буде використовуватися пошуковими системами. Як правило, максимум 20 слів є оптимальним." @@ -125,18 +115,20 @@ INSTL_EMAIL_HEADING="Нижче ви знайдете параметри кон INSTL_EMAIL_NOT_SENT="Неможливо відправити листа." ;Complete view -INSTL_COMPLETE="Завершення" INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Деталі входу адміністратора" -INSTL_COMPLETE_DESC1="Натисніть кнопку «Сайт» для переходу на ваш сайт на Joomla! або кнопку «Адміністрування» для авторизації в адміністративній частині сайту." -INSTL_COMPLETE_DESC2="На Сервері допомоги Joomla!, Ви знайдете легко, крок за кроком, керівництво по встановленню власного мовного пакету для Joomla! Також Ви знайдете список посилань на доступні мовні пакети." -INSTL_COMPLETE_DESC3="Натисніть кнопку праворуч, щоб відкрити довідку Сервера допомоги у новому вікні." +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Тека встановлення вже була видалена." +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_ERROR_FOLDER_DELETE="Тека встановлення не може бути видалена. Будь ласка, знищіть теку вручну." +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_FOLDER_REMOVED="Тека встановлення успішно видалена" INSTL_COMPLETE_LANGUAGE_1="Joomla! на вашій мові?" +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_LANGUAGE_DESC="Перед видаленням теки встановлення ви можете встановити додаткові мови. Якщо ви бажаєте додати додаткові мови для вашого сайту, то натисніть на наступну кнопку." INSTL_COMPLETE_LANGUAGE_DESC2="Зауваження: Вам необхідний доступ до мережі Інтернет, щоб система Joomla! змогла завантажити та встановити нову мову.
    Деякі конфігурації сервера можуть не дозволить Joomla! встановити мови. Якщо у вас виникла така проблема — не турбуйтеся, ви зможете встановити необхідні мови пізніше через адміністративну частину Joomla!" +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_REMOVE_FOLDER="Видалити теку встановлення" +; The word 'installation' should not be translated as it is a physical folder. INSTL_COMPLETE_REMOVE_INSTALLATION="БУДЬ ЛАСКА, ПАМ'ЯТАЙТЕ, ЩО НЕОБХІДНО ПОВНІСТЮ ЗНИЩИТИ ДИРЕКТОРІЮ ВСТАНОВЛЕННЯ INSTALLATION.
    Ви не зможете продовжити далі роботу після Встановлення системи доки директорія не буде ЗНИЩЕНА — це функція безпеки Joomla!." INSTL_COMPLETE_TITLE="Вітаємо! Joomla встановлена!" INSTL_COMPLETE_INSTALL_LANGUAGES="Додатковий крок: Встановлення мови" @@ -147,12 +139,13 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Мова" INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Версія" INSTL_LANGUAGES_DESC="Інтерфейс Joomla доступний на багатьох мовах. Оберіть потрібну мову, натиснувши на галочку та встановіть необхідну мову, натиснувши на кнопку «Далі».
    Зауваження: ця операція займе близько 5 секунд для завантаження та встановлення будь-якої мови. Будь ласка, обирайте не більше 3-х мов для встановлення, щоб уникнути тайм-аутів.
    Українську локалізацію Ви можете завжди завантажити та встановити з сайту української спільноти Joomla! Україна
    " INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Ця операція може зайняти до 10 секунд для кожної мови.
    Будь ласка, зачекайте, поки система завантажить та встановить мову..." -INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Будь ласка, jберіть мову. Якщо вам не потрібно встановлювати інші мови натисніть на кнопку «Назад»" +INSTL_LANGUAGES_MORE_LANGUAGES="Натисніть на кнопку «Назад», якщо ви бажаєте встановити більше мов." +INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Будь ласка, оберіть мову. Якщо вам не потрібно встановлювати інші мови натисніть на кнопку «Назад»" INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! не змогла підключитися до сервера мови. Будь ласка, завершіть процес встановлення." INSTL_LANGUAGES_WARNING_NO_INTERNET2="Зауваження: Ви зможете встановити мову пізніше через адміністративну частину Joomla!" INSTL_LANGUAGES_WARNING_BACK_BUTTON="Повернутися до попереднього кроку встановлення" -;Defaultlanguage view +;Default language view INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE="Активувати багатомовність" INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="Якщо активувати, то ваш сайт на Joomla буде мати багатомовність із локалізованими меню для кожної встановленої мови" INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN="Включити плагін код мови" @@ -184,8 +177,6 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Встановити локал INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Якщо включити, то Joomla автоматично створить одну категорію змісту для кожної встановленої мови. Окрім цього, одна обрана стаття міститиме приклад змісту для кожної створеної категорії" INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Багатомовність" INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Цей розділ дає змогу автоматично активувати для Joomla! функцію багатомовності" -INSTL_DEFAULTLANGUAGE_NOTE="Зауваження. Після натиснення на кнопку «Далі» ви будете направлені у кінець процесу встановлення, де вам буде запропоновано видалити теки встановлення" -INSTL_DEFAULTLANGUAGE_TABLE_HEADER="Оберіть свою мову за замовчуванням" INSTL_DEFAULTLANGUAGE_TRY_LATER="Ви зможете встановити пакет пізніше через адміністративну частину Joomla!" ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español @@ -193,23 +184,25 @@ INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Українська (UA)" ;Database Model INSTL_DATABASE_COULD_NOT_CONNECT="Не можу підключитися до бази даних. Повернений номер помилки: %s" +INSTL_DATABASE_COULD_NOT_CREATE_DATABASE="Під час встановлення не вдалосяя підключитися до вказаної бази даних і створити базу. Перевірте налаштування і, якщо необхідно, вручну створіть базу даних." INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Не вдалося оновить кеш маніфесту для розширення %s" INSTL_DATABASE_EMPTY_NAME="" INSTL_DATABASE_ERROR_BACKINGUP="Під час резервування бази даних виникли помилки." INSTL_DATABASE_ERROR_CREATE="Сталася помилка при спробі створення бази даних %s.
    Користувач, можливо, не має достатньо привілеїв для створення бази даних. Необхідну базу даних, можливо, необхідно буде створити окремо перед Встановленням Joomla!." INSTL_DATABASE_ERROR_DELETE="При знищені бази даних виникли помилки." -INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Помилка ініціалізації номеру версії схеми" INSTL_DATABASE_FIELD_VALUE_REMOVE="Знищити" INSTL_DATABASE_FIELD_VALUE_BACKUP="Резервна копія" +INSTL_DATABASE_FIX_LOWERCASE="Префікс таблиць повинен бути у нижньому регістрі для бази PostgreSQL." INSTL_DATABASE_FIX_TOO_LONG="Префікс таблиці бази даних MySQL повинен містити максимум 15 символів" INSTL_DATABASE_INVALID_DB_DETAILS="Параметри бази даних не зазначені або зазначені невірно." INSTL_DATABASE_INVALID_MYSQL_VERSION="Ви повинні встановити базу даних MySQL версії 5.0.4 або вище, щоб продовжити Встановлення. Ваша версія бази даних MySQL: %s" INSTL_DATABASE_INVALID_MYSQLI_VERSION="Для продовження встановлення необхідна MySQL 5.0.4 або вище. Поточна версія MySQL: %s" +INSTL_DATABASE_INVALID_PDOMYSQL_VERSION="Для продовження встановлення необхідна версія бази даних MySQL 5.0.4 або вище. Ваша версія бази: %s" +INSTL_DATABASE_INVALID_POSTGRESQL_VERSION="Для продовження встановлення необхідна версія бази даних PostgreSQL 8.3.18 або вище. Ваша версія бази: %s" INSTL_DATABASE_INVALID_SQLSRV_VERSION="Для продовження встановлення необхідний SQL Server 2008 R2 (10.50.1600.1) або вище. Поточна версія SQL Server: %s" INSTL_DATABASE_INVALID_SQLZURE_VERSION="Для продовження встановлення необхідний SQL Server 2008 R2 (10.50.1600.1) або вище. Поточна версія SQL Server: %s" INSTL_DATABASE_INVALID_TYPE="Будь ласка, оберіть тип бази даних" INSTL_DATABASE_NAME_TOO_LONG="Назва бази даних MySQL повинна містити максимум 64 символи" -INSTL_DATABASE_PREFIX_INVALID_CHARS="Префікс таблиці бази даних MySQL повинен починатися з букви після якої можуть бути, як букви так числа, або нижнє підкреслення" INSTL_DATABASE_INVALID_NAME="Версія MySQL нижча за 5.1.6 не може містити точок та інших «спеціальних» символів в назві. Ваша версія: %s" INSTL_DATABASE_NAME_INVALID_SPACES="Назва для бази даних MySQL та імена таблиць не можуть починатися або закінчуватися пробілом." INSTL_DATABASE_NAME_INVALID_CHAR="Ідентифікатор MySQL не може містити NUL ASCII(0x00)." @@ -244,8 +237,6 @@ INSTL_FTP_NOSYST="Функція "_QQ_"SYST"_QQ_" є помилковою." INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Не вдалося автоматично визначити кореневу теку FTP." ;others -INSTL_ADVANCED_SETTINGS="Розширені параметри" -INSTL_BASIC_SETTINGS="Базові параметри" INSTL_CONFPROBLEM="Ваш конфігураційний файл або директорія не доступні для запису або виникли проблеми при створенні файлу конфігурації. Вам необхідно завантажити наступний код вручну. Натисніть курсором у текстовій області, щоб виділити весь код, а потім вставити його у новий текстовий файл. Дайте назву для цього файлу 'configuration.php' і завантажити його в кореневу теку вашого сайту." INSTL_DATABASE_SUPPORT="Підтримка бази даних:" INSTL_DISPLAY_ERRORS="Показувати помилки" @@ -253,9 +244,7 @@ INSTL_ERROR_DB="Виникли помилки при заповненні баз INSTL_ERROR_INITIALISE_SCHEMA="Не вдається ініціалізувати схему бази даних" INSTL_FILE_UPLOADS="Завантаження файлів" INSTL_GNU_GPL_LICENSE="Загальна публічна ліцензія GNU" -INSTL_INSTALLATION="Встановлення" INSTL_JSON_SUPPORT_AVAILABLE="Підтримка JSON" -INSTL_LICENSE="Ліцензія" INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC" INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime" INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language за замовчуванням" @@ -266,6 +255,7 @@ INSTL_NOTICEYOUCANSTILLINSTALL="Ви можете продовжити вста INSTL_OUTPUT_BUFFERING="Output Buffering" INSTL_PARSE_INI_FILE_AVAILABLE="Підтримка парсера INI" INSTL_PHP_VERSION="Версія PHP" +INSTL_PHP_VERSION_NEWER="Версія PHP >= %s" INSTL_REGISTER_GLOBALS="Register Globals" INSTL_SAFE_MODE="Safe Mode" INSTL_SESSION_AUTO_START="Session Auto Start" @@ -277,7 +267,6 @@ INSTL_PROCESS_BUSY="Триває процес встановлення. Заче ;Global strings JADMINISTRATOR="Адміністратор" -JADVANCED="Розширені" JCHECK_AGAIN="Повторити перевірку" JERROR="Помилка" JEMAIL="Електронна адреса" @@ -304,10 +293,11 @@ JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Не вдалося завантажи JLIB_ENVIRONMENT_SESSION_EXPIRED="Час сеансу минув, будь ласка, відновіть сторінку." JLIB_FILESYSTEM_ERROR_COPY_FAILED="Не вдалося скопіювати" JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :files: Шлях не є текою. Шлях: %s" -JLIB_FORM_FIELD_INVALID="Некоректне поле: "; +JLIB_FORM_FIELD_INVALID="Некоректне поле: " JLIB_FORM_VALIDATE_FIELD_INVALID="Невірне поле: %s" JLIB_FORM_VALIDATE_FIELD_REQUIRED="Обов'язкове поле: %s" JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Помилка копіювання файлу %1$s у %2$s." +JLIB_INSTALLER_NOT_ERROR="Якщо помилка пов'язана з встановленням мовних файлів редактора TinyMCE, то це ніяким чином не вплине на встановлення мови для Joomla. Деякі мовні пакети, створені до Joomla! 3.2.0 можуть спробувати встановити окремий пакет мовних файлів для TinyMCE. Оскільки ваша мова включена в основний пакет, то ці версії мовних файлів більше не є потрібними і їх не потрібно встановлювати." JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Не можливо підключитися до бази даних
    joomla.library: %1$s — %2$s" ; Strings for the language debugger @@ -325,10 +315,36 @@ SITE_NAME="Назва сайту" MYSQL="MySQL" MYSQLI="MySQLi" ORACLE="Oracle" +PDOMYSQL="MySQL (PDO)" POSTGRESQL="PostgreSQL" SQLAZURE="Microsoft SQL Azure" SQLITE="SQLite" SQLSRV="Microsoft SQL Server" + +; New Strings +INSTL_STEP_LANGUAGE_LABEL="Мова" +INSTL_STEP_LICENSE_LABEL="Ліцензія" +INSTL_STEP_PREINSTALL_LABEL="Параметри сервера" +INSTL_STEPS_TITLE="Кроки" +INSTL_LANGUAGE_TITLE="Оберіть мову" +INSTL_SELECT_LANGUAGE_DESC="Будь ласка, оберіть мову для використання в наступних кроках встановлення Joomla!" +INSTL_PRECHECK_FOR_VERSION="Перевірка перед встановленням %s:" +INSTL_DATABASE_TITLE="Параметри з'єднання" +INSTL_DATABASE_DESC="

    Налаштування Joomla! для запуску на сервері, включає 4 простих кроки...

    Будь ласка, введіть назву хоста сервера на якому Ви встановлюєте Joomla!

    Введіть ім'я користувача MySQL, пароль та ім'я бази даних, яку збираєтесь використовувати для Joomla.

    Введіть префікс, який буде використовуватися для таблиць. Префікс таблиць повинен відрізнятись від попередньо встановленої Joomla.

    " +INSTL_SITE_NAME_TITLE="Назва сайту" +INSTL_COMPLETE="Завершення" +INSTL_COMPLETE_DESC1="Натисніть кнопку «Сайт» для переходу на ваш сайт на Joomla! або кнопку «Адміністрування» для авторизації в адміністративній частині сайту." +INSTL_COMPLETE_DESC2="На Сервері допомоги Joomla!, Ви знайдете легко, крок за кроком, керівництво по встановленню власного мовного пакету для Joomla! Також Ви знайдете список посилань на доступні мовні пакети." +INSTL_COMPLETE_DESC3="Натисніть кнопку праворуч, щоб відкрити довідку Сервера допомоги у новому вікні." +INSTL_DEFAULTLANGUAGE_NOTE="Зауваження. Після натиснення на кнопку «Далі» ви будете направлені у кінець процесу встановлення, де вам буде запропоновано видалити теки встановлення" +INSTL_DEFAULTLANGUAGE_TABLE_HEADER="Оберіть свою мову за замовчуванням" +INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Помилка ініціалізації номеру версії схеми" +INSTL_DATABASE_PREFIX_INVALID_CHARS="Префікс таблиці бази даних MySQL повинен починатися з букви після якої можуть бути, як букви так числа, або нижнє підкреслення" +INSTL_ADVANCED_SETTINGS="Розширені параметри" +INSTL_BASIC_SETTINGS="Базові параметри" +INSTL_INSTALLATION="Встановлення" +INSTL_LICENSE="Ліцензія" +JADVANCED="Розширені" INSTL_SAMPLE_BLOG_UA_SET="Демонстраційні дані для блогу на українській мові (UA)" INSTL_SAMPLE_BROCHURE_UA_SET="Демонстраційні дані для брошури на українській мові (UA)" INSTL_SAMPLE_DATA_UA_SET="За замовчуванням демонстраційні дані на українській мові (UA)" diff --git a/installation/language/uk-UA/uk-UA.xml b/installation/language/uk-UA/uk-UA.xml index 389903f97e922..17019452c7062 100644 --- a/installation/language/uk-UA/uk-UA.xml +++ b/installation/language/uk-UA/uk-UA.xml @@ -1,14 +1,13 @@ Ukrainian-Українська (Україна) - 3.2.0 + 3.5.0 16.09.2012 Joomla! Ukraine - 2005 - 2014 (C) Open Source Matters. All rights reserved. + 2005 - 2016 (C) Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - Ukrainian Localization for Joomla! 3.0 Installation uk-UA.ini diff --git a/installation/language/vi-VN/vi-VN.ini b/installation/language/vi-VN/vi-VN.ini index e486062806780..f183d3c41bf36 100644 --- a/installation/language/vi-VN/vi-VN.ini +++ b/installation/language/vi-VN/vi-VN.ini @@ -1,10 +1,8 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 - - ;Stepbar INSTL_STEP_COMPLETE_LABEL="Kết thúc" INSTL_STEP_DATABASE_LABEL="Cơ sở dữ liệu" @@ -89,7 +87,7 @@ INSTL_SAMPLE_LEARN_SET="Dữ liệu mẫu Học Joomla English (GB)" INSTL_SAMPLE_TESTING_SET="Dữ liệu mẫu Thử English (GB)" INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Cài đặt Joomla chỉ với một menu và form đăng nhập, không gồm dữ liệu nội dung." INSTL_SAMPLE_BLOG_SET_DESC="Cài đặt Joomla chỉ với một số bài viết và module liên quan đến blog như Bài viết cũ, Danh sách bài Blog, Các bài đọc nhiều nhất." -INSTL_SAMPLE_BROCHURE_SET_DESC="Cài đặt Joomla chỉ với một số trang (một menu với các trang như Trang chủ, Về chúng tôi, Liên hệ) và module như Tìm kiếm, Custom HTML và form Đăng nhập." +INSTL_SAMPLE_BROCHURE_SET_DESC="Cài đặt Joomla chỉ với một số trang (một menu với các trang như Trang chủ, Về chúng tôi, Liên hệ) và module như Tìm kiếm, Custom và form Đăng nhập." INSTL_SAMPLE_DATA_SET_DESC="Cài đặt Joomla chỉ với một trang(một menu với liên kết) và module như Bài viết mới nhất, form Đăng nhập." INSTL_SAMPLE_LEARN_SET_DESC="Cài đặt Joomla chỉ với bài viết mẫu dùng để mô tả cách hoạt động của Joomla." INSTL_SAMPLE_TESTING_SET_DESC="Cài đặt Joomla với tất cả các menu có sẵn để giúp cho việc dùng thử Joomla." @@ -118,14 +116,20 @@ INSTL_EMAIL_NOT_SENT="Email không thể được gửi." ;Complete view INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Chi tiết đăng nhập tài khoản quản trị" -INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Thư mục cài đặt đã được xóa bỏ." -INSTL_COMPLETE_ERROR_FOLDER_DELETE="Không thể tự động xóa bỏ thư mục cài đặt. Xin hãy xóa thư mục này bằng tay." -INSTL_COMPLETE_FOLDER_REMOVED="Thư mục cài đặt đã được gỡ bỏ thành công." +; Từ 'installation' không được dịch vì đó là tên một thư mục thực tế. +INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Thư mục installation đã được xóa bỏ." +; Từ 'installation' không được dịch vì đó là tên một thư mục thực tế. +INSTL_COMPLETE_ERROR_FOLDER_DELETE="Không thể tự động xóa bỏ thư mục installation. Xin hãy xóa thư mục này bằng tay." +; Từ 'installation' không được dịch vì đó là tên một thư mục thực tế. +INSTL_COMPLETE_FOLDER_REMOVED="Thư mục installation đã được gỡ bỏ thành công." INSTL_COMPLETE_LANGUAGE_1="Joomla! bằng ngôn ngữ của bạn và/hoặc tự tạo ra trang đa ngôn ngữ cơ bản" -INSTL_COMPLETE_LANGUAGE_DESC="Trước khi xóa bỏ thư mục cài đặt bạn có thể cài đặt thêm ngôn ngữ. Nếu bạn muốn thêm ngôn ngứ khác vào ứng dụng Joomla! của bạn thì nhấn vào nút sau." +; Từ 'installation' không được dịch vì đó là tên một thư mục thực tế. +INSTL_COMPLETE_LANGUAGE_DESC="Trước khi xóa bỏ thư mục installation bạn có thể cài đặt thêm ngôn ngữ. Nếu bạn muốn thêm ngôn ngứ khác vào ứng dụng Joomla! của bạn thì nhấn vào nút sau." INSTL_COMPLETE_LANGUAGE_DESC2="Lưu ý: bạn sẽ cần kết nối Internet để cho phép Joomla! tải xuống và cài đặt ngôn ngữ mới.
    Một số cấu hình máy chủ sẽ không cho phép Joomla! cài đặt các ngôn ngữ. Nếu đó là trường hợp của bạn, đừng lo lắng, bạn sẽ có thể cài đặt chúng sau bằng cách sử dụng tài khoản quản trị Joomla!." -INSTL_COMPLETE_REMOVE_FOLDER="Gỡ bỏ thư mục cài đặt" -INSTL_COMPLETE_REMOVE_INSTALLATION="HÃY NHỚ HOÀN TOÀN GỠ BỎ THƯ MỤC CÀI ĐẶT
    Bạn sẽ không thể tiếp tục cho đến khi thư mục cài đặt được gỡ bỏ. Đây là một tính năng bảo mật của Joomla!." +; Từ 'installation' không được dịch vì đó là tên một thư mục thực tế. +INSTL_COMPLETE_REMOVE_FOLDER="Gỡ bỏ thư mục installation" +; Từ 'installation' không được dịch vì đó là tên một thư mục thực tế. +INSTL_COMPLETE_REMOVE_INSTALLATION="HÃY NHỚ HOÀN TOÀN GỠ BỎ THƯ MỤC INSTALLATION
    Bạn sẽ không thể tiếp tục cho đến khi thư mục installation được gỡ bỏ. Đây là một tính năng bảo mật của Joomla!." INSTL_COMPLETE_TITLE="Chúc mừng bạn! Joomla! đã được cài đặt." INSTL_COMPLETE_INSTALL_LANGUAGES="Các bước bổ sung: Cài đặt ngôn ngữ" diff --git a/installation/language/vi-VN/vi-VN.xml b/installation/language/vi-VN/vi-VN.xml index 17ea2866fba17..5b31371f1af22 100644 --- a/installation/language/vi-VN/vi-VN.xml +++ b/installation/language/vi-VN/vi-VN.xml @@ -1,12 +1,13 @@ - + Vietnamese (Vietnam) - 3.4.4 + 3.5.0 August 2015 - Joomla Viet Nam Translation Team - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Joomla! Project + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - vn-VN.ini @@ -14,7 +15,6 @@ Vietnamese (Vietnam) vi-VN 0 - 1     diff --git a/installation/language/zh-CN/zh-CN.ini b/installation/language/zh-CN/zh-CN.ini index e63578953faee..5b4e881f11af9 100644 --- a/installation/language/zh-CN/zh-CN.ini +++ b/installation/language/zh-CN/zh-CN.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note：All ini files need to be saved as UTF-8 @@ -36,7 +36,7 @@ INSTL_DATABASE_NO_SCHEMA="没有该数据库类型的数据库模式（database INSTL_DATABASE_OLD_PROCESS_DESC="以前安装的joomla!在安装过程中将会被备份" INSTL_DATABASE_OLD_PROCESS_LABEL="旧数据的处理" INSTL_DATABASE_PASSWORD_DESC="为网站安全起见，请为mysql用户设置密码" -INSTL_DATABASE_PASSWORD_LABEL="密码" +INSTL_DATABASE_PASSWORD_LABEL="数据库密码" INSTL_DATABASE_PREFIX_DESC="为数据表选择一个前缀或者使用随机产生的前缀。理想的前缀是：三四个字符长度，仅包含字母并且以下划线结束。请确保数据库里的其它数据表没有使用该前缀。一般也不要使用 "bak_" ，因该前缀常用于备份数据表。" INSTL_DATABASE_PREFIX_LABEL="数据表前缀" INSTL_DATABASE_PREFIX_MSG="数据表前缀必须以字母开始，中间是数字或字母，最后以下划线结束。" @@ -74,7 +74,7 @@ INSTL_ADMIN_USER_DESC="设置您网站超级管理员的用户名" INSTL_SITE_NAME_LABEL="网站名称" INSTL_SITE_NAME_DESC="请填写您的网站的名称。" INSTL_SITE_METADESC_LABEL="网站描述" -INSTL_SITE_METADESC_TITLE_LABEL="请填写提供给搜索引擎的网站的描述。一般最好是20个字。" +INSTL_SITE_METADESC_TITLE_LABEL="请填写提供给搜索引擎的网站的描述。一般针对谷歌最好是20个字。" INSTL_SITE_OFFLINE_LABEL="网站关闭" INSTL_SITE_OFFLINE_TITLE_LABEL="设置为完成安装后关闭网站前台。此后您可以随时通过全局配置开放网站。" INSTL_SITE_INSTALL_SAMPLE_LABEL="安装示范数据" @@ -87,7 +87,7 @@ INSTL_SAMPLE_LEARN_SET="学习型Joomla示范数据（英文）" INSTL_SAMPLE_TESTING_SET="帮助测试示范数据（英文）" INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="安装后只有一个菜单和一个登录表单，不安装任何示范内容。" INSTL_SAMPLE_BLOG_SET_DESC="安装后网站里将有类似博客的包含热门文章等等的基础排版。" -INSTL_SAMPLE_BROCHURE_SET_DESC="安装后网站内容为手册风格。菜单有“首页”、“关于我们”、“新闻”、“联系我们”。模块有搜索、自定义HTML和登录框。" +INSTL_SAMPLE_BROCHURE_SET_DESC="安装后网站内容为手册风格。菜单有“首页”、“关于我们”、“新闻”、“联系我们”。模块有搜索、自定义和登录框。" INSTL_SAMPLE_DATA_SET_DESC="安装后网站将只有一个页面（一个菜单项）和最新文章、登录框等模块。" INSTL_SAMPLE_LEARN_SET_DESC="安装后网站里将有一些文章介绍Joomla的基础概念。" INSTL_SAMPLE_TESTING_SET_DESC="安装所有的示范内容，便于全面测试Joomla。" @@ -101,7 +101,7 @@ INSTL_SUMMARY_EMAIL_PASSWORDS_LABEL="在Email中包含密码。" INSTL_SUMMARY_EMAIL_PASSWORDS_DESC="警示：强烈建议您不要通过Email发送或保存密码。" ;Installing view -INSTL_INSTALLING="安装中..." +INSTL_INSTALLING="安装中……" INSTL_INSTALLING_DATABASE_BACKUP="旧数据表备份中" INSTL_INSTALLING_DATABASE_REMOVE="旧数据表删除中" INSTL_INSTALLING_DATABASE="数据表创建中" @@ -116,14 +116,20 @@ INSTL_EMAIL_NOT_SENT="无法发送Email。" ;Complete view INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="管理员登陆用的资料" -INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="已删除安装目录。" -INSTL_COMPLETE_ERROR_FOLDER_DELETE="安装目录无法删除，请手动删除。" -INSTL_COMPLETE_FOLDER_REMOVED="安装目录成功移除。" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="已删除目录installation。" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_ERROR_FOLDER_DELETE="目录installation无法删除，请手动删除。" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_FOLDER_REMOVED="成功删除目录installation。" INSTL_COMPLETE_LANGUAGE_1="创建使用您母语的网站及（或）自动创建多语言网站" -INSTL_COMPLETE_LANGUAGE_DESC="删除安装文件夹前可为本站安装指定语言或多语言。请点击以下按钮：" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_LANGUAGE_DESC="删除目录iinstallation前可为本站安装指定语言或多语言。请点击以下按钮：" INSTL_COMPLETE_LANGUAGE_DESC2="提示：您将需要访问权限来允许Joomla下载和安装新的语言。
    有的服务器的配置不允许Joomla这样安装语言。如您遇到的正是这种情况，不用担心，您还能稍后通过登录Joomla管理后台来安装语言。" -INSTL_COMPLETE_REMOVE_FOLDER="删除安装目录" -INSTL_COMPLETE_REMOVE_INSTALLATION="请记住要彻底删除安装目录（installation）
    在目录 "installation" 被删除之前，您无法进行下一步操作。这是Joomla!的一项安全功能。" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_REMOVE_FOLDER="删除目录installation" +; The word 'installation' should not be translated as it is a physical folder. +INSTL_COMPLETE_REMOVE_INSTALLATION="请记住要彻底删除目录installation
    在目录 "installation" 被删除之前，您无法进行下一步操作。这是Joomla!的一项安全功能。" INSTL_COMPLETE_TITLE="恭喜！已经成功安装您的Joomla网站！" INSTL_COMPLETE_INSTALL_LANGUAGES="特别推荐：安装语言" @@ -299,11 +305,11 @@ JNONE="无" ;Necessary for errors ADMIN_EMAIL="您的邮箱" -ADMIN_PASSWORD="系统管理员密码" -ADMIN_PASSWORD2="确认系统管理员密码" +ADMIN_PASSWORD="管理员密码" +ADMIN_PASSWORD2="确认管理员密码" SITE_NAME="网站名称" -; 数据库类型 （允许一个比内部名称允许更具描述性的标签） +; 数据库类型 （允许比内部名称允许更具描述性的标签） MYSQL="MySQL" MYSQLI="MySQLi" ORACLE="Oracle" diff --git a/installation/language/zh-CN/zh-CN.xml b/installation/language/zh-CN/zh-CN.xml index da36deb9d3eda..590d074263632 100644 --- a/installation/language/zh-CN/zh-CN.xml +++ b/installation/language/zh-CN/zh-CN.xml @@ -1,15 +1,13 @@ Chinese Simplified 简体中文 - 3.4.0 + 3.5.0 2015.3.15 Joomla! Project - admin@joomla.org - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - This Chinese Simplified language for the installation of Joomla 3.x. zh-CN.ini diff --git a/installation/language/zh-TW/zh-TW.ini b/installation/language/zh-TW/zh-TW.ini index 1594796e0924e..7f192b7c23660 100644 --- a/installation/language/zh-TW/zh-TW.ini +++ b/installation/language/zh-TW/zh-TW.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt ; Note : All ini files need to be saved as UTF-8 @@ -87,7 +87,7 @@ INSTL_SAMPLE_LEARN_SET="學習Joomla(英文)範例資料" INSTL_SAMPLE_TESTING_SET="測試用(英文)範例資料" INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="安裝Joomla，加上一個選單和登入表單，但不加入任何的內容。" INSTL_SAMPLE_BLOG_SET_DESC="安裝Joomla，加入一些文章和部落格相關模組，例如較舊的文章、部落格摘要、最多閱讀的文章。" -INSTL_SAMPLE_BROCHURE_SET_DESC="安裝Joomla，加入一些頁面(一個包含首頁、關於我們、新聞、聯絡我們的選單)，以及模組例如搜尋、自訂HTML、登入表單。" +INSTL_SAMPLE_BROCHURE_SET_DESC="安裝Joomla，加入一些頁面(一個包含首頁、關於我們、新聞、聯絡我們的選單)，以及模組例如搜尋、自訂、登入表單。" INSTL_SAMPLE_DATA_SET_DESC="安裝Joomla，加入一個頁面(一個選單包含一個連結)，以及模組例如最新文章、登入表單。" INSTL_SAMPLE_LEARN_SET_DESC="安裝Joomla，加入說明Joomla是如何運作的範例文章。" INSTL_SAMPLE_TESTING_SET_DESC="安裝Joomla，加入所以可能的選單項目，用於協助測試Joomla。" @@ -192,6 +192,7 @@ INSTL_DATABASE_ERROR_CREATE="當嘗試建立資料庫 %s 時發生錯誤。
    Chinese Traditional (Taiwan) - 3.4.4 - August 2015 + 3.5.0 + January 2016 Joomla! Taiwan - admin@joomla.org - www.joomla.org - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt - zh-TW.ini diff --git a/installation/model/configuration.php b/installation/model/configuration.php index 4eb5bae1c57a4..217068ee5fa64 100644 --- a/installation/model/configuration.php +++ b/installation/model/configuration.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage Model * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/model/database.php b/installation/model/database.php index 0fcc2d4c03b55..24830d0e1be67 100644 --- a/installation/model/database.php +++ b/installation/model/database.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage Model * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -158,6 +158,16 @@ public function initialise($options) return false; } + // Workaround for UPPERCASE table prefix for postgresql + if ($options->db_type == 'postgresql') + { + if (strtolower($options->db_prefix) != $options->db_prefix) + { + $app->enqueueMessage(JText::_('INSTL_DATABASE_FIX_LOWERCASE'), 'notice'); + return false; + } + } + // Get a database object. try { @@ -507,6 +517,31 @@ public function createTables($options) return false; } + // Get query object for later database access + $query = $db->getQuery(true); + + // MySQL only: Attempt to update the table #__utf8_conversion. + $serverType = $db->getServerType(); + + if ($serverType === 'mysql') + { + $query->clear() + ->update($db->quoteName('#__utf8_conversion')) + ->set($db->quoteName('converted') . ' = ' . ($db->hasUTF8mb4Support() ? 2 : 1)); + $db->setQuery($query); + + try + { + $db->execute(); + } + catch (RuntimeException $e) + { + $app->enqueueMessage($e->getMessage(), 'notice'); + + return false; + } + } + // Attempt to update the table #__schema. $pathPart = JPATH_ADMINISTRATOR . '/components/com_admin/sql/updates/'; @@ -542,7 +577,7 @@ public function createTables($options) } } - $query = $db->getQuery(true) + $query->clear() ->insert($db->quoteName('#__schemas')) ->columns( array( diff --git a/installation/model/forms/database.xml b/installation/model/forms/database.xml index 4fd4508028741..ecb67af45b1d1 100644 --- a/installation/model/forms/database.xml +++ b/installation/model/forms/database.xml @@ -22,6 +22,7 @@ /> Protostar is a mobile ready template designed using Twitter Bootstrap. It is sleek and easily to customise. It is the default template for Joomla 3.

    ', 1, 0, '0000-00-00 00:00:00', 1, '{"category_layout":"","image":""}', '', '', '{"author":"","robots":""}', 910, '2012-09-25 11:50:03', 123, '2012-09-25 12:13:14', 0, '*', 1); INSERT IGNORE INTO `#__contact_details` (`id`, `name`, `alias`, `con_position`, `address`, `suburb`, `state`, `country`, `postcode`, `telephone`, `fax`, `misc`, `image`, `email_to`, `default_con`, `published`, `checked_out`, `checked_out_time`, `ordering`, `params`, `user_id`, `catid`, `access`, `mobile`, `webpage`, `sortname1`, `sortname2`, `sortname3`, `language`, `created`, `created_by`, `created_by_alias`, `modified`, `modified_by`, `metakey`, `metadesc`, `metadata`, `featured`, `xreference`, `publish_up`, `publish_down`, `version`, `hits`) VALUES -(1, 'Contact Name Here', 'name', 'Position', 'Street Address', 'Suburb', 'State', 'Country', 'Zip Code', 'Telephone', 'Fax', '

    Information about or by the contact.

    ', 'images/powered_by.png', 'email@example.com', 1, 1, 0, '0000-00-00 00:00:00', 1, '{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"1","linka_name":"Twitter","linka":"http:\\/\\/twitter.com\\/joomla","linkb_name":"YouTube","linkb":"http:\\/\\/www.youtube.com\\/user\\/joomla","linkc_name":"Facebook","linkc":"http:\\/\\/www.facebook.com\\/joomla","linkd_name":"FriendFeed","linkd":"http:\\/\\/friendfeed.com\\/joomla","linke_name":"Scribed","linke":"http:\\/\\/www.scribd.com\\/people\\/view\\/504592-joomla","contact_layout":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":""}', 0, 16, 1, '', '', 'last', 'first', 'middle', 'en-GB', '2011-01-01 00:00:01', 42, 'Joomla', '0000-00-00 00:00:00', 0, '', '', '{"robots":"","rights":""}', 1, '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 0), +(1, 'Contact Name Here', 'name', 'Position', 'Street Address', 'Suburb', 'State', 'Country', 'Zip Code', 'Telephone', 'Fax', '

    Information about or by the contact.

    ', 'images/powered_by.png', 'email@example.com', 1, 1, 0, '0000-00-00 00:00:00', 1, '{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"1","linka_name":"Twitter","linka":"http:\\/\\/twitter.com\\/joomla","linkb_name":"YouTube","linkb":"http:\\/\\/www.youtube.com\\/user\\/joomla","linkc_name":"Facebook","linkc":"http:\\/\\/www.facebook.com\\/joomla","linkd_name":"FriendFeed","linkd":"http:\\/\\/friendfeed.com\\/joomla","linke_name":"Scribd","linke":"http:\\/\\/www.scribd.com\\/people\\/view\\/504592-joomla","contact_layout":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":""}', 0, 16, 1, '', '', 'last', 'first', 'middle', 'en-GB', '2011-01-01 00:00:01', 42, 'Joomla', '0000-00-00 00:00:00', 0, '', '', '{"robots":"","rights":""}', 1, '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 0), (2, 'Webmaster', 'webmaster', '', '', '', '', '', '', '', '', '', '', 'webmaster@example.com', 0, 1, 0, '0000-00-00 00:00:00', 1, '{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"","linka_name":"","linka":"","linkb_name":"","linkb":"","linkc_name":"","linkc":"","linkd_name":"","linkd":"","linke_name":"","linke":"","show_email_form":"1","show_email_copy":"1","banned_email":"","banned_subject":"","banned_text":"","validate_session":"1","custom_reply":"","redirect":""}', 0, 34, 1, '', '', '', '', '', 'en-GB', '2011-01-01 00:00:01', 42, 'Joomla', '0000-00-00 00:00:00', 0, '', '', '{"robots":"","rights":""}', 1, '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 0), (3, 'Owner', 'owner', '', '', '', '', '', '', '', '', '

    I''m the owner of this store.

    ', '', '', 0, 1, 0, '0000-00-00 00:00:00', 2, '{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"","linka_name":"","linka":"","linkb_name":"","linkb":"","linkc_name":"","linkc":"","linkd_name":"","linkd":"","linke_name":"","linke":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":""}', 0, 36, 1, '', '', '', '', '', '*', '2011-01-01 00:00:01', 42, 'Joomla', '0000-00-00 00:00:00', 0, '', '', '{"robots":"","rights":""}', 1, '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 0), (4, 'Buyer', 'buyer', '', '', '', '', '', '', '', '', '

    I am in charge of buying fruit. If you sell good fruit, contact me.

    ', '', '', 0, 1, 0, '0000-00-00 00:00:00', 1, '{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"0","linka_name":"","linka":"","linkb_name":"","linkb":"","linkc_name":"","linkc":"","linkd_name":"","linkd":"","linke_name":"","linke":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":""}', 0, 36, 1, '', '', '', '', '', '*', '2011-01-01 00:00:01', 42, 'Joomla', '0000-00-00 00:00:00', 0, '', '', '{"robots":"","rights":""}', 1, '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 0), @@ -351,7 +351,6 @@ INSERT IGNORE INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path` (9, 'menu', 'com_contact_categories', 'Categories', '', 'Contacts/Categories', 'index.php?option=com_categories&extension=com_contact', 'component', 0, 7, 2, 6, 0, '0000-00-00 00:00:00', 0, 0, 'class:contact-cat', 0, '', 26, 27, 0, '*', 1), (10, 'menu', 'com_messages', 'Messaging', '', 'Messaging', 'index.php?option=com_messages', 'component', 0, 1, 1, 15, 0, '0000-00-00 00:00:00', 0, 0, 'class:messages', 0, '', 29, 34, 0, '*', 1), (11, 'menu', 'com_messages_add', 'New Private Message', '', 'Messaging/New Private Message', 'index.php?option=com_messages&task=message.add', 'component', 0, 10, 2, 15, 0, '0000-00-00 00:00:00', 0, 0, 'class:messages-add', 0, '', 30, 31, 0, '*', 1), -(12, 'menu', 'com_messages_read', 'Read Private Message', '', 'Messaging/Read Private Message', 'index.php?option=com_messages', 'component', 0, 10, 2, 15, 0, '0000-00-00 00:00:00', 0, 0, 'class:messages-read', 0, '', 32, 33, 0, '*', 1), (13, 'menu', 'com_newsfeeds', 'News Feeds', '', 'News Feeds', 'index.php?option=com_newsfeeds', 'component', 0, 1, 1, 17, 0, '0000-00-00 00:00:00', 0, 0, 'class:newsfeeds', 0, '', 35, 40, 0, '*', 1), (14, 'menu', 'com_newsfeeds_feeds', 'Feeds', '', 'News Feeds/Feeds', 'index.php?option=com_newsfeeds', 'component', 0, 13, 2, 17, 0, '0000-00-00 00:00:00', 0, 0, 'class:newsfeeds', 0, '', 36, 37, 0, '*', 1), (15, 'menu', 'com_newsfeeds_categories', 'Categories', '', 'News Feeds/Categories', 'index.php?option=com_categories&extension=com_newsfeeds', 'component', 0, 13, 2, 6, 0, '0000-00-00 00:00:00', 0, 0, 'class:newsfeeds-cat', 0, '', 38, 39, 0, '*', 1), diff --git a/installation/sql/mysql/sample_testing.sql b/installation/sql/mysql/sample_testing.sql index 8b1fa3a20c8f4..697d9a9ca3092 100644 --- a/installation/sql/mysql/sample_testing.sql +++ b/installation/sql/mysql/sample_testing.sql @@ -256,7 +256,7 @@ INSERT IGNORE INTO `#__categories` (`id`, `asset_id`, `parent_id`, `lft`, `rgt`, (77, 169, 1, 133, 134, 1, 'uncategorised', 'com_users', 'Uncategorised', 'uncategorised', '', '', 1, 0, '0000-00-00 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '0000-00-00 00:00:00', 0, '*', 1); INSERT IGNORE INTO `#__contact_details` (`id`, `name`, `alias`, `con_position`, `address`, `suburb`, `state`, `country`, `postcode`, `telephone`, `fax`, `misc`, `image`, `email_to`, `default_con`, `published`, `checked_out`, `checked_out_time`, `ordering`, `params`, `user_id`, `catid`, `access`, `mobile`, `webpage`, `sortname1`, `sortname2`, `sortname3`, `language`, `created`, `created_by`, `created_by_alias`, `modified`, `modified_by`, `metakey`, `metadesc`, `metadata`, `featured`, `xreference`, `publish_up`, `publish_down`, `version`, `hits`) VALUES -(1, 'Contact Name Here', 'name', 'Position', 'Street Address', 'Suburb', 'State', 'Country', 'Zip Code', 'Telephone', 'Fax', '

    Information about or by the contact.

    ', 'images/powered_by.png', 'email@example.com', 1, 1, 0, '0000-00-00 00:00:00', 1, '{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"1","linka_name":"Twitter","linka":"http:\\/\\/twitter.com\\/joomla","linkb_name":"YouTube","linkb":"http:\\/\\/www.youtube.com\\/user\\/joomla","linkc_name":"Facebook","linkc":"http:\\/\\/www.facebook.com\\/joomla","linkd_name":"FriendFeed","linkd":"http:\\/\\/friendfeed.com\\/joomla","linke_name":"Scribed","linke":"http:\\/\\/www.scribd.com\\/people\\/view\\/504592-joomla","contact_layout":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":""}', 0, 16, 1, '', '', 'last', 'first', 'middle', 'en-GB', '2011-01-01 00:00:01', 42, 'Joomla', '0000-00-00 00:00:00', 0, '', '', '{"robots":"","rights":""}', 1, '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 0), +(1, 'Contact Name Here', 'name', 'Position', 'Street Address', 'Suburb', 'State', 'Country', 'Zip Code', 'Telephone', 'Fax', '

    Information about or by the contact.

    ', 'images/powered_by.png', 'email@example.com', 1, 1, 0, '0000-00-00 00:00:00', 1, '{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"1","linka_name":"Twitter","linka":"http:\\/\\/twitter.com\\/joomla","linkb_name":"YouTube","linkb":"http:\\/\\/www.youtube.com\\/user\\/joomla","linkc_name":"Facebook","linkc":"http:\\/\\/www.facebook.com\\/joomla","linkd_name":"FriendFeed","linkd":"http:\\/\\/friendfeed.com\\/joomla","linke_name":"Scribd","linke":"http:\\/\\/www.scribd.com\\/people\\/view\\/504592-joomla","contact_layout":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":""}', 0, 16, 1, '', '', 'last', 'first', 'middle', 'en-GB', '2011-01-01 00:00:01', 42, 'Joomla', '0000-00-00 00:00:00', 0, '', '', '{"robots":"","rights":""}', 1, '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 0), (2, 'Webmaster', 'webmaster', '', '', '', '', '', '', '', '', '', '', 'webmaster@example.com', 0, 1, 0, '0000-00-00 00:00:00', 1, '{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"","linka_name":"","linka":"","linkb_name":"","linkb":"","linkc_name":"","linkc":"","linkd_name":"","linkd":"","linke_name":"","linke":"","show_email_form":"1","show_email_copy":"1","banned_email":"","banned_subject":"","banned_text":"","validate_session":"1","custom_reply":"","redirect":""}', 0, 34, 1, '', '', '', '', '', 'en-GB', '2011-01-01 00:00:01', 42, 'Joomla', '0000-00-00 00:00:00', 0, '', '', '{"robots":"","rights":""}', 1, '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 0), (3, 'Owner', 'owner', '', '', '', '', '', '', '', '', '

    I''m the owner of this store.

    ', '', '', 0, 1, 0, '0000-00-00 00:00:00', 2, '{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"","linka_name":"","linka":"","linkb_name":"","linkb":"","linkc_name":"","linkc":"","linkd_name":"","linkd":"","linke_name":"","linke":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":""}', 0, 36, 1, '', '', '', '', '', '*', '2011-01-01 00:00:01', 42, 'Joomla', '0000-00-00 00:00:00', 0, '', '', '{"robots":"","rights":""}', 1, '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 0), (4, 'Buyer', 'buyer', '', '', '', '', '', '', '', '', '

    I am in charge of buying fruit. If you sell good fruit, contact me.

    ', '', '', 0, 1, 0, '0000-00-00 00:00:00', 1, '{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"0","linka_name":"","linka":"","linkb_name":"","linkb":"","linkc_name":"","linkc":"","linkd_name":"","linkd":"","linke_name":"","linke":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":""}', 0, 36, 1, '', '', '', '', '', '*', '2011-01-01 00:00:01', 42, 'Joomla', '0000-00-00 00:00:00', 0, '', '', '{"robots":"","rights":""}', 1, '', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 0), @@ -367,7 +367,6 @@ INSERT IGNORE INTO `#__menu` (`id`, `menutype`, `title`, `alias`, `note`, `path` (9, 'menu', 'com_contact_categories', 'Categories', '', 'Contacts/Categories', 'index.php?option=com_categories&extension=com_contact', 'component', 0, 7, 2, 6, 0, '0000-00-00 00:00:00', 0, 0, 'class:contact-cat', 0, '', 18, 19, 0, '*', 1), (10, 'menu', 'com_messages', 'Messaging', '', 'Messaging', 'index.php?option=com_messages', 'component', 0, 1, 1, 15, 0, '0000-00-00 00:00:00', 0, 0, 'class:messages', 0, '', 21, 26, 0, '*', 1), (11, 'menu', 'com_messages_add', 'New Private Message', '', 'Messaging/New Private Message', 'index.php?option=com_messages&task=message.add', 'component', 0, 10, 2, 15, 0, '0000-00-00 00:00:00', 0, 0, 'class:messages-add', 0, '', 22, 23, 0, '*', 1), -(12, 'menu', 'com_messages_read', 'Read Private Message', '', 'Messaging/Read Private Message', 'index.php?option=com_messages', 'component', 0, 10, 2, 15, 0, '0000-00-00 00:00:00', 0, 0, 'class:messages-read', 0, '', 24, 25, 0, '*', 1), (13, 'menu', 'com_newsfeeds', 'News Feeds', '', 'News Feeds', 'index.php?option=com_newsfeeds', 'component', 0, 1, 1, 17, 0, '0000-00-00 00:00:00', 0, 0, 'class:newsfeeds', 0, '', 27, 32, 0, '*', 1), (14, 'menu', 'com_newsfeeds_feeds', 'Feeds', '', 'News Feeds/Feeds', 'index.php?option=com_newsfeeds', 'component', 0, 13, 2, 17, 0, '0000-00-00 00:00:00', 0, 0, 'class:newsfeeds', 0, '', 28, 29, 0, '*', 1), (15, 'menu', 'com_newsfeeds_categories', 'Categories', '', 'News Feeds/Categories', 'index.php?option=com_categories&extension=com_newsfeeds', 'component', 0, 13, 2, 6, 0, '0000-00-00 00:00:00', 0, 0, 'class:newsfeeds-cat', 0, '', 30, 31, 0, '*', 1), diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql index db9977c188c14..3949eeb1e1c2f 100644 --- a/installation/sql/postgresql/joomla.sql +++ b/installation/sql/postgresql/joomla.sql @@ -608,8 +608,9 @@ INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder" (449, 'plg_authentication_cookie', 'plugin', 'cookie', 'authentication', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0), (450, 'plg_twofactorauth_yubikey', 'plugin', 'yubikey', 'twofactorauth', 0, 0, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0), (451, 'plg_search_tags', 'plugin', 'tags', 'search', 0, 1, 1, 0, '', '{"search_limit":"50","show_tagged_items":"1"}', '', '', 0, '1970-01-01 00:00:00', 0, 0), -(452, 'plg_system_updatenotification', 'plugin', 'updatenotification', 'system', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0); -(453, 'plg_editors-xtd_module', 'plugin', 'module', 'editors-xtd', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0); +(452, 'plg_system_updatenotification', 'plugin', 'updatenotification', 'system', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0), +(453, 'plg_editors-xtd_module', 'plugin', 'module', 'editors-xtd', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0), +(454, 'plg_system_stats', 'plugin', 'stats', 'system', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0); -- Templates INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES @@ -1209,11 +1210,10 @@ INSERT INTO "#__menu" ("id", "menutype", "title", "alias", "note", "path", "link (5, 'menu', 'com_banners_clients', 'Clients', '', 'Banners/Clients', 'index.php?option=com_banners&view=clients', 'component', 0, 2, 2, 4, 0, '1970-01-01 00:00:00', 0, 0, 'class:banners-clients', 0, '', 6, 7, 0, '*', 1), (6, 'menu', 'com_banners_tracks', 'Tracks', '', 'Banners/Tracks', 'index.php?option=com_banners&view=tracks', 'component', 0, 2, 2, 4, 0, '1970-01-01 00:00:00', 0, 0, 'class:banners-tracks', 0, '', 8, 9, 0, '*', 1), (7, 'menu', 'com_contact', 'Contacts', '', 'Contacts', 'index.php?option=com_contact', 'component', 0, 1, 1, 8, 0, '1970-01-01 00:00:00', 0, 0, 'class:contact', 0, '', 11, 16, 0, '*', 1), -(8, 'menu', 'com_contact', 'Contacts', '', 'Contacts/Contacts', 'index.php?option=com_contact', 'component', 0, 7, 2, 8, 0, '1970-01-01 00:00:00', 0, 0, 'class:contact', 0, '', 12, 13, 0, '*', 1), +(8, 'menu', 'com_contact_contacts', 'Contacts', '', 'Contacts/Contacts', 'index.php?option=com_contact', 'component', 0, 7, 2, 8, 0, '1970-01-01 00:00:00', 0, 0, 'class:contact', 0, '', 12, 13, 0, '*', 1), (9, 'menu', 'com_contact_categories', 'Categories', '', 'Contacts/Categories', 'index.php?option=com_categories&extension=com_contact', 'component', 0, 7, 2, 6, 0, '1970-01-01 00:00:00', 0, 0, 'class:contact-cat', 0, '', 14, 15, 0, '*', 1), (10, 'menu', 'com_messages', 'Messaging', '', 'Messaging', 'index.php?option=com_messages', 'component', 0, 1, 1, 15, 0, '1970-01-01 00:00:00', 0, 0, 'class:messages', 0, '', 17, 22, 0, '*', 1), (11, 'menu', 'com_messages_add', 'New Private Message', '', 'Messaging/New Private Message', 'index.php?option=com_messages&task=message.add', 'component', 0, 10, 2, 15, 0, '1970-01-01 00:00:00', 0, 0, 'class:messages-add', 0, '', 18, 19, 0, '*', 1), -(12, 'menu', 'com_messages_read', 'Read Private Message', '', 'Messaging/Read Private Message', 'index.php?option=com_messages', 'component', 0, 10, 2, 15, 0, '1970-01-01 00:00:00', 0, 0, 'class:messages-read', 0, '', 20, 21, 0, '*', 1), (13, 'menu', 'com_newsfeeds', 'News Feeds', '', 'News Feeds', 'index.php?option=com_newsfeeds', 'component', 0, 1, 1, 17, 0, '1970-01-01 00:00:00', 0, 0, 'class:newsfeeds', 0, '', 23, 28, 0, '*', 1), (14, 'menu', 'com_newsfeeds_feeds', 'Feeds', '', 'News Feeds/Feeds', 'index.php?option=com_newsfeeds', 'component', 0, 13, 2, 17, 0, '1970-01-01 00:00:00', 0, 0, 'class:newsfeeds', 0, '', 24, 25, 0, '*', 1), (15, 'menu', 'com_newsfeeds_categories', 'Categories', '', 'News Feeds/Categories', 'index.php?option=com_categories&extension=com_newsfeeds', 'component', 0, 13, 2, 6, 0, '1970-01-01 00:00:00', 0, 0, 'class:newsfeeds-cat', 0, '', 26, 27, 0, '*', 1), @@ -1448,25 +1448,26 @@ COMMENT ON COLUMN "#__postinstall_messages"."version_introduced" IS 'Version whe INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled") VALUES (700, 'PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_TITLE', 'PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_BODY', 'PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_ACTION', 'plg_twofactorauth_totp', 1, 'action', 'site://plugins/twofactorauth/totp/postinstall/actions.php', 'twofactorauth_postinstall_action', 'site://plugins/twofactorauth/totp/postinstall/actions.php', 'twofactorauth_postinstall_condition', '3.2.0', 1), -(700, 'COM_CPANEL_WELCOME_BEGINNERS_TITLE', 'COM_CPANEL_WELCOME_BEGINNERS_MESSAGE', '', 'com_cpanel', 1, 'message', '', '', '', '', '3.2.0', 1); +(700, 'COM_CPANEL_WELCOME_BEGINNERS_TITLE', 'COM_CPANEL_WELCOME_BEGINNERS_MESSAGE', '', 'com_cpanel', 1, 'message', '', '', '', '', '3.2.0', 1), +(700, 'COM_CPANEL_MSG_STATS_COLLECTION_TITLE', 'COM_CPANEL_MSG_STATS_COLLECTION_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/statscollection.php', 'admin_postinstall_statscollection_condition', '3.5.0', 1); -- -- Table: #__redirect_links -- CREATE TABLE "#__redirect_links" ( "id" serial NOT NULL, - "old_url" varchar(255) NOT NULL, - "new_url" varchar(255), - "referer" varchar(150) NOT NULL, + "old_url" varchar(2048) NOT NULL, + "new_url" varchar(2048), + "referer" varchar(2048) NOT NULL, "comment" varchar(255) NOT NULL, "hits" bigint DEFAULT 0 NOT NULL, "published" smallint NOT NULL, "created_date" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL, "modified_date" timestamp without time zone DEFAULT '1970-01-01 00:00:00' NOT NULL, - "header" INTEGER DEFAULT 301 NOT NULL, - PRIMARY KEY ("id"), - CONSTRAINT "#__redirect_links_idx_link_old" UNIQUE ("old_url") + "header" integer DEFAULT 301 NOT NULL, + PRIMARY KEY ("id") ); +CREATE INDEX "#__redirect_links_idx_old_url" ON "#__redirect_links" ("old_url"); CREATE INDEX "#__redirect_links_idx_link_modifed" ON "#__redirect_links" ("modified_date"); -- diff --git a/installation/sql/postgresql/sample_blog.sql b/installation/sql/postgresql/sample_blog.sql index 79fac9ad8d3f1..4affb5e9f1ca8 100644 --- a/installation/sql/postgresql/sample_blog.sql +++ b/installation/sql/postgresql/sample_blog.sql @@ -98,7 +98,6 @@ INSERT INTO "#__menu" VALUES (9,'menu','com_contact_categories','Categories','','Contacts/Categories','index.php?option=com_categories&extension=com_contact','component',0,7,2,6,0,'1970-01-01 00:00:00',0,0,'class:contact-cat',0,'',36,37,0,'*',1), (10,'menu','com_messages','Messaging','','Messaging','index.php?option=com_messages','component',0,1,1,15,0,'1970-01-01 00:00:00',0,0,'class:messages',0,'',39,44,0,'*',1), (11,'menu','com_messages_add','New Private Message','','Messaging/New Private Message','index.php?option=com_messages&task=message.add','component',0,10,2,15,0,'1970-01-01 00:00:00',0,0,'class:messages-add',0,'',40,41,0,'*',1), -(12,'menu','com_messages_read','Read Private Message','','Messaging/Read Private Message','index.php?option=com_messages','component',0,10,2,15,0,'1970-01-01 00:00:00',0,0,'class:messages-read',0,'',42,43,0,'*',1), (13,'menu','com_newsfeeds','News Feeds','','News Feeds','index.php?option=com_newsfeeds','component',0,1,1,17,0,'1970-01-01 00:00:00',0,0,'class:newsfeeds',0,'',45,50,0,'*',1), (14,'menu','com_newsfeeds_feeds','Feeds','','News Feeds/Feeds','index.php?option=com_newsfeeds','component',0,13,2,17,0,'1970-01-01 00:00:00',0,0,'class:newsfeeds',0,'',46,47,0,'*',1), (15,'menu','com_newsfeeds_categories','Categories','','News Feeds/Categories','index.php?option=com_categories&extension=com_newsfeeds','component',0,13,2,6,0,'1970-01-01 00:00:00',0,0,'class:newsfeeds-cat',0,'',48,49,0,'*',1), diff --git a/installation/sql/postgresql/sample_data.sql b/installation/sql/postgresql/sample_data.sql index c80cd9b52c62c..c5dbe9557f605 100644 --- a/installation/sql/postgresql/sample_data.sql +++ b/installation/sql/postgresql/sample_data.sql @@ -71,7 +71,6 @@ INSERT INTO "#__menu" VALUES (9,'menu','com_contact_categories','Categories','','Contacts/Categories','index.php?option=com_categories&extension=com_contact','component',0,7,2,6,0,'1970-01-01 00:00:00',0,0,'class:contact-cat',0,'',16,17,0,'*',1), (10,'menu','com_messages','Messaging','','Messaging','index.php?option=com_messages','component',0,1,1,15,0,'1970-01-01 00:00:00',0,0,'class:messages',0,'',19,24,0,'*',1), (11,'menu','com_messages_add','New Private Message','','Messaging/New Private Message','index.php?option=com_messages&task=message.add','component',0,10,2,15,0,'1970-01-01 00:00:00',0,0,'class:messages-add',0,'',20,21,0,'*',1), -(12,'menu','com_messages_read','Read Private Message','','Messaging/Read Private Message','index.php?option=com_messages','component',0,10,2,15,0,'1970-01-01 00:00:00',0,0,'class:messages-read',0,'',22,23,0,'*',1), (13,'menu','com_newsfeeds','News Feeds','','News Feeds','index.php?option=com_newsfeeds','component',0,1,1,17,0,'1970-01-01 00:00:00',0,0,'class:newsfeeds',0,'',25,30,0,'*',1), (14,'menu','com_newsfeeds_feeds','Feeds','','News Feeds/Feeds','index.php?option=com_newsfeeds','component',0,13,2,17,0,'1970-01-01 00:00:00',0,0,'class:newsfeeds',0,'',26,27,0,'*',1), (15,'menu','com_newsfeeds_categories','Categories','','News Feeds/Categories','index.php?option=com_categories&extension=com_newsfeeds','component',0,13,2,6,0,'1970-01-01 00:00:00',0,0,'class:newsfeeds-cat',0,'',28,29,0,'*',1), diff --git a/installation/sql/postgresql/sample_learn.sql b/installation/sql/postgresql/sample_learn.sql index 83c5a8f96208d..b525b014e902e 100644 --- a/installation/sql/postgresql/sample_learn.sql +++ b/installation/sql/postgresql/sample_learn.sql @@ -268,7 +268,7 @@ SELECT setval('#__categories_id_seq', max(id)) FROM #__categories; -- Dumping data for table #__contact_details -- INSERT INTO "#__contact_details" VALUES -(1,'Contact Name Here','name','Position','Street Address','Suburb','State','Country','Zip Code','Telephone','Fax','

    Information about or by the contact.

    ','images/powered_by.png','email@example.com',1,1,0,'1970-01-01 00:00:00',1,'{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"1","linka_name":"Twitter","linka":"http:\\/\\/twitter.com\\/joomla","linkb_name":"YouTube","linkb":"http:\\/\\/www.youtube.com\\/user\\/joomla","linkc_name":"Facebook","linkc":"http:\\/\\/www.facebook.com\\/joomla","linkd_name":"FriendFeed","linkd":"http:\\/\\/friendfeed.com\\/joomla","linke_name":"Scribed","linke":"http:\\/\\/www.scribd.com\\/people\\/view\\/504592-joomla","contact_layout":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":""}',0,16,1,'','','last','first','middle','en-GB','2011-01-01 00:00:01',42,'Joomla','1970-01-01 00:00:00',0,'','','{"robots":"","rights":""}',1,'','1970-01-01 00:00:00','1970-01-01 00:00:00',1,0), +(1,'Contact Name Here','name','Position','Street Address','Suburb','State','Country','Zip Code','Telephone','Fax','

    Information about or by the contact.

    ','images/powered_by.png','email@example.com',1,1,0,'1970-01-01 00:00:00',1,'{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"1","linka_name":"Twitter","linka":"http:\\/\\/twitter.com\\/joomla","linkb_name":"YouTube","linkb":"http:\\/\\/www.youtube.com\\/user\\/joomla","linkc_name":"Facebook","linkc":"http:\\/\\/www.facebook.com\\/joomla","linkd_name":"FriendFeed","linkd":"http:\\/\\/friendfeed.com\\/joomla","linke_name":"Scribd","linke":"http:\\/\\/www.scribd.com\\/people\\/view\\/504592-joomla","contact_layout":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":""}',0,16,1,'','','last','first','middle','en-GB','2011-01-01 00:00:01',42,'Joomla','1970-01-01 00:00:00',0,'','','{"robots":"","rights":""}',1,'','1970-01-01 00:00:00','1970-01-01 00:00:00',1,0), (2,'Webmaster','webmaster','','','','','','','','','','','webmaster@example.com',0,1,0,'1970-01-01 00:00:00',1,'{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"","linka_name":"","linka":"","linkb_name":"","linkb":"","linkc_name":"","linkc":"","linkd_name":"","linkd":"","linke_name":"","linke":"","show_email_form":"1","show_email_copy":"1","banned_email":"","banned_subject":"","banned_text":"","validate_session":"1","custom_reply":"","redirect":""}',0,34,1,'','','','','','en-GB','2011-01-01 00:00:01',42,'Joomla','1970-01-01 00:00:00',0,'','','{"robots":"","rights":""}',1,'','1970-01-01 00:00:00','1970-01-01 00:00:00',1,0), (3,'Owner','owner','','','','','','','','','

    I\'m the owner of this store.

    ','','',0,1,0,'1970-01-01 00:00:00',2,'{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"","linka_name":"","linka":"","linkb_name":"","linkb":"","linkc_name":"","linkc":"","linkd_name":"","linkd":"","linke_name":"","linke":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":""}',0,36,1,'','','','','','*','2011-01-01 00:00:01',42,'Joomla','1970-01-01 00:00:00',0,'','','{"robots":"","rights":""}',1,'','1970-01-01 00:00:00','1970-01-01 00:00:00',1,0), (4,'Buyer','buyer','','','','','','','','','

    I am in charge of buying fruit. If you sell good fruit, contact me.

    ','','',0,1,0,'1970-01-01 00:00:00',1,'{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"0","linka_name":"","linka":"","linkb_name":"","linkb":"","linkc_name":"","linkc":"","linkd_name":"","linkd":"","linke_name":"","linke":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":""}',0,36,1,'','','','','','*','2011-01-01 00:00:01',42,'Joomla','1970-01-01 00:00:00',0,'','','{"robots":"","rights":""}',1,'','1970-01-01 00:00:00','1970-01-01 00:00:00',1,0), @@ -377,7 +377,6 @@ INSERT INTO "#__menu" VALUES (9,'menu','com_contact_categories','Categories','','Contacts/Categories','index.php?option=com_categories&extension=com_contact','component',0,7,2,6,0,'1970-01-01 00:00:00',0,0,'class:contact-cat',0,'',26,27,0,'*',1), (10,'menu','com_messages','Messaging','','Messaging','index.php?option=com_messages','component',0,1,1,15,0,'1970-01-01 00:00:00',0,0,'class:messages',0,'',29,34,0,'*',1), (11,'menu','com_messages_add','New Private Message','','Messaging/New Private Message','index.php?option=com_messages&task=message.add','component',0,10,2,15,0,'1970-01-01 00:00:00',0,0,'class:messages-add',0,'',30,31,0,'*',1), -(12,'menu','com_messages_read','Read Private Message','','Messaging/Read Private Message','index.php?option=com_messages','component',0,10,2,15,0,'1970-01-01 00:00:00',0,0,'class:messages-read',0,'',32,33,0,'*',1), (13,'menu','com_newsfeeds','News Feeds','','News Feeds','index.php?option=com_newsfeeds','component',0,1,1,17,0,'1970-01-01 00:00:00',0,0,'class:newsfeeds',0,'',35,40,0,'*',1), (14,'menu','com_newsfeeds_feeds','Feeds','','News Feeds/Feeds','index.php?option=com_newsfeeds','component',0,13,2,17,0,'1970-01-01 00:00:00',0,0,'class:newsfeeds',0,'',36,37,0,'*',1), (15,'menu','com_newsfeeds_categories','Categories','','News Feeds/Categories','index.php?option=com_categories&extension=com_newsfeeds','component',0,13,2,6,0,'1970-01-01 00:00:00',0,0,'class:newsfeeds-cat',0,'',38,39,0,'*',1), diff --git a/installation/sql/postgresql/sample_testing.sql b/installation/sql/postgresql/sample_testing.sql index 0ba5720b6989a..7ea6602ca9c02 100644 --- a/installation/sql/postgresql/sample_testing.sql +++ b/installation/sql/postgresql/sample_testing.sql @@ -269,7 +269,7 @@ SELECT setval('#__categories_id_seq', max(id)) FROM #__categories; -- Dumping data for table #__contact_details -- INSERT INTO "#__contact_details" VALUES -(1,'Contact Name Here','name','Position','Street Address','Suburb','State','Country','Zip Code','Telephone','Fax','

    Information about or by the contact.

    ','images/powered_by.png','email@example.com',1,1,0,'1970-01-01 00:00:00',1,'{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"1","linka_name":"Twitter","linka":"http:\\/\\/twitter.com\\/joomla","linkb_name":"YouTube","linkb":"http:\\/\\/www.youtube.com\\/user\\/joomla","linkc_name":"Facebook","linkc":"http:\\/\\/www.facebook.com\\/joomla","linkd_name":"FriendFeed","linkd":"http:\\/\\/friendfeed.com\\/joomla","linke_name":"Scribed","linke":"http:\\/\\/www.scribd.com\\/people\\/view\\/504592-joomla","contact_layout":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":""}',0,16,1,'','','last','first','middle','en-GB','2011-01-01 00:00:01',42,'Joomla','1970-01-01 00:00:00',0,'','','{"robots":"","rights":""}',1,'','1970-01-01 00:00:00','1970-01-01 00:00:00',1,0), +(1,'Contact Name Here','name','Position','Street Address','Suburb','State','Country','Zip Code','Telephone','Fax','

    Information about or by the contact.

    ','images/powered_by.png','email@example.com',1,1,0,'1970-01-01 00:00:00',1,'{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"1","linka_name":"Twitter","linka":"http:\\/\\/twitter.com\\/joomla","linkb_name":"YouTube","linkb":"http:\\/\\/www.youtube.com\\/user\\/joomla","linkc_name":"Facebook","linkc":"http:\\/\\/www.facebook.com\\/joomla","linkd_name":"FriendFeed","linkd":"http:\\/\\/friendfeed.com\\/joomla","linke_name":"Scribd","linke":"http:\\/\\/www.scribd.com\\/people\\/view\\/504592-joomla","contact_layout":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":""}',0,16,1,'','','last','first','middle','en-GB','2011-01-01 00:00:01',42,'Joomla','1970-01-01 00:00:00',0,'','','{"robots":"","rights":""}',1,'','1970-01-01 00:00:00','1970-01-01 00:00:00',1,0), (2,'Webmaster','webmaster','','','','','','','','','','','webmaster@example.com',0,1,0,'1970-01-01 00:00:00',1,'{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"","linka_name":"","linka":"","linkb_name":"","linkb":"","linkc_name":"","linkc":"","linkd_name":"","linkd":"","linke_name":"","linke":"","show_email_form":"1","show_email_copy":"1","banned_email":"","banned_subject":"","banned_text":"","validate_session":"1","custom_reply":"","redirect":""}',0,34,1,'','','','','','en-GB','2011-01-01 00:00:01',42,'Joomla','1970-01-01 00:00:00',0,'','','{"robots":"","rights":""}',1,'','1970-01-01 00:00:00','1970-01-01 00:00:00',1,0), (3,'Owner','owner','','','','','','','','','

    I''m the owner of this store.

    ','','',0,1,0,'1970-01-01 00:00:00',2,'{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"","linka_name":"","linka":"","linkb_name":"","linkb":"","linkc_name":"","linkc":"","linkd_name":"","linkd":"","linke_name":"","linke":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":""}',0,36,1,'','','','','','*','2011-01-01 00:00:01',42,'Joomla','1970-01-01 00:00:00',0,'','','{"robots":"","rights":""}',1,'','1970-01-01 00:00:00','1970-01-01 00:00:00',1,0), (4,'Buyer','buyer','','','','','','','','','

    I am in charge of buying fruit. If you sell good fruit, contact me.

    ','','',0,1,0,'1970-01-01 00:00:00',1,'{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"0","linka_name":"","linka":"","linkb_name":"","linkb":"","linkc_name":"","linkc":"","linkd_name":"","linkd":"","linke_name":"","linke":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":""}',0,36,1,'','','','','','*','2011-01-01 00:00:01',42,'Joomla','1970-01-01 00:00:00',0,'','','{"robots":"","rights":""}',1,'','1970-01-01 00:00:00','1970-01-01 00:00:00',1,0), @@ -390,7 +390,6 @@ INSERT INTO "#__menu" VALUES (9,'menu','com_contact_categories','Categories','','Contacts/Categories','index.php?option=com_categories&extension=com_contact','component',0,7,2,6,0,'1970-01-01 00:00:00',0,0,'class:contact-cat',0,'',18,19,0,'*',1), (10,'menu','com_messages','Messaging','','Messaging','index.php?option=com_messages','component',0,1,1,15,0,'1970-01-01 00:00:00',0,0,'class:messages',0,'',21,26,0,'*',1), (11,'menu','com_messages_add','New Private Message','','Messaging/New Private Message','index.php?option=com_messages&task=message.add','component',0,10,2,15,0,'1970-01-01 00:00:00',0,0,'class:messages-add',0,'',22,23,0,'*',1), -(12,'menu','com_messages_read','Read Private Message','','Messaging/Read Private Message','index.php?option=com_messages','component',0,10,2,15,0,'1970-01-01 00:00:00',0,0,'class:messages-read',0,'',24,25,0,'*',1), (13,'menu','com_newsfeeds','News Feeds','','News Feeds','index.php?option=com_newsfeeds','component',0,1,1,17,0,'1970-01-01 00:00:00',0,0,'class:newsfeeds',0,'',27,32,0,'*',1), (14,'menu','com_newsfeeds_feeds','Feeds','','News Feeds/Feeds','index.php?option=com_newsfeeds','component',0,13,2,17,0,'1970-01-01 00:00:00',0,0,'class:newsfeeds',0,'',28,29,0,'*',1), (15,'menu','com_newsfeeds_categories','Categories','','News Feeds/Categories','index.php?option=com_categories&extension=com_newsfeeds','component',0,13,2,6,0,'1970-01-01 00:00:00',0,0,'class:newsfeeds-cat',0,'',30,31,0,'*',1), diff --git a/installation/sql/sqlazure/joomla.sql b/installation/sql/sqlazure/joomla.sql index 9fbc489f35330..aa3ecd5774730 100644 --- a/installation/sql/sqlazure/joomla.sql +++ b/installation/sql/sqlazure/joomla.sql @@ -997,9 +997,11 @@ SELECT 450, 'plg_twofactorauth_yubikey', 'plugin', 'yubikey', 'twofactorauth', 0 UNION ALL SELECT 451, 'plg_search_tags', 'plugin', 'tags', 'search', 0, 1, 1, 0, '', '{"search_limit":"50","show_tagged_items":"1"}', '', '', 0, '1900-01-01 00:00:00', 0, 0 UNION ALL -SELECT 452, 'plg_system_updatenotification', 'plugin', 'updatenotification', 'system', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0; +SELECT 452, 'plg_system_updatenotification', 'plugin', 'updatenotification', 'system', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0 UNION ALL -SELECT 453, 'plg_editors-xtd_module', 'plugin', 'module', 'editors-xtd', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0; +SELECT 453, 'plg_editors-xtd_module', 'plugin', 'module', 'editors-xtd', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0 +UNION ALL +SELECT 454, 'plg_system_stats', 'plugin', 'stats', 'system', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0; INSERT [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state]) @@ -1987,7 +1989,7 @@ SELECT 6, 'menu', 'com_banners_tracks', 'Tracks', '', 'Banners/Tracks', 'index.p UNION ALL SELECT 7, 'menu', 'com_contact', 'Contacts', '', 'Contacts', 'index.php?option=com_contact', 'component', 0, 1, 1, 8, 0, '1900-01-01 00:00:00', 0, 0, 'class:contact', 0, '', 11, 16, 0, '*', 1 UNION ALL -SELECT 8, 'menu', 'com_contact', 'Contacts', '', 'Contacts/Contacts', 'index.php?option=com_contact', 'component', 0, 7, 2, 8, 0, '1900-01-01 00:00:00', 0, 0, 'class:contact', 0, '', 12, 13, 0, '*', 1 +SELECT 8, 'menu', 'com_contact_contacts', 'Contacts', '', 'Contacts/Contacts', 'index.php?option=com_contact', 'component', 0, 7, 2, 8, 0, '1900-01-01 00:00:00', 0, 0, 'class:contact', 0, '', 12, 13, 0, '*', 1 UNION ALL SELECT 9, 'menu', 'com_contact_categories', 'Categories', '', 'Contacts/Categories', 'index.php?option=com_categories&extension=com_contact', 'component', 0, 7, 2, 6, 0, '1900-01-01 00:00:00', 0, 0, 'class:contact-cat', 0, '', 14, 15, 0, '*', 1 UNION ALL @@ -1995,8 +1997,6 @@ SELECT 10, 'menu', 'com_messages', 'Messaging', '', 'Messaging', 'index.php?opti UNION ALL SELECT 11, 'menu', 'com_messages_add', 'New Private Message', '', 'Messaging/New Private Message', 'index.php?option=com_messages&task=message.add', 'component', 0, 10, 2, 15, 0, '1900-01-01 00:00:00', 0, 0, 'class:messages-add', 0, '', 18, 19, 0, '*', 1 UNION ALL -SELECT 12, 'menu', 'com_messages_read', 'Read Private Message', '', 'Messaging/Read Private Message', 'index.php?option=com_messages', 'component', 0, 10, 2, 15, 0, '1900-01-01 00:00:00', 0, 0, 'class:messages-read', 0, '', 20, 21, 0, '*', 1 -UNION ALL SELECT 13, 'menu', 'com_newsfeeds', 'News Feeds', '', 'News Feeds', 'index.php?option=com_newsfeeds', 'component', 0, 1, 1, 17, 0, '1900-01-01 00:00:00', 0, 0, 'class:newsfeeds', 0, '', 23, 28, 0, '*', 1 UNION ALL SELECT 14, 'menu', 'com_newsfeeds_feeds', 'Feeds', '', 'News Feeds/Feeds', 'index.php?option=com_newsfeeds', 'component', 0, 13, 2, 17, 0, '1900-01-01 00:00:00', 0, 0, 'class:newsfeeds', 0, '', 24, 25, 0, '*', 1 @@ -2326,16 +2326,18 @@ CREATE TABLE [#__postinstall_messages] ( INSERT INTO [#__postinstall_messages] ([extension_id], [title_key], [description_key], [action_key], [language_extension], [language_client_id], [type], [action_file], [action], [condition_file], [condition_method], [version_introduced], [enabled]) SELECT 700, 'PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_TITLE', 'PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_BODY', 'PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_ACTION', 'plg_twofactorauth_totp', 1, 'action', 'site://plugins/twofactorauth/totp/postinstall/actions.php', 'twofactorauth_postinstall_action', 'site://plugins/twofactorauth/totp/postinstall/actions.php', 'twofactorauth_postinstall_condition', '3.2.0', 1 UNION ALL -SELECT 700, 'COM_CPANEL_WELCOME_BEGINNERS_TITLE', 'COM_CPANEL_WELCOME_BEGINNERS_MESSAGE', '', 'com_cpanel', 1, 'message', '', '', '', '', '3.2.0', 1; +SELECT 700, 'COM_CPANEL_WELCOME_BEGINNERS_TITLE', 'COM_CPANEL_WELCOME_BEGINNERS_MESSAGE', '', 'com_cpanel', 1, 'message', '', '', '', '', '3.2.0', 1 +UNION ALL +SELECT 700, 'COM_CPANEL_MSG_STATS_COLLECTION_TITLE', 'COM_CPANEL_MSG_STATS_COLLECTION_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/statscollection.php', 'admin_postinstall_statscollection_condition', '3.5.0', 1; /****** Object: Table [#__redirect_links] ******/ SET QUOTED_IDENTIFIER ON; CREATE TABLE [#__redirect_links]( [id] [bigint] IDENTITY(1,1) NOT NULL, - [old_url] [nvarchar](255) NOT NULL, - [new_url] [nvarchar](255), - [referer] [nvarchar](150) NOT NULL, + [old_url] [nvarchar](2048) NOT NULL, + [new_url] [nvarchar](2048), + [referer] [nvarchar](2048) NOT NULL, [comment] [nvarchar](255) NOT NULL, [hits] [bigint] NOT NULL DEFAULT 0, [published] [smallint] NOT NULL, @@ -2346,11 +2348,12 @@ CREATE TABLE [#__redirect_links]( ( [id] ASC )WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY], - CONSTRAINT [#__redirect_links$idx_link_old] UNIQUE NONCLUSTERED +) ON [PRIMARY]; + +CREATE NONCLUSTERED INDEX [idx_old_url] ON [#__redirect_links] ( [old_url] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY]; +)WITH (STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, DROP_EXISTING = OFF, ONLINE = OFF); CREATE NONCLUSTERED INDEX [idx_link_modifed] ON [#__redirect_links] ( diff --git a/installation/sql/sqlazure/sample_blog.sql b/installation/sql/sqlazure/sample_blog.sql index 4615f0d7ec152..5ccf2f026c4c0 100644 --- a/installation/sql/sqlazure/sample_blog.sql +++ b/installation/sql/sqlazure/sample_blog.sql @@ -122,7 +122,6 @@ INSERT [#__menu] ([id], [menutype], [title], [alias], [note], [path], [link], [t INSERT [#__menu] ([id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id], [checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) VALUES (9, 'menu', 'com_contact_categories', 'Categories', '', 'Contacts/Categories', 'index.php?option=com_categories&extension=com_contact', 'component', 0, 7, 2, 6, 0, '1900-01-01 00:00:00', 0, 0, 'class:contact-cat', 0, '', 36, 37, 0, '*', 1); INSERT [#__menu] ([id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id], [checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) VALUES (10, 'menu', 'com_messages', 'Messaging', '', 'Messaging', 'index.php?option=com_messages', 'component', 0, 1, 1, 15, 0, '1900-01-01 00:00:00', 0, 0, 'class:messages', 0, '', 39, 44, 0, '*', 1); INSERT [#__menu] ([id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id], [checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) VALUES (11, 'menu', 'com_messages_add', 'New Private Message', '', 'Messaging/New Private Message', 'index.php?option=com_messages&task=message.add', 'component', 0, 10, 2, 15, 0, '1900-01-01 00:00:00', 0, 0, 'class:messages-add', 0, '', 40, 41, 0, '*', 1); -INSERT [#__menu] ([id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id], [checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) VALUES (12, 'menu', 'com_messages_read', 'Read Private Message', '', 'Messaging/Read Private Message', 'index.php?option=com_messages', 'component', 0, 10, 2, 15, 0, '1900-01-01 00:00:00', 0, 0, 'class:messages-read', 0, '', 42, 43, 0, '*', 1); INSERT [#__menu] ([id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id], [checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) VALUES (13, 'menu', 'com_newsfeeds', 'News Feeds', '', 'News Feeds', 'index.php?option=com_newsfeeds', 'component', 0, 1, 1, 17, 0, '1900-01-01 00:00:00', 0, 0, 'class:newsfeeds', 0, '', 45, 50, 0, '*', 1); INSERT [#__menu] ([id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id], [checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) VALUES (14, 'menu', 'com_newsfeeds_feeds', 'Feeds', '', 'News Feeds/Feeds', 'index.php?option=com_newsfeeds', 'component', 0, 13, 2, 17, 0, '1900-01-01 00:00:00', 0, 0, 'class:newsfeeds', 0, '', 46, 47, 0, '*', 1); INSERT [#__menu] ([id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id], [checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) VALUES (15, 'menu', 'com_newsfeeds_categories', 'Categories', '', 'News Feeds/Categories', 'index.php?option=com_categories&extension=com_newsfeeds', 'component', 0, 13, 2, 6, 0, '1900-01-01 00:00:00', 0, 0, 'class:newsfeeds-cat', 0, '', 48, 49, 0, '*', 1); diff --git a/installation/sql/sqlazure/sample_brochure.sql b/installation/sql/sqlazure/sample_brochure.sql index 05638161d08bd..f0548228c652a 100644 --- a/installation/sql/sqlazure/sample_brochure.sql +++ b/installation/sql/sqlazure/sample_brochure.sql @@ -64,7 +64,7 @@ SET IDENTITY_INSERT [#__categories] OFF; SET IDENTITY_INSERT [#__contact_details] ON; INSERT INTO [#__contact_details] ([id], [name], [alias], [con_position], [address], [suburb], [state], [country], [postcode], [telephone], [fax], [misc], [image], [email_to], [default_con], [published], [checked_out], [checked_out_time], [ordering], [params], [user_id], [catid], [access], [mobile], [webpage], [sortname1], [sortname2], [sortname3], [language], [created], [created_by], [created_by_alias], [modified], [modified_by], [metakey], [metadesc], [metadata], [featured], [xreference], [publish_up], [publish_down], [version], [hits]) VALUES -(1, 'Contact Name Here', 'name', 'Position', 'Street Address', 'Suburb', 'State', 'Country', 'Zip Code', 'Telephone', 'Fax', '

    Information about or by the contact.

    ', 'images/powered_by.png', 'email@example.com', 1, 1, 0, '1900-01-01T00:00:00.000', 1, '{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"1","linka_name":"Twitter","linka":"http://twitter.com/joomla","linkb_name":"YouTube","linkb":"http://www.youtube.com/user/joomla","linkc_name":"Facebook","linkc":"http://www.facebook.com/joomla","linkd_name":"FriendFeed","linkd":"http://friendfeed.com/joomla","linke_name":"Scribed","linke":"http://www.scribd.com/people/view/504592-joomla","contact_layout":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":""}', 0, 16, 1, '', '', 'last', 'first', 'middle', 'en-GB', '2011-01-01 00:00:01', 42, 'Joomla', '1900-01-01T00:00:00.000', 0, '', '', '{"robots":"","rights":""}', 1, '', '1900-01-01T00:00:00.000', '1900-01-01T00:00:00.000', 1, 0); +(1, 'Contact Name Here', 'name', 'Position', 'Street Address', 'Suburb', 'State', 'Country', 'Zip Code', 'Telephone', 'Fax', '

    Information about or by the contact.

    ', 'images/powered_by.png', 'email@example.com', 1, 1, 0, '1900-01-01T00:00:00.000', 1, '{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"1","linka_name":"Twitter","linka":"http://twitter.com/joomla","linkb_name":"YouTube","linkb":"http://www.youtube.com/user/joomla","linkc_name":"Facebook","linkc":"http://www.facebook.com/joomla","linkd_name":"FriendFeed","linkd":"http://friendfeed.com/joomla","linke_name":"Scribd","linke":"http://www.scribd.com/people/view/504592-joomla","contact_layout":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":""}', 0, 16, 1, '', '', 'last', 'first', 'middle', 'en-GB', '2011-01-01 00:00:01', 42, 'Joomla', '1900-01-01T00:00:00.000', 0, '', '', '{"robots":"","rights":""}', 1, '', '1900-01-01T00:00:00.000', '1900-01-01T00:00:00.000', 1, 0); SET IDENTITY_INSERT [#__contact_details] OFF; @@ -97,7 +97,6 @@ INSERT INTO [#__menu] ( [id], [menutype], [title], [alias], [note], [path], [lin INSERT INTO [#__menu] ( [id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id],[checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) VALUES(9, 'menu', 'com_contact_categories', 'Categories', '', 'Contacts/Categories', 'index.php?option=com_categories&extension=com_contact', 'component', 0, 7, 2, 6, 0, '1900-01-01T00:00:00.000', 0, 0, 'class:contact-cat', 0, '', 18, 19, 0, '*', 1); INSERT INTO [#__menu] ( [id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id],[checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) VALUES(10, 'menu', 'com_messages', 'Messaging', '', 'Messaging', 'index.php?option=com_messages', 'component', 0, 1, 1, 15, 0, '1900-01-01T00:00:00.000', 0, 0, 'class:messages', 0, '', 21, 26, 0, '*', 1); INSERT INTO [#__menu] ( [id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id],[checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) VALUES(11, 'menu', 'com_messages_add', 'New Private Message', '', 'Messaging/New Private Message', 'index.php?option=com_messages&task=message.add', 'component', 0, 10, 2, 15, 0, '1900-01-01T00:00:00.000', 0, 0, 'class:messages-add', 0, '', 22, 23, 0, '*', 1); -INSERT INTO [#__menu] ( [id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id],[checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) VALUES(12, 'menu', 'com_messages_read', 'Read Private Message', '', 'Messaging/Read Private Message', 'index.php?option=com_messages', 'component', 0, 10, 2, 15, 0, '1900-01-01T00:00:00.000', 0, 0, 'class:messages-read', 0, '', 24, 25, 0, '*', 1); INSERT INTO [#__menu] ( [id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id],[checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) VALUES(13, 'menu', 'com_newsfeeds', 'News Feeds', '', 'News Feeds', 'index.php?option=com_newsfeeds', 'component', 0, 1, 1, 17, 0, '1900-01-01T00:00:00.000', 0, 0, 'class:newsfeeds', 0, '', 27, 32, 0, '*', 1); INSERT INTO [#__menu] ( [id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id],[checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) VALUES(14, 'menu', 'com_newsfeeds_feeds', 'Feeds', '', 'News Feeds/Feeds', 'index.php?option=com_newsfeeds', 'component', 0, 13, 2, 17, 0, '1900-01-01T00:00:00.000', 0, 0, 'class:newsfeeds', 0, '', 28, 29, 0, '*', 1); INSERT INTO [#__menu] ( [id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id],[checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) VALUES(15, 'menu', 'com_newsfeeds_categories', 'Categories', '', 'News Feeds/Categories', 'index.php?option=com_categories&extension=com_newsfeeds', 'component', 0, 13, 2, 6, 0, '1900-01-01T00:00:00.000', 0, 0, 'class:newsfeeds-cat', 0, '', 30, 31, 0, '*', 1); diff --git a/installation/sql/sqlazure/sample_data.sql b/installation/sql/sqlazure/sample_data.sql index b7a62d43a8036..220fd5468cfca 100644 --- a/installation/sql/sqlazure/sample_data.sql +++ b/installation/sql/sqlazure/sample_data.sql @@ -83,7 +83,6 @@ INSERT [#__menu] ([id], [menutype], [title], [alias], [note], [path], [link], [t INSERT [#__menu] ([id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id], [checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) VALUES (9, 'menu', 'com_contact_categories', 'Categories', '', 'Contacts/Categories', 'index.php?option=com_categories&extension=com_contact', 'component', 0, 7, 2, 6, 0, '1900-01-01 00:00:00', 0, 0, 'class:contact-cat', 0, '', 16, 17, 0, '*', 1); INSERT [#__menu] ([id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id], [checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) VALUES (10, 'menu', 'com_messages', 'Messaging', '', 'Messaging', 'index.php?option=com_messages', 'component', 0, 1, 1, 15, 0, '1900-01-01 00:00:00', 0, 0, 'class:messages', 0, '', 19, 24, 0, '*', 1); INSERT [#__menu] ([id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id], [checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) VALUES (11, 'menu', 'com_messages_add', 'New Private Message', '', 'Messaging/New Private Message', 'index.php?option=com_messages&task=message.add', 'component', 0, 10, 2, 15, 0, '1900-01-01 00:00:00', 0, 0, 'class:messages-add', 0, '', 20, 21, 0, '*', 1); -INSERT [#__menu] ([id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id], [checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) VALUES (12, 'menu', 'com_messages_read', 'Read Private Message', '', 'Messaging/Read Private Message', 'index.php?option=com_messages', 'component', 0, 10, 2, 15, 0, '1900-01-01 00:00:00', 0, 0, 'class:messages-read', 0, '', 22, 23, 0, '*', 1); INSERT [#__menu] ([id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id], [checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) VALUES (13, 'menu', 'com_newsfeeds', 'News Feeds', '', 'News Feeds', 'index.php?option=com_newsfeeds', 'component', 0, 1, 1, 17, 0, '1900-01-01 00:00:00', 0, 0, 'class:newsfeeds', 0, '', 25, 30, 0, '*', 1); INSERT [#__menu] ([id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id], [checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) VALUES (14, 'menu', 'com_newsfeeds_feeds', 'Feeds', '', 'News Feeds/Feeds', 'index.php?option=com_newsfeeds', 'component', 0, 13, 2, 17, 0, '1900-01-01 00:00:00', 0, 0, 'class:newsfeeds', 0, '', 26, 27, 0, '*', 1); INSERT [#__menu] ([id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id], [checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) VALUES (15, 'menu', 'com_newsfeeds_categories', 'Categories', '', 'News Feeds/Categories', 'index.php?option=com_categories&extension=com_newsfeeds', 'component', 0, 13, 2, 6, 0, '1900-01-01 00:00:00', 0, 0, 'class:newsfeeds-cat', 0, '', 28, 29, 0, '*', 1); diff --git a/installation/sql/sqlazure/sample_learn.sql b/installation/sql/sqlazure/sample_learn.sql index b9b191d8d55a0..f543a9c2f12b3 100644 --- a/installation/sql/sqlazure/sample_learn.sql +++ b/installation/sql/sqlazure/sample_learn.sql @@ -284,7 +284,7 @@ SET IDENTITY_INSERT [#__categories] OFF; SET IDENTITY_INSERT [#__contact_details] ON; -INSERT [#__contact_details] ([id], [name], [alias], [con_position], [address], [suburb], [state], [country], [postcode], [telephone], [fax], [misc], [image], [email_to], [default_con], [published], [checked_out], [checked_out_time], [ordering], [params], [user_id], [catid], [access], [mobile], [webpage], [sortname1], [sortname2], [sortname3], [language], [created], [created_by], [created_by_alias], [modified], [modified_by], [metakey], [metadesc], [metadata], [featured], [xreference], [publish_up], [publish_down], [version], [hits]) VALUES (1, 'Contact Name Here', 'name', 'Position', 'Street Address', 'Suburb', 'State', 'Country', 'Zip Code', 'Telephone', 'Fax', '

    Information about or by the contact.

    ', 'images/powered_by.png', 'email@example.com', 1, 1, 0, '1900-01-01 00:00:00', 1, '{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"1","linka_name":"Twitter","linka":"http:\/\/twitter.com\/joomla","linkb_name":"YouTube","linkb":"http:\/\/www.youtube.com\/user\/joomla","linkc_name":"Facebook","linkc":"http:\/\/www.facebook.com\/joomla","linkd_name":"FriendFeed","linkd":"http:\/\/friendfeed.com\/joomla","linke_name":"Scribed","linke":"http:\/\/www.scribd.com\/people\/view\/504592-joomla","contact_layout":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":""}', 0, 16, 1, '', '', 'last', 'first', 'middle', 'en-GB', '2011-01-01 00:00:01', 726, 'Joomla', '1900-01-01 00:00:00', 0, '', '', '{"robots":"","rights":""}', 1, '', '1900-01-01 00:00:00', '1900-01-01 00:00:00', 1, 0); +INSERT [#__contact_details] ([id], [name], [alias], [con_position], [address], [suburb], [state], [country], [postcode], [telephone], [fax], [misc], [image], [email_to], [default_con], [published], [checked_out], [checked_out_time], [ordering], [params], [user_id], [catid], [access], [mobile], [webpage], [sortname1], [sortname2], [sortname3], [language], [created], [created_by], [created_by_alias], [modified], [modified_by], [metakey], [metadesc], [metadata], [featured], [xreference], [publish_up], [publish_down], [version], [hits]) VALUES (1, 'Contact Name Here', 'name', 'Position', 'Street Address', 'Suburb', 'State', 'Country', 'Zip Code', 'Telephone', 'Fax', '

    Information about or by the contact.

    ', 'images/powered_by.png', 'email@example.com', 1, 1, 0, '1900-01-01 00:00:00', 1, '{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"1","linka_name":"Twitter","linka":"http:\/\/twitter.com\/joomla","linkb_name":"YouTube","linkb":"http:\/\/www.youtube.com\/user\/joomla","linkc_name":"Facebook","linkc":"http:\/\/www.facebook.com\/joomla","linkd_name":"FriendFeed","linkd":"http:\/\/friendfeed.com\/joomla","linke_name":"Scribd","linke":"http:\/\/www.scribd.com\/people\/view\/504592-joomla","contact_layout":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":""}', 0, 16, 1, '', '', 'last', 'first', 'middle', 'en-GB', '2011-01-01 00:00:01', 726, 'Joomla', '1900-01-01 00:00:00', 0, '', '', '{"robots":"","rights":""}', 1, '', '1900-01-01 00:00:00', '1900-01-01 00:00:00', 1, 0); INSERT [#__contact_details] ([id], [name], [alias], [con_position], [address], [suburb], [state], [country], [postcode], [telephone], [fax], [misc], [image], [email_to], [default_con], [published], [checked_out], [checked_out_time], [ordering], [params], [user_id], [catid], [access], [mobile], [webpage], [sortname1], [sortname2], [sortname3], [language], [created], [created_by], [created_by_alias], [modified], [modified_by], [metakey], [metadesc], [metadata], [featured], [xreference], [publish_up], [publish_down], [version], [hits]) VALUES (2, 'Webmaster', 'webmaster', '', '', '', '', '', '', '', '', '', '', 'webmaster@example.com', 0, 1, 0, '1900-01-01 00:00:00', 1, '{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"","linka_name":"","linka":"","linkb_name":"","linkb":"","linkc_name":"","linkc":"","linkd_name":"","linkd":"","linke_name":"","linke":"","show_email_form":"1","show_email_copy":"1","banned_email":"","banned_subject":"","banned_text":"","validate_session":"1","custom_reply":"","redirect":""}', 0, 34, 1, '', '', '', '', '', 'en-GB', '2011-01-01 00:00:01', 726, 'Joomla', '1900-01-01 00:00:00', 0, '', '', '{"robots":"","rights":""}', 1, '', '1900-01-01 00:00:00', '1900-01-01 00:00:00', 1, 0); INSERT [#__contact_details] ([id], [name], [alias], [con_position], [address], [suburb], [state], [country], [postcode], [telephone], [fax], [misc], [image], [email_to], [default_con], [published], [checked_out], [checked_out_time], [ordering], [params], [user_id], [catid], [access], [mobile], [webpage], [sortname1], [sortname2], [sortname3], [language], [created], [created_by], [created_by_alias], [modified], [modified_by], [metakey], [metadesc], [metadata], [featured], [xreference], [publish_up], [publish_down], [version], [hits]) VALUES (3, 'Owner', 'owner', '', '', '', '', '', '', '', '', '

    I''m the owner of this store.

    ', '', '', 0, 1, 0, '1900-01-01 00:00:00', 2, '{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"","linka_name":"","linka":"","linkb_name":"","linkb":"","linkc_name":"","linkc":"","linkd_name":"","linkd":"","linke_name":"","linke":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":""}', 0, 36, 1, '', '', '', '', '', '*', '2011-01-01 00:00:01', 726, 'Joomla', '1900-01-01 00:00:00', 0, '', '', '{"robots":"","rights":""}', 1, '', '1900-01-01 00:00:00', '1900-01-01 00:00:00', 1, 0); INSERT [#__contact_details] ([id], [name], [alias], [con_position], [address], [suburb], [state], [country], [postcode], [telephone], [fax], [misc], [image], [email_to], [default_con], [published], [checked_out], [checked_out_time], [ordering], [params], [user_id], [catid], [access], [mobile], [webpage], [sortname1], [sortname2], [sortname3], [language], [created], [created_by], [created_by_alias], [modified], [modified_by], [metakey], [metadesc], [metadata], [featured], [xreference], [publish_up], [publish_down], [version], [hits]) VALUES (4, 'Buyer', 'buyer', '', '', '', '', '', '', '', '', '

    I am in charge of buying fruit. If you sell good fruit, contact me.

    ', '', '', 0, 1, 0, '1900-01-01 00:00:00', 1, '{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"0","linka_name":"","linka":"","linkb_name":"","linkb":"","linkc_name":"","linkc":"","linkd_name":"","linkd":"","linke_name":"","linke":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":""}', 0, 36, 1, '', '', '', '', '', '*', '2011-01-01 00:00:01', 726, 'Joomla', '1900-01-01 00:00:00', 0, '', '', '{"robots":"","rights":""}', 1, '', '1900-01-01 00:00:00', '1900-01-01 00:00:00', 1, 0); @@ -633,7 +633,6 @@ INSERT [#__menu] ([id], [menutype], [title], [alias], [note], [path], [link], [t INSERT [#__menu] ([id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id], [checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) VALUES (9, 'menu', 'com_contact_categories', 'Categories', '', 'Contacts/Categories', 'index.php?option=com_categories&extension=com_contact', 'component', 0, 7, 2, 6, 0, '1900-01-01 00:00:01', 0, 0, 'class:contact-cat', 0, '', 26, 27, 0, '*', 1); INSERT [#__menu] ([id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id], [checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) VALUES (10, 'menu', 'com_messages', 'Messaging', '', 'Messaging', 'index.php?option=com_messages', 'component', 0, 1, 1, 15, 0, '1900-01-01 00:00:01', 0, 0, 'class:messages', 0, '', 29, 34, 0, '*', 1); INSERT [#__menu] ([id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id], [checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) VALUES (11, 'menu', 'com_messages_add', 'New Private Message', '', 'Messaging/New Private Message', 'index.php?option=com_messages&task=message.add', 'component', 0, 10, 2, 15, 0, '1900-01-01 00:00:01', 0, 0, 'class:messages-add', 0, '', 30, 31, 0, '*', 1); -INSERT [#__menu] ([id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id], [checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) VALUES (12, 'menu', 'com_messages_read', 'Read Private Message', '', 'Messaging/Read Private Message', 'index.php?option=com_messages', 'component', 0, 10, 2, 15, 0, '1900-01-01 00:00:01', 0, 0, 'class:messages-read', 0, '', 32, 33, 0, '*', 1); INSERT [#__menu] ([id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id], [checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) VALUES (13, 'menu', 'com_newsfeeds', 'News Feeds', '', 'News Feeds', 'index.php?option=com_newsfeeds', 'component', 0, 1, 1, 17, 0, '1900-01-01 00:00:01', 0, 0, 'class:newsfeeds', 0, '', 35, 40, 0, '*', 1); INSERT [#__menu] ([id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id], [checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) VALUES (14, 'menu', 'com_newsfeeds_feeds', 'Feeds', '', 'News Feeds/Feeds', 'index.php?option=com_newsfeeds', 'component', 0, 13, 2, 17, 0, '1900-01-01 00:00:01', 0, 0, 'class:newsfeeds', 0, '', 36, 37, 0, '*', 1); INSERT [#__menu] ([id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id], [checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) VALUES (15, 'menu', 'com_newsfeeds_categories', 'Categories', '', 'News Feeds/Categories', 'index.php?option=com_categories&extension=com_newsfeeds', 'component', 0, 13, 2, 6, 0, '1900-01-01 00:00:01', 0, 0, 'class:newsfeeds-cat', 0, '', 38, 39, 0, '*', 1); diff --git a/installation/sql/sqlazure/sample_testing.sql b/installation/sql/sqlazure/sample_testing.sql index f9eaa794fb670..90dd29291cd68 100644 --- a/installation/sql/sqlazure/sample_testing.sql +++ b/installation/sql/sqlazure/sample_testing.sql @@ -294,7 +294,7 @@ SET IDENTITY_INSERT [#__categories] OFF; SET IDENTITY_INSERT [#__contact_details] ON; -INSERT [#__contact_details] ([id], [name], [alias], [con_position], [address], [suburb], [state], [country], [postcode], [telephone], [fax], [misc], [image], [email_to], [default_con], [published], [checked_out], [checked_out_time], [ordering], [params], [user_id], [catid], [access], [mobile], [webpage], [sortname1], [sortname2], [sortname3], [language], [created], [created_by], [created_by_alias], [modified], [modified_by], [metakey], [metadesc], [metadata], [featured], [xreference], [publish_up], [publish_down], [version], [hits]) VALUES (1, 'Contact Name Here', 'name', 'Position', 'Street Address', 'Suburb', 'State', 'Country', 'Zip Code', 'Telephone', 'Fax', '

    Information about or by the contact.

    ', 'images/powered_by.png', 'email@example.com', 1, 1, 0, '1900-01-01 00:00:00', 1, '{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"1","linka_name":"Twitter","linka":"http:\/\/twitter.com\/joomla","linkb_name":"YouTube","linkb":"http:\/\/www.youtube.com\/user\/joomla","linkc_name":"Facebook","linkc":"http:\/\/www.facebook.com\/joomla","linkd_name":"FriendFeed","linkd":"http:\/\/friendfeed.com\/joomla","linke_name":"Scribed","linke":"http:\/\/www.scribd.com\/people\/view\/504592-joomla","contact_layout":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":""}', 0, 16, 1, '', '', 'last', 'first', 'middle', 'en-GB', '2011-01-01 00:00:00', 793, 'Joomla', '1900-01-01 00:00:00', 0, '', '', '{"robots":"","rights":""}', 1, '', '1900-01-01 00:00:00', '1900-01-01 00:00:00', 1, 0); +INSERT [#__contact_details] ([id], [name], [alias], [con_position], [address], [suburb], [state], [country], [postcode], [telephone], [fax], [misc], [image], [email_to], [default_con], [published], [checked_out], [checked_out_time], [ordering], [params], [user_id], [catid], [access], [mobile], [webpage], [sortname1], [sortname2], [sortname3], [language], [created], [created_by], [created_by_alias], [modified], [modified_by], [metakey], [metadesc], [metadata], [featured], [xreference], [publish_up], [publish_down], [version], [hits]) VALUES (1, 'Contact Name Here', 'name', 'Position', 'Street Address', 'Suburb', 'State', 'Country', 'Zip Code', 'Telephone', 'Fax', '

    Information about or by the contact.

    ', 'images/powered_by.png', 'email@example.com', 1, 1, 0, '1900-01-01 00:00:00', 1, '{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"1","linka_name":"Twitter","linka":"http:\/\/twitter.com\/joomla","linkb_name":"YouTube","linkb":"http:\/\/www.youtube.com\/user\/joomla","linkc_name":"Facebook","linkc":"http:\/\/www.facebook.com\/joomla","linkd_name":"FriendFeed","linkd":"http:\/\/friendfeed.com\/joomla","linke_name":"Scribd","linke":"http:\/\/www.scribd.com\/people\/view\/504592-joomla","contact_layout":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":""}', 0, 16, 1, '', '', 'last', 'first', 'middle', 'en-GB', '2011-01-01 00:00:00', 793, 'Joomla', '1900-01-01 00:00:00', 0, '', '', '{"robots":"","rights":""}', 1, '', '1900-01-01 00:00:00', '1900-01-01 00:00:00', 1, 0); INSERT [#__contact_details] ([id], [name], [alias], [con_position], [address], [suburb], [state], [country], [postcode], [telephone], [fax], [misc], [image], [email_to], [default_con], [published], [checked_out], [checked_out_time], [ordering], [params], [user_id], [catid], [access], [mobile], [webpage], [sortname1], [sortname2], [sortname3], [language], [created], [created_by], [created_by_alias], [modified], [modified_by], [metakey], [metadesc], [metadata], [featured], [xreference], [publish_up], [publish_down], [version], [hits]) VALUES (2, 'Webmaster', 'webmaster', '', '', '', '', '', '', '', '', '', '', 'webmaster@example.com', 0, 1, 0, '1900-01-01 00:00:00', 1, '{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"","linka_name":"","linka":"","linkb_name":"","linkb":"","linkc_name":"","linkc":"","linkd_name":"","linkd":"","linke_name":"","linke":"","show_email_form":"1","show_email_copy":"1","banned_email":"","banned_subject":"","banned_text":"","validate_session":"1","custom_reply":"","redirect":""}', 0, 34, 1, '', '', '', '', '', 'en-GB', '2011-01-01 00:00:00', 793, 'Joomla', '1900-01-01 00:00:00', 0, '', '', '{"robots":"","rights":""}', 1, '', '1900-01-01 00:00:00', '1900-01-01 00:00:00', 1, 0); INSERT [#__contact_details] ([id], [name], [alias], [con_position], [address], [suburb], [state], [country], [postcode], [telephone], [fax], [misc], [image], [email_to], [default_con], [published], [checked_out], [checked_out_time], [ordering], [params], [user_id], [catid], [access], [mobile], [webpage], [sortname1], [sortname2], [sortname3], [language], [created], [created_by], [created_by_alias], [modified], [modified_by], [metakey], [metadesc], [metadata], [featured], [xreference], [publish_up], [publish_down], [version], [hits]) VALUES (3, 'Owner', 'owner', '', '', '', '', '', '', '', '', '

    I''m the owner of this store.

    ', '', '', 0, 1, 0, '1900-01-01 00:00:00', 2, '{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"","linka_name":"","linka":"","linkb_name":"","linkb":"","linkc_name":"","linkc":"","linkd_name":"","linkd":"","linke_name":"","linke":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":""}', 0, 36, 1, '', '', '', '', '', '*', '2011-01-01 00:00:00', 793, 'Joomla', '1900-01-01 00:00:00', 0, '', '', '{"robots":"","rights":""}', 1, '', '1900-01-01 00:00:00', '1900-01-01 00:00:00', 1, 0); INSERT [#__contact_details] ([id], [name], [alias], [con_position], [address], [suburb], [state], [country], [postcode], [telephone], [fax], [misc], [image], [email_to], [default_con], [published], [checked_out], [checked_out_time], [ordering], [params], [user_id], [catid], [access], [mobile], [webpage], [sortname1], [sortname2], [sortname3], [language], [created], [created_by], [created_by_alias], [modified], [modified_by], [metakey], [metadesc], [metadata], [featured], [xreference], [publish_up], [publish_down], [version], [hits]) VALUES (4, 'Buyer', 'buyer', '', '', '', '', '', '', '', '', '

    I am in charge of buying fruit. If you sell good fruit, contact me.

    ', '', '', 0, 1, 0, '1900-01-01 00:00:00', 1, '{"show_contact_category":"","show_contact_list":"","presentation_style":"","show_name":"","show_position":"","show_email":"","show_street_address":"","show_suburb":"","show_state":"","show_postcode":"","show_country":"","show_telephone":"","show_mobile":"","show_fax":"","show_webpage":"","show_misc":"","show_image":"","allow_vcard":"","show_articles":"","show_profile":"","show_links":"0","linka_name":"","linka":"","linkb_name":"","linkb":"","linkc_name":"","linkc":"","linkd_name":"","linkd":"","linke_name":"","linke":"","show_email_form":"","show_email_copy":"","banned_email":"","banned_subject":"","banned_text":"","validate_session":"","custom_reply":"","redirect":""}', 0, 36, 1, '', '', '', '', '', '*', '2011-01-01 00:00:00', 793, 'Joomla', '1900-01-01 00:00:00', 0, '', '', '{"robots":"","rights":""}', 1, '', '1900-01-01 00:00:00', '1900-01-01 00:00:00', 1, 0); @@ -711,7 +711,6 @@ INSERT [#__menu] ([id], [menutype], [title], [alias], [note], [path], [link], [t INSERT [#__menu] ([id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id], [checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) VALUES (9, 'menu', 'com_contact_categories', 'Categories', '', 'Contacts/Categories', 'index.php?option=com_categories&extension=com_contact', 'component', 0, 7, 2, 6, 0, '1900-01-01 00:00:00', 0, 0, 'class:contact-cat', 0, '', 18, 19, 0, '*', 1); INSERT [#__menu] ([id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id], [checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) VALUES (10, 'menu', 'com_messages', 'Messaging', '', 'Messaging', 'index.php?option=com_messages', 'component', 0, 1, 1, 15, 0, '1900-01-01 00:00:00', 0, 0, 'class:messages', 0, '', 21, 26, 0, '*', 1); INSERT [#__menu] ([id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id], [checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) VALUES (11, 'menu', 'com_messages_add', 'New Private Message', '', 'Messaging/New Private Message', 'index.php?option=com_messages&task=message.add', 'component', 0, 10, 2, 15, 0, '1900-01-01 00:00:00', 0, 0, 'class:messages-add', 0, '', 22, 23, 0, '*', 1); -INSERT [#__menu] ([id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id], [checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) VALUES (12, 'menu', 'com_messages_read', 'Read Private Message', '', 'Messaging/Read Private Message', 'index.php?option=com_messages', 'component', 0, 10, 2, 15, 0, '1900-01-01 00:00:00', 0, 0, 'class:messages-read', 0, '', 24, 25, 0, '*', 1); INSERT [#__menu] ([id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id], [checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) VALUES (13, 'menu', 'com_newsfeeds', 'News Feeds', '', 'News Feeds', 'index.php?option=com_newsfeeds', 'component', 0, 1, 1, 17, 0, '1900-01-01 00:00:00', 0, 0, 'class:newsfeeds', 0, '', 27, 32, 0, '*', 1); INSERT [#__menu] ([id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id], [checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) VALUES (14, 'menu', 'com_newsfeeds_feeds', 'Feeds', '', 'News Feeds/Feeds', 'index.php?option=com_newsfeeds', 'component', 0, 13, 2, 17, 0, '1900-01-01 00:00:00', 0, 0, 'class:newsfeeds', 0, '', 28, 29, 0, '*', 1); INSERT [#__menu] ([id], [menutype], [title], [alias], [note], [path], [link], [type], [published], [parent_id], [level], [component_id], [checked_out], [checked_out_time], [browserNav], [access], [img], [template_style_id], [params], [lft], [rgt], [home], [language], [client_id]) VALUES (15, 'menu', 'com_newsfeeds_categories', 'Categories', '', 'News Feeds/Categories', 'index.php?option=com_categories&extension=com_newsfeeds', 'component', 0, 13, 2, 6, 0, '1900-01-01 00:00:00', 0, 0, 'class:newsfeeds-cat', 0, '', 30, 31, 0, '*', 1); diff --git a/installation/template/body.php b/installation/template/body.php index 15c22afb49313..22e431c3ff823 100644 --- a/installation/template/body.php +++ b/installation/template/body.php @@ -2,7 +2,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/template/css/template.css b/installation/template/css/template.css index ed7633c32f68d..806b849fce32a 100644 --- a/installation/template/css/template.css +++ b/installation/template/css/template.css @@ -1,18 +1,4 @@ /* CSS Document */ -.spinner{ - background: -moz-radial-gradient(center, ellipse cover, rgba(255,255,255,1) 0%, rgba(255,255,255,0) 100%); /* FF3.6+ */ - background: -webkit-gradient(radial, center center, 0px, center center, 100%, color-stop(0%,rgba(255,255,255,1)), color-stop(100%,rgba(255,255,255,0))); /* Chrome,Safari4+ */ - background: -webkit-radial-gradient(center, ellipse cover, rgba(255,255,255,1) 0%,rgba(255,255,255,0) 100%); /* Chrome10+,Safari5.1+ */ - background: -o-radial-gradient(center, ellipse cover, rgba(255,255,255,1) 0%,rgba(255,255,255,0) 100%); /* Opera 12+ */ - background: -ms-radial-gradient(center, ellipse cover, rgba(255,255,255,1) 0%,rgba(255,255,255,0) 100%); /* IE10+ */ - background: radial-gradient(ellipse at center, rgba(255,255,255,1) 0%,rgba(255,255,255,0) 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#00ffffff',GradientType=1 ); /* IE6-9 fallback on horizontal gradient */ -} -.spinner-img{ - background: url('../images/ajax-loader.gif') no-repeat 50% 50%; - height: 15px; - width: 128px; -} .container{ position: relative; max-width: 900px; @@ -140,3 +126,17 @@ textarea.noResize { .tooltip { white-space: pre-wrap; } + +#loading { + position: absolute; + display: none; + left: 0; + top: 0; + width: 100%; + height: 100%; + z-index: 1000; + opacity: .95; + -ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity = 95); + filter: alpha(opacity = 95); + background: url('../../../media/jui/images/ajax-loader.gif') rgba(255,255,255,0.7) center no-repeat; + } diff --git a/installation/template/css/template_rtl.css b/installation/template/css/template_rtl.css index 141ed13085e51..5fdd2cc99aec2 100644 --- a/installation/template/css/template_rtl.css +++ b/installation/template/css/template_rtl.css @@ -1,5 +1,5 @@ /** - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/template/images/ajax-loader.gif b/installation/template/images/ajax-loader.gif index 7cc3ea996c810..fe1048bc9b829 100644 Binary files a/installation/template/images/ajax-loader.gif and b/installation/template/images/ajax-loader.gif differ diff --git a/installation/template/images/j_arrow.png b/installation/template/images/j_arrow.png index aed0f7a50c93b..11637687fb2f0 100644 Binary files a/installation/template/images/j_arrow.png and b/installation/template/images/j_arrow.png differ diff --git a/installation/template/images/j_arrow_down.png b/installation/template/images/j_arrow_down.png index f04ce3796d8af..f26a104411d6b 100644 Binary files a/installation/template/images/j_arrow_down.png and b/installation/template/images/j_arrow_down.png differ diff --git a/installation/template/images/j_arrow_left.png b/installation/template/images/j_arrow_left.png index 5ea6991cb185c..7e96f7df0de89 100644 Binary files a/installation/template/images/j_arrow_left.png and b/installation/template/images/j_arrow_left.png differ diff --git a/installation/template/images/j_button1_admin.png b/installation/template/images/j_button1_admin.png index 8d3537e320b1c..33a2038549506 100644 Binary files a/installation/template/images/j_button1_admin.png and b/installation/template/images/j_button1_admin.png differ diff --git a/installation/template/images/j_button1_collate.png b/installation/template/images/j_button1_collate.png index 6fd177222aa66..7fbe9c3bf2b53 100644 Binary files a/installation/template/images/j_button1_collate.png and b/installation/template/images/j_button1_collate.png differ diff --git a/installation/template/images/j_button1_left.png b/installation/template/images/j_button1_left.png index 3e9c832da9eef..22d99f0d8932e 100644 Binary files a/installation/template/images/j_button1_left.png and b/installation/template/images/j_button1_left.png differ diff --git a/installation/template/images/j_button1_next.png b/installation/template/images/j_button1_next.png index 0ac14a47b95a1..e6ad56d53390c 100644 Binary files a/installation/template/images/j_button1_next.png and b/installation/template/images/j_button1_next.png differ diff --git a/installation/template/images/j_button1_prev.png b/installation/template/images/j_button1_prev.png index d90cffac85aa4..4efae57412078 100644 Binary files a/installation/template/images/j_button1_prev.png and b/installation/template/images/j_button1_prev.png differ diff --git a/installation/template/images/j_button1_refresh.png b/installation/template/images/j_button1_refresh.png index 72fbefd10e118..01e7e7483060f 100644 Binary files a/installation/template/images/j_button1_refresh.png and b/installation/template/images/j_button1_refresh.png differ diff --git a/installation/template/images/j_button1_right.png b/installation/template/images/j_button1_right.png index 02d45db89678d..7c54c9fbe5364 100644 Binary files a/installation/template/images/j_button1_right.png and b/installation/template/images/j_button1_right.png differ diff --git a/installation/template/images/j_button1_site.png b/installation/template/images/j_button1_site.png index b7ea47845a077..d7624f530c62e 100644 Binary files a/installation/template/images/j_button1_site.png and b/installation/template/images/j_button1_site.png differ diff --git a/installation/template/images/j_divider.png b/installation/template/images/j_divider.png index 49ebe911ae799..32cfad68d2b44 100644 Binary files a/installation/template/images/j_divider.png and b/installation/template/images/j_divider.png differ diff --git a/installation/template/images/j_header_middle.png b/installation/template/images/j_header_middle.png index b04b8e6ec063a..50dcf07e6cd5b 100644 Binary files a/installation/template/images/j_header_middle.png and b/installation/template/images/j_header_middle.png differ diff --git a/installation/template/images/j_joomla_box.png b/installation/template/images/j_joomla_box.png index e7c013dac26a7..0f86cbebc05dc 100644 Binary files a/installation/template/images/j_joomla_box.png and b/installation/template/images/j_joomla_box.png differ diff --git a/installation/template/images/joomla.png b/installation/template/images/joomla.png index c2e32f4c983e1..7a37d147f31ea 100644 Binary files a/installation/template/images/joomla.png and b/installation/template/images/joomla.png differ diff --git a/installation/template/images/logo.png b/installation/template/images/logo.png index 8f80d303cc20f..00d0220049204 100644 Binary files a/installation/template/images/logo.png and b/installation/template/images/logo.png differ diff --git a/installation/template/images/spinner.gif b/installation/template/images/spinner.gif index 0ca7ada960568..103683597e564 100644 Binary files a/installation/template/images/spinner.gif and b/installation/template/images/spinner.gif differ diff --git a/installation/template/index.php b/installation/template/index.php index 869c0469fa809..08aabc1735082 100644 --- a/installation/template/index.php +++ b/installation/template/index.php @@ -2,7 +2,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -17,7 +17,6 @@ // Load the JavaScript behaviors JHtml::_('bootstrap.framework'); JHtml::_('formbehavior.chosen', 'select'); -JHtml::_('behavior.framework', true); JHtml::_('behavior.keepalive'); JHtml::_('behavior.formvalidator'); JHtml::_('script', 'installation/template/js/installation.js'); diff --git a/installation/template/js/installation.js b/installation/template/js/installation.js index a28c343549b38..38eeac2744d8b 100644 --- a/installation/template/js/installation.js +++ b/installation/template/js/installation.js @@ -1,12 +1,12 @@ /** * @package Joomla.Installation * @subpackage JavaScript - * @copyright Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ var Installation = function(_container, _base) { - var $, container, busy, spinner, baseUrl, view; + var $, container, busy, $spinner, baseUrl, view; /** * Initializes JavaScript events on each request, required for AJAX @@ -16,6 +16,10 @@ var Installation = function(_container, _base) { $('form.form-validate').each(function(index, form) { document.formvalidator.attachToForm(form); }); + + // Create and append the spinner + $spinner = $('
    ', {id: 'loading'}); + $('#' + container).prepend($spinner); } /** @@ -31,7 +35,7 @@ var Installation = function(_container, _base) { return false; } - spinner.show(true); + $spinner.show(); busy = true; Joomla.removeMessages(); var data = 'format: json&' + $form.serialize(); @@ -53,7 +57,7 @@ var Installation = function(_container, _base) { window.location = baseUrl + '?view=' + r.data.view; } }).fail(function(xhr) { - spinner.hide(true); + $spinner.hide(); busy = false; try { var r = $.parseJSON(xhr.responseText); @@ -79,7 +83,7 @@ var Installation = function(_container, _base) { return false; } - spinner.show(true); + $spinner.show(); busy = true; Joomla.removeMessages(); var data = 'format: json&' + $form.serialize(); @@ -101,7 +105,7 @@ var Installation = function(_container, _base) { window.location = baseUrl + '?view=' + r.data.view; } }).fail(function(xhr) { - spinner.hide(true); + $spinner.hide(); busy = false; try { var r = $.parseJSON(xhr.responseText); @@ -125,7 +129,7 @@ var Installation = function(_container, _base) { var goToPage = function(page, fromSubmit) { if (!fromSubmit) { Joomla.removeMessages(); - spinner.show(true); + $spinner.show(); } $.ajax({ @@ -139,7 +143,7 @@ var Installation = function(_container, _base) { // Attach JS behaviors to the newly loaded HTML pageInit(); - spinner.hide(true); + $spinner.hide(); busy = false; initElements(); @@ -170,12 +174,11 @@ var Installation = function(_container, _base) { var task = tasks.shift(); var $form = $('#adminForm'); var $tr = $('#install_' + task); - var $taskSpinner = $tr.find('.spinner'); var data = 'format: json&' + $form.serialize(); $progress.css('width', parseFloat($progress.get(0).style.width) + step_width + '%'); $tr.addClass('active'); - $taskSpinner.css('visibility', 'visible'); + $spinner.show(); $.ajax({ type : "POST", @@ -191,7 +194,7 @@ var Installation = function(_container, _base) { } else { $progress.css('width', parseFloat($progress.get(0).style.width) + (step_width * 10) + '%'); $tr.removeClass('active'); - $taskSpinner.css('visibility', 'hidden'); + $spinner.hide(); install(tasks, step_width); } @@ -352,7 +355,6 @@ var Installation = function(_container, _base) { $ = jQuery.noConflict(); busy = false; container = _container; - spinner = new Spinner(container); baseUrl = _base; view = ''; diff --git a/installation/view/complete/html.php b/installation/view/complete/html.php index 03d0628306112..b8433e550946a 100644 --- a/installation/view/complete/html.php +++ b/installation/view/complete/html.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage View * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/view/complete/tmpl/default.php b/installation/view/complete/tmpl/default.php index 26012c8843a50..207b74289472c 100644 --- a/installation/view/complete/tmpl/default.php +++ b/installation/view/complete/tmpl/default.php @@ -2,7 +2,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/view/database/tmpl/default.php b/installation/view/database/tmpl/default.php index 3cb8eaba706df..8374a843609c5 100644 --- a/installation/view/database/tmpl/default.php +++ b/installation/view/database/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage View * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -59,6 +59,7 @@ form->getLabel('db_pass'); ?>
    + form->getInput('db_pass'); ?>

    diff --git a/installation/view/default.php b/installation/view/default.php index 877d7a84cb514..648df45bd012f 100644 --- a/installation/view/default.php +++ b/installation/view/default.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage View * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/view/defaultlanguage/html.php b/installation/view/defaultlanguage/html.php index 56abb501d8762..8a1b54bad9d7d 100644 --- a/installation/view/defaultlanguage/html.php +++ b/installation/view/defaultlanguage/html.php @@ -4,7 +4,7 @@ * @package Joomla.Installation * @subpackage View * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/view/defaultlanguage/tmpl/default.php b/installation/view/defaultlanguage/tmpl/default.php index 0934eaa76c92f..9dbb11a299b8e 100644 --- a/installation/view/defaultlanguage/tmpl/default.php +++ b/installation/view/defaultlanguage/tmpl/default.php @@ -2,12 +2,24 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; +JFactory::getDocument()->addScriptDeclaration( +<<
    @@ -104,7 +116,7 @@ class="btn btn-primary" name="administratorlang" value="language; ?>" published) echo 'checked="checked"'; ?> - /> + />

    ",d=0;a>d;d++)f+="";f+=""}return f+="
    - ', 'ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?> + + - + + - + - + - + - + - +
    + extension_id); ?> @@ -193,8 +165,6 @@ - - diff --git a/administrator/components/com_plugins/views/plugins/view.html.php b/administrator/components/com_plugins/views/plugins/view.html.php index 73a67249fcea3..e1f996e926d20 100644 --- a/administrator/components/com_plugins/views/plugins/view.html.php +++ b/administrator/components/com_plugins/views/plugins/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_plugins * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -31,9 +31,11 @@ class PluginsViewPlugins extends JViewLegacy */ public function display($tpl = null) { - $this->items = $this->get('Items'); + $this->items = $this->get('Items'); $this->pagination = $this->get('Pagination'); - $this->state = $this->get('State'); + $this->state = $this->get('State'); + $this->filterForm = $this->get('FilterForm'); + $this->activeFilters = $this->get('ActiveFilters'); // Check for errors. if (count($errors = $this->get('Errors'))) @@ -44,7 +46,8 @@ public function display($tpl = null) } $this->addToolbar(); - parent::display($tpl); + + return parent::display($tpl); } /** @@ -79,27 +82,6 @@ protected function addToolbar() JToolbarHelper::help('JHELP_EXTENSIONS_PLUGIN_MANAGER'); - JHtmlSidebar::setAction('index.php?option=com_plugins&view=plugins'); - - JHtmlSidebar::addFilter( - JText::_('JOPTION_SELECT_PUBLISHED'), - 'filter_enabled', - JHtml::_('select.options', PluginsHelper::publishedOptions(), 'value', 'text', $this->state->get('filter.enabled'), true) - ); - - JHtmlSidebar::addFilter( - JText::_('COM_PLUGINS_OPTION_FOLDER'), - 'filter_folder', - JHtml::_('select.options', PluginsHelper::folderOptions(), 'value', 'text', $this->state->get('filter.folder')) - ); - - JHtmlSidebar::addFilter( - JText::_('JOPTION_SELECT_ACCESS'), - 'filter_access', - JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access')) - ); - - $this->sidebar = JHtmlSidebar::render(); } /** diff --git a/administrator/components/com_postinstall/controllers/message.php b/administrator/components/com_postinstall/controllers/message.php index a6b1472c48d05..d67213010b44c 100644 --- a/administrator/components/com_postinstall/controllers/message.php +++ b/administrator/components/com_postinstall/controllers/message.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_postinstall * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_postinstall/models/messages.php b/administrator/components/com_postinstall/models/messages.php index 7eaea2b143be2..1f5ec09d6d9b2 100644 --- a/administrator/components/com_postinstall/models/messages.php +++ b/administrator/components/com_postinstall/models/messages.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_postinstall * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -126,6 +126,9 @@ protected function onProcessList(&$resultArray) $unset_keys = array(); $language_extensions = array(); + // Order the results DESC so the newest is on the top. + $resultArray = array_reverse($resultArray); + foreach ($resultArray as $key => $item) { // Filter out messages based on dynamically loaded programmatic conditions. diff --git a/administrator/components/com_postinstall/postinstall.php b/administrator/components/com_postinstall/postinstall.php index 0870584fb1a17..38bd2f398f22b 100644 --- a/administrator/components/com_postinstall/postinstall.php +++ b/administrator/components/com_postinstall/postinstall.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_postinstall * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_postinstall/postinstall.xml b/administrator/components/com_postinstall/postinstall.xml index 86e20e81ba9e5..6af6daff48ea7 100644 --- a/administrator/components/com_postinstall/postinstall.xml +++ b/administrator/components/com_postinstall/postinstall.xml @@ -3,7 +3,7 @@ com_postinstall Joomla! Project September 2013 - (C) 2005 - 2015 Open Source Matters. All rights reserved. + (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/components/com_postinstall/toolbar.php b/administrator/components/com_postinstall/toolbar.php index eb4d330fe14f6..ff45d6f436526 100644 --- a/administrator/components/com_postinstall/toolbar.php +++ b/administrator/components/com_postinstall/toolbar.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_postinstall * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_postinstall/views/messages/tmpl/default.php b/administrator/components/com_postinstall/views/messages/tmpl/default.php index a0d0affc68787..d9be8477f52ba 100644 --- a/administrator/components/com_postinstall/views/messages/tmpl/default.php +++ b/administrator/components/com_postinstall/views/messages/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_postinstall * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_postinstall/views/messages/view.html.php b/administrator/components/com_postinstall/views/messages/view.html.php index 30b25da61578d..726482bc1b178 100644 --- a/administrator/components/com_postinstall/views/messages/view.html.php +++ b/administrator/components/com_postinstall/views/messages/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_postinstall * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_redirect/controller.php b/administrator/components/com_redirect/controller.php index 6970c37a499d0..edba4e74f4c25 100644 --- a/administrator/components/com_redirect/controller.php +++ b/administrator/components/com_redirect/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_redirect * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_redirect/controllers/link.php b/administrator/components/com_redirect/controllers/link.php index fcb29d6c5b3ad..ec3d43bd091cd 100644 --- a/administrator/components/com_redirect/controllers/link.php +++ b/administrator/components/com_redirect/controllers/link.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_redirect * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_redirect/controllers/links.php b/administrator/components/com_redirect/controllers/links.php index 727e5a36708ee..159f163415eba 100644 --- a/administrator/components/com_redirect/controllers/links.php +++ b/administrator/components/com_redirect/controllers/links.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_redirect * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_redirect/helpers/html/redirect.php b/administrator/components/com_redirect/helpers/html/redirect.php index 12aabc133e0fd..9c8cd27372c58 100644 --- a/administrator/components/com_redirect/helpers/html/redirect.php +++ b/administrator/components/com_redirect/helpers/html/redirect.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_redirect * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_redirect/helpers/redirect.php b/administrator/components/com_redirect/helpers/redirect.php index 5373a97bf65ef..6e7297bb2b5c4 100644 --- a/administrator/components/com_redirect/helpers/redirect.php +++ b/administrator/components/com_redirect/helpers/redirect.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_redirect * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_redirect/models/fields/redirect.php b/administrator/components/com_redirect/models/fields/redirect.php index 18ebb7aafb81c..1d108a7c6905e 100644 --- a/administrator/components/com_redirect/models/fields/redirect.php +++ b/administrator/components/com_redirect/models/fields/redirect.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_redirect * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_redirect/models/link.php b/administrator/components/com_redirect/models/link.php index ab4970542d682..12e657b5ec4f4 100644 --- a/administrator/components/com_redirect/models/link.php +++ b/administrator/components/com_redirect/models/link.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_redirect * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_redirect/models/links.php b/administrator/components/com_redirect/models/links.php index 987033bd3e492..ad2a6a5574fc5 100644 --- a/administrator/components/com_redirect/models/links.php +++ b/administrator/components/com_redirect/models/links.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_redirect * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_redirect/redirect.php b/administrator/components/com_redirect/redirect.php index e0cc8af27051e..e2088de15b80e 100644 --- a/administrator/components/com_redirect/redirect.php +++ b/administrator/components/com_redirect/redirect.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_redirect * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_redirect/redirect.xml b/administrator/components/com_redirect/redirect.xml index 389aac3b8e0ae..49a04413d489f 100644 --- a/administrator/components/com_redirect/redirect.xml +++ b/administrator/components/com_redirect/redirect.xml @@ -3,7 +3,7 @@ com_redirect Joomla! Project April 2006 - (C) 2005 - 2015 Open Source Matters. All rights reserved. + (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/components/com_redirect/tables/link.php b/administrator/components/com_redirect/tables/link.php index 071e16c28259d..4c6d0b9a279f5 100644 --- a/administrator/components/com_redirect/tables/link.php +++ b/administrator/components/com_redirect/tables/link.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_redirect * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_redirect/views/link/tmpl/edit.php b/administrator/components/com_redirect/views/link/tmpl/edit.php index 7125c3f00fe17..5b0a79b043bcc 100644 --- a/administrator/components/com_redirect/views/link/tmpl/edit.php +++ b/administrator/components/com_redirect/views/link/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_redirect * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_redirect/views/link/view.html.php b/administrator/components/com_redirect/views/link/view.html.php index 1b449ea29ebc7..4e7f53436ad79 100644 --- a/administrator/components/com_redirect/views/link/view.html.php +++ b/administrator/components/com_redirect/views/link/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_redirect * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_redirect/views/links/tmpl/default.php b/administrator/components/com_redirect/views/links/tmpl/default.php index d9289f0abed56..dc4e3f464ba04 100755 --- a/administrator/components/com_redirect/views/links/tmpl/default.php +++ b/administrator/components/com_redirect/views/links/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_redirect * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_redirect/views/links/tmpl/default_addform.php b/administrator/components/com_redirect/views/links/tmpl/default_addform.php index 9abe6634ad7d8..da439adead5f0 100644 --- a/administrator/components/com_redirect/views/links/tmpl/default_addform.php +++ b/administrator/components/com_redirect/views/links/tmpl/default_addform.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_redirect * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_redirect/views/links/tmpl/default_batch.php b/administrator/components/com_redirect/views/links/tmpl/default_batch.php index 390ffbadae1c4..e2812e5bd42c3 100644 --- a/administrator/components/com_redirect/views/links/tmpl/default_batch.php +++ b/administrator/components/com_redirect/views/links/tmpl/default_batch.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_redirect * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * * @deprecated 3.4 Use default_batch_body and default_batch_footer diff --git a/administrator/components/com_redirect/views/links/tmpl/default_batch_body.php b/administrator/components/com_redirect/views/links/tmpl/default_batch_body.php index 17fb0c1ce9bfc..d00f72043bf2a 100644 --- a/administrator/components/com_redirect/views/links/tmpl/default_batch_body.php +++ b/administrator/components/com_redirect/views/links/tmpl/default_batch_body.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_redirect * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_redirect/views/links/tmpl/default_batch_footer.php b/administrator/components/com_redirect/views/links/tmpl/default_batch_footer.php index db6f73e2287fc..8d2c6deef7d71 100644 --- a/administrator/components/com_redirect/views/links/tmpl/default_batch_footer.php +++ b/administrator/components/com_redirect/views/links/tmpl/default_batch_footer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_redirect * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_redirect/views/links/view.html.php b/administrator/components/com_redirect/views/links/view.html.php index 42006d2242001..3751ed4eff97f 100644 --- a/administrator/components/com_redirect/views/links/view.html.php +++ b/administrator/components/com_redirect/views/links/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_redirect * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -122,7 +122,7 @@ protected function addToolbar() if ($state->get('filter.state') == -2 && $canDo->get('core.delete')) { - JToolbarHelper::deleteList('', 'links.delete', 'JTOOLBAR_EMPTY_TRASH'); + JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'links.delete', 'JTOOLBAR_EMPTY_TRASH'); JToolbarHelper::divider(); } elseif ($canDo->get('core.edit.state')) diff --git a/administrator/components/com_search/controller.php b/administrator/components/com_search/controller.php index 1d5fd684e09ff..4b94a2f3b3379 100644 --- a/administrator/components/com_search/controller.php +++ b/administrator/components/com_search/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_search * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_search/controllers/searches.php b/administrator/components/com_search/controllers/searches.php index 2519c9fa2abc4..1db936e29e617 100644 --- a/administrator/components/com_search/controllers/searches.php +++ b/administrator/components/com_search/controllers/searches.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_search * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_search/helpers/search.php b/administrator/components/com_search/helpers/search.php index ef65cb9429cd7..b1cf69ecee58c 100644 --- a/administrator/components/com_search/helpers/search.php +++ b/administrator/components/com_search/helpers/search.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_search * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_search/helpers/site.php b/administrator/components/com_search/helpers/site.php index 8571a8d080b5b..91a5c8d7fead2 100644 --- a/administrator/components/com_search/helpers/site.php +++ b/administrator/components/com_search/helpers/site.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_search * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_search/models/searches.php b/administrator/components/com_search/models/searches.php index 7cdb6e47f5254..6285aac320d9e 100644 --- a/administrator/components/com_search/models/searches.php +++ b/administrator/components/com_search/models/searches.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_search * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_search/search.php b/administrator/components/com_search/search.php index 89629b0dbb593..feaecdde7b1bb 100644 --- a/administrator/components/com_search/search.php +++ b/administrator/components/com_search/search.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_search * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_search/search.xml b/administrator/components/com_search/search.xml index 885956ecd6017..cb29447c354ad 100644 --- a/administrator/components/com_search/search.xml +++ b/administrator/components/com_search/search.xml @@ -3,7 +3,7 @@ com_search Joomla! Project April 2006 - (C) 2005 - 2015 Open Source Matters. All rights reserved. + (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/components/com_search/views/searches/tmpl/default.php b/administrator/components/com_search/views/searches/tmpl/default.php index 414b71e5518d8..95cac0c6293e1 100644 --- a/administrator/components/com_search/views/searches/tmpl/default.php +++ b/administrator/components/com_search/views/searches/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_search * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_search/views/searches/view.html.php b/administrator/components/com_search/views/searches/view.html.php index 082bf8e102926..a23a5523150e7 100644 --- a/administrator/components/com_search/views/searches/view.html.php +++ b/administrator/components/com_search/views/searches/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_search * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_tags/controller.php b/administrator/components/com_tags/controller.php index 4a3508a8d9c2d..173caf51abce5 100644 --- a/administrator/components/com_tags/controller.php +++ b/administrator/components/com_tags/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_tags/controllers/tag.php b/administrator/components/com_tags/controllers/tag.php index 4b58ef629aff8..4cab1ec40e002 100644 --- a/administrator/components/com_tags/controllers/tag.php +++ b/administrator/components/com_tags/controllers/tag.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_tags/controllers/tags.php b/administrator/components/com_tags/controllers/tags.php index bc94170035447..e31a91f9782aa 100644 --- a/administrator/components/com_tags/controllers/tags.php +++ b/administrator/components/com_tags/controllers/tags.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_tags/helpers/tags.php b/administrator/components/com_tags/helpers/tags.php new file mode 100644 index 0000000000000..f85140698f789 --- /dev/null +++ b/administrator/components/com_tags/helpers/tags.php @@ -0,0 +1,63 @@ +/language + $lang->load($component, JPATH_BASE, null, false, true) + || $lang->load($component, JPath::clean(JPATH_ADMINISTRATOR . '/components/' . $component), null, false, true); + } + } + } + } +} diff --git a/administrator/components/com_tags/models/forms/filter_tags.xml b/administrator/components/com_tags/models/forms/filter_tags.xml index e05962cc60575..a1300c2f95a01 100644 --- a/administrator/components/com_tags/models/forms/filter_tags.xml +++ b/administrator/components/com_tags/models/forms/filter_tags.xml @@ -35,6 +35,18 @@ + + + - - + + - - + + diff --git a/administrator/components/com_tags/models/tag.php b/administrator/components/com_tags/models/tag.php index 7b3b6e6e963c0..480f4b4a231aa 100644 --- a/administrator/components/com_tags/models/tag.php +++ b/administrator/components/com_tags/models/tag.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_tags/models/tags.php b/administrator/components/com_tags/models/tags.php index aeadbe2aea432..01d23db53c614 100644 --- a/administrator/components/com_tags/models/tags.php +++ b/administrator/components/com_tags/models/tags.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -61,23 +61,21 @@ public function __construct($config = array()) * * @since 3.1 */ - protected function populateState($ordering = null, $direction = null) + protected function populateState($ordering = 'a.lft', $direction = 'asc') { - $context = $this->context; - - $search = $this->getUserStateFromRequest($context . '.search', 'filter_search'); + $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search'); $this->setState('filter.search', $search); - $level = $this->getUserStateFromRequest($context . '.filter.level', 'filter_level', 0, 'int'); + $level = $this->getUserStateFromRequest($this->context . '.filter.level', 'filter_level', ''); $this->setState('filter.level', $level); - $access = $this->getUserStateFromRequest($context . '.filter.access', 'filter_access', 0, 'int'); + $access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', ''); $this->setState('filter.access', $access); - $published = $this->getUserStateFromRequest($context . '.filter.published', 'filter_published', ''); + $published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', ''); $this->setState('filter.published', $published); - $language = $this->getUserStateFromRequest($context . '.filter.language', 'filter_language', ''); + $language = $this->getUserStateFromRequest($this->context . '.filter.language', 'filter_language', ''); $this->setState('filter.language', $language); // Load the parameters. @@ -85,7 +83,7 @@ protected function populateState($ordering = null, $direction = null) $this->setState('params', $params); // List state information. - parent::populateState('a.lft', 'asc'); + parent::populateState($ordering, $direction); } /** @@ -105,6 +103,8 @@ protected function getStoreId($id = '') { // Compile the store id. $id .= ':' . $this->getState('filter.search'); + $id .= ':' . $this->getState('filter.level'); + $id .= ':' . $this->getState('filter.access'); $id .= ':' . $this->getState('filter.published'); $id .= ':' . $this->getState('filter.language'); @@ -139,7 +139,7 @@ protected function getListQuery() ->where('a.alias <> ' . $db->quote('root')); // Join over the language - $query->select('l.title AS language_title') + $query->select('l.title AS language_title, l.image AS language_image') ->join('LEFT', $db->quoteName('#__languages') . ' AS l ON l.lang_code = a.language'); // Join over the users for the checked out user. diff --git a/administrator/components/com_tags/tables/tag.php b/administrator/components/com_tags/tables/tag.php index 508bf6de5a247..fc82993198203 100644 --- a/administrator/components/com_tags/tables/tag.php +++ b/administrator/components/com_tags/tables/tag.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -154,12 +154,12 @@ public function check() if (empty($this->metadesc)) { - $this->metadesc = ' '; + $this->metadesc = ''; } if (empty($this->metakey)) { - $this->metakey = ' '; + $this->metakey = ''; } if (empty($this->metadata)) diff --git a/administrator/components/com_tags/tags.php b/administrator/components/com_tags/tags.php index 5b2ab6be44489..59cd7365ef457 100644 --- a/administrator/components/com_tags/tags.php +++ b/administrator/components/com_tags/tags.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_tags/tags.xml b/administrator/components/com_tags/tags.xml index e037086234b17..2526832deb464 100644 --- a/administrator/components/com_tags/tags.xml +++ b/administrator/components/com_tags/tags.xml @@ -3,7 +3,7 @@ com_tags Joomla! Project December 2013 - (C) 2005 - 2015 Open Source Matters. All rights reserved. + (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org @@ -28,6 +28,7 @@ config.xml controller.php controllers + helpers models views diff --git a/administrator/components/com_tags/views/tag/tmpl/edit.php b/administrator/components/com_tags/views/tag/tmpl/edit.php index e6082c96c1d58..71dc264fa9e1d 100644 --- a/administrator/components/com_tags/views/tag/tmpl/edit.php +++ b/administrator/components/com_tags/views/tag/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_tags/views/tag/tmpl/edit_metadata.php b/administrator/components/com_tags/views/tag/tmpl/edit_metadata.php index da9011a9c356c..33ddf62260c72 100644 --- a/administrator/components/com_tags/views/tag/tmpl/edit_metadata.php +++ b/administrator/components/com_tags/views/tag/tmpl/edit_metadata.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_tags/views/tag/tmpl/edit_options.php b/administrator/components/com_tags/views/tag/tmpl/edit_options.php index 941c9cf34a6a1..f452e3a04c898 100644 --- a/administrator/components/com_tags/views/tag/tmpl/edit_options.php +++ b/administrator/components/com_tags/views/tag/tmpl/edit_options.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_tags/views/tag/view.html.php b/administrator/components/com_tags/views/tag/view.html.php index b549a447eba1f..75169cc5c9c88 100644 --- a/administrator/components/com_tags/views/tag/view.html.php +++ b/administrator/components/com_tags/views/tag/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_tags/views/tags/tmpl/default.php b/administrator/components/com_tags/views/tags/tmpl/default.php index 7d271ff5d4dba..ea3b962369f39 100644 --- a/administrator/components/com_tags/views/tags/tmpl/default.php +++ b/administrator/components/com_tags/views/tags/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -21,35 +21,14 @@ $userId = $user->get('id'); $listOrder = $this->escape($this->state->get('list.ordering')); $listDirn = $this->escape($this->state->get('list.direction')); -$ordering = ($listOrder == 'a.lft'); $canOrder = $user->authorise('core.edit.state', 'com_tags'); -$saveOrder = ($listOrder == 'a.lft' && $listDirn == 'asc'); +$saveOrder = ($listOrder == 'a.lft' && strtolower($listDirn) == 'asc'); if ($saveOrder) { $saveOrderingUrl = 'index.php?option=com_tags&task=tags.saveOrderAjax'; JHtml::_('sortablelist.sortable', 'categoryList', 'adminForm', strtolower($listDirn), $saveOrderingUrl, false, true); } - -$sortFields = $this->getSortFields(); - -JFactory::getDocument()->addScriptDeclaration(' - Joomla.orderTable = function() - { - table = document.getElementById("sortTable"); - direction = document.getElementById("directionTable"); - order = table.options[table.selectedIndex].value; - if (order != "' . $listOrder . '") - { - dirn = "asc"; - } - else - { - dirn = direction.options[direction.selectedIndex].value; - } - Joomla.tableOrdering(order, dirn, ""); - }; -'); ?>
    sidebar)) : ?> @@ -72,32 +51,32 @@ - + + - - - @@ -191,7 +170,7 @@ language == '*') : ?> - language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> + language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . ' ' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> @@ -146,8 +134,6 @@ - - diff --git a/administrator/components/com_templates/views/styles/view.html.php b/administrator/components/com_templates/views/styles/view.html.php index 53698c9ffca01..3e4fe15e44695 100644 --- a/administrator/components/com_templates/views/styles/view.html.php +++ b/administrator/components/com_templates/views/styles/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -31,10 +31,12 @@ class TemplatesViewStyles extends JViewLegacy */ public function display($tpl = null) { - $this->items = $this->get('Items'); - $this->pagination = $this->get('Pagination'); - $this->state = $this->get('State'); - $this->preview = JComponentHelper::getParams('com_templates')->get('template_positions_display'); + $this->items = $this->get('Items'); + $this->pagination = $this->get('Pagination'); + $this->state = $this->get('State'); + $this->filterForm = $this->get('FilterForm'); + $this->activeFilters = $this->get('ActiveFilters'); + $this->preview = JComponentHelper::getParams('com_templates')->get('template_positions_display'); TemplatesHelper::addSubmenu('styles'); @@ -84,7 +86,7 @@ protected function addToolbar() if ($canDo->get('core.delete')) { - JToolbarHelper::deleteList('', 'styles.delete'); + JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'styles.delete', 'JTOOLBAR_DELETE'); JToolbarHelper::divider(); } @@ -98,22 +100,5 @@ protected function addToolbar() JHtmlSidebar::setAction('index.php?option=com_templates&view=styles'); - JHtmlSidebar::addFilter( - JText::_('COM_TEMPLATES_FILTER_TEMPLATE'), - 'filter_template', - JHtml::_( - 'select.options', - TemplatesHelper::getTemplateOptions($this->state->get('filter.client_id')), - 'value', - 'text', - $this->state->get('filter.template') - ) - ); - - JHtmlSidebar::addFilter( - JText::_('JGLOBAL_FILTER_CLIENT'), - 'filter_client_id', - JHtml::_('select.options', TemplatesHelper::getClientOptions(), 'value', 'text', $this->state->get('filter.client_id')) - ); } } diff --git a/administrator/components/com_templates/views/template/tmpl/default.php b/administrator/components/com_templates/views/template/tmpl/default.php index 9d0e4eca13ed1..d7f321a3abcea 100644 --- a/administrator/components/com_templates/views/template/tmpl/default.php +++ b/administrator/components/com_templates/views/template/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -145,7 +145,7 @@ function clearCoords() if($this->type == 'font') { JFactory::getDocument()->addStyleDeclaration( - "/* Styles for font preview */ + "/* Styles for font preview */ @font-face { font-family: previewFont; @@ -159,99 +159,103 @@ function clearCoords() } ?> 'editor')); ?> - -
    -
    - type == 'file'): ?> -

    source->filename, $this->template->element); ?>

    - - type == 'image'): ?> -

    image['path'], $this->template->element); ?>

    - - type == 'font'): ?> -

    font['rel_path'], $this->template->element); ?>

    - -
    -
    -
    -
    - loadTemplate('tree');?> -
    -
    - type == 'home'): ?> -
    - - -
    -

    -

    -

    - - - -

    -
    - - - type == 'file'): ?> -
    + +
    +
    + type == 'file'): ?> +

    source->filename, $this->template->element); ?>

    + + type == 'image'): ?> +

    image['path'], $this->template->element); ?>

    + + type == 'font'): ?> +

    font['rel_path'], $this->template->element); ?>

    + +
    +
    +
    +
    + loadTemplate('tree');?> +
    +
    + type == 'home'): ?> + + + +
    +

    +

    +

    + + + +

    +
    + + + type == 'file'): ?> +
    -
    - form->getInput('source'); ?> -
    - - - form->getInput('extension_id'); ?> - form->getInput('filename'); ?> - - - - type == 'archive'): ?> - -
    -
      - archive as $file): ?> -
    • - -   - - -   - -
      • - -
    - - +
    + form->getInput('source'); ?> +
    + + + form->getInput('extension_id'); ?> + form->getInput('filename'); ?> + + + + type == 'archive'): ?> + +
    +
      + archive as $file): ?> +
    • + +   + + +   + +
      • + +
    + + - - - type == 'image'): ?> - -
    -
    - - - - - - -
    - - - type == 'font'): ?> -
    -
    -
    -

    H1

    Quickly gaze at Joomla! views from HTML, CSS, JavaScript and XML

    -

    H2

    Quickly gaze at Joomla! views from HTML, CSS, JavaScript and XML

    -

    H3

    Quickly gaze at Joomla! views from HTML, CSS, JavaScript and XML

    -

    H4

    Quickly gaze at Joomla! views from HTML, CSS, JavaScript and XML

    -

    H5

    Quickly gaze at Joomla! views from HTML, CSS, JavaScript and XML
    -

    H6

    Quickly gaze at Joomla! views from HTML, CSS, JavaScript and XML
    -

    Bold

    Quickly gaze at Joomla! views from HTML, CSS, JavaScript and XML -

    Italics

    Quickly gaze at Joomla! views from HTML, CSS, JavaScript and XML -

    Unordered List

    + + + type == 'image'): ?> + +
    +
    + + + + + + +
    + + + type == 'font'): ?> +
    +
    +
    +

    H1

    Quickly gaze at Joomla! views from HTML, CSS, JavaScript and XML

    +

    H2

    Quickly gaze at Joomla! views from HTML, CSS, JavaScript and XML

    +

    H3

    Quickly gaze at Joomla! views from HTML, CSS, JavaScript and XML

    +

    H4

    Quickly gaze at Joomla! views from HTML, CSS, JavaScript and XML

    +

    H5

    Quickly gaze at Joomla! views from HTML, CSS, JavaScript and XML
    +

    H6

    Quickly gaze at Joomla! views from HTML, CSS, JavaScript and XML
    +

    Bold

    Quickly gaze at Joomla! views from HTML, CSS, JavaScript and XML +

    Italics

    Quickly gaze at Joomla! views from HTML, CSS, JavaScript and XML +

    Unordered List

    +
      +
    • Item
      • +
    • Item
      • +
    • Item
      • Item
      • Item
        • @@ -259,116 +263,112 @@ function clearCoords()
        • Item
        • Item
          • -
        • Item
          -
            -
          • Item
            • -
          • Item
            • -
          • Item
            • -
          -
          • +
        • Item
      -

      Ordered List

      -
        + +
    +

    Ordered List

    +
      +
    1. Item
      2. +
    2. Item
      3. +
    3. Item
      +
      • Item
      • Item
      • Item
        • Item
        • Item
          • -
        • Item
          -
            -
          • Item
            • -
          • Item
            • -
          • Item
            • -
          -
          • +
        • Item
        • -
    - - -
    - -
    - -
    -
    - - - -
    -
    - -
      - - overridesList['modules'] as $module): ?> -
    • - path - . '&id=' . $input->getInt('id') . '&file=' . $this->file . '&' . $token; - ?> - -  name; ?> - -
      • - -
    -
    -
    - -
      - - overridesList['components'] as $key => $value): ?> -
    • - -   - -
        - -
      • - path - . '&id=' . $input->getInt('id') . '&file=' . $this->file . '&' . $token; - ?> - -  name; ?> - -
        • - -
      -
      • - -
    -
    -
    - -
      - - overridesList['layouts'] as $layout): ?> -
    • - path - . '&id=' . $input->getInt('id') . '&file=' . $this->file . '&' . $token; - ?> - -  name; ?> - -
      • - -
    + + + + + + +
    -
    - + +
    +
    + + + +
    +
    + +
      + + overridesList['modules'] as $module): ?> +
    • + path + . '&id=' . $input->getInt('id') . '&file=' . $this->file . '&' . $token; + ?> + +  name; ?> + +
      • + +
    +
    +
    + +
      + + overridesList['components'] as $key => $value): ?> +
    • + +   + +
        + +
      • + path + . '&id=' . $input->getInt('id') . '&file=' . $this->file . '&' . $token; + ?> + +  name; ?> + +
        • + +
      +
      • + +
    +
    +
    + +
      + + overridesList['layouts'] as $layout): ?> +
    • + path + . '&id=' . $input->getInt('id') . '&file=' . $this->file . '&' . $token; + ?> + +  name; ?> + +
      • + +
    +
    +
    + - - loadTemplate('description');?> - + +loadTemplate('description');?> +
    + method="post" name="adminForm" id="adminForm"> @@ -450,7 +451,7 @@ function clearCoords()
    + class="well" >
    diff --git a/administrator/components/com_templates/views/template/tmpl/default_description.php b/administrator/components/com_templates/views/template/tmpl/default_description.php index c0cfee243ebd3..76e6f28a74159 100644 --- a/administrator/components/com_templates/views/template/tmpl/default_description.php +++ b/administrator/components/com_templates/views/template/tmpl/default_description.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/views/template/tmpl/default_folders.php b/administrator/components/com_templates/views/template/tmpl/default_folders.php index 8075e28733ab6..6af67ce4e350d 100644 --- a/administrator/components/com_templates/views/template/tmpl/default_folders.php +++ b/administrator/components/com_templates/views/template/tmpl/default_folders.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/views/template/tmpl/default_tree.php b/administrator/components/com_templates/views/template/tmpl/default_tree.php index d7743d2d1472b..62f48c0d1a848 100644 --- a/administrator/components/com_templates/views/template/tmpl/default_tree.php +++ b/administrator/components/com_templates/views/template/tmpl/default_tree.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/views/template/tmpl/readonly.php b/administrator/components/com_templates/views/template/tmpl/readonly.php index 2da41dad0dfd8..7ac3b758e469f 100644 --- a/administrator/components/com_templates/views/template/tmpl/readonly.php +++ b/administrator/components/com_templates/views/template/tmpl/readonly.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/views/template/view.html.php b/administrator/components/com_templates/views/template/view.html.php index 4ec01d80553ea..11927cb34937c 100644 --- a/administrator/components/com_templates/views/template/view.html.php +++ b/administrator/components/com_templates/views/template/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * -* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. +* @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/views/templates/tmpl/default.php b/administrator/components/com_templates/views/templates/tmpl/default.php index b0739c65674c4..efbc6a0bb3982 100644 --- a/administrator/components/com_templates/views/templates/tmpl/default.php +++ b/administrator/components/com_templates/views/templates/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -26,17 +26,8 @@ sidebar; ?>
    - -
    -
    - -
    -
    - - -
    -
    -
    + $this)); ?> +
    items)) : ?>
    @@ -49,10 +40,10 @@  
    actions as $key => $action) : ?> - - - @@ -72,9 +72,9 @@ @@ -106,9 +106,7 @@ endif; ?> @@ -105,9 +105,7 @@ endif; ?> - - @@ -171,8 +125,8 @@ - - @@ -162,11 +116,8 @@
    - ', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?> + + - + - + + + + + state->get('list.direction'), $this->state->get('list.ordering')); ?> - - - state->get('list.direction'), $this->state->get('list.ordering')); ?> - - +
    + pagination->getListFooter(); ?>
    @@ -221,8 +200,6 @@ - - diff --git a/administrator/components/com_tags/views/tags/tmpl/default_batch.php b/administrator/components/com_tags/views/tags/tmpl/default_batch.php index e5b8da91b7490..85dd17fa1168b 100644 --- a/administrator/components/com_tags/views/tags/tmpl/default_batch.php +++ b/administrator/components/com_tags/views/tags/tmpl/default_batch.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * * @deprecated 3.4 Use default_batch_body and default_batch_footer diff --git a/administrator/components/com_tags/views/tags/tmpl/default_batch_body.php b/administrator/components/com_tags/views/tags/tmpl/default_batch_body.php index b99d5b896af66..edf3d03aecbfc 100644 --- a/administrator/components/com_tags/views/tags/tmpl/default_batch_body.php +++ b/administrator/components/com_tags/views/tags/tmpl/default_batch_body.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_tags/views/tags/tmpl/default_batch_footer.php b/administrator/components/com_tags/views/tags/tmpl/default_batch_footer.php index cfcae68c2c4c5..37e2be26b8c1f 100644 --- a/administrator/components/com_tags/views/tags/tmpl/default_batch_footer.php +++ b/administrator/components/com_tags/views/tags/tmpl/default_batch_footer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_tags/views/tags/view.html.php b/administrator/components/com_tags/views/tags/view.html.php index c33f4be2df3d6..18e2990e5796b 100644 --- a/administrator/components/com_tags/views/tags/view.html.php +++ b/administrator/components/com_tags/views/tags/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_tags * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -130,7 +130,7 @@ protected function addToolbar() if ($state->get('filter.published') == -2 && $canDo->get('core.delete')) { - JToolbarHelper::deleteList('', 'tags.delete', 'JTOOLBAR_EMPTY_TRASH'); + JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'tags.delete', 'JTOOLBAR_EMPTY_TRASH'); } elseif ($canDo->get('core.edit.state')) { @@ -155,12 +155,12 @@ protected function addToolbar() protected function getSortFields() { return array( - 'a.lft' => JText::_('JGRID_HEADING_ORDERING'), - 'a.state' => JText::_('JSTATUS'), - 'a.title' => JText::_('JGLOBAL_TITLE'), - 'a.access' => JText::_('JGRID_HEADING_ACCESS'), - 'language' => JText::_('JGRID_HEADING_LANGUAGE'), - 'a.id' => JText::_('JGRID_HEADING_ID') + 'a.lft' => JText::_('JGRID_HEADING_ORDERING'), + 'a.state' => JText::_('JSTATUS'), + 'a.title' => JText::_('JGLOBAL_TITLE'), + 'a.access' => JText::_('JGRID_HEADING_ACCESS'), + 'a.language' => JText::_('JGRID_HEADING_LANGUAGE'), + 'a.id' => JText::_('JGRID_HEADING_ID') ); } } diff --git a/administrator/components/com_templates/controller.php b/administrator/components/com_templates/controller.php index 12b30cea03e39..3b9e1d565cefb 100644 --- a/administrator/components/com_templates/controller.php +++ b/administrator/components/com_templates/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/controllers/style.php b/administrator/components/com_templates/controllers/style.php index 93d2c0adedc8d..e59fc48c4e2fc 100644 --- a/administrator/components/com_templates/controllers/style.php +++ b/administrator/components/com_templates/controllers/style.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/controllers/styles.php b/administrator/components/com_templates/controllers/styles.php index 4312de9c61f47..073ab86986364 100644 --- a/administrator/components/com_templates/controllers/styles.php +++ b/administrator/components/com_templates/controllers/styles.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_templates/controllers/template.php b/administrator/components/com_templates/controllers/template.php index 86e4766e8abae..5f0f5a7f2a0be 100644 --- a/administrator/components/com_templates/controllers/template.php +++ b/administrator/components/com_templates/controllers/template.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -376,6 +376,9 @@ public function less() */ public function delete() { + // Check for request forgeries + JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN')); + $app = JFactory::getApplication(); $model = $this->getModel(); $id = $app->input->get('id'); @@ -412,6 +415,9 @@ public function delete() */ public function createFile() { + // Check for request forgeries + JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN')); + $app = JFactory::getApplication(); $model = $this->getModel(); $id = $app->input->get('id'); @@ -456,6 +462,9 @@ public function createFile() */ public function uploadFile() { + // Check for request forgeries + JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN')); + $app = JFactory::getApplication(); $model = $this->getModel(); $id = $app->input->get('id'); @@ -487,6 +496,9 @@ public function uploadFile() */ public function createFolder() { + // Check for request forgeries + JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN')); + $app = JFactory::getApplication(); $model = $this->getModel(); $id = $app->input->get('id'); @@ -523,6 +535,9 @@ public function createFolder() */ public function deleteFolder() { + // Check for request forgeries + JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN')); + $app = JFactory::getApplication(); $model = $this->getModel(); $id = $app->input->get('id'); @@ -564,6 +579,9 @@ public function deleteFolder() */ public function renameFile() { + // Check for request forgeries + JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN')); + $app = JFactory::getApplication(); $model = $this->getModel(); $id = $app->input->get('id'); @@ -673,6 +691,9 @@ public function resizeImage() */ public function copyFile() { + // Check for request forgeries + JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN')); + $app = JFactory::getApplication(); $id = $app->input->get('id'); $file = $app->input->get('file'); @@ -708,6 +729,9 @@ public function copyFile() */ public function extractArchive() { + // Check for request forgeries + JSession::checkToken() or jexit(JText::_('JINVALID_TOKEN')); + $app = JFactory::getApplication(); $id = $app->input->get('id'); $file = $app->input->get('file'); diff --git a/administrator/components/com_templates/helpers/html/templates.php b/administrator/components/com_templates/helpers/html/templates.php index a49638531e297..e26b8507b8648 100644 --- a/administrator/components/com_templates/helpers/html/templates.php +++ b/administrator/components/com_templates/helpers/html/templates.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -76,7 +76,7 @@ public static function thumbModal($template, $clientId = 0) if (file_exists($preview)) { $preview = $baseUrl . '/templates/' . $template . '/template_preview.png'; - $footer = ' - - -
    - - pagination->getLimitBox(); ?> -
    - + $this)); ?>
    items)) : ?>
    @@ -55,22 +43,22 @@  
    		- + - + - + - + - +
    - + - + @@ -125,8 +116,6 @@ - - diff --git a/administrator/components/com_templates/views/templates/view.html.php b/administrator/components/com_templates/views/templates/view.html.php index f186caf0c7dcd..a0725c02eecf8 100644 --- a/administrator/components/com_templates/views/templates/view.html.php +++ b/administrator/components/com_templates/views/templates/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -51,11 +51,13 @@ class TemplatesViewTemplates extends JViewLegacy */ public function display($tpl = null) { - $this->items = $this->get('Items'); - $this->pagination = $this->get('Pagination'); - $this->state = $this->get('State'); - $this->preview = JComponentHelper::getParams('com_templates')->get('template_positions_display'); - $this->file = base64_encode('home'); + $this->items = $this->get('Items'); + $this->pagination = $this->get('Pagination'); + $this->state = $this->get('State'); + $this->filterForm = $this->get('FilterForm'); + $this->activeFilters = $this->get('ActiveFilters'); + $this->preview = JComponentHelper::getParams('com_templates')->get('template_positions_display'); + $this->file = base64_encode('home'); TemplatesHelper::addSubmenu('templates'); @@ -95,12 +97,6 @@ protected function addToolbar() JHtmlSidebar::setAction('index.php?option=com_templates&view=templates'); - JHtmlSidebar::addFilter( - JText::_('JGLOBAL_FILTER_CLIENT'), - 'filter_client_id', - JHtml::_('select.options', TemplatesHelper::getClientOptions(), 'value', 'text', $this->state->get('filter.client_id')) - ); - $this->sidebar = JHtmlSidebar::render(); } } diff --git a/administrator/components/com_users/controller.php b/administrator/components/com_users/controller.php index cd3e538cbac56..040221e6a7610 100644 --- a/administrator/components/com_users/controller.php +++ b/administrator/components/com_users/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/controllers/group.php b/administrator/components/com_users/controllers/group.php index 0120790a97875..dcaf8905405bd 100644 --- a/administrator/components/com_users/controllers/group.php +++ b/administrator/components/com_users/controllers/group.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/controllers/groups.php b/administrator/components/com_users/controllers/groups.php index cedeef4452b1c..f1b9357f9b5cf 100644 --- a/administrator/components/com_users/controllers/groups.php +++ b/administrator/components/com_users/controllers/groups.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/controllers/level.php b/administrator/components/com_users/controllers/level.php index 20d489f8a0e8f..5161047017e1e 100644 --- a/administrator/components/com_users/controllers/level.php +++ b/administrator/components/com_users/controllers/level.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/controllers/levels.php b/administrator/components/com_users/controllers/levels.php index 622ce88055f8b..8fcfd54a2931f 100644 --- a/administrator/components/com_users/controllers/levels.php +++ b/administrator/components/com_users/controllers/levels.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/controllers/mail.php b/administrator/components/com_users/controllers/mail.php index b96582d3cde53..8c21b6bd87925 100644 --- a/administrator/components/com_users/controllers/mail.php +++ b/administrator/components/com_users/controllers/mail.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/controllers/note.php b/administrator/components/com_users/controllers/note.php index 6af4e97baa9cf..ab094cb146dd8 100644 --- a/administrator/components/com_users/controllers/note.php +++ b/administrator/components/com_users/controllers/note.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/controllers/notes.php b/administrator/components/com_users/controllers/notes.php index f99028783ac50..1cfaf91713de4 100644 --- a/administrator/components/com_users/controllers/notes.php +++ b/administrator/components/com_users/controllers/notes.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/controllers/profile.json.php b/administrator/components/com_users/controllers/profile.json.php new file mode 100644 index 0000000000000..b9390f4a97786 --- /dev/null +++ b/administrator/components/com_users/controllers/profile.json.php @@ -0,0 +1,21 @@ +'; } @@ -122,7 +122,7 @@ public static function notesModal($count, $userId) } $title = JText::plural('COM_USERS_N_USER_NOTES', $count); - $footer = ''; return JHtml::_( @@ -134,7 +134,7 @@ public static function notesModal($count, $userId) 'keyboard' => true, 'closeButton' => true, 'footer' => $footer, - 'url' => JRoute::_('index.php?option=com_users&view=notes&tmpl=component&layout=modal&u_id=' . (int) $userId), + 'url' => JRoute::_('index.php?option=com_users&view=notes&tmpl=component&layout=modal&filter[user_id]=' . (int) $userId), 'height' => '300px', 'width' => '800px' ) diff --git a/administrator/components/com_users/helpers/users.php b/administrator/components/com_users/helpers/users.php index 78fb1c8f756d8..145cf38ac1171 100644 --- a/administrator/components/com_users/helpers/users.php +++ b/administrator/components/com_users/helpers/users.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/models/debuggroup.php b/administrator/components/com_users/models/debuggroup.php index d225087f1febb..0cb01b3e0c576 100644 --- a/administrator/components/com_users/models/debuggroup.php +++ b/administrator/components/com_users/models/debuggroup.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/models/debuguser.php b/administrator/components/com_users/models/debuguser.php index 13740a1f935db..435fa6854dc6c 100644 --- a/administrator/components/com_users/models/debuguser.php +++ b/administrator/components/com_users/models/debuguser.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/models/fields/groupparent.php b/administrator/components/com_users/models/fields/groupparent.php index 00aa0a421af5f..b8469533b41ef 100644 --- a/administrator/components/com_users/models/fields/groupparent.php +++ b/administrator/components/com_users/models/fields/groupparent.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/models/forms/filter_groups.xml b/administrator/components/com_users/models/forms/filter_groups.xml new file mode 100644 index 0000000000000..ca7509b8e8ede --- /dev/null +++ b/administrator/components/com_users/models/forms/filter_groups.xml @@ -0,0 +1,39 @@ + +
    + + + + + + + + + + + + + + + +
    diff --git a/administrator/components/com_users/models/forms/filter_levels.xml b/administrator/components/com_users/models/forms/filter_levels.xml new file mode 100644 index 0000000000000..22f1965a71b44 --- /dev/null +++ b/administrator/components/com_users/models/forms/filter_levels.xml @@ -0,0 +1,39 @@ + +
    + + + + + + + + + + + + + + + +
    diff --git a/administrator/components/com_users/models/forms/filter_notes.xml b/administrator/components/com_users/models/forms/filter_notes.xml new file mode 100644 index 0000000000000..9edb1bc2cba5e --- /dev/null +++ b/administrator/components/com_users/models/forms/filter_notes.xml @@ -0,0 +1,62 @@ + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    \ No newline at end of file diff --git a/administrator/components/com_users/models/forms/note.xml b/administrator/components/com_users/models/forms/note.xml index f942122e8181a..b3260eb5f35b4 100644 --- a/administrator/components/com_users/models/forms/note.xml +++ b/administrator/components/com_users/models/forms/note.xml @@ -68,7 +68,7 @@ type="calendar" label="COM_USERS_FIELD_REVIEW_TIME_LABEL" description="COM_USERS_FIELD_REVIEW_TIME_DESC" - default="0000-00-00" + default="NOW" format="%Y-%m-%d" /> diff --git a/administrator/components/com_users/models/group.php b/administrator/components/com_users/models/group.php index d06ae77ec7498..8909aef0d1233 100644 --- a/administrator/components/com_users/models/group.php +++ b/administrator/components/com_users/models/group.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/models/groups.php b/administrator/components/com_users/models/groups.php index c3b72c472e2f3..8559b30b5c9f0 100644 --- a/administrator/components/com_users/models/groups.php +++ b/administrator/components/com_users/models/groups.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -52,18 +52,17 @@ public function __construct($config = array()) * * @since 1.6 */ - protected function populateState($ordering = null, $direction = null) + protected function populateState($ordering = 'a.lft', $direction = 'asc') { // Load the filter state. - $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search'); - $this->setState('filter.search', $search); + $this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search')); // Load the parameters. $params = JComponentHelper::getParams('com_users'); $this->setState('params', $params); // List state information. - parent::populateState('a.lft', 'asc'); + parent::populateState($ordering, $direction); } /** @@ -81,7 +80,6 @@ protected function getStoreId($id = '') { // Compile the store id. $id .= ':' . $this->getState('filter.search'); - $id .= ':' . $this->getState('filter.search'); return parent::getStoreId($id); } diff --git a/administrator/components/com_users/models/level.php b/administrator/components/com_users/models/level.php index d3096d7458afe..7d56eadc06882 100644 --- a/administrator/components/com_users/models/level.php +++ b/administrator/components/com_users/models/level.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/models/levels.php b/administrator/components/com_users/models/levels.php index c3c91b9c28427..d837fae8aa0e0 100644 --- a/administrator/components/com_users/models/levels.php +++ b/administrator/components/com_users/models/levels.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -50,18 +50,17 @@ public function __construct($config = array()) * * @since 1.6 */ - protected function populateState($ordering = null, $direction = null) + protected function populateState($ordering = 'a.ordering', $direction = 'asc') { // Load the filter state. - $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search'); - $this->setState('filter.search', $search); + $this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search')); // Load the parameters. $params = JComponentHelper::getParams('com_users'); $this->setState('params', $params); // List state information. - parent::populateState('a.ordering', 'asc'); + parent::populateState($ordering, $direction); } /** @@ -125,7 +124,7 @@ protected function getListQuery() $query->group('a.id'); // Add the list ordering clause. - $query->order($db->escape($this->getState('list.ordering', 'a.lft')) . ' ' . $db->escape($this->getState('list.direction', 'ASC'))); + $query->order($db->escape($this->getState('list.ordering', 'a.ordering')) . ' ' . $db->escape($this->getState('list.direction', 'ASC'))); return $query; } diff --git a/administrator/components/com_users/models/mail.php b/administrator/components/com_users/models/mail.php index edd8a99900671..cfc05d573cdde 100644 --- a/administrator/components/com_users/models/mail.php +++ b/administrator/components/com_users/models/mail.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/models/note.php b/administrator/components/com_users/models/note.php index 60f9db02837d8..4499cf44e26b5 100644 --- a/administrator/components/com_users/models/note.php +++ b/administrator/components/com_users/models/note.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/models/notes.php b/administrator/components/com_users/models/notes.php index 5d13ba3c0ca04..96ba11d398362 100644 --- a/administrator/components/com_users/models/notes.php +++ b/administrator/components/com_users/models/notes.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -29,19 +29,14 @@ public function __construct($config = array()) if (empty($config['filter_fields'])) { $config['filter_fields'] = array( - 'id', - 'a.id', - 'user_id', - 'a.user_id', + 'id', 'a.id', + 'user_id', 'a.user_id', 'u.name', - 'subject', - 'a.subject', - 'catid', - 'a.catid', + 'subject', 'a.subject', + 'catid', 'a.catid', 'category_id', 'state', 'a.state', 'c.title', - 'review_time', - 'a.review_time', + 'review_time', 'a.review_time', 'publish_up', 'a.publish_up', 'publish_down', 'a.publish_down', ); @@ -61,7 +56,6 @@ protected function getListQuery() { $db = $this->getDbo(); $query = $db->getQuery(true); - $section = $this->getState('filter.category_id'); // Select the required fields from the table. $query->select( @@ -106,7 +100,7 @@ protected function getListQuery() } // Filter by published state - $published = $this->getState('filter.state'); + $published = $this->getState('filter.published'); if (is_numeric($published)) { @@ -118,14 +112,11 @@ protected function getListQuery() } // Filter by a single or group of categories. - $categoryId = (int) $this->getState('filter.category_id'); + $categoryId = $this->getState('filter.category_id'); - if ($categoryId) + if ($categoryId && is_scalar($categoryId)) { - if (is_scalar($section)) - { - $query->where('a.catid = ' . $categoryId); - } + $query->where('a.catid = ' . $categoryId); } // Filter by a single user. @@ -139,9 +130,7 @@ protected function getListQuery() } // Add the list ordering clause. - $orderCol = $this->state->get('list.ordering'); - $orderDirn = $this->state->get('list.direction'); - $query->order($db->escape($orderCol . ' ' . $orderDirn)); + $query->order($db->escape($this->getState('list.ordering', 'a.review_time')) . ' ' . $db->escape($this->getState('list.direction', 'DESC'))); return $query; } @@ -165,6 +154,7 @@ protected function getStoreId($id = '') $id .= ':' . $this->getState('filter.search'); $id .= ':' . $this->getState('filter.state'); $id .= ':' . $this->getState('filter.category_id'); + $id .= ':' . $this->getState('filter.user_id'); return parent::getStoreId($id); } @@ -181,7 +171,7 @@ public function getUser() $user = new JUser; // Filter by search in title - $search = JFactory::getApplication()->input->get('u_id', 0, 'int'); + $search = (int) $this->getState('filter.user_id'); if ($search != 0) { @@ -203,29 +193,22 @@ public function getUser() * * @since 1.6 */ - protected function populateState($ordering = null, $direction = null) + protected function populateState($ordering = 'a.review_time', $direction = 'desc') { - $app = JFactory::getApplication(); - $input = $app->input; - // Adjust the context to support modal layouts. - if ($layout = $input->get('layout')) + if ($layout = JFactory::getApplication()->input->get('layout')) { $this->context .= '.' . $layout; } - $value = $app->getUserStateFromRequest($this->context . '.filter.search', 'filter_search'); - $this->setState('filter.search', $value); + $this->setState('filter.search', $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search')); - $published = $this->getUserStateFromRequest($this->context . '.filter.state', 'filter_published', '', 'string'); - $this->setState('filter.state', $published); + $this->setState('filter.state', $this->getUserStateFromRequest($this->context . '.filter.state', 'filter_published', '', 'string')); - $section = $app->getUserStateFromRequest($this->context . '.filter.category_id', 'filter_category_id'); - $this->setState('filter.category_id', $section); + $this->setState('filter.category_id', $this->getUserStateFromRequest($this->context . '.filter.category_id', 'filter_category_id')); - $userId = $input->get('u_id', 0, 'int'); - $this->setState('filter.user_id', $userId); + $this->setState('filter.user_id', $this->getUserStateFromRequest($this->context . '.filter.user_id', 'filter_user_id')); - parent::populateState('a.review_time', 'DESC'); + parent::populateState($ordering, $direction); } } diff --git a/administrator/components/com_users/models/user.php b/administrator/components/com_users/models/user.php index 3ada3300eea20..a94e48399790b 100644 --- a/administrator/components/com_users/models/user.php +++ b/administrator/components/com_users/models/user.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -684,6 +684,13 @@ public function batchReset($user_ids, $action) // Prune out the current user if they are in the supplied user ID array $user_ids = array_diff($user_ids, array(JFactory::getUser()->id)); + if (empty($user_ids)) + { + $this->setError(JText::_('COM_USERS_USERS_ERROR_CANNOT_REQUIRERESET_SELF')); + + return false; + } + // Get the DB object $db = $this->getDbo(); @@ -877,9 +884,14 @@ public function getAssignedGroups($userId = null) if (empty($userId)) { - $result = array(); + $result = array(); + $form = $this->getForm(); + $groupIDs = array(); - $groupsIDs = $this->getForm()->getValue('groups'); + if ($form) + { + $groupsIDs = $form->getValue('groups'); + } if (!empty($groupsIDs)) { diff --git a/administrator/components/com_users/models/users.php b/administrator/components/com_users/models/users.php index a18daf89b76c3..82489af21d8b2 100644 --- a/administrator/components/com_users/models/users.php +++ b/administrator/components/com_users/models/users.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -80,7 +80,7 @@ protected function populateState($ordering = null, $direction = null) $state = $this->getUserStateFromRequest($this->context . '.filter.state', 'filter_state'); $this->setState('filter.state', $state); - $groupId = $this->getUserStateFromRequest($this->context . '.filter.group', 'filter_group_id', null, 'int'); + $groupId = $this->getUserStateFromRequest($this->context . '.filter.group_id', 'filter_group_id', null, 'int'); $this->setState('filter.group_id', $groupId); $range = $this->getUserStateFromRequest($this->context . '.filter.range', 'filter_range'); diff --git a/administrator/components/com_users/tables/note.php b/administrator/components/com_users/tables/note.php index c4bdcf18d8a6e..5f828d271a80e 100644 --- a/administrator/components/com_users/tables/note.php +++ b/administrator/components/com_users/tables/note.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/users.php b/administrator/components/com_users/users.php index 07b8499f705ef..6aa00c34e5deb 100644 --- a/administrator/components/com_users/users.php +++ b/administrator/components/com_users/users.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/users.xml b/administrator/components/com_users/users.xml index 3813603f002a6..d068344d225ce 100644 --- a/administrator/components/com_users/users.xml +++ b/administrator/components/com_users/users.xml @@ -3,7 +3,7 @@ com_users Joomla! Project April 2006 - (C) 2005 - 2015 Open Source Matters. All rights reserved. + (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt admin@joomla.org www.joomla.org diff --git a/administrator/components/com_users/views/debuggroup/tmpl/default.php b/administrator/components/com_users/views/debuggroup/tmpl/default.php index 67c69d077eaa1..dba26ff803642 100644 --- a/administrator/components/com_users/views/debuggroup/tmpl/default.php +++ b/administrator/components/com_users/views/debuggroup/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -48,14 +48,14 @@     		+ + +
    - - - + + +
    - - - + diff --git a/administrator/components/com_users/views/debuggroup/view.html.php b/administrator/components/com_users/views/debuggroup/view.html.php index 1606f7d8c6959..a7acf0e3f3b5c 100644 --- a/administrator/components/com_users/views/debuggroup/view.html.php +++ b/administrator/components/com_users/views/debuggroup/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/debuguser/tmpl/default.php b/administrator/components/com_users/views/debuguser/tmpl/default.php index 1f4c228455a32..540a8cae6e78f 100644 --- a/administrator/components/com_users/views/debuguser/tmpl/default.php +++ b/administrator/components/com_users/views/debuguser/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -71,9 +71,9 @@
    - - - + + +
    - - - + diff --git a/administrator/components/com_users/views/debuguser/view.html.php b/administrator/components/com_users/views/debuguser/view.html.php index adaa461eec27f..47c13d9783ffc 100644 --- a/administrator/components/com_users/views/debuguser/view.html.php +++ b/administrator/components/com_users/views/debuguser/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/group/tmpl/edit.php b/administrator/components/com_users/views/group/tmpl/edit.php index 61db323582a3c..de5af5ee74362 100644 --- a/administrator/components/com_users/views/group/tmpl/edit.php +++ b/administrator/components/com_users/views/group/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/group/view.html.php b/administrator/components/com_users/views/group/view.html.php index 7b6ad71d454d5..2143050713301 100644 --- a/administrator/components/com_users/views/group/view.html.php +++ b/administrator/components/com_users/views/group/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/groups/tmpl/default.php b/administrator/components/com_users/views/groups/tmpl/default.php index 54918635b59a7..b1da0a4fd6ac3 100644 --- a/administrator/components/com_users/views/groups/tmpl/default.php +++ b/administrator/components/com_users/views/groups/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -19,7 +19,6 @@ $user = JFactory::getUser(); $listOrder = $this->escape($this->state->get('list.ordering')); $listDirn = $this->escape($this->state->get('list.direction')); -$sortFields = $this->getSortFields(); JText::script('COM_USERS_GROUPS_CONFIRM_DELETE'); @@ -54,24 +53,6 @@ Joomla.submitform(task); }; '); - -JFactory::getDocument()->addScriptDeclaration(' - Joomla.orderTable = function() - { - table = document.getElementById("sortTable"); - direction = document.getElementById("directionTable"); - order = table.options[table.selectedIndex].value; - if (order != "' . $listOrder . '") - { - dirn = "asc"; - } - else - { - dirn = direction.options[direction.selectedIndex].value; - } - Joomla.tableOrdering(order, dirn, ""); - }; -'); ?>
    sidebar)) : ?> @@ -82,34 +63,7 @@
    -
    -
    - -
    -
    - - -
    -
    - - pagination->getLimitBox(); ?> -
    -
    - - -
    -
    - - -
    -
    + $this, 'options' => array('filterButton' => false))); ?>
    items)) : ?>
    @@ -123,13 +77,13 @@
    		- + + - + +
    - user_count ? $item->user_count : ''; ?> + + user_count ? '' . $item->user_count . '' : '0'; ?> id; ?> @@ -185,8 +139,6 @@ - - diff --git a/administrator/components/com_users/views/groups/view.html.php b/administrator/components/com_users/views/groups/view.html.php index 118636bf6a365..cbd43e6950dee 100644 --- a/administrator/components/com_users/views/groups/view.html.php +++ b/administrator/components/com_users/views/groups/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -49,9 +49,11 @@ class UsersViewGroups extends JViewLegacy */ public function display($tpl = null) { - $this->items = $this->get('Items'); - $this->pagination = $this->get('Pagination'); - $this->state = $this->get('State'); + $this->items = $this->get('Items'); + $this->pagination = $this->get('Pagination'); + $this->state = $this->get('State'); + $this->filterForm = $this->get('FilterForm'); + $this->activeFilters = $this->get('ActiveFilters'); UsersHelper::addSubmenu('groups'); @@ -94,7 +96,7 @@ protected function addToolbar() if ($canDo->get('core.delete')) { - JToolbarHelper::deleteList('', 'groups.delete'); + JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'groups.delete', 'JTOOLBAR_DELETE'); JToolbarHelper::divider(); } diff --git a/administrator/components/com_users/views/level/tmpl/edit.php b/administrator/components/com_users/views/level/tmpl/edit.php index 9959b53306707..82fb60d21cedb 100644 --- a/administrator/components/com_users/views/level/tmpl/edit.php +++ b/administrator/components/com_users/views/level/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/level/view.html.php b/administrator/components/com_users/views/level/view.html.php index 571b8af9db7e1..70c4c91efe282 100644 --- a/administrator/components/com_users/views/level/view.html.php +++ b/administrator/components/com_users/views/level/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/levels/tmpl/default.php b/administrator/components/com_users/views/levels/tmpl/default.php index 6f34c63e1aff0..e9555b3744554 100644 --- a/administrator/components/com_users/views/levels/tmpl/default.php +++ b/administrator/components/com_users/views/levels/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -21,8 +21,6 @@ $listDirn = $this->escape($this->state->get('list.direction')); $canOrder = $user->authorise('core.edit.state', 'com_users'); $saveOrder = $listOrder == 'a.ordering'; -$sortFields = $this->getSortFields(); -$saveOrder = $listOrder == 'a.ordering'; if ($saveOrder) { @@ -30,23 +28,6 @@ JHtml::_('sortablelist.sortable', 'levelList', 'adminForm', strtolower($listDirn), $saveOrderingUrl); } -JFactory::getDocument()->addScriptDeclaration(' - Joomla.orderTable = function() - { - table = document.getElementById("sortTable"); - direction = document.getElementById("directionTable"); - order = table.options[table.selectedIndex].value; - if (order != "' . $listOrder . '") - { - dirn = "asc"; - } - else - { - dirn = direction.options[direction.selectedIndex].value; - } - Joomla.tableOrdering(order, dirn, ""); - }; -'); ?>
    sidebar)) : ?> @@ -57,34 +38,7 @@
    -
    -
    - -
    -
    - - -
    -
    - - pagination->getLimitBox(); ?> -
    -
    - - -
    -
    - - -
    -
    + $this, 'options' => array('filterButton' => false))); ?>
    items)) : ?>
    @@ -95,22 +49,22 @@
    - ', 'a.ordering', $listDirn, $listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?> + - + - +
    + pagination->getListFooter(); ?>
    - - - diff --git a/administrator/components/com_users/views/levels/view.html.php b/administrator/components/com_users/views/levels/view.html.php index 0ae1709f10fac..3769c7c0eba7c 100644 --- a/administrator/components/com_users/views/levels/view.html.php +++ b/administrator/components/com_users/views/levels/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -49,9 +49,11 @@ class UsersViewLevels extends JViewLegacy */ public function display($tpl = null) { - $this->items = $this->get('Items'); - $this->pagination = $this->get('Pagination'); - $this->state = $this->get('State'); + $this->items = $this->get('Items'); + $this->pagination = $this->get('Pagination'); + $this->state = $this->get('State'); + $this->filterForm = $this->get('FilterForm'); + $this->activeFilters = $this->get('ActiveFilters'); UsersHelper::addSubmenu('levels'); @@ -94,7 +96,7 @@ protected function addToolbar() if ($canDo->get('core.delete')) { - JToolbarHelper::deleteList('', 'level.delete'); + JToolbarHelper::deleteList('JGLOBAL_CONFIRM_DELETE', 'level.delete', 'JTOOLBAR_DELETE'); JToolbarHelper::divider(); } diff --git a/administrator/components/com_users/views/mail/tmpl/default.php b/administrator/components/com_users/views/mail/tmpl/default.php index cf9c84b5be63b..0c4ef4fbf23c8 100644 --- a/administrator/components/com_users/views/mail/tmpl/default.php +++ b/administrator/components/com_users/views/mail/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/mail/view.html.php b/administrator/components/com_users/views/mail/view.html.php index 08e592138e447..b672cda1e52fe 100644 --- a/administrator/components/com_users/views/mail/view.html.php +++ b/administrator/components/com_users/views/mail/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/note/tmpl/edit.php b/administrator/components/com_users/views/note/tmpl/edit.php index 9ef3cc12e2b4b..c0ce94a12a9e8 100644 --- a/administrator/components/com_users/views/note/tmpl/edit.php +++ b/administrator/components/com_users/views/note/tmpl/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/note/view.html.php b/administrator/components/com_users/views/note/view.html.php index 17ae22fe01f73..5d1968488d391 100644 --- a/administrator/components/com_users/views/note/view.html.php +++ b/administrator/components/com_users/views/note/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/components/com_users/views/notes/tmpl/default.php b/administrator/components/com_users/views/notes/tmpl/default.php index 3e0119cac904e..46ec75742bf2e 100644 --- a/administrator/components/com_users/views/notes/tmpl/default.php +++ b/administrator/components/com_users/views/notes/tmpl/default.php @@ -3,38 +3,20 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; JHtml::_('bootstrap.tooltip'); +JHtml::_('behavior.multiselect'); JHtml::_('formbehavior.chosen', 'select'); $user = JFactory::getUser(); +$canEdit = $user->authorise('core.edit', 'com_users'); $listOrder = $this->escape($this->state->get('list.ordering')); $listDirn = $this->escape($this->state->get('list.direction')); -$canEdit = $user->authorise('core.edit', 'com_users'); -$sortFields = $this->getSortFields(); - -JFactory::getDocument()->addScriptDeclaration(' - Joomla.orderTable = function() - { - table = document.getElementById("sortTable"); - direction = document.getElementById("directionTable"); - order = table.options[table.selectedIndex].value; - if (order != "' . $listOrder . '") - { - dirn = "asc"; - } - else - { - dirn = direction.options[direction.selectedIndex].value; - } - Joomla.tableOrdering(order, dirn, ""); - }; -'); ?>
    sidebar)) : ?> @@ -45,35 +27,8 @@
    -
    -
    - -
    -
    - - -
    -
    - - pagination->getLimitBox(); ?> -
    -
    - - -
    -
    - - -
    -
    -
    + $this)); ?> + items)) : ?>
    @@ -86,22 +41,22 @@
    		- + - + - + - + - + - +
    -
    +
    escape($item->name); ?> @@ -118,7 +118,7 @@
    		+ escape($item->username); ?> @@ -144,7 +144,7 @@ group_names); ?> + escape($item->email)); ?> diff --git a/administrator/components/com_users/views/users/tmpl/default_batch.php b/administrator/components/com_users/views/users/tmpl/default_batch.php index d19641a773a18..a063a003a785f 100644 --- a/administrator/components/com_users/views/users/tmpl/default_batch.php +++ b/administrator/components/com_users/views/users/tmpl/default_batch.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * * @deprecated 3.4 Use default_batch_body and default_batch_footer diff --git a/administrator/components/com_users/views/users/tmpl/default_batch_body.php b/administrator/components/com_users/views/users/tmpl/default_batch_body.php index 46cc0f26574ae..af6f6ec886f59 100644 --- a/administrator/components/com_users/views/users/tmpl/default_batch_body.php +++ b/administrator/components/com_users/views/users/tmpl/default_batch_body.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_users/views/users/tmpl/default_batch_footer.php b/administrator/components/com_users/views/users/tmpl/default_batch_footer.php index ae1cabfdb65bb..03d54793c73e0 100644 --- a/administrator/components/com_users/views/users/tmpl/default_batch_footer.php +++ b/administrator/components/com_users/views/users/tmpl/default_batch_footer.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; diff --git a/administrator/components/com_users/views/users/tmpl/modal.php b/administrator/components/com_users/views/users/tmpl/modal.php index aeada70d68efd..e63a8d653e177 100644 --- a/administrator/components/com_users/views/users/tmpl/modal.php +++ b/administrator/components/com_users/views/users/tmpl/modal.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -17,7 +17,6 @@ $input = JFactory::getApplication()->input; $field = $input->getCmd('field'); -$function = 'jSelectUser_' . $field; $listOrder = $this->escape($this->state->get('list.ordering')); $listDirn = $this->escape($this->state->get('list.direction')); ?> @@ -31,7 +30,10 @@
    - + get('required', 0, 'int') != 1 ) : ?> + +
    @@ -72,7 +74,8 @@ foreach ($this->items as $item) : ?>
    - + name; ?> diff --git a/administrator/templates/hathor/html/com_banners/client/edit.php b/administrator/templates/hathor/html/com_banners/client/edit.php index 8616623d358d7..682d1764b5cd8 100644 --- a/administrator/templates/hathor/html/com_banners/client/edit.php +++ b/administrator/templates/hathor/html/com_banners/client/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_banners/clients/default.php b/administrator/templates/hathor/html/com_banners/clients/default.php index 373d4f174d6bb..f7ccfac0ed6ed 100644 --- a/administrator/templates/hathor/html/com_banners/clients/default.php +++ b/administrator/templates/hathor/html/com_banners/clients/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_banners/tracks/default.php b/administrator/templates/hathor/html/com_banners/tracks/default.php index 226dea02ad134..e468abf3dd689 100644 --- a/administrator/templates/hathor/html/com_banners/tracks/default.php +++ b/administrator/templates/hathor/html/com_banners/tracks/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_cache/cache/default.php b/administrator/templates/hathor/html/com_cache/cache/default.php index 1263a074defb1..524a27a7a467d 100644 --- a/administrator/templates/hathor/html/com_cache/cache/default.php +++ b/administrator/templates/hathor/html/com_cache/cache/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -25,11 +25,11 @@
    -
    		- + - + - + - + @@ -183,25 +183,25 @@ - items[0]) && property_exists($this->items[0], count_published)) : ?> + items[0]) && property_exists($this->items[0], 'count_published')) : ?> count_published; ?> count_unpublished; ?> count_archived; ?> count_trashed; ?> @@ -221,7 +221,7 @@ language == '*'): ?> - language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> + language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . ' ' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> diff --git a/administrator/templates/hathor/html/com_categories/category/edit.php b/administrator/templates/hathor/html/com_categories/category/edit.php index ce8029278985d..333069fcfb076 100644 --- a/administrator/templates/hathor/html/com_categories/category/edit.php +++ b/administrator/templates/hathor/html/com_categories/category/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_categories/category/edit_options.php b/administrator/templates/hathor/html/com_categories/category/edit_options.php index f0ee11c209f2e..608311490df78 100644 --- a/administrator/templates/hathor/html/com_categories/category/edit_options.php +++ b/administrator/templates/hathor/html/com_categories/category/edit_options.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_checkin/checkin/default.php b/administrator/templates/hathor/html/com_checkin/checkin/default.php index 57154dd7e7a79..f7596acfca7d7 100644 --- a/administrator/templates/hathor/html/com_checkin/checkin/default.php +++ b/administrator/templates/hathor/html/com_checkin/checkin/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_checkin * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_config/application/default.php b/administrator/templates/hathor/html/com_config/application/default.php index 9de28a7bb0a76..a6ee3366fad53 100644 --- a/administrator/templates/hathor/html/com_config/application/default.php +++ b/administrator/templates/hathor/html/com_config/application/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_config/application/default_cache.php b/administrator/templates/hathor/html/com_config/application/default_cache.php index 8dd70f4b7eea7..dba8513d0a340 100644 --- a/administrator/templates/hathor/html/com_config/application/default_cache.php +++ b/administrator/templates/hathor/html/com_config/application/default_cache.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_config/application/default_cookie.php b/administrator/templates/hathor/html/com_config/application/default_cookie.php index 21a9a4690a3c3..e6563b97d9ee5 100644 --- a/administrator/templates/hathor/html/com_config/application/default_cookie.php +++ b/administrator/templates/hathor/html/com_config/application/default_cookie.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_config/application/default_database.php b/administrator/templates/hathor/html/com_config/application/default_database.php index 15add496f840a..2dc3a49c0e36b 100644 --- a/administrator/templates/hathor/html/com_config/application/default_database.php +++ b/administrator/templates/hathor/html/com_config/application/default_database.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_config/application/default_debug.php b/administrator/templates/hathor/html/com_config/application/default_debug.php index 10787322e0217..2679dd6f482d2 100644 --- a/administrator/templates/hathor/html/com_config/application/default_debug.php +++ b/administrator/templates/hathor/html/com_config/application/default_debug.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_config/application/default_filters.php b/administrator/templates/hathor/html/com_config/application/default_filters.php index a817889a90fbc..9baa56bb19423 100644 --- a/administrator/templates/hathor/html/com_config/application/default_filters.php +++ b/administrator/templates/hathor/html/com_config/application/default_filters.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_config/application/default_ftp.php b/administrator/templates/hathor/html/com_config/application/default_ftp.php index fa7c519d1f79b..0de1a5567fa3c 100644 --- a/administrator/templates/hathor/html/com_config/application/default_ftp.php +++ b/administrator/templates/hathor/html/com_config/application/default_ftp.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_config/application/default_ftplogin.php b/administrator/templates/hathor/html/com_config/application/default_ftplogin.php index 1f7de20300ef2..cd0b53bf278ab 100644 --- a/administrator/templates/hathor/html/com_config/application/default_ftplogin.php +++ b/administrator/templates/hathor/html/com_config/application/default_ftplogin.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_config/application/default_locale.php b/administrator/templates/hathor/html/com_config/application/default_locale.php index c7cf1cf6d6de0..00e98112e4a49 100644 --- a/administrator/templates/hathor/html/com_config/application/default_locale.php +++ b/administrator/templates/hathor/html/com_config/application/default_locale.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_config/application/default_mail.php b/administrator/templates/hathor/html/com_config/application/default_mail.php index 0411b4b228127..a243f7797fcbf 100644 --- a/administrator/templates/hathor/html/com_config/application/default_mail.php +++ b/administrator/templates/hathor/html/com_config/application/default_mail.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_config/application/default_metadata.php b/administrator/templates/hathor/html/com_config/application/default_metadata.php index efcf91125b131..04505475cda6b 100644 --- a/administrator/templates/hathor/html/com_config/application/default_metadata.php +++ b/administrator/templates/hathor/html/com_config/application/default_metadata.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_config/application/default_navigation.php b/administrator/templates/hathor/html/com_config/application/default_navigation.php index 85666b38ca6dd..48134c5c5f814 100644 --- a/administrator/templates/hathor/html/com_config/application/default_navigation.php +++ b/administrator/templates/hathor/html/com_config/application/default_navigation.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_config/application/default_permissions.php b/administrator/templates/hathor/html/com_config/application/default_permissions.php index efe163f6607a1..a87f752768dd2 100644 --- a/administrator/templates/hathor/html/com_config/application/default_permissions.php +++ b/administrator/templates/hathor/html/com_config/application/default_permissions.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_config/application/default_seo.php b/administrator/templates/hathor/html/com_config/application/default_seo.php index df5a6ec161285..a1869d5c4311e 100644 --- a/administrator/templates/hathor/html/com_config/application/default_seo.php +++ b/administrator/templates/hathor/html/com_config/application/default_seo.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_config/application/default_server.php b/administrator/templates/hathor/html/com_config/application/default_server.php index e485d58d0cf4f..8dcb1cc5bb4c6 100644 --- a/administrator/templates/hathor/html/com_config/application/default_server.php +++ b/administrator/templates/hathor/html/com_config/application/default_server.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_config/application/default_session.php b/administrator/templates/hathor/html/com_config/application/default_session.php index bea75f8744892..15fdf0ef6c5f6 100644 --- a/administrator/templates/hathor/html/com_config/application/default_session.php +++ b/administrator/templates/hathor/html/com_config/application/default_session.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_config/application/default_site.php b/administrator/templates/hathor/html/com_config/application/default_site.php index adb5c60c30a64..df95ebd12d0cf 100644 --- a/administrator/templates/hathor/html/com_config/application/default_site.php +++ b/administrator/templates/hathor/html/com_config/application/default_site.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_config/application/default_system.php b/administrator/templates/hathor/html/com_config/application/default_system.php index 64dc2c914ed6a..8e45693fae8a8 100644 --- a/administrator/templates/hathor/html/com_config/application/default_system.php +++ b/administrator/templates/hathor/html/com_config/application/default_system.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_config/component/default.php b/administrator/templates/hathor/html/com_config/component/default.php index 9e6350ea2e28d..0733ef4d254f4 100644 --- a/administrator/templates/hathor/html/com_config/component/default.php +++ b/administrator/templates/hathor/html/com_config/component/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_contact/contact/edit.php b/administrator/templates/hathor/html/com_contact/contact/edit.php index 581b1b11807a1..c1e2a23931d32 100644 --- a/administrator/templates/hathor/html/com_contact/contact/edit.php +++ b/administrator/templates/hathor/html/com_contact/contact/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_contact/contact/edit_params.php b/administrator/templates/hathor/html/com_contact/contact/edit_params.php index 6d220a528a24c..ffe4cb08ab28c 100644 --- a/administrator/templates/hathor/html/com_contact/contact/edit_params.php +++ b/administrator/templates/hathor/html/com_contact/contact/edit_params.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_contact/contacts/default.php b/administrator/templates/hathor/html/com_contact/contacts/default.php index 715d53b0054f0..694e52df26fec 100644 --- a/administrator/templates/hathor/html/com_contact/contacts/default.php +++ b/administrator/templates/hathor/html/com_contact/contacts/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -206,7 +206,7 @@ language == '*'):?> - language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> + language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . ' ' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> diff --git a/administrator/templates/hathor/html/com_contact/contacts/modal.php b/administrator/templates/hathor/html/com_contact/contacts/modal.php index f8bebdaf12a68..d6837c4533e11 100644 --- a/administrator/templates/hathor/html/com_contact/contacts/modal.php +++ b/administrator/templates/hathor/html/com_contact/contacts/modal.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -116,7 +116,7 @@ language == '*'):?> - language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> + language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . ' ' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> diff --git a/administrator/templates/hathor/html/com_content/article/edit.php b/administrator/templates/hathor/html/com_content/article/edit.php index 42a1b795bdb3b..0ce67ab03f015 100644 --- a/administrator/templates/hathor/html/com_content/article/edit.php +++ b/administrator/templates/hathor/html/com_content/article/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_content/articles/default.php b/administrator/templates/hathor/html/com_content/articles/default.php index 2b39142c47d7d..bc33b2f746b7c 100644 --- a/administrator/templates/hathor/html/com_content/articles/default.php +++ b/administrator/templates/hathor/html/com_content/articles/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -221,7 +221,7 @@ language == '*'):?> - language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> + language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . ' ' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> diff --git a/administrator/templates/hathor/html/com_content/articles/modal.php b/administrator/templates/hathor/html/com_content/articles/modal.php index 5ef934fc1018a..7a03a43a507ba 100644 --- a/administrator/templates/hathor/html/com_content/articles/modal.php +++ b/administrator/templates/hathor/html/com_content/articles/modal.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -114,7 +114,7 @@ language == '*'):?> - language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> + language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . ' ' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> diff --git a/administrator/templates/hathor/html/com_content/featured/default.php b/administrator/templates/hathor/html/com_content/featured/default.php index b05f39a8dc32c..f7baa18bf7939 100644 --- a/administrator/templates/hathor/html/com_content/featured/default.php +++ b/administrator/templates/hathor/html/com_content/featured/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ /* add accessibility, labels on input forms */ @@ -191,7 +191,7 @@ language == '*') : ?> - language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> + language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . ' ' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> diff --git a/administrator/templates/hathor/html/com_cpanel/cpanel/default.php b/administrator/templates/hathor/html/com_cpanel/cpanel/default.php index d30eb138ef10c..7e72807cace7f 100644 --- a/administrator/templates/hathor/html/com_cpanel/cpanel/default.php +++ b/administrator/templates/hathor/html/com_cpanel/cpanel/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_finder/filters/default.php b/administrator/templates/hathor/html/com_finder/filters/default.php index a75f57d90db3e..3b65dde1f8de4 100644 --- a/administrator/templates/hathor/html/com_finder/filters/default.php +++ b/administrator/templates/hathor/html/com_finder/filters/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_finder/index/default.php b/administrator/templates/hathor/html/com_finder/index/default.php index 5ea10c56c81bb..f94cd0d81f934 100644 --- a/administrator/templates/hathor/html/com_finder/index/default.php +++ b/administrator/templates/hathor/html/com_finder/index/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -130,7 +130,7 @@ link_id); ?> + publish_start_date or (int) $item->publish_end_date or (int) $item->start_date or (int) $item->end_date) : ?> diff --git a/administrator/templates/hathor/html/com_finder/maps/default.php b/administrator/templates/hathor/html/com_finder/maps/default.php index 3f99599a81414..da6a3d2186f28 100644 --- a/administrator/templates/hathor/html/com_finder/maps/default.php +++ b/administrator/templates/hathor/html/com_finder/maps/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_installer/database/default.php b/administrator/templates/hathor/html/com_installer/database/default.php index b4513be76dc25..50e20b785e83e 100644 --- a/administrator/templates/hathor/html/com_installer/database/default.php +++ b/administrator/templates/hathor/html/com_installer/database/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_installer/default/default_ftp.php b/administrator/templates/hathor/html/com_installer/default/default_ftp.php index 738795067637b..91916df8fcacb 100644 --- a/administrator/templates/hathor/html/com_installer/default/default_ftp.php +++ b/administrator/templates/hathor/html/com_installer/default/default_ftp.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_installer/discover/default.php b/administrator/templates/hathor/html/com_installer/discover/default.php index aa394228da7d3..16a7ce1b2a8a1 100644 --- a/administrator/templates/hathor/html/com_installer/discover/default.php +++ b/administrator/templates/hathor/html/com_installer/discover/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_installer/install/default.php b/administrator/templates/hathor/html/com_installer/install/default.php index 8306cea307950..92163b5ee8101 100644 --- a/administrator/templates/hathor/html/com_installer/install/default.php +++ b/administrator/templates/hathor/html/com_installer/install/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_installer/install/default_form.php b/administrator/templates/hathor/html/com_installer/install/default_form.php index fa3bb0dc06d3a..82010004ae779 100644 --- a/administrator/templates/hathor/html/com_installer/install/default_form.php +++ b/administrator/templates/hathor/html/com_installer/install/default_form.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -63,7 +63,7 @@ { var form = document.getElementById('adminForm'); - form.install_url.value = 'http://appscdn.joomla.org/webapps/jedapps/webinstaller.xml'; + form.install_url.value = 'https://appscdn.joomla.org/webapps/jedapps/webinstaller.xml'; Joomla.submitbutton4(); }; diff --git a/administrator/templates/hathor/html/com_installer/languages/default.php b/administrator/templates/hathor/html/com_installer/languages/default.php index 1faf9c38dc1c8..09e92596e4447 100644 --- a/administrator/templates/hathor/html/com_installer/languages/default.php +++ b/administrator/templates/hathor/html/com_installer/languages/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_installer * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -65,8 +65,8 @@ name; ?> - version, 0, 3) != $version->RELEASE - || substr($language->version, 0, 5) != $version->RELEASE . "." . $version->DEV_LEVEL) : ?> + version, 0, 3) != $version::RELEASE + || substr($language->version, 0, 5) != $version->getShortVersion()) : ?>
    		- - escape($row->language); ?> - - published, $i, 'installed.', !$row->published && $canChange);?> diff --git a/administrator/templates/hathor/html/com_menus/menu/edit.php b/administrator/templates/hathor/html/com_menus/menu/edit.php index 6268865055eed..3dbeab8f6edf9 100644 --- a/administrator/templates/hathor/html/com_menus/menu/edit.php +++ b/administrator/templates/hathor/html/com_menus/menu/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_menus/menus/default.php b/administrator/templates/hathor/html/com_menus/menus/default.php index 47c834e0204b6..ade1d6264b83b 100644 --- a/administrator/templates/hathor/html/com_menus/menus/default.php +++ b/administrator/templates/hathor/html/com_menus/menus/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -22,16 +22,6 @@ $listDirn = $this->escape($this->state->get('list.direction')); $modMenuId = (int) $this->get('ModMenuId'); -JFactory::getDocument()->addScriptDeclaration(" - Joomla.submitbutton = function(task) - { - if (task != 'menus.delete' || confirm('" . JText::_('COM_MENUS_MENU_CONFIRM_DELETE', true) . "')) - { - Joomla.submitform(task); - } - }; -"); - $script = array(); $script[] = "jQuery(document).ready(function() {"; @@ -166,7 +156,7 @@ 'title' => JText::_('COM_MENUS_EDIT_MODULE_SETTINGS'), 'height' => '300px', 'width' => '800px', - 'footer' => '' . '' ) ); ?> diff --git a/administrator/templates/hathor/html/com_menus/menutypes/default.php b/administrator/templates/hathor/html/com_menus/menutypes/default.php index e5e69006fe617..da0fa0b95564b 100644 --- a/administrator/templates/hathor/html/com_menus/menutypes/default.php +++ b/administrator/templates/hathor/html/com_menus/menutypes/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_messages/message/edit.php b/administrator/templates/hathor/html/com_messages/message/edit.php index d23bafda1275d..cb25d6740c5fb 100644 --- a/administrator/templates/hathor/html/com_messages/message/edit.php +++ b/administrator/templates/hathor/html/com_messages/message/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_messages/messages/default.php b/administrator/templates/hathor/html/com_messages/messages/default.php index ff15b004b1794..8cb0ec6203db2 100644 --- a/administrator/templates/hathor/html/com_messages/messages/default.php +++ b/administrator/templates/hathor/html/com_messages/messages/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_modules/module/edit.php b/administrator/templates/hathor/html/com_modules/module/edit.php index ab7d22e86d6e2..6b197297047be 100644 --- a/administrator/templates/hathor/html/com_modules/module/edit.php +++ b/administrator/templates/hathor/html/com_modules/module/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_modules/module/edit_assignment.php b/administrator/templates/hathor/html/com_modules/module/edit_assignment.php index 24f71cb8bbfa5..174fe4d4163aa 100644 --- a/administrator/templates/hathor/html/com_modules/module/edit_assignment.php +++ b/administrator/templates/hathor/html/com_modules/module/edit_assignment.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_modules/module/edit_options.php b/administrator/templates/hathor/html/com_modules/module/edit_options.php index bcec24db737be..47183a4aaad11 100644 --- a/administrator/templates/hathor/html/com_modules/module/edit_options.php +++ b/administrator/templates/hathor/html/com_modules/module/edit_options.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_modules/modules/default.php b/administrator/templates/hathor/html/com_modules/modules/default.php index 7d07ee7dbb3eb..6cf65ab045c18 100644 --- a/administrator/templates/hathor/html/com_modules/modules/default.php +++ b/administrator/templates/hathor/html/com_modules/modules/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -201,7 +201,7 @@ language == '*'):?> - language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> + language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . ' ' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> diff --git a/administrator/templates/hathor/html/com_modules/positions/modal.php b/administrator/templates/hathor/html/com_modules/positions/modal.php index a3110b4812535..9aad317f52834 100644 --- a/administrator/templates/hathor/html/com_modules/positions/modal.php +++ b/administrator/templates/hathor/html/com_modules/positions/modal.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_newsfeeds/newsfeed/edit.php b/administrator/templates/hathor/html/com_newsfeeds/newsfeed/edit.php index 1f6ee2f55515a..76ee05f823673 100644 --- a/administrator/templates/hathor/html/com_newsfeeds/newsfeed/edit.php +++ b/administrator/templates/hathor/html/com_newsfeeds/newsfeed/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_newsfeeds/newsfeed/edit_params.php b/administrator/templates/hathor/html/com_newsfeeds/newsfeed/edit_params.php index 1d5486d1c6f1e..36f674766160f 100644 --- a/administrator/templates/hathor/html/com_newsfeeds/newsfeed/edit_params.php +++ b/administrator/templates/hathor/html/com_newsfeeds/newsfeed/edit_params.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/default.php b/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/default.php index f930ed424b781..1f7ca0f4a7aa3 100644 --- a/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/default.php +++ b/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -201,7 +201,7 @@ language == '*'):?> - language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> + language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . ' ' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> diff --git a/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/modal.php b/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/modal.php index 9f6583f182613..838a1667f8de9 100644 --- a/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/modal.php +++ b/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/modal.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -107,7 +107,7 @@ language == '*'):?> - language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> + language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . ' ' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> diff --git a/administrator/templates/hathor/html/com_plugins/plugin/edit.php b/administrator/templates/hathor/html/com_plugins/plugin/edit.php index 9a7f3a3f78a76..8ac723361115d 100644 --- a/administrator/templates/hathor/html/com_plugins/plugin/edit.php +++ b/administrator/templates/hathor/html/com_plugins/plugin/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_plugins/plugin/edit_options.php b/administrator/templates/hathor/html/com_plugins/plugin/edit_options.php index 09ec94fa142c1..a1d0ef795b254 100644 --- a/administrator/templates/hathor/html/com_plugins/plugin/edit_options.php +++ b/administrator/templates/hathor/html/com_plugins/plugin/edit_options.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_plugins/plugins/default.php b/administrator/templates/hathor/html/com_plugins/plugins/default.php index 2358a2218b77b..2c153a336d60e 100644 --- a/administrator/templates/hathor/html/com_plugins/plugins/default.php +++ b/administrator/templates/hathor/html/com_plugins/plugins/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_postinstall/messages/default.php b/administrator/templates/hathor/html/com_postinstall/messages/default.php index 25609bf9e08d0..98bbca301fbcc 100644 --- a/administrator/templates/hathor/html/com_postinstall/messages/default.php +++ b/administrator/templates/hathor/html/com_postinstall/messages/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_postinstall * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_redirect/links/default.php b/administrator/templates/hathor/html/com_redirect/links/default.php index 7f4f507d88d2c..cf538c105dab1 100644 --- a/administrator/templates/hathor/html/com_redirect/links/default.php +++ b/administrator/templates/hathor/html/com_redirect/links/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_search/searches/default.php b/administrator/templates/hathor/html/com_search/searches/default.php index 735d3b1305ae8..2fa64d6b592de 100644 --- a/administrator/templates/hathor/html/com_search/searches/default.php +++ b/administrator/templates/hathor/html/com_search/searches/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_tags/tag/edit.php b/administrator/templates/hathor/html/com_tags/tag/edit.php index 9b20a3106a973..4fe358ef84a5a 100644 --- a/administrator/templates/hathor/html/com_tags/tag/edit.php +++ b/administrator/templates/hathor/html/com_tags/tag/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_tags/tag/edit_metadata.php b/administrator/templates/hathor/html/com_tags/tag/edit_metadata.php index 704a3f228d3fa..ae842fbf73304 100644 --- a/administrator/templates/hathor/html/com_tags/tag/edit_metadata.php +++ b/administrator/templates/hathor/html/com_tags/tag/edit_metadata.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_tags/tag/edit_options.php b/administrator/templates/hathor/html/com_tags/tag/edit_options.php index 80b2f10d55932..a83cdc2bb88a8 100644 --- a/administrator/templates/hathor/html/com_tags/tag/edit_options.php +++ b/administrator/templates/hathor/html/com_tags/tag/edit_options.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_tags/tags/default.php b/administrator/templates/hathor/html/com_tags/tags/default.php index f95ce8e067453..3dbba58c2cac6 100644 --- a/administrator/templates/hathor/html/com_tags/tags/default.php +++ b/administrator/templates/hathor/html/com_tags/tags/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -132,7 +132,7 @@ language == '*'):?> - language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> + language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . ' ' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> diff --git a/administrator/templates/hathor/html/com_templates/style/edit.php b/administrator/templates/hathor/html/com_templates/style/edit.php index 14d87752bb40c..ac7adc0e1020e 100644 --- a/administrator/templates/hathor/html/com_templates/style/edit.php +++ b/administrator/templates/hathor/html/com_templates/style/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_templates/style/edit_assignment.php b/administrator/templates/hathor/html/com_templates/style/edit_assignment.php index 5483594a73555..9fb7a2f6b622d 100644 --- a/administrator/templates/hathor/html/com_templates/style/edit_assignment.php +++ b/administrator/templates/hathor/html/com_templates/style/edit_assignment.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_templates/style/edit_options.php b/administrator/templates/hathor/html/com_templates/style/edit_options.php index 4d792e4707381..c32fce89e811e 100644 --- a/administrator/templates/hathor/html/com_templates/style/edit_options.php +++ b/administrator/templates/hathor/html/com_templates/style/edit_options.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_templates/styles/default.php b/administrator/templates/hathor/html/com_templates/styles/default.php index e82c548f51f4f..080a5338418e7 100644 --- a/administrator/templates/hathor/html/com_templates/styles/default.php +++ b/administrator/templates/hathor/html/com_templates/styles/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_templates/template/default.php b/administrator/templates/hathor/html/com_templates/template/default.php index de74cd0231ce4..6c14bfe02f9d4 100644 --- a/administrator/templates/hathor/html/com_templates/template/default.php +++ b/administrator/templates/hathor/html/com_templates/template/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -116,7 +116,7 @@ function clearCoords() if($this->type == 'font') { JFactory::getDocument()->addStyleDeclaration( - "/* Styles for font preview */ + "/* Styles for font preview */ @font-face { font-family: previewFont; @@ -141,8 +141,15 @@ function clearCoords()

    fileName); ?>

    - - + + + + + + + + +
    @@ -427,72 +434,72 @@ function clearCoords() 1)); ?> - -
    -
    - - - -
    - -
    - type != 'home'): ?> - -
    -
    - - - -
    - -
    - - + +
    - + + +
    + +
    + type != 'home'): ?> + +
    +
    + + + +
    + +
    + + +
    + +
    -
    - -
    +
    + +
    -
    - -
    +
    + +
    diff --git a/administrator/templates/hathor/html/com_templates/template/default_description.php b/administrator/templates/hathor/html/com_templates/template/default_description.php index c0cfee243ebd3..76e6f28a74159 100644 --- a/administrator/templates/hathor/html/com_templates/template/default_description.php +++ b/administrator/templates/hathor/html/com_templates/template/default_description.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_templates/template/default_folders.php b/administrator/templates/hathor/html/com_templates/template/default_folders.php index 8075e28733ab6..6af67ce4e350d 100644 --- a/administrator/templates/hathor/html/com_templates/template/default_folders.php +++ b/administrator/templates/hathor/html/com_templates/template/default_folders.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_templates/template/default_tree.php b/administrator/templates/hathor/html/com_templates/template/default_tree.php index 51b6b72cc2f33..7cb55f94160b3 100644 --- a/administrator/templates/hathor/html/com_templates/template/default_tree.php +++ b/administrator/templates/hathor/html/com_templates/template/default_tree.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_templates * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_templates/templates/default.php b/administrator/templates/hathor/html/com_templates/templates/default.php index b9ac35385007d..b9537b83f2aed 100644 --- a/administrator/templates/hathor/html/com_templates/templates/default.php +++ b/administrator/templates/hathor/html/com_templates/templates/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_users/debuggroup/default.php b/administrator/templates/hathor/html/com_users/debuggroup/default.php index 0a8cf6e18a8c5..9fdf7f6883920 100644 --- a/administrator/templates/hathor/html/com_users/debuggroup/default.php +++ b/administrator/templates/hathor/html/com_users/debuggroup/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_users/debuguser/default.php b/administrator/templates/hathor/html/com_users/debuguser/default.php index 3c63f5b76e1ae..60cfe8d481568 100644 --- a/administrator/templates/hathor/html/com_users/debuguser/default.php +++ b/administrator/templates/hathor/html/com_users/debuguser/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_users/groups/default.php b/administrator/templates/hathor/html/com_users/groups/default.php index cbf1ac2ee977a..48ef39876ac6b 100644 --- a/administrator/templates/hathor/html/com_users/groups/default.php +++ b/administrator/templates/hathor/html/com_users/groups/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_users/levels/default.php b/administrator/templates/hathor/html/com_users/levels/default.php index 0ec55043553da..5ec7822cdc87f 100644 --- a/administrator/templates/hathor/html/com_users/levels/default.php +++ b/administrator/templates/hathor/html/com_users/levels/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_users/note/edit.php b/administrator/templates/hathor/html/com_users/note/edit.php index f9d937706f614..1561d15baafcf 100644 --- a/administrator/templates/hathor/html/com_users/note/edit.php +++ b/administrator/templates/hathor/html/com_users/note/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_users * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_users/notes/default.php b/administrator/templates/hathor/html/com_users/notes/default.php index aa0b715acaba6..c137d88f79496 100644 --- a/administrator/templates/hathor/html/com_users/notes/default.php +++ b/administrator/templates/hathor/html/com_users/notes/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_users/user/edit.php b/administrator/templates/hathor/html/com_users/user/edit.php index decb463133d09..8a767dff6a5b9 100644 --- a/administrator/templates/hathor/html/com_users/user/edit.php +++ b/administrator/templates/hathor/html/com_users/user/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_users/users/default.php b/administrator/templates/hathor/html/com_users/users/default.php index 0b34c4ee0a68a..f19cc08f88332 100644 --- a/administrator/templates/hathor/html/com_users/users/default.php +++ b/administrator/templates/hathor/html/com_users/users/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -133,7 +133,7 @@ id); ?>     		+
    note_count, $item->id); ?> note_count, $item->id); ?> @@ -154,7 +154,7 @@
    		+ escape($item->username); ?> @@ -178,7 +178,7 @@ group_names); ?> + escape($item->email); ?> diff --git a/administrator/templates/hathor/html/com_users/users/modal.php b/administrator/templates/hathor/html/com_users/users/modal.php index ebd048848f3ab..94448d9351db3 100644 --- a/administrator/templates/hathor/html/com_users/users/modal.php +++ b/administrator/templates/hathor/html/com_users/users/modal.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -25,7 +25,8 @@ - +
    @@ -60,7 +61,9 @@ foreach ($this->items as $item) : ?>
    - + name; ?> diff --git a/administrator/templates/hathor/html/com_weblinks/weblink/edit.php b/administrator/templates/hathor/html/com_weblinks/weblink/edit.php index f166380d77daa..1904e9938608b 100644 --- a/administrator/templates/hathor/html/com_weblinks/weblink/edit.php +++ b/administrator/templates/hathor/html/com_weblinks/weblink/edit.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_weblinks/weblink/edit_params.php b/administrator/templates/hathor/html/com_weblinks/weblink/edit_params.php index 30a3abc3d04ef..56e8169dc3013 100644 --- a/administrator/templates/hathor/html/com_weblinks/weblink/edit_params.php +++ b/administrator/templates/hathor/html/com_weblinks/weblink/edit_params.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/com_weblinks/weblinks/default.php b/administrator/templates/hathor/html/com_weblinks/weblinks/default.php index f9958bc6979c6..2a72f77dc41d5 100644 --- a/administrator/templates/hathor/html/com_weblinks/weblinks/default.php +++ b/administrator/templates/hathor/html/com_weblinks/weblinks/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -182,7 +182,7 @@ language == '*') : ?> - language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> + language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . ' ' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?> diff --git a/administrator/templates/hathor/html/layouts/com_media/toolbar/deletemedia.php b/administrator/templates/hathor/html/layouts/com_media/toolbar/deletemedia.php index ff3a7707a472c..b59b80870a64b 100644 --- a/administrator/templates/hathor/html/layouts/com_media/toolbar/deletemedia.php +++ b/administrator/templates/hathor/html/layouts/com_media/toolbar/deletemedia.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/layouts/com_media/toolbar/newfolder.php b/administrator/templates/hathor/html/layouts/com_media/toolbar/newfolder.php index 49b8cb647e2af..2ab4186e57020 100644 --- a/administrator/templates/hathor/html/layouts/com_media/toolbar/newfolder.php +++ b/administrator/templates/hathor/html/layouts/com_media/toolbar/newfolder.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/layouts/com_media/toolbar/uploadmedia.php b/administrator/templates/hathor/html/layouts/com_media/toolbar/uploadmedia.php index f9d8044e8a4c9..7d3a315e33282 100644 --- a/administrator/templates/hathor/html/layouts/com_media/toolbar/uploadmedia.php +++ b/administrator/templates/hathor/html/layouts/com_media/toolbar/uploadmedia.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_media * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/layouts/com_messages/toolbar/mysettings.php b/administrator/templates/hathor/html/layouts/com_messages/toolbar/mysettings.php index 2a85f3461901c..b48e75c45b647 100644 --- a/administrator/templates/hathor/html/layouts/com_messages/toolbar/mysettings.php +++ b/administrator/templates/hathor/html/layouts/com_messages/toolbar/mysettings.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_messages * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/layouts/com_modules/toolbar/cancelselect.php b/administrator/templates/hathor/html/layouts/com_modules/toolbar/cancelselect.php index 4c4cf577181c2..a490a643d27dd 100644 --- a/administrator/templates/hathor/html/layouts/com_modules/toolbar/cancelselect.php +++ b/administrator/templates/hathor/html/layouts/com_modules/toolbar/cancelselect.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/layouts/com_modules/toolbar/newmodule.php b/administrator/templates/hathor/html/layouts/com_modules/toolbar/newmodule.php index 509356d0a01a8..5293edac9b259 100644 --- a/administrator/templates/hathor/html/layouts/com_modules/toolbar/newmodule.php +++ b/administrator/templates/hathor/html/layouts/com_modules/toolbar/newmodule.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage com_modules * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/layouts/joomla/edit/details.php b/administrator/templates/hathor/html/layouts/joomla/edit/details.php index 1513f42c424f4..5c18b8e86c5e8 100644 --- a/administrator/templates/hathor/html/layouts/joomla/edit/details.php +++ b/administrator/templates/hathor/html/layouts/joomla/edit/details.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/layouts/joomla/edit/metadata.php b/administrator/templates/hathor/html/layouts/joomla/edit/metadata.php index 6a073d7f4a4ba..c36001d04726e 100644 --- a/administrator/templates/hathor/html/layouts/joomla/edit/metadata.php +++ b/administrator/templates/hathor/html/layouts/joomla/edit/metadata.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/layouts/joomla/quickicons/icon.php b/administrator/templates/hathor/html/layouts/joomla/quickicons/icon.php index dc28744981e2c..8f4fe53ed102a 100644 --- a/administrator/templates/hathor/html/layouts/joomla/quickicons/icon.php +++ b/administrator/templates/hathor/html/layouts/joomla/quickicons/icon.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/layouts/joomla/sidebars/submenu.php b/administrator/templates/hathor/html/layouts/joomla/sidebars/submenu.php index 6dfd045f4f9dc..ed356ab074bd0 100644 --- a/administrator/templates/hathor/html/layouts/joomla/sidebars/submenu.php +++ b/administrator/templates/hathor/html/layouts/joomla/sidebars/submenu.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/layouts/joomla/toolbar/base.php b/administrator/templates/hathor/html/layouts/joomla/toolbar/base.php index 6cd2b7bbeda51..68dfcf4c474fc 100644 --- a/administrator/templates/hathor/html/layouts/joomla/toolbar/base.php +++ b/administrator/templates/hathor/html/layouts/joomla/toolbar/base.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/layouts/joomla/toolbar/batch.php b/administrator/templates/hathor/html/layouts/joomla/toolbar/batch.php index 24663e8b2abcb..77e061f73182f 100644 --- a/administrator/templates/hathor/html/layouts/joomla/toolbar/batch.php +++ b/administrator/templates/hathor/html/layouts/joomla/toolbar/batch.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/layouts/joomla/toolbar/confirm.php b/administrator/templates/hathor/html/layouts/joomla/toolbar/confirm.php index 251ea6180f891..5476ecce0caca 100644 --- a/administrator/templates/hathor/html/layouts/joomla/toolbar/confirm.php +++ b/administrator/templates/hathor/html/layouts/joomla/toolbar/confirm.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/layouts/joomla/toolbar/containerclose.php b/administrator/templates/hathor/html/layouts/joomla/toolbar/containerclose.php index 19616a5348366..0a03e537a0dcc 100644 --- a/administrator/templates/hathor/html/layouts/joomla/toolbar/containerclose.php +++ b/administrator/templates/hathor/html/layouts/joomla/toolbar/containerclose.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/layouts/joomla/toolbar/containeropen.php b/administrator/templates/hathor/html/layouts/joomla/toolbar/containeropen.php index 9650c298997a5..f8dd97b332a74 100644 --- a/administrator/templates/hathor/html/layouts/joomla/toolbar/containeropen.php +++ b/administrator/templates/hathor/html/layouts/joomla/toolbar/containeropen.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/layouts/joomla/toolbar/help.php b/administrator/templates/hathor/html/layouts/joomla/toolbar/help.php index a04d6cc137763..f3be91ea8e74a 100644 --- a/administrator/templates/hathor/html/layouts/joomla/toolbar/help.php +++ b/administrator/templates/hathor/html/layouts/joomla/toolbar/help.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/layouts/joomla/toolbar/iconclass.php b/administrator/templates/hathor/html/layouts/joomla/toolbar/iconclass.php index 0f3334da381ee..822fec434fd67 100644 --- a/administrator/templates/hathor/html/layouts/joomla/toolbar/iconclass.php +++ b/administrator/templates/hathor/html/layouts/joomla/toolbar/iconclass.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/layouts/joomla/toolbar/link.php b/administrator/templates/hathor/html/layouts/joomla/toolbar/link.php index 5c93c4274702e..5620ed27fa527 100644 --- a/administrator/templates/hathor/html/layouts/joomla/toolbar/link.php +++ b/administrator/templates/hathor/html/layouts/joomla/toolbar/link.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/layouts/joomla/toolbar/popup.php b/administrator/templates/hathor/html/layouts/joomla/toolbar/popup.php index 1c05dcb4fcf2d..ea2af27cc5ef4 100644 --- a/administrator/templates/hathor/html/layouts/joomla/toolbar/popup.php +++ b/administrator/templates/hathor/html/layouts/joomla/toolbar/popup.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/layouts/joomla/toolbar/separator.php b/administrator/templates/hathor/html/layouts/joomla/toolbar/separator.php index 350a42c86c1d1..7ac8ff77b12b9 100644 --- a/administrator/templates/hathor/html/layouts/joomla/toolbar/separator.php +++ b/administrator/templates/hathor/html/layouts/joomla/toolbar/separator.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/layouts/joomla/toolbar/slider.php b/administrator/templates/hathor/html/layouts/joomla/toolbar/slider.php index 42f978d252a58..6e0ebdae569c1 100644 --- a/administrator/templates/hathor/html/layouts/joomla/toolbar/slider.php +++ b/administrator/templates/hathor/html/layouts/joomla/toolbar/slider.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/layouts/joomla/toolbar/standard.php b/administrator/templates/hathor/html/layouts/joomla/toolbar/standard.php index b13dde48e4390..278b17bdb5211 100644 --- a/administrator/templates/hathor/html/layouts/joomla/toolbar/standard.php +++ b/administrator/templates/hathor/html/layouts/joomla/toolbar/standard.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/layouts/joomla/toolbar/title.php b/administrator/templates/hathor/html/layouts/joomla/toolbar/title.php index 71766f4a38504..5edffbac9a9f7 100644 --- a/administrator/templates/hathor/html/layouts/joomla/toolbar/title.php +++ b/administrator/templates/hathor/html/layouts/joomla/toolbar/title.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/layouts/joomla/toolbar/versions.php b/administrator/templates/hathor/html/layouts/joomla/toolbar/versions.php index c31e72f49181e..b54143c04ea88 100644 --- a/administrator/templates/hathor/html/layouts/joomla/toolbar/versions.php +++ b/administrator/templates/hathor/html/layouts/joomla/toolbar/versions.php @@ -3,11 +3,14 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; + +JHtml::_('behavior.modal', 'a.modal_jform_contenthistory'); + ?> addChild( - new JMenuNode(JText::_('MOD_MENU_HELP_SECURITY'), 'http://developer.joomla.org/security-centre.html', 'class:help-security', false, '_blank') + new JMenuNode(JText::_('MOD_MENU_HELP_SECURITY'), 'https://developer.joomla.org/security-centre.html', 'class:help-security', false, '_blank') ); $menu->addChild( - new JMenuNode(JText::_('MOD_MENU_HELP_DEVELOPER'), 'http://developer.joomla.org', 'class:help-dev', false, '_blank') + new JMenuNode(JText::_('MOD_MENU_HELP_DEVELOPER'), 'https://developer.joomla.org', 'class:help-dev', false, '_blank') ); $menu->addChild( - new JMenuNode(JText::_('MOD_MENU_HELP_XCHANGE'), 'http://joomla.stackexchange.com', 'class:help-dev', false, '_blank') + new JMenuNode(JText::_('MOD_MENU_HELP_XCHANGE'), 'https://joomla.stackexchange.com', 'class:help-dev', false, '_blank') ); $menu->addChild( - new JMenuNode(JText::_('MOD_MENU_HELP_SHOP'), 'http://shop.joomla.org', 'class:help-shop', false, '_blank') + new JMenuNode(JText::_('MOD_MENU_HELP_SHOP'), 'https://shop.joomla.org', 'class:help-shop', false, '_blank') ); $menu->getParent(); } diff --git a/administrator/templates/hathor/html/mod_quickicon/default.php b/administrator/templates/hathor/html/mod_quickicon/default.php index 05dfd1613ba2d..12e3787742257 100644 --- a/administrator/templates/hathor/html/mod_quickicon/default.php +++ b/administrator/templates/hathor/html/mod_quickicon/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_quickicon * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/modules.php b/administrator/templates/hathor/html/modules.php index fdaa65d344baa..8724c9427a70f 100644 --- a/administrator/templates/hathor/html/modules.php +++ b/administrator/templates/hathor/html/modules.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/html/pagination.php b/administrator/templates/hathor/html/pagination.php index 47c2203c0ca51..e245d81adcbad 100644 --- a/administrator/templates/hathor/html/pagination.php +++ b/administrator/templates/hathor/html/pagination.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/images/admin/blank.png b/administrator/templates/hathor/images/admin/blank.png index c2da5b889d844..1797bf909a764 100644 Binary files a/administrator/templates/hathor/images/admin/blank.png and b/administrator/templates/hathor/images/admin/blank.png differ diff --git a/administrator/templates/hathor/images/admin/checked_out.png b/administrator/templates/hathor/images/admin/checked_out.png index 1b6218e790b3f..6ad8f25ac9b91 100644 Binary files a/administrator/templates/hathor/images/admin/checked_out.png and b/administrator/templates/hathor/images/admin/checked_out.png differ diff --git a/administrator/templates/hathor/images/admin/collapseall.png b/administrator/templates/hathor/images/admin/collapseall.png index 516574588fda8..3d50db8208660 100644 Binary files a/administrator/templates/hathor/images/admin/collapseall.png and b/administrator/templates/hathor/images/admin/collapseall.png differ diff --git a/administrator/templates/hathor/images/admin/disabled.png b/administrator/templates/hathor/images/admin/disabled.png index 8b192f65c1b04..5218081bee8dd 100644 Binary files a/administrator/templates/hathor/images/admin/disabled.png and b/administrator/templates/hathor/images/admin/disabled.png differ diff --git a/administrator/templates/hathor/images/admin/downarrow-1.png b/administrator/templates/hathor/images/admin/downarrow-1.png index d8a7cfba1ebc5..c94074e5963e8 100644 Binary files a/administrator/templates/hathor/images/admin/downarrow-1.png and b/administrator/templates/hathor/images/admin/downarrow-1.png differ diff --git a/administrator/templates/hathor/images/admin/downarrow.png b/administrator/templates/hathor/images/admin/downarrow.png index 8af25e6b494a9..a27a7585f7916 100644 Binary files a/administrator/templates/hathor/images/admin/downarrow.png and b/administrator/templates/hathor/images/admin/downarrow.png differ diff --git a/administrator/templates/hathor/images/admin/downarrow0.png b/administrator/templates/hathor/images/admin/downarrow0.png index 1535443aba70c..bd9f310e25124 100644 Binary files a/administrator/templates/hathor/images/admin/downarrow0.png and b/administrator/templates/hathor/images/admin/downarrow0.png differ diff --git a/administrator/templates/hathor/images/admin/expandall.png b/administrator/templates/hathor/images/admin/expandall.png index f3b8af647c076..233cb73562a7c 100644 Binary files a/administrator/templates/hathor/images/admin/expandall.png and b/administrator/templates/hathor/images/admin/expandall.png differ diff --git a/administrator/templates/hathor/images/admin/featured.png b/administrator/templates/hathor/images/admin/featured.png index 38013fd496a2d..a3e2c15965d89 100644 Binary files a/administrator/templates/hathor/images/admin/featured.png and b/administrator/templates/hathor/images/admin/featured.png differ diff --git a/administrator/templates/hathor/images/admin/filesave.png b/administrator/templates/hathor/images/admin/filesave.png index e892a85f3b2db..65a45b551ed04 100644 Binary files a/administrator/templates/hathor/images/admin/filesave.png and b/administrator/templates/hathor/images/admin/filesave.png differ diff --git a/administrator/templates/hathor/images/admin/filter_16.png b/administrator/templates/hathor/images/admin/filter_16.png index 0d2207267538c..cbc62b7d30f78 100644 Binary files a/administrator/templates/hathor/images/admin/filter_16.png and b/administrator/templates/hathor/images/admin/filter_16.png differ diff --git a/administrator/templates/hathor/images/admin/icon-16-allow.png b/administrator/templates/hathor/images/admin/icon-16-allow.png index 75d3ee65e9f77..d28a18b2f21e3 100644 Binary files a/administrator/templates/hathor/images/admin/icon-16-allow.png and b/administrator/templates/hathor/images/admin/icon-16-allow.png differ diff --git a/administrator/templates/hathor/images/admin/icon-16-allowinactive.png b/administrator/templates/hathor/images/admin/icon-16-allowinactive.png index a743fe0351cd5..d20e059da06b9 100644 Binary files a/administrator/templates/hathor/images/admin/icon-16-allowinactive.png and b/administrator/templates/hathor/images/admin/icon-16-allowinactive.png differ diff --git a/administrator/templates/hathor/images/admin/icon-16-deny.png b/administrator/templates/hathor/images/admin/icon-16-deny.png index 35d3c05f7d82f..a5b37aa2c36d0 100644 Binary files a/administrator/templates/hathor/images/admin/icon-16-deny.png and b/administrator/templates/hathor/images/admin/icon-16-deny.png differ diff --git a/administrator/templates/hathor/images/admin/icon-16-denyinactive.png b/administrator/templates/hathor/images/admin/icon-16-denyinactive.png index bb45a921d7173..0dc1b43e0fa08 100644 Binary files a/administrator/templates/hathor/images/admin/icon-16-denyinactive.png and b/administrator/templates/hathor/images/admin/icon-16-denyinactive.png differ diff --git a/administrator/templates/hathor/images/admin/icon-16-links.png b/administrator/templates/hathor/images/admin/icon-16-links.png index 0cb30a43a4b5a..52b4cb434eb81 100644 Binary files a/administrator/templates/hathor/images/admin/icon-16-links.png and b/administrator/templates/hathor/images/admin/icon-16-links.png differ diff --git a/administrator/templates/hathor/images/admin/icon-16-notice-note.png b/administrator/templates/hathor/images/admin/icon-16-notice-note.png index dc9f2a7399f92..a207d70ae835c 100644 Binary files a/administrator/templates/hathor/images/admin/icon-16-notice-note.png and b/administrator/templates/hathor/images/admin/icon-16-notice-note.png differ diff --git a/administrator/templates/hathor/images/admin/icon-16-protected.png b/administrator/templates/hathor/images/admin/icon-16-protected.png index e9f719ebf6fa9..b72ad93568e40 100644 Binary files a/administrator/templates/hathor/images/admin/icon-16-protected.png and b/administrator/templates/hathor/images/admin/icon-16-protected.png differ diff --git a/administrator/templates/hathor/images/admin/publish_g.png b/administrator/templates/hathor/images/admin/publish_g.png index 3eb10aa784858..d3794988476dd 100644 Binary files a/administrator/templates/hathor/images/admin/publish_g.png and b/administrator/templates/hathor/images/admin/publish_g.png differ diff --git a/administrator/templates/hathor/images/admin/publish_r.png b/administrator/templates/hathor/images/admin/publish_r.png index f5786903e5ab1..1405a7900f5ee 100644 Binary files a/administrator/templates/hathor/images/admin/publish_r.png and b/administrator/templates/hathor/images/admin/publish_r.png differ diff --git a/administrator/templates/hathor/images/admin/publish_x.png b/administrator/templates/hathor/images/admin/publish_x.png index ab174c4eded7b..8719043981ae1 100644 Binary files a/administrator/templates/hathor/images/admin/publish_x.png and b/administrator/templates/hathor/images/admin/publish_x.png differ diff --git a/administrator/templates/hathor/images/admin/publish_y.png b/administrator/templates/hathor/images/admin/publish_y.png index 62e92619e69d0..4652e87c2e529 100644 Binary files a/administrator/templates/hathor/images/admin/publish_y.png and b/administrator/templates/hathor/images/admin/publish_y.png differ diff --git a/administrator/templates/hathor/images/admin/sort_asc.png b/administrator/templates/hathor/images/admin/sort_asc.png index e2ebfe3652f7c..1204f31f50f22 100644 Binary files a/administrator/templates/hathor/images/admin/sort_asc.png and b/administrator/templates/hathor/images/admin/sort_asc.png differ diff --git a/administrator/templates/hathor/images/admin/sort_desc.png b/administrator/templates/hathor/images/admin/sort_desc.png index 707a62c4f4745..c0ca72e6c8f39 100644 Binary files a/administrator/templates/hathor/images/admin/sort_desc.png and b/administrator/templates/hathor/images/admin/sort_desc.png differ diff --git a/administrator/templates/hathor/images/admin/tick.png b/administrator/templates/hathor/images/admin/tick.png index cf79d8969e409..2b11164d73a67 100644 Binary files a/administrator/templates/hathor/images/admin/tick.png and b/administrator/templates/hathor/images/admin/tick.png differ diff --git a/administrator/templates/hathor/images/admin/trash.png b/administrator/templates/hathor/images/admin/trash.png index d76a6b8d9f904..b2d671a41d012 100644 Binary files a/administrator/templates/hathor/images/admin/trash.png and b/administrator/templates/hathor/images/admin/trash.png differ diff --git a/administrator/templates/hathor/images/admin/uparrow-1.png b/administrator/templates/hathor/images/admin/uparrow-1.png index f5e7d73af68fa..20175936c331c 100644 Binary files a/administrator/templates/hathor/images/admin/uparrow-1.png and b/administrator/templates/hathor/images/admin/uparrow-1.png differ diff --git a/administrator/templates/hathor/images/admin/uparrow.png b/administrator/templates/hathor/images/admin/uparrow.png index c018ae7aa2f6e..def39656bc43d 100644 Binary files a/administrator/templates/hathor/images/admin/uparrow.png and b/administrator/templates/hathor/images/admin/uparrow.png differ diff --git a/administrator/templates/hathor/images/admin/uparrow0.png b/administrator/templates/hathor/images/admin/uparrow0.png index 0d82478388d87..60602b836a59f 100644 Binary files a/administrator/templates/hathor/images/admin/uparrow0.png and b/administrator/templates/hathor/images/admin/uparrow0.png differ diff --git a/administrator/templates/hathor/images/arrow.png b/administrator/templates/hathor/images/arrow.png index 3c482ed599d25..7fe1a536d1007 100644 Binary files a/administrator/templates/hathor/images/arrow.png and b/administrator/templates/hathor/images/arrow.png differ diff --git a/administrator/templates/hathor/images/calendar.png b/administrator/templates/hathor/images/calendar.png index 5debe829b6da7..586bc28ed06b0 100644 Binary files a/administrator/templates/hathor/images/calendar.png and b/administrator/templates/hathor/images/calendar.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-apply.png b/administrator/templates/hathor/images/header/icon-48-apply.png index 2091a1c6c3a84..179c201726d43 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-apply.png and b/administrator/templates/hathor/images/header/icon-48-apply.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-archive.png b/administrator/templates/hathor/images/header/icon-48-archive.png index 50b8c777933a3..87bbe30229327 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-archive.png and b/administrator/templates/hathor/images/header/icon-48-archive.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-article-add.png b/administrator/templates/hathor/images/header/icon-48-article-add.png index 99ba159d51f35..b9249fd45efee 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-article-add.png and b/administrator/templates/hathor/images/header/icon-48-article-add.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-article-edit.png b/administrator/templates/hathor/images/header/icon-48-article-edit.png index 2fac1676ea15d..2d271335e8697 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-article-edit.png and b/administrator/templates/hathor/images/header/icon-48-article-edit.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-article.png b/administrator/templates/hathor/images/header/icon-48-article.png index 753e2ff75167f..0f629c9ac824b 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-article.png and b/administrator/templates/hathor/images/header/icon-48-article.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-banner-categories.png b/administrator/templates/hathor/images/header/icon-48-banner-categories.png index 46528bde9d6b9..bf588204dee93 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-banner-categories.png and b/administrator/templates/hathor/images/header/icon-48-banner-categories.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-category-add.png b/administrator/templates/hathor/images/header/icon-48-category-add.png index 02b687ccb1909..5ee7740a5fa51 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-category-add.png and b/administrator/templates/hathor/images/header/icon-48-category-add.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-category.png b/administrator/templates/hathor/images/header/icon-48-category.png index da68764500098..354f185329668 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-category.png and b/administrator/templates/hathor/images/header/icon-48-category.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-checkin.png b/administrator/templates/hathor/images/header/icon-48-checkin.png index fd43cbb3b8155..6ab4cddae23f5 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-checkin.png and b/administrator/templates/hathor/images/header/icon-48-checkin.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-clear.png b/administrator/templates/hathor/images/header/icon-48-clear.png index 3b71349acb51e..76dee7ce3657d 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-clear.png and b/administrator/templates/hathor/images/header/icon-48-clear.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-component.png b/administrator/templates/hathor/images/header/icon-48-component.png index ba0fdae6d2880..c4179a6ea2b1b 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-component.png and b/administrator/templates/hathor/images/header/icon-48-component.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-config.png b/administrator/templates/hathor/images/header/icon-48-config.png index cb376da3f4ab7..1b895fcb6be4b 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-config.png and b/administrator/templates/hathor/images/header/icon-48-config.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-contacts-categories.png b/administrator/templates/hathor/images/header/icon-48-contacts-categories.png index 604004b501e02..73a689b52646f 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-contacts-categories.png and b/administrator/templates/hathor/images/header/icon-48-contacts-categories.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-contacts.png b/administrator/templates/hathor/images/header/icon-48-contacts.png index 6e365e8daa52b..d2128a1c4814a 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-contacts.png and b/administrator/templates/hathor/images/header/icon-48-contacts.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-default.png b/administrator/templates/hathor/images/header/icon-48-default.png index 819081b4bef99..de1b8053665a7 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-default.png and b/administrator/templates/hathor/images/header/icon-48-default.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-download.png b/administrator/templates/hathor/images/header/icon-48-download.png index 0ee1822f673bd..bbd5d9171a1e8 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-download.png and b/administrator/templates/hathor/images/header/icon-48-download.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-edit.png b/administrator/templates/hathor/images/header/icon-48-edit.png index 8f7ac474a38e6..e24a733cf3b59 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-edit.png and b/administrator/templates/hathor/images/header/icon-48-edit.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-extension.png b/administrator/templates/hathor/images/header/icon-48-extension.png index 77b1f10e4ed0b..b26131d15547f 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-extension.png and b/administrator/templates/hathor/images/header/icon-48-extension.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-featured.png b/administrator/templates/hathor/images/header/icon-48-featured.png index 359affe0d66ac..acfe49a793508 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-featured.png and b/administrator/templates/hathor/images/header/icon-48-featured.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-groups-add.png b/administrator/templates/hathor/images/header/icon-48-groups-add.png index 490c89cdfd2d5..411fd886d65fd 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-groups-add.png and b/administrator/templates/hathor/images/header/icon-48-groups-add.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-groups.png b/administrator/templates/hathor/images/header/icon-48-groups.png index 8fd2fc28f7c64..21d52f2464e30 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-groups.png and b/administrator/templates/hathor/images/header/icon-48-groups.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-help-forum.png b/administrator/templates/hathor/images/header/icon-48-help-forum.png index 8aeb7af8e53c7..62133d7ec5dc3 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-help-forum.png and b/administrator/templates/hathor/images/header/icon-48-help-forum.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-help-this.png b/administrator/templates/hathor/images/header/icon-48-help-this.png index 704ee29f05cd1..b1845f5cacdac 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-help-this.png and b/administrator/templates/hathor/images/header/icon-48-help-this.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-help_header.png b/administrator/templates/hathor/images/header/icon-48-help_header.png index 6467c2157dcac..559b654bfe558 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-help_header.png and b/administrator/templates/hathor/images/header/icon-48-help_header.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-inbox.png b/administrator/templates/hathor/images/header/icon-48-inbox.png index 87abf2201c863..29f412989ddee 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-inbox.png and b/administrator/templates/hathor/images/header/icon-48-inbox.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-info.png b/administrator/templates/hathor/images/header/icon-48-info.png index 43ecf3276f9b1..0d8641d021c76 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-info.png and b/administrator/templates/hathor/images/header/icon-48-info.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-install.png b/administrator/templates/hathor/images/header/icon-48-install.png index c9834df2a714a..5747c4d7a4bc4 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-install.png and b/administrator/templates/hathor/images/header/icon-48-install.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-levels-add.png b/administrator/templates/hathor/images/header/icon-48-levels-add.png index 662663ff57dbc..e5458d5abef9e 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-levels-add.png and b/administrator/templates/hathor/images/header/icon-48-levels-add.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-levels.png b/administrator/templates/hathor/images/header/icon-48-levels.png index 4859431627213..3a87ad0f59c39 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-levels.png and b/administrator/templates/hathor/images/header/icon-48-levels.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-links-cat.png b/administrator/templates/hathor/images/header/icon-48-links-cat.png index da425d334bffc..7b20b25705f78 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-links-cat.png and b/administrator/templates/hathor/images/header/icon-48-links-cat.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-links.png b/administrator/templates/hathor/images/header/icon-48-links.png index 4dcc7a4118092..b534e8a37cf70 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-links.png and b/administrator/templates/hathor/images/header/icon-48-links.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-massmail.png b/administrator/templates/hathor/images/header/icon-48-massmail.png index 7817a8853b79f..c0c8fcd180fce 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-massmail.png and b/administrator/templates/hathor/images/header/icon-48-massmail.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-media.png b/administrator/templates/hathor/images/header/icon-48-media.png index a4b6b8feaf56b..4fbb51cd05473 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-media.png and b/administrator/templates/hathor/images/header/icon-48-media.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-menu-add.png b/administrator/templates/hathor/images/header/icon-48-menu-add.png index 14608c506dafa..5c901aa879b7d 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-menu-add.png and b/administrator/templates/hathor/images/header/icon-48-menu-add.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-menu.png b/administrator/templates/hathor/images/header/icon-48-menu.png index d239f8f934206..26194944d963a 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-menu.png and b/administrator/templates/hathor/images/header/icon-48-menu.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-menumgr.png b/administrator/templates/hathor/images/header/icon-48-menumgr.png index 10c96ee63e58f..58146f31933d0 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-menumgr.png and b/administrator/templates/hathor/images/header/icon-48-menumgr.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-module.png b/administrator/templates/hathor/images/header/icon-48-module.png index 0586b25168695..0a8e444eb7a80 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-module.png and b/administrator/templates/hathor/images/header/icon-48-module.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-move.png b/administrator/templates/hathor/images/header/icon-48-move.png index 2d74b38032c40..70772a3958d88 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-move.png and b/administrator/templates/hathor/images/header/icon-48-move.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-new-privatemessage.png b/administrator/templates/hathor/images/header/icon-48-new-privatemessage.png index a5102505bab7e..7bab1e70e5bd8 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-new-privatemessage.png and b/administrator/templates/hathor/images/header/icon-48-new-privatemessage.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-newcategory.png b/administrator/templates/hathor/images/header/icon-48-newcategory.png index e61be606457b2..5797c9cee8a1a 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-newcategory.png and b/administrator/templates/hathor/images/header/icon-48-newcategory.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-newsfeeds.png b/administrator/templates/hathor/images/header/icon-48-newsfeeds.png index b12220268746b..f1bd76d09d6f3 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-newsfeeds.png and b/administrator/templates/hathor/images/header/icon-48-newsfeeds.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-notice.png b/administrator/templates/hathor/images/header/icon-48-notice.png index a16591356f195..16e1b96ea6078 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-notice.png and b/administrator/templates/hathor/images/header/icon-48-notice.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-plugin.png b/administrator/templates/hathor/images/header/icon-48-plugin.png index bfedd4591e59f..d127b6cdc42d2 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-plugin.png and b/administrator/templates/hathor/images/header/icon-48-plugin.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-preview.png b/administrator/templates/hathor/images/header/icon-48-preview.png index f4dd5948c168d..40dd10be4f235 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-preview.png and b/administrator/templates/hathor/images/header/icon-48-preview.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-purge.png b/administrator/templates/hathor/images/header/icon-48-purge.png index 1d8eed5994962..97346a9742902 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-purge.png and b/administrator/templates/hathor/images/header/icon-48-purge.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-read-privatemessage.png b/administrator/templates/hathor/images/header/icon-48-read-privatemessage.png index 00f8de2634ab2..cd255df8d06e4 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-read-privatemessage.png and b/administrator/templates/hathor/images/header/icon-48-read-privatemessage.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-readmess.png b/administrator/templates/hathor/images/header/icon-48-readmess.png index 2cfc2ba19d186..208b79345f0e0 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-readmess.png and b/administrator/templates/hathor/images/header/icon-48-readmess.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-redirect.png b/administrator/templates/hathor/images/header/icon-48-redirect.png index dc91344eefe79..580a555aee93c 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-redirect.png and b/administrator/templates/hathor/images/header/icon-48-redirect.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-revert.png b/administrator/templates/hathor/images/header/icon-48-revert.png index 5f890b3f69237..9bf2944a04d00 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-revert.png and b/administrator/templates/hathor/images/header/icon-48-revert.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-search.png b/administrator/templates/hathor/images/header/icon-48-search.png index 41da15816ce00..79004021d0396 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-search.png and b/administrator/templates/hathor/images/header/icon-48-search.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-section.png b/administrator/templates/hathor/images/header/icon-48-section.png index d158fc3b30d94..e6e0195ddbdee 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-section.png and b/administrator/templates/hathor/images/header/icon-48-section.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-stats.png b/administrator/templates/hathor/images/header/icon-48-stats.png index fb47bd91f84a6..64659fdeb67f2 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-stats.png and b/administrator/templates/hathor/images/header/icon-48-stats.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-tags.png b/administrator/templates/hathor/images/header/icon-48-tags.png index aeeaa538fddb8..9ba2124d1f24e 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-tags.png and b/administrator/templates/hathor/images/header/icon-48-tags.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-themes.png b/administrator/templates/hathor/images/header/icon-48-themes.png index 8a29b16bedd48..7e31c86fe966b 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-themes.png and b/administrator/templates/hathor/images/header/icon-48-themes.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-unarchive.png b/administrator/templates/hathor/images/header/icon-48-unarchive.png index 6aab7631ae47f..6e3b0581e8c7e 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-unarchive.png and b/administrator/templates/hathor/images/header/icon-48-unarchive.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-upload.png b/administrator/templates/hathor/images/header/icon-48-upload.png index 7e3d08240ac76..7d76ece323eb4 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-upload.png and b/administrator/templates/hathor/images/header/icon-48-upload.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-user-profile.png b/administrator/templates/hathor/images/header/icon-48-user-profile.png index 43ecf3276f9b1..0d8641d021c76 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-user-profile.png and b/administrator/templates/hathor/images/header/icon-48-user-profile.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-user.png b/administrator/templates/hathor/images/header/icon-48-user.png index 42b43a37d380f..cc6e43a62c6f5 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-user.png and b/administrator/templates/hathor/images/header/icon-48-user.png differ diff --git a/administrator/templates/hathor/images/header/icon-48-writemess.png b/administrator/templates/hathor/images/header/icon-48-writemess.png index d682477ee0b2d..827d99a0697d3 100644 Binary files a/administrator/templates/hathor/images/header/icon-48-writemess.png and b/administrator/templates/hathor/images/header/icon-48-writemess.png differ diff --git a/administrator/templates/hathor/images/header/icon-messaging.png b/administrator/templates/hathor/images/header/icon-messaging.png index 9955f51508423..46a377b202a17 100644 Binary files a/administrator/templates/hathor/images/header/icon-messaging.png and b/administrator/templates/hathor/images/header/icon-messaging.png differ diff --git a/administrator/templates/hathor/images/j_arrow.png b/administrator/templates/hathor/images/j_arrow.png index c701d57eb8550..772bb4d908aa0 100644 Binary files a/administrator/templates/hathor/images/j_arrow.png and b/administrator/templates/hathor/images/j_arrow.png differ diff --git a/administrator/templates/hathor/images/j_arrow_down.png b/administrator/templates/hathor/images/j_arrow_down.png index c47ea0c55dfc8..5e7334113d8db 100644 Binary files a/administrator/templates/hathor/images/j_arrow_down.png and b/administrator/templates/hathor/images/j_arrow_down.png differ diff --git a/administrator/templates/hathor/images/j_arrow_left.png b/administrator/templates/hathor/images/j_arrow_left.png index d1169ade443ed..bee0eb1c0c31f 100644 Binary files a/administrator/templates/hathor/images/j_arrow_left.png and b/administrator/templates/hathor/images/j_arrow_left.png differ diff --git a/administrator/templates/hathor/images/j_arrow_right.png b/administrator/templates/hathor/images/j_arrow_right.png index 1890efec8a33d..ed65eeda45ce1 100644 Binary files a/administrator/templates/hathor/images/j_arrow_right.png and b/administrator/templates/hathor/images/j_arrow_right.png differ diff --git a/administrator/templates/hathor/images/j_login_lock.png b/administrator/templates/hathor/images/j_login_lock.png index f0cb65cc21a3a..b14c49b76baa0 100644 Binary files a/administrator/templates/hathor/images/j_login_lock.png and b/administrator/templates/hathor/images/j_login_lock.png differ diff --git a/administrator/templates/hathor/images/j_logo.png b/administrator/templates/hathor/images/j_logo.png index 3e103e6b874b9..3b1f5dfecfbda 100644 Binary files a/administrator/templates/hathor/images/j_logo.png and b/administrator/templates/hathor/images/j_logo.png differ diff --git a/administrator/templates/hathor/images/logo.png b/administrator/templates/hathor/images/logo.png index 8f80d303cc20f..00d0220049204 100644 Binary files a/administrator/templates/hathor/images/logo.png and b/administrator/templates/hathor/images/logo.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-alert.png b/administrator/templates/hathor/images/menu/icon-16-alert.png index 178425ab27119..c1e0ed45691a8 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-alert.png and b/administrator/templates/hathor/images/menu/icon-16-alert.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-apply.png b/administrator/templates/hathor/images/menu/icon-16-apply.png index 4b5279cfd7d06..415fe20597eb6 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-apply.png and b/administrator/templates/hathor/images/menu/icon-16-apply.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-archive.png b/administrator/templates/hathor/images/menu/icon-16-archive.png index c05689e579622..1a948a56443fb 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-archive.png and b/administrator/templates/hathor/images/menu/icon-16-archive.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-article.png b/administrator/templates/hathor/images/menu/icon-16-article.png index e9ba5e8e27afc..c3a39d4af904f 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-article.png and b/administrator/templates/hathor/images/menu/icon-16-article.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-back-user.png b/administrator/templates/hathor/images/menu/icon-16-back-user.png index 315b37f833ab4..61ae0e0a06476 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-back-user.png and b/administrator/templates/hathor/images/menu/icon-16-back-user.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-banner-categories.png b/administrator/templates/hathor/images/menu/icon-16-banner-categories.png index 2642f772eeaeb..8ce715f76e5d8 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-banner-categories.png and b/administrator/templates/hathor/images/menu/icon-16-banner-categories.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-banner-client.png b/administrator/templates/hathor/images/menu/icon-16-banner-client.png index b82175c85db41..9e071732d6bd1 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-banner-client.png and b/administrator/templates/hathor/images/menu/icon-16-banner-client.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-banner-tracks.png b/administrator/templates/hathor/images/menu/icon-16-banner-tracks.png index 54c0d31d5f9b8..7f7f121804d1a 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-banner-tracks.png and b/administrator/templates/hathor/images/menu/icon-16-banner-tracks.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-banner.png b/administrator/templates/hathor/images/menu/icon-16-banner.png index 658f59ad82244..2b030c9cc023e 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-banner.png and b/administrator/templates/hathor/images/menu/icon-16-banner.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-calendar.png b/administrator/templates/hathor/images/menu/icon-16-calendar.png index f8430b7ac3001..e2de0b7ec5d95 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-calendar.png and b/administrator/templates/hathor/images/menu/icon-16-calendar.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-category.png b/administrator/templates/hathor/images/menu/icon-16-category.png index 7f1ff4f86a34b..f0c7a4f8d0eac 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-category.png and b/administrator/templates/hathor/images/menu/icon-16-category.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-checkin.png b/administrator/templates/hathor/images/menu/icon-16-checkin.png index cf79d8969e409..2b11164d73a67 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-checkin.png and b/administrator/templates/hathor/images/menu/icon-16-checkin.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-clear.png b/administrator/templates/hathor/images/menu/icon-16-clear.png index 91fbd3cfc38ca..b609ada0f9658 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-clear.png and b/administrator/templates/hathor/images/menu/icon-16-clear.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-component.png b/administrator/templates/hathor/images/menu/icon-16-component.png index 9866415c4f6d9..051a57b278407 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-component.png and b/administrator/templates/hathor/images/menu/icon-16-component.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-config.png b/administrator/templates/hathor/images/menu/icon-16-config.png index ed6eee1ad0881..c4edc5e3658bd 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-config.png and b/administrator/templates/hathor/images/menu/icon-16-config.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-contacts-categories.png b/administrator/templates/hathor/images/menu/icon-16-contacts-categories.png index a1272ef9c9377..05fee27648997 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-contacts-categories.png and b/administrator/templates/hathor/images/menu/icon-16-contacts-categories.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-contacts.png b/administrator/templates/hathor/images/menu/icon-16-contacts.png index 948382718de37..24a8e8ee7ab96 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-contacts.png and b/administrator/templates/hathor/images/menu/icon-16-contacts.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-cpanel.png b/administrator/templates/hathor/images/menu/icon-16-cpanel.png index 6ae8892e2b8f9..c6d7761aa18e0 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-cpanel.png and b/administrator/templates/hathor/images/menu/icon-16-cpanel.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-default.png b/administrator/templates/hathor/images/menu/icon-16-default.png index b886691f6d083..ab7702f9391ad 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-default.png and b/administrator/templates/hathor/images/menu/icon-16-default.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-delete.png b/administrator/templates/hathor/images/menu/icon-16-delete.png index 872e15c6b3950..a93bed32d135b 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-delete.png and b/administrator/templates/hathor/images/menu/icon-16-delete.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-deny.png b/administrator/templates/hathor/images/menu/icon-16-deny.png index 8007e310efaa5..58d4407667f7a 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-deny.png and b/administrator/templates/hathor/images/menu/icon-16-deny.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-download.png b/administrator/templates/hathor/images/menu/icon-16-download.png index 214c5e322e175..396357c712d99 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-download.png and b/administrator/templates/hathor/images/menu/icon-16-download.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-edit.png b/administrator/templates/hathor/images/menu/icon-16-edit.png index 5ba3f13139e56..936fe76cf73e6 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-edit.png and b/administrator/templates/hathor/images/menu/icon-16-edit.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-featured.png b/administrator/templates/hathor/images/menu/icon-16-featured.png index bfb7a0dc8f795..dfd4e1de35bf9 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-featured.png and b/administrator/templates/hathor/images/menu/icon-16-featured.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-frontpage.png b/administrator/templates/hathor/images/menu/icon-16-frontpage.png index a6986d5dca1a1..675de06a1e49c 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-frontpage.png and b/administrator/templates/hathor/images/menu/icon-16-frontpage.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-groups.png b/administrator/templates/hathor/images/menu/icon-16-groups.png index 68c0c705cca75..28c67dcc6df96 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-groups.png and b/administrator/templates/hathor/images/menu/icon-16-groups.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-help-community.png b/administrator/templates/hathor/images/menu/icon-16-help-community.png index 982e74663d421..7b39c5fc16f5c 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-help-community.png and b/administrator/templates/hathor/images/menu/icon-16-help-community.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-help-dev.png b/administrator/templates/hathor/images/menu/icon-16-help-dev.png index 058a71aeef25d..3187674abe503 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-help-dev.png and b/administrator/templates/hathor/images/menu/icon-16-help-dev.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-help-docs.png b/administrator/templates/hathor/images/menu/icon-16-help-docs.png index 6e3db1abf1845..e8f6f4e47ba53 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-help-docs.png and b/administrator/templates/hathor/images/menu/icon-16-help-docs.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-help-forum.png b/administrator/templates/hathor/images/menu/icon-16-help-forum.png index 6bb75951d9817..bc0d3837a603c 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-help-forum.png and b/administrator/templates/hathor/images/menu/icon-16-help-forum.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-help-jed.png b/administrator/templates/hathor/images/menu/icon-16-help-jed.png index d68aae009570b..498a01ac4d4c9 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-help-jed.png and b/administrator/templates/hathor/images/menu/icon-16-help-jed.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-help-jrd.png b/administrator/templates/hathor/images/menu/icon-16-help-jrd.png index 604e317d5a7df..79a9d30d03de3 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-help-jrd.png and b/administrator/templates/hathor/images/menu/icon-16-help-jrd.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-help-security.png b/administrator/templates/hathor/images/menu/icon-16-help-security.png index ca65b7cd33971..0050ca5d110fe 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-help-security.png and b/administrator/templates/hathor/images/menu/icon-16-help-security.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-help-shop.png b/administrator/templates/hathor/images/menu/icon-16-help-shop.png index 3280e357d68a6..e24dc8a539301 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-help-shop.png and b/administrator/templates/hathor/images/menu/icon-16-help-shop.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-help-this.png b/administrator/templates/hathor/images/menu/icon-16-help-this.png index e5a0265723eb4..c90eac90e0a6e 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-help-this.png and b/administrator/templates/hathor/images/menu/icon-16-help-this.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-help-trans.png b/administrator/templates/hathor/images/menu/icon-16-help-trans.png index d1c20dd3fec98..1f2264c1ee9d6 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-help-trans.png and b/administrator/templates/hathor/images/menu/icon-16-help-trans.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-help.png b/administrator/templates/hathor/images/menu/icon-16-help.png index 40930b66bbc4e..8c3a8ab93b126 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-help.png and b/administrator/templates/hathor/images/menu/icon-16-help.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-inbox.png b/administrator/templates/hathor/images/menu/icon-16-inbox.png index 4c12fce8f66a1..f808d62dcc20a 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-inbox.png and b/administrator/templates/hathor/images/menu/icon-16-inbox.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-info.png b/administrator/templates/hathor/images/menu/icon-16-info.png index 071d458babf97..3080bfdf070f8 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-info.png and b/administrator/templates/hathor/images/menu/icon-16-info.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-language.png b/administrator/templates/hathor/images/menu/icon-16-language.png index b652c510c5aaf..76d3364004d78 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-language.png and b/administrator/templates/hathor/images/menu/icon-16-language.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-links-cat.png b/administrator/templates/hathor/images/menu/icon-16-links-cat.png index 40829a38f5a95..bc2a50ba7bb08 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-links-cat.png and b/administrator/templates/hathor/images/menu/icon-16-links-cat.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-links.png b/administrator/templates/hathor/images/menu/icon-16-links.png index 0cb30a43a4b5a..52b4cb434eb81 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-links.png and b/administrator/templates/hathor/images/menu/icon-16-links.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-logout.png b/administrator/templates/hathor/images/menu/icon-16-logout.png index fb12ae7d28238..aab064a4789b9 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-logout.png and b/administrator/templates/hathor/images/menu/icon-16-logout.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-massmail.png b/administrator/templates/hathor/images/menu/icon-16-massmail.png index 7c0c6bfaf8273..d460e1ad2409b 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-massmail.png and b/administrator/templates/hathor/images/menu/icon-16-massmail.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-media.png b/administrator/templates/hathor/images/menu/icon-16-media.png index eaa7ca85423f9..ffb9498ee2eaf 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-media.png and b/administrator/templates/hathor/images/menu/icon-16-media.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-menu.png b/administrator/templates/hathor/images/menu/icon-16-menu.png index 5a188d1ad4cbc..c6a0ee429a6f0 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-menu.png and b/administrator/templates/hathor/images/menu/icon-16-menu.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-menumgr.png b/administrator/templates/hathor/images/menu/icon-16-menumgr.png index add14ad318865..88a2d1b3094b2 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-menumgr.png and b/administrator/templates/hathor/images/menu/icon-16-menumgr.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-messages.png b/administrator/templates/hathor/images/menu/icon-16-messages.png index a407ce1189267..56fc7804879a4 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-messages.png and b/administrator/templates/hathor/images/menu/icon-16-messages.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-messaging.png b/administrator/templates/hathor/images/menu/icon-16-messaging.png index d021214fb4852..33ffed14b5853 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-messaging.png and b/administrator/templates/hathor/images/menu/icon-16-messaging.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-module.png b/administrator/templates/hathor/images/menu/icon-16-module.png index 2b4c63785ab00..55ba9dbd552ef 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-module.png and b/administrator/templates/hathor/images/menu/icon-16-module.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-move.png b/administrator/templates/hathor/images/menu/icon-16-move.png index 7b3f2cd8d58cb..6d709fccf108c 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-move.png and b/administrator/templates/hathor/images/menu/icon-16-move.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-new-privatemessage.png b/administrator/templates/hathor/images/menu/icon-16-new-privatemessage.png index eae843ffc9540..f8f1ea8fc9726 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-new-privatemessage.png and b/administrator/templates/hathor/images/menu/icon-16-new-privatemessage.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-newarticle.png b/administrator/templates/hathor/images/menu/icon-16-newarticle.png index e9b72f2960016..c78257d136e7a 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-newarticle.png and b/administrator/templates/hathor/images/menu/icon-16-newarticle.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-newcategory.png b/administrator/templates/hathor/images/menu/icon-16-newcategory.png index 8a1f3bdf588be..fd4318c6b0202 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-newcategory.png and b/administrator/templates/hathor/images/menu/icon-16-newcategory.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-newgroup.png b/administrator/templates/hathor/images/menu/icon-16-newgroup.png index f0f276e657dde..cb5b82cf014f2 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-newgroup.png and b/administrator/templates/hathor/images/menu/icon-16-newgroup.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-newlevel.png b/administrator/templates/hathor/images/menu/icon-16-newlevel.png index f5fa4702a00fc..4ff0fb9a6bf76 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-newlevel.png and b/administrator/templates/hathor/images/menu/icon-16-newlevel.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-newsfeeds-cat.png b/administrator/templates/hathor/images/menu/icon-16-newsfeeds-cat.png index 5eea13a0a4ae5..55ebb428d0917 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-newsfeeds-cat.png and b/administrator/templates/hathor/images/menu/icon-16-newsfeeds-cat.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-newsfeeds.png b/administrator/templates/hathor/images/menu/icon-16-newsfeeds.png index 68b920a7fc26c..6639ec8402638 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-newsfeeds.png and b/administrator/templates/hathor/images/menu/icon-16-newsfeeds.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-newuser.png b/administrator/templates/hathor/images/menu/icon-16-newuser.png index 98bba0bb5b305..25d4cfd2cbc89 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-newuser.png and b/administrator/templates/hathor/images/menu/icon-16-newuser.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-nopreview.png b/administrator/templates/hathor/images/menu/icon-16-nopreview.png index 0edc3dc9b7a39..cc79db627356e 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-nopreview.png and b/administrator/templates/hathor/images/menu/icon-16-nopreview.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-notdefault.png b/administrator/templates/hathor/images/menu/icon-16-notdefault.png index a72f1554a4e94..8e5ced866959e 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-notdefault.png and b/administrator/templates/hathor/images/menu/icon-16-notdefault.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-notice.png b/administrator/templates/hathor/images/menu/icon-16-notice.png index 62e93a2a04d74..59f8b36534c67 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-notice.png and b/administrator/templates/hathor/images/menu/icon-16-notice.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-plugin.png b/administrator/templates/hathor/images/menu/icon-16-plugin.png index b3ae9e4fa61bf..852c87dd9d76b 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-plugin.png and b/administrator/templates/hathor/images/menu/icon-16-plugin.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-preview.png b/administrator/templates/hathor/images/menu/icon-16-preview.png index 39212393724e1..e532f7d7b9b8e 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-preview.png and b/administrator/templates/hathor/images/menu/icon-16-preview.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-purge.png b/administrator/templates/hathor/images/menu/icon-16-purge.png index 1f426f7a35633..3aa8a5e231f70 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-purge.png and b/administrator/templates/hathor/images/menu/icon-16-purge.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-read-privatemessage.png b/administrator/templates/hathor/images/menu/icon-16-read-privatemessage.png index ca9f8cbbe5e58..ee2f44033991e 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-read-privatemessage.png and b/administrator/templates/hathor/images/menu/icon-16-read-privatemessage.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-readmess.png b/administrator/templates/hathor/images/menu/icon-16-readmess.png index 04c714f172d78..4c5f30464ab0f 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-readmess.png and b/administrator/templates/hathor/images/menu/icon-16-readmess.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-redirect.png b/administrator/templates/hathor/images/menu/icon-16-redirect.png index 72ce56695137b..3a30b15b418e9 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-redirect.png and b/administrator/templates/hathor/images/menu/icon-16-redirect.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-revert.png b/administrator/templates/hathor/images/menu/icon-16-revert.png index 12990eca2d2c7..0b6c71f365de5 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-revert.png and b/administrator/templates/hathor/images/menu/icon-16-revert.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-search.png b/administrator/templates/hathor/images/menu/icon-16-search.png index 2366e36307a60..04cf3852aee95 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-search.png and b/administrator/templates/hathor/images/menu/icon-16-search.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-send.png b/administrator/templates/hathor/images/menu/icon-16-send.png index f8998525a97a2..188add672da15 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-send.png and b/administrator/templates/hathor/images/menu/icon-16-send.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-stats.png b/administrator/templates/hathor/images/menu/icon-16-stats.png index 3f88faa1b7daa..f0c4c04596354 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-stats.png and b/administrator/templates/hathor/images/menu/icon-16-stats.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-tags.png b/administrator/templates/hathor/images/menu/icon-16-tags.png index 31fb2b45812ee..94411880b986e 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-tags.png and b/administrator/templates/hathor/images/menu/icon-16-tags.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-themes.png b/administrator/templates/hathor/images/menu/icon-16-themes.png index cb12e02f22e71..2f20de7b95535 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-themes.png and b/administrator/templates/hathor/images/menu/icon-16-themes.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-trash.png b/administrator/templates/hathor/images/menu/icon-16-trash.png index 6571d4753fb67..9c100938a6604 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-trash.png and b/administrator/templates/hathor/images/menu/icon-16-trash.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-unarticle.png b/administrator/templates/hathor/images/menu/icon-16-unarticle.png index 517b4c0246be0..793ea003e9236 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-unarticle.png and b/administrator/templates/hathor/images/menu/icon-16-unarticle.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-upload.png b/administrator/templates/hathor/images/menu/icon-16-upload.png index 4b72a38590fa5..41549c52ebc71 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-upload.png and b/administrator/templates/hathor/images/menu/icon-16-upload.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-user-dd.png b/administrator/templates/hathor/images/menu/icon-16-user-dd.png index 90795f8e01df4..a7ab24643df23 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-user-dd.png and b/administrator/templates/hathor/images/menu/icon-16-user-dd.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-user.png b/administrator/templates/hathor/images/menu/icon-16-user.png index 8d906f98b3e09..51f4ba5110f5b 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-user.png and b/administrator/templates/hathor/images/menu/icon-16-user.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-viewsite.png b/administrator/templates/hathor/images/menu/icon-16-viewsite.png index e93a2047286e9..121997e531c4c 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-viewsite.png and b/administrator/templates/hathor/images/menu/icon-16-viewsite.png differ diff --git a/administrator/templates/hathor/images/menu/icon-16-writemess.png b/administrator/templates/hathor/images/menu/icon-16-writemess.png index 8c5ad3f643008..f24cfb3db9041 100644 Binary files a/administrator/templates/hathor/images/menu/icon-16-writemess.png and b/administrator/templates/hathor/images/menu/icon-16-writemess.png differ diff --git a/administrator/templates/hathor/images/mini_icon.png b/administrator/templates/hathor/images/mini_icon.png index 9dd21f8abae49..91a2a59d2a940 100644 Binary files a/administrator/templates/hathor/images/mini_icon.png and b/administrator/templates/hathor/images/mini_icon.png differ diff --git a/administrator/templates/hathor/images/notice-alert.png b/administrator/templates/hathor/images/notice-alert.png index cae75c82ea236..d21ae83486103 100644 Binary files a/administrator/templates/hathor/images/notice-alert.png and b/administrator/templates/hathor/images/notice-alert.png differ diff --git a/administrator/templates/hathor/images/notice-info.png b/administrator/templates/hathor/images/notice-info.png index 77dce6ab6512f..939933a5715d6 100644 Binary files a/administrator/templates/hathor/images/notice-info.png and b/administrator/templates/hathor/images/notice-info.png differ diff --git a/administrator/templates/hathor/images/notice-note.png b/administrator/templates/hathor/images/notice-note.png index dd18b4f10213c..aa4d3aacd5db1 100644 Binary files a/administrator/templates/hathor/images/notice-note.png and b/administrator/templates/hathor/images/notice-note.png differ diff --git a/administrator/templates/hathor/images/required.png b/administrator/templates/hathor/images/required.png index d06726e0ada20..3cb1bc128db19 100644 Binary files a/administrator/templates/hathor/images/required.png and b/administrator/templates/hathor/images/required.png differ diff --git a/administrator/templates/hathor/images/selector-arrow-hc.png b/administrator/templates/hathor/images/selector-arrow-hc.png index f496952738f26..a613f31e114ee 100644 Binary files a/administrator/templates/hathor/images/selector-arrow-hc.png and b/administrator/templates/hathor/images/selector-arrow-hc.png differ diff --git a/administrator/templates/hathor/images/selector-arrow-std.png b/administrator/templates/hathor/images/selector-arrow-std.png index 0c3ea875c0835..15e3d8fe83b86 100644 Binary files a/administrator/templates/hathor/images/selector-arrow-std.png and b/administrator/templates/hathor/images/selector-arrow-std.png differ diff --git a/administrator/templates/hathor/images/selector-arrow.png b/administrator/templates/hathor/images/selector-arrow.png index 0d97c40a74e0a..9e7687e582639 100644 Binary files a/administrator/templates/hathor/images/selector-arrow.png and b/administrator/templates/hathor/images/selector-arrow.png differ diff --git a/administrator/templates/hathor/images/system/calendar.png b/administrator/templates/hathor/images/system/calendar.png index 5debe829b6da7..586bc28ed06b0 100644 Binary files a/administrator/templates/hathor/images/system/calendar.png and b/administrator/templates/hathor/images/system/calendar.png differ diff --git a/administrator/templates/hathor/images/system/selector-arrow.png b/administrator/templates/hathor/images/system/selector-arrow.png index 0d97c40a74e0a..9e7687e582639 100644 Binary files a/administrator/templates/hathor/images/system/selector-arrow.png and b/administrator/templates/hathor/images/system/selector-arrow.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-adduser.png b/administrator/templates/hathor/images/toolbar/icon-32-adduser.png index 0bb703320a45b..a34c2455f3a23 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-adduser.png and b/administrator/templates/hathor/images/toolbar/icon-32-adduser.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-alert.png b/administrator/templates/hathor/images/toolbar/icon-32-alert.png index 5bb808783dd38..c4bd24ec35122 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-alert.png and b/administrator/templates/hathor/images/toolbar/icon-32-alert.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-apply.png b/administrator/templates/hathor/images/toolbar/icon-32-apply.png index 187f0b081f9bd..423fcacb1bf78 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-apply.png and b/administrator/templates/hathor/images/toolbar/icon-32-apply.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-archive.png b/administrator/templates/hathor/images/toolbar/icon-32-archive.png index 8ca06af6be380..13a72777ef76d 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-archive.png and b/administrator/templates/hathor/images/toolbar/icon-32-archive.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-article.png b/administrator/templates/hathor/images/toolbar/icon-32-article.png index cf5ed7f9efd27..bf16fa6aca4ed 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-article.png and b/administrator/templates/hathor/images/toolbar/icon-32-article.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-back.png b/administrator/templates/hathor/images/toolbar/icon-32-back.png index 284bd39cd4da6..7b8d35a0022f1 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-back.png and b/administrator/templates/hathor/images/toolbar/icon-32-back.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-banner-client.png b/administrator/templates/hathor/images/toolbar/icon-32-banner-client.png index e449f67f74ae5..5ad4ea221f326 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-banner-client.png and b/administrator/templates/hathor/images/toolbar/icon-32-banner-client.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-batch.png b/administrator/templates/hathor/images/toolbar/icon-32-batch.png index 65b4e65597a9e..b3cd07e4dde59 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-batch.png and b/administrator/templates/hathor/images/toolbar/icon-32-batch.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-cancel.png b/administrator/templates/hathor/images/toolbar/icon-32-cancel.png index 1909b3ff79e88..b143e100b9c30 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-cancel.png and b/administrator/templates/hathor/images/toolbar/icon-32-cancel.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-checkin.png b/administrator/templates/hathor/images/toolbar/icon-32-checkin.png index 90b70caf82416..04e4e5b349e53 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-checkin.png and b/administrator/templates/hathor/images/toolbar/icon-32-checkin.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-component.png b/administrator/templates/hathor/images/toolbar/icon-32-component.png index 692f238be26fb..7ffc421a88cbf 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-component.png and b/administrator/templates/hathor/images/toolbar/icon-32-component.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-config.png b/administrator/templates/hathor/images/toolbar/icon-32-config.png index f8eee5197c351..53de9648c9d12 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-config.png and b/administrator/templates/hathor/images/toolbar/icon-32-config.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-contacts.png b/administrator/templates/hathor/images/toolbar/icon-32-contacts.png index 96147ba416654..2b7abca4ce33c 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-contacts.png and b/administrator/templates/hathor/images/toolbar/icon-32-contacts.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-css.png b/administrator/templates/hathor/images/toolbar/icon-32-css.png index c96c0f0e6652f..1b75813bbca44 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-css.png and b/administrator/templates/hathor/images/toolbar/icon-32-css.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-default.png b/administrator/templates/hathor/images/toolbar/icon-32-default.png index fe011f14d7075..90c8aa95eb1c8 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-default.png and b/administrator/templates/hathor/images/toolbar/icon-32-default.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-delete-style.png b/administrator/templates/hathor/images/toolbar/icon-32-delete-style.png index 264cb06ad5cc8..247ead53598f1 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-delete-style.png and b/administrator/templates/hathor/images/toolbar/icon-32-delete-style.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-delete.png b/administrator/templates/hathor/images/toolbar/icon-32-delete.png index 27afa89dcfd2f..4d05ecdb12412 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-delete.png and b/administrator/templates/hathor/images/toolbar/icon-32-delete.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-deny.png b/administrator/templates/hathor/images/toolbar/icon-32-deny.png index 213027cf3b0f9..4ac081c68ac5d 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-deny.png and b/administrator/templates/hathor/images/toolbar/icon-32-deny.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-download.png b/administrator/templates/hathor/images/toolbar/icon-32-download.png index 8a33a259e1dca..d09df7824f306 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-download.png and b/administrator/templates/hathor/images/toolbar/icon-32-download.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-error.png b/administrator/templates/hathor/images/toolbar/icon-32-error.png index 758a281d65fe0..0cc0aaa71aae3 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-error.png and b/administrator/templates/hathor/images/toolbar/icon-32-error.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-export.png b/administrator/templates/hathor/images/toolbar/icon-32-export.png index e651c80a352e8..d9d59835859af 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-export.png and b/administrator/templates/hathor/images/toolbar/icon-32-export.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-extension.png b/administrator/templates/hathor/images/toolbar/icon-32-extension.png index 76a469f5365a8..8a45ae77ea682 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-extension.png and b/administrator/templates/hathor/images/toolbar/icon-32-extension.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-featured.png b/administrator/templates/hathor/images/toolbar/icon-32-featured.png index e3ef0bfad0db1..1662afae21702 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-featured.png and b/administrator/templates/hathor/images/toolbar/icon-32-featured.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-forward.png b/administrator/templates/hathor/images/toolbar/icon-32-forward.png index d772c405720b4..c3ac95d324b9c 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-forward.png and b/administrator/templates/hathor/images/toolbar/icon-32-forward.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-help.png b/administrator/templates/hathor/images/toolbar/icon-32-help.png index 9b3e739c64fca..fbf408cd9a97e 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-help.png and b/administrator/templates/hathor/images/toolbar/icon-32-help.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-html.png b/administrator/templates/hathor/images/toolbar/icon-32-html.png index cc1ea3a50b482..1570f323ebab7 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-html.png and b/administrator/templates/hathor/images/toolbar/icon-32-html.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-inbox.png b/administrator/templates/hathor/images/toolbar/icon-32-inbox.png index 4d2090b33f6c2..490d275c198fb 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-inbox.png and b/administrator/templates/hathor/images/toolbar/icon-32-inbox.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-messaging.png b/administrator/templates/hathor/images/toolbar/icon-32-messaging.png index c4c762578d309..ee6080cd4035a 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-messaging.png and b/administrator/templates/hathor/images/toolbar/icon-32-messaging.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-messanging.png b/administrator/templates/hathor/images/toolbar/icon-32-messanging.png index 8a92b0c70c8fb..ee6080cd4035a 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-messanging.png and b/administrator/templates/hathor/images/toolbar/icon-32-messanging.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-move.png b/administrator/templates/hathor/images/toolbar/icon-32-move.png index 3217a57079980..2ef3a18968a97 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-move.png and b/administrator/templates/hathor/images/toolbar/icon-32-move.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-preview.png b/administrator/templates/hathor/images/toolbar/icon-32-preview.png index 7065b15a779b9..eefa6a51e00b6 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-preview.png and b/administrator/templates/hathor/images/toolbar/icon-32-preview.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-print.png b/administrator/templates/hathor/images/toolbar/icon-32-print.png index d971abc184f53..8ed65a3333b0d 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-print.png and b/administrator/templates/hathor/images/toolbar/icon-32-print.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-publish.png b/administrator/templates/hathor/images/toolbar/icon-32-publish.png index d712bba0b5f66..3bd38264d6e03 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-publish.png and b/administrator/templates/hathor/images/toolbar/icon-32-publish.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-purge.png b/administrator/templates/hathor/images/toolbar/icon-32-purge.png index 3932658cabef4..c87eebd05c700 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-purge.png and b/administrator/templates/hathor/images/toolbar/icon-32-purge.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-read-privatemessage.png b/administrator/templates/hathor/images/toolbar/icon-32-read-privatemessage.png index 19b4c6b4f24c7..eb40ead2cd341 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-read-privatemessage.png and b/administrator/templates/hathor/images/toolbar/icon-32-read-privatemessage.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-refresh.png b/administrator/templates/hathor/images/toolbar/icon-32-refresh.png index 179e692a8db19..e974d56fd3ff9 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-refresh.png and b/administrator/templates/hathor/images/toolbar/icon-32-refresh.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-remove.png b/administrator/templates/hathor/images/toolbar/icon-32-remove.png index 00155d2022c8e..65ffdb3e859e9 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-remove.png and b/administrator/templates/hathor/images/toolbar/icon-32-remove.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-revert.png b/administrator/templates/hathor/images/toolbar/icon-32-revert.png index 220d3fe78d64e..60b139696fcfc 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-revert.png and b/administrator/templates/hathor/images/toolbar/icon-32-revert.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-save.png b/administrator/templates/hathor/images/toolbar/icon-32-save.png index 49718f5c3cf3a..399dec5c32ed2 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-save.png and b/administrator/templates/hathor/images/toolbar/icon-32-save.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-search.png b/administrator/templates/hathor/images/toolbar/icon-32-search.png index 462b6d76e9e55..a3be36a395d2f 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-search.png and b/administrator/templates/hathor/images/toolbar/icon-32-search.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-send.png b/administrator/templates/hathor/images/toolbar/icon-32-send.png index db7394550c669..51ae41456d8db 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-send.png and b/administrator/templates/hathor/images/toolbar/icon-32-send.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-stats.png b/administrator/templates/hathor/images/toolbar/icon-32-stats.png index 2417dc0566baf..b3eb1ebe91686 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-stats.png and b/administrator/templates/hathor/images/toolbar/icon-32-stats.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-unarchive.png b/administrator/templates/hathor/images/toolbar/icon-32-unarchive.png index 0ac7ee9b2865e..32b95072766d0 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-unarchive.png and b/administrator/templates/hathor/images/toolbar/icon-32-unarchive.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-upload.png b/administrator/templates/hathor/images/toolbar/icon-32-upload.png index d7c2e44b7680f..e41e613b80683 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-upload.png and b/administrator/templates/hathor/images/toolbar/icon-32-upload.png differ diff --git a/administrator/templates/hathor/images/toolbar/icon-32-xml.png b/administrator/templates/hathor/images/toolbar/icon-32-xml.png index f29bd5c699014..95831db9fea4a 100644 Binary files a/administrator/templates/hathor/images/toolbar/icon-32-xml.png and b/administrator/templates/hathor/images/toolbar/icon-32-xml.png differ diff --git a/administrator/templates/hathor/index.php b/administrator/templates/hathor/index.php index 1dd16feda1cbb..7463312aa1029 100644 --- a/administrator/templates/hathor/index.php +++ b/administrator/templates/hathor/index.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/js/template.js b/administrator/templates/hathor/js/template.js index cadbd1b0e46fb..24e166be15eb9 100644 --- a/administrator/templates/hathor/js/template.js +++ b/administrator/templates/hathor/js/template.js @@ -1,6 +1,6 @@ /** * @package Hathor - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/language/en-GB/en-GB.tpl_hathor.ini b/administrator/templates/hathor/language/en-GB/en-GB.tpl_hathor.ini index 85bb4ad0d31d5..88714fde3b655 100644 --- a/administrator/templates/hathor/language/en-GB/en-GB.tpl_hathor.ini +++ b/administrator/templates/hathor/language/en-GB/en-GB.tpl_hathor.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/templates/hathor/language/en-GB/en-GB.tpl_hathor.sys.ini b/administrator/templates/hathor/language/en-GB/en-GB.tpl_hathor.sys.ini index 16502a07c2952..c07ac763e1ae4 100644 --- a/administrator/templates/hathor/language/en-GB/en-GB.tpl_hathor.sys.ini +++ b/administrator/templates/hathor/language/en-GB/en-GB.tpl_hathor.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/administrator/templates/hathor/less/colour_baseline.less b/administrator/templates/hathor/less/colour_baseline.less index 0e2e4bc024646..bab0cfdab89cf 100644 --- a/administrator/templates/hathor/less/colour_baseline.less +++ b/administrator/templates/hathor/less/colour_baseline.less @@ -174,10 +174,10 @@ div.toolbar-list a { } div.toolbar-list a:hover { - border-left: 1px solid @NWBorder; - border-top: 1px solid @NWBorder; - border-right: 1px solid @SEBorder; - border-bottom: 1px solid @SEBorder; + border-left: 1px solid @nwBorder; + border-top: 1px solid @nwBorder; + border-right: 1px solid @seBorder; + border-bottom: 1px solid @seBorder; background: @hoverBackground; color: @toolbarColor; } @@ -201,10 +201,10 @@ div.btn-toolbar div.btn-group button { } div.btn-toolbar div.btn-group button:hover { - border-left: 1px solid @NWBorder; - border-top: 1px solid @NWBorder; - border-right: 1px solid @SEBorder; - border-bottom: 1px solid @SEBorder; + border-left: 1px solid @nwBorder; + border-top: 1px solid @nwBorder; + border-right: 1px solid @seBorder; + border-bottom: 1px solid @seBorder; background: @hoverBackground; color: @toolbarColor; cursor: pointer; @@ -224,10 +224,10 @@ div.btn-toolbar a { } div.btn-toolbar a:hover { - border-left: 1px solid @NWBorder; - border-top: 1px solid @NWBorder; - border-right: 1px solid @SEBorder; - border-bottom: 1px solid @SEBorder; + border-left: 1px solid @nwBorder; + border-top: 1px solid @nwBorder; + border-right: 1px solid @seBorder; + border-bottom: 1px solid @seBorder; background: @hoverBackground; color: @toolbarColor; cursor: pointer; @@ -376,10 +376,10 @@ div.current fieldset.adminform { #cpanel div.icon a:focus, .cpanel div.icon a:hover, .cpanel div.icon a:focus { - border-left: 1px solid @NWBorder; - border-top: 1px solid @NWBorder; - border-right: 1px solid @SEBorder; - border-bottom: 1px solid @SEBorder; + border-left: 1px solid @nwBorder; + border-top: 1px solid @nwBorder; + border-right: 1px solid @seBorder; + border-bottom: 1px solid @seBorder; color: @linkColor; background: @hoverBackground; } diff --git a/administrator/templates/hathor/less/colour_brown.less b/administrator/templates/hathor/less/colour_brown.less index 3d267cea75d55..ffa966561bf37 100644 --- a/administrator/templates/hathor/less/colour_brown.less +++ b/administrator/templates/hathor/less/colour_brown.less @@ -33,10 +33,10 @@ @gradientTop: #d5c1b2; @gradientBottom: #d5c1b2; @mainBorder: #000000; -@toolbarColor: #000000; -@hoverBackground: #e1d3c8; -@NWBorder: #000000; -@SEBorder: #000000; +@toolbarColor: #054993; +@hoverBackground: #e5d9c3; +@nwBorder: #868778; +@seBorder: #f6f7db; // Import the baseline to compile the CSS @import "colour_baseline.less"; diff --git a/administrator/templates/hathor/less/hathor_variables.less b/administrator/templates/hathor/less/hathor_variables.less index 8e4eb7144b920..b2c0715b62ace 100644 --- a/administrator/templates/hathor/less/hathor_variables.less +++ b/administrator/templates/hathor/less/hathor_variables.less @@ -131,8 +131,8 @@ // ------------------------- @toolbarColor: @linkColor; @hoverBackground: #e5d9c3; -@NWBorder: #868778; -@SEBorder: #f6f7db; +@nwBorder: #868778; +@seBorder: #f6f7db; @fadedText: #cccccc; @disabledBackground: #eeeeee; @permissionDefault: #ffffcf; diff --git a/administrator/templates/hathor/login.php b/administrator/templates/hathor/login.php index b4021ab3097f0..851bf9a153c0d 100644 --- a/administrator/templates/hathor/login.php +++ b/administrator/templates/hathor/login.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.hathor * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/hathor/templateDetails.xml b/administrator/templates/hathor/templateDetails.xml index 8a985940490d9..34ca2bcca2919 100644 --- a/administrator/templates/hathor/templateDetails.xml +++ b/administrator/templates/hathor/templateDetails.xml @@ -6,7 +6,7 @@ Andrea Tarr hathor@tarrconsulting.com http://www.tarrconsulting.com - Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt 3.0.0 TPL_HATHOR_XML_DESCRIPTION diff --git a/administrator/templates/hathor/template_preview.png b/administrator/templates/hathor/template_preview.png index a097c55de4e2e..be57da7cc5433 100644 Binary files a/administrator/templates/hathor/template_preview.png and b/administrator/templates/hathor/template_preview.png differ diff --git a/administrator/templates/hathor/template_thumbnail.png b/administrator/templates/hathor/template_thumbnail.png index 6bf98488ef40a..b9b2b49b88d51 100644 Binary files a/administrator/templates/hathor/template_thumbnail.png and b/administrator/templates/hathor/template_thumbnail.png differ diff --git a/administrator/templates/isis/component.php b/administrator/templates/isis/component.php index edae0947d8592..295ebec382b86 100644 --- a/administrator/templates/isis/component.php +++ b/administrator/templates/isis/component.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Templates.isis * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/isis/cpanel.php b/administrator/templates/isis/cpanel.php index 1158a1616e36a..1de4b7ad664e9 100644 --- a/administrator/templates/isis/cpanel.php +++ b/administrator/templates/isis/cpanel.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Templates.isis * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/isis/css/template-rtl.css b/administrator/templates/isis/css/template-rtl.css index 449f54da6c36d..4c0bae23af01b 100644 --- a/administrator/templates/isis/css/template-rtl.css +++ b/administrator/templates/isis/css/template-rtl.css @@ -2790,7 +2790,7 @@ input[type="submit"].btn.btn-mini { color: #8a6d3b; } .alert h4 { - margin: 0; + margin: 0 0 .5em; } .alert .close { position: relative; @@ -4706,6 +4706,9 @@ a.badge:focus { .affix { position: fixed; } +@-ms-viewport { + width: device-width; +} .hidden { display: none; visibility: hidden; @@ -7029,7 +7032,7 @@ a:focus { outline: none; } .view-login { - background-color: #224c8f; + background-color: #17568c; padding-top: 0; } .view-login .container { @@ -7153,6 +7156,30 @@ body .navbar-fixed-top { .navbar .nav-user { font-size: 13px; } +.navbar .nav > li ul { + overflow-y: auto; + overflow-x: hidden; + -webkit-overflow-scrolling: touch; + -moz-overflow-scrolling: touch; + -ms-overflow-scrolling: touch; + -o-overflow-scrolling: touch; + overflow-scrolling: touch; + height: auto; + max-height: 500px; + margin: 0; +} +.navbar .nav > li ul::-webkit-scrollbar { + -webkit-appearance: none; + width: 7px; +} +.navbar .nav > li ul::-webkit-scrollbar-thumb { + border-radius: 4px; + background-color: rgba(0,0,0,0.5); + -webkit-box-shadow: 0 0 1px rgba(255,255,255,0.5); +} +.navbar .empty-nav { + display: none; +} .navbar-fixed-top .navbar-inner, .navbar-static-top .navbar-inner { -webkit-box-shadow: none; @@ -7271,6 +7298,9 @@ body .navbar-fixed-top { z-index: 100; } @media (max-width: 767px) { + body { + -webkit-overflow-scrolling: touch; + } .subhead { margin-left: -20px; margin-right: -20px; @@ -7335,12 +7365,19 @@ h6 { font-size: 12px; line-height: 14px; } +.sidebar-nav .nav-list { + padding-left: 25px; + padding-right: 25px; +} .sidebar-nav .nav-list > li > a { color: #555; + padding: 3px 25px; + margin-left: -25px; + margin-right: -25px; } .sidebar-nav .nav-list > li.active > a { color: #fff; - margin-right: -16px; + margin-right: -26px; } .quick-icons .nav li + .nav-header { margin-top: 12px; @@ -8031,6 +8068,7 @@ a.grid_true { margin: -10px 0 0 -1px; padding-top: 28px; padding-bottom: 10px; + clear: both; background-color: #f5f5f5; border-bottom: 1px solid #e3e3e3; border-right: 1px solid #e3e3e3; @@ -8143,6 +8181,25 @@ body.modal-open { overflow: hidden; -ms-overflow-style: none; } +.field-media-wrapper .modal .modal-body { + padding: 5px 10px; + overflow: hidden; +} +.js-pstats-data-details dd { + margin-left: 240px; +} +.js-pstats-data-details dt { + width: 220px; +} +@media (max-width: 767px) { + .field-media-wrapper .modal .modal-body { + padding: 5px 0; + } +} +.modal-body { + -webkit-overflow-scrolling: touch; + overflow-y: auto !important; +} .pull-right { float: left; } @@ -8555,7 +8612,14 @@ body { } .dl-horizontal dt { float: right; + text-align: left; + clear: right; } +.dl-horizontal dd { + margin-left: 0; + margin-right: 180px; +} +.dl-horizontal dt .profile> ul { margin: 9px 25px 0 0; } @@ -8924,3 +8988,6 @@ a.grid_true { width: 229px; } } +.js-pstats-data-details dd { + margin-right: 240px; +} diff --git a/administrator/templates/isis/css/template.css b/administrator/templates/isis/css/template.css index d5a4f5af82b0f..b42dcb9b02d7a 100644 --- a/administrator/templates/isis/css/template.css +++ b/administrator/templates/isis/css/template.css @@ -2790,7 +2790,7 @@ input[type="submit"].btn.btn-mini { color: #8a6d3b; } .alert h4 { - margin: 0; + margin: 0 0 .5em; } .alert .close { position: relative; @@ -4706,6 +4706,9 @@ a.badge:focus { .affix { position: fixed; } +@-ms-viewport { + width: device-width; +} .hidden { display: none; visibility: hidden; @@ -7029,7 +7032,7 @@ a:focus { outline: none; } .view-login { - background-color: #224c8f; + background-color: #17568c; padding-top: 0; } .view-login .container { @@ -7153,6 +7156,30 @@ body .navbar-fixed-top { .navbar .nav-user { font-size: 13px; } +.navbar .nav > li ul { + overflow-y: auto; + overflow-x: hidden; + -webkit-overflow-scrolling: touch; + -moz-overflow-scrolling: touch; + -ms-overflow-scrolling: touch; + -o-overflow-scrolling: touch; + overflow-scrolling: touch; + height: auto; + max-height: 500px; + margin: 0; +} +.navbar .empty-nav { + display: none; +} +.navbar .nav > li ul::-webkit-scrollbar { + -webkit-appearance: none; + width: 7px; +} +.navbar .nav > li ul::-webkit-scrollbar-thumb { + border-radius: 4px; + background-color: rgba(0,0,0,0.5); + -webkit-box-shadow: 0 0 1px rgba(255,255,255,0.5); +} .navbar-fixed-top .navbar-inner, .navbar-static-top .navbar-inner { -webkit-box-shadow: none; @@ -7271,6 +7298,9 @@ body .navbar-fixed-top { z-index: 100; } @media (max-width: 767px) { + body { + -webkit-overflow-scrolling: touch; + } .subhead { margin-left: -20px; margin-right: -20px; @@ -7335,12 +7365,19 @@ h6 { font-size: 12px; line-height: 14px; } +.sidebar-nav .nav-list { + padding-left: 25px; + padding-right: 25px; +} .sidebar-nav .nav-list > li > a { color: #555; + padding: 3px 25px; + margin-left: -25px; + margin-right: -25px; } .sidebar-nav .nav-list > li.active > a { color: #fff; - margin-right: -16px; + margin-right: -26px; } .quick-icons .nav li + .nav-header { margin-top: 12px; @@ -8031,6 +8068,7 @@ a.grid_true { margin: -10px 0 0 -1px; padding-top: 28px; padding-bottom: 10px; + clear: both; background-color: #f5f5f5; border-bottom: 1px solid #e3e3e3; border-right: 1px solid #e3e3e3; @@ -8143,3 +8181,22 @@ body.modal-open { overflow: hidden; -ms-overflow-style: none; } +.field-media-wrapper .modal .modal-body { + padding: 5px 10px; + overflow: hidden; +} +.js-pstats-data-details dd { + margin-left: 240px; +} +.js-pstats-data-details dt { + width: 220px; +} +@media (max-width: 767px) { + .field-media-wrapper .modal .modal-body { + padding: 5px 0; + } +} +.modal-body { + -webkit-overflow-scrolling: touch; + overflow-y: auto !important; +} diff --git a/administrator/templates/isis/error.php b/administrator/templates/isis/error.php index 4c73b9e98b860..e5c6bd7f89d74 100644 --- a/administrator/templates/isis/error.php +++ b/administrator/templates/isis/error.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Templates.isis * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/isis/html/layouts/joomla/form/field/user.php b/administrator/templates/isis/html/layouts/joomla/form/field/user.php new file mode 100644 index 0000000000000..bd34dce372b81 --- /dev/null +++ b/administrator/templates/isis/html/layouts/joomla/form/field/user.php @@ -0,0 +1,99 @@ + section in form XML. + * @var boolean $hidden Is this field hidden in the form? + * @var string $hint Placeholder for the field. + * @var string $id DOM id of the field. + * @var string $label Label of the field. + * @var string $labelclass Classes to apply to the label. + * @var boolean $multiple Does this field support multiple values? + * @var string $name Name of the input field. + * @var string $onchange Onchange attribute for the field. + * @var string $onclick Onclick attribute for the field. + * @var string $pattern Pattern (Reg Ex) of value of the form field. + * @var boolean $readonly Is this field read only? + * @var boolean $repeat Allows extensions to duplicate elements. + * @var boolean $required Is this field required? + * @var integer $size Size attribute of the input. + * @var boolean $spellcheck Spellcheck state for the form field. + * @var string $validate Validation rules to apply. + * @var string $value Value attribute of the field. + * @var array $checkedOptions Options that will be set as checked. + * @var boolean $hasValue Has this field a value assigned? + * @var array $options Options available for this field. + * + * @var string $userName The user name + * @var mixed $groups The filtering groups (null means no filtering) + * @var mixed $exclude The users to exclude from the list of users + */ + +// Set the link for the user selection page +$link = 'index.php?option=com_users&view=users&layout=modal&tmpl=component&required=' + . ($required ? 1 : 0) . '&field={field-user-id}' + . (isset($groups) ? ('&groups=' . base64_encode(json_encode($groups))) : '') + . (isset($excluded) ? ('&excluded=' . base64_encode(json_encode($excluded))) : ''); + +// Invalidate the input value if no user selected +if (JText::_('JLIB_FORM_SELECT_USER') == htmlspecialchars($userName, ENT_COMPAT, 'UTF-8')) +{ + $userName = ""; +} + +JHtml::script('jui/fielduser.min.js', false, true, false, false, true); +?> + +
    +
    + + /> + + + JText::_('JLIB_FORM_CHANGE_USER'), + 'closeButton' => true, + 'footer' => '' + ) + ); ?> + +
    + + +
    diff --git a/administrator/templates/isis/html/layouts/joomla/system/message.php b/administrator/templates/isis/html/layouts/joomla/system/message.php index c46bca073745e..e83b8a0fde927 100644 --- a/administrator/templates/isis/html/layouts/joomla/system/message.php +++ b/administrator/templates/isis/html/layouts/joomla/system/message.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.Isis * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -21,7 +21,7 @@

    -

    +
    diff --git a/administrator/templates/isis/html/layouts/joomla/toolbar/versions.php b/administrator/templates/isis/html/layouts/joomla/toolbar/versions.php new file mode 100644 index 0000000000000..035d018a6caf1 --- /dev/null +++ b/administrator/templates/isis/html/layouts/joomla/toolbar/versions.php @@ -0,0 +1,43 @@ + $link, + 'title' => JText::_('COM_CONTENTHISTORY_MODAL_TITLE'), + 'height' => '300px', + 'width' => '800px', + 'footer' => '' + ) +); +?> + + diff --git a/administrator/templates/isis/html/mod_version/default.php b/administrator/templates/isis/html/mod_version/default.php index 5e59407f957f7..bc6b425ce73f4 100644 --- a/administrator/templates/isis/html/mod_version/default.php +++ b/administrator/templates/isis/html/mod_version/default.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage mod_version * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/isis/html/modules.php b/administrator/templates/isis/html/modules.php index 45cb4cd60c3f4..3e39de2087f18 100644 --- a/administrator/templates/isis/html/modules.php +++ b/administrator/templates/isis/html/modules.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Templates.isis * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/isis/html/pagination.php b/administrator/templates/isis/html/pagination.php index 16265406ed490..c3d6c66cba274 100644 --- a/administrator/templates/isis/html/pagination.php +++ b/administrator/templates/isis/html/pagination.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.Isis * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/isis/images/admin/blank.png b/administrator/templates/isis/images/admin/blank.png index c2da5b889d844..1797bf909a764 100644 Binary files a/administrator/templates/isis/images/admin/blank.png and b/administrator/templates/isis/images/admin/blank.png differ diff --git a/administrator/templates/isis/images/admin/checked_out.png b/administrator/templates/isis/images/admin/checked_out.png index b40435610734d..6ad8f25ac9b91 100644 Binary files a/administrator/templates/isis/images/admin/checked_out.png and b/administrator/templates/isis/images/admin/checked_out.png differ diff --git a/administrator/templates/isis/images/admin/collapseall.png b/administrator/templates/isis/images/admin/collapseall.png index 696940df96518..a986d3b4fbfc5 100644 Binary files a/administrator/templates/isis/images/admin/collapseall.png and b/administrator/templates/isis/images/admin/collapseall.png differ diff --git a/administrator/templates/isis/images/admin/disabled.png b/administrator/templates/isis/images/admin/disabled.png index 3129eeab8ed68..4c1f7c3b218f5 100644 Binary files a/administrator/templates/isis/images/admin/disabled.png and b/administrator/templates/isis/images/admin/disabled.png differ diff --git a/administrator/templates/isis/images/admin/downarrow-1.png b/administrator/templates/isis/images/admin/downarrow-1.png index d8a7cfba1ebc5..c94074e5963e8 100644 Binary files a/administrator/templates/isis/images/admin/downarrow-1.png and b/administrator/templates/isis/images/admin/downarrow-1.png differ diff --git a/administrator/templates/isis/images/admin/downarrow.png b/administrator/templates/isis/images/admin/downarrow.png index 92bbb806eb493..69950e19d656c 100644 Binary files a/administrator/templates/isis/images/admin/downarrow.png and b/administrator/templates/isis/images/admin/downarrow.png differ diff --git a/administrator/templates/isis/images/admin/downarrow0.png b/administrator/templates/isis/images/admin/downarrow0.png index 92bbb806eb493..69950e19d656c 100644 Binary files a/administrator/templates/isis/images/admin/downarrow0.png and b/administrator/templates/isis/images/admin/downarrow0.png differ diff --git a/administrator/templates/isis/images/admin/expandall.png b/administrator/templates/isis/images/admin/expandall.png index c6a82d6bf13a9..64b8c4b56915c 100644 Binary files a/administrator/templates/isis/images/admin/expandall.png and b/administrator/templates/isis/images/admin/expandall.png differ diff --git a/administrator/templates/isis/images/admin/featured.png b/administrator/templates/isis/images/admin/featured.png index 5f7fb72f908c6..e03064c7cf33e 100644 Binary files a/administrator/templates/isis/images/admin/featured.png and b/administrator/templates/isis/images/admin/featured.png differ diff --git a/administrator/templates/isis/images/admin/filesave.png b/administrator/templates/isis/images/admin/filesave.png index 1c62de2e3f36a..65a45b551ed04 100644 Binary files a/administrator/templates/isis/images/admin/filesave.png and b/administrator/templates/isis/images/admin/filesave.png differ diff --git a/administrator/templates/isis/images/admin/filter_16.png b/administrator/templates/isis/images/admin/filter_16.png index 03690e3da4dd8..cbc62b7d30f78 100644 Binary files a/administrator/templates/isis/images/admin/filter_16.png and b/administrator/templates/isis/images/admin/filter_16.png differ diff --git a/administrator/templates/isis/images/admin/icon-16-add.png b/administrator/templates/isis/images/admin/icon-16-add.png index f59c31cbf5933..6e7aa02ab332c 100644 Binary files a/administrator/templates/isis/images/admin/icon-16-add.png and b/administrator/templates/isis/images/admin/icon-16-add.png differ diff --git a/administrator/templates/isis/images/admin/icon-16-allow.png b/administrator/templates/isis/images/admin/icon-16-allow.png index 8d7fc820bcfb0..d28a18b2f21e3 100644 Binary files a/administrator/templates/isis/images/admin/icon-16-allow.png and b/administrator/templates/isis/images/admin/icon-16-allow.png differ diff --git a/administrator/templates/isis/images/admin/icon-16-allowinactive.png b/administrator/templates/isis/images/admin/icon-16-allowinactive.png index 512b267cbb429..d20e059da06b9 100644 Binary files a/administrator/templates/isis/images/admin/icon-16-allowinactive.png and b/administrator/templates/isis/images/admin/icon-16-allowinactive.png differ diff --git a/administrator/templates/isis/images/admin/icon-16-deny.png b/administrator/templates/isis/images/admin/icon-16-deny.png index 8176a78c5bbc2..ebeb69cdf1c9a 100644 Binary files a/administrator/templates/isis/images/admin/icon-16-deny.png and b/administrator/templates/isis/images/admin/icon-16-deny.png differ diff --git a/administrator/templates/isis/images/admin/icon-16-denyinactive.png b/administrator/templates/isis/images/admin/icon-16-denyinactive.png index d51bc87b7d5e2..0dc1b43e0fa08 100644 Binary files a/administrator/templates/isis/images/admin/icon-16-denyinactive.png and b/administrator/templates/isis/images/admin/icon-16-denyinactive.png differ diff --git a/administrator/templates/isis/images/admin/icon-16-links.png b/administrator/templates/isis/images/admin/icon-16-links.png index 0cb30a43a4b5a..52b4cb434eb81 100644 Binary files a/administrator/templates/isis/images/admin/icon-16-links.png and b/administrator/templates/isis/images/admin/icon-16-links.png differ diff --git a/administrator/templates/isis/images/admin/icon-16-notice-note.png b/administrator/templates/isis/images/admin/icon-16-notice-note.png index dc9f2a7399f92..a207d70ae835c 100644 Binary files a/administrator/templates/isis/images/admin/icon-16-notice-note.png and b/administrator/templates/isis/images/admin/icon-16-notice-note.png differ diff --git a/administrator/templates/isis/images/admin/icon-16-protected.png b/administrator/templates/isis/images/admin/icon-16-protected.png index 101e3c35afb53..b72ad93568e40 100644 Binary files a/administrator/templates/isis/images/admin/icon-16-protected.png and b/administrator/templates/isis/images/admin/icon-16-protected.png differ diff --git a/administrator/templates/isis/images/admin/menu_divider.png b/administrator/templates/isis/images/admin/menu_divider.png index d50a34a2ddab9..b4706b18b39f9 100644 Binary files a/administrator/templates/isis/images/admin/menu_divider.png and b/administrator/templates/isis/images/admin/menu_divider.png differ diff --git a/administrator/templates/isis/images/admin/note_add_16.png b/administrator/templates/isis/images/admin/note_add_16.png index fc240c275cdea..0acd4a592806b 100644 Binary files a/administrator/templates/isis/images/admin/note_add_16.png and b/administrator/templates/isis/images/admin/note_add_16.png differ diff --git a/administrator/templates/isis/images/admin/publish_g.png b/administrator/templates/isis/images/admin/publish_g.png index 3eb10aa784858..d3794988476dd 100644 Binary files a/administrator/templates/isis/images/admin/publish_g.png and b/administrator/templates/isis/images/admin/publish_g.png differ diff --git a/administrator/templates/isis/images/admin/publish_r.png b/administrator/templates/isis/images/admin/publish_r.png index f57a1bc6b377d..1405a7900f5ee 100644 Binary files a/administrator/templates/isis/images/admin/publish_r.png and b/administrator/templates/isis/images/admin/publish_r.png differ diff --git a/administrator/templates/isis/images/admin/publish_x.png b/administrator/templates/isis/images/admin/publish_x.png index 9eccb6b106419..8719043981ae1 100644 Binary files a/administrator/templates/isis/images/admin/publish_x.png and b/administrator/templates/isis/images/admin/publish_x.png differ diff --git a/administrator/templates/isis/images/admin/publish_y.png b/administrator/templates/isis/images/admin/publish_y.png index 9b05f3868cde4..75b0ddf9d75bb 100644 Binary files a/administrator/templates/isis/images/admin/publish_y.png and b/administrator/templates/isis/images/admin/publish_y.png differ diff --git a/administrator/templates/isis/images/admin/sort_asc.png b/administrator/templates/isis/images/admin/sort_asc.png index e2ebfe3652f7c..1204f31f50f22 100644 Binary files a/administrator/templates/isis/images/admin/sort_asc.png and b/administrator/templates/isis/images/admin/sort_asc.png differ diff --git a/administrator/templates/isis/images/admin/sort_desc.png b/administrator/templates/isis/images/admin/sort_desc.png index 6038299d996fb..c0ca72e6c8f39 100644 Binary files a/administrator/templates/isis/images/admin/sort_desc.png and b/administrator/templates/isis/images/admin/sort_desc.png differ diff --git a/administrator/templates/isis/images/admin/tick.png b/administrator/templates/isis/images/admin/tick.png index ce48a2471932a..7cf3ad3ab29db 100644 Binary files a/administrator/templates/isis/images/admin/tick.png and b/administrator/templates/isis/images/admin/tick.png differ diff --git a/administrator/templates/isis/images/admin/trash.png b/administrator/templates/isis/images/admin/trash.png index 2e7a4e897c252..9c100938a6604 100644 Binary files a/administrator/templates/isis/images/admin/trash.png and b/administrator/templates/isis/images/admin/trash.png differ diff --git a/administrator/templates/isis/images/admin/uparrow-1.png b/administrator/templates/isis/images/admin/uparrow-1.png index f5e7d73af68fa..20175936c331c 100644 Binary files a/administrator/templates/isis/images/admin/uparrow-1.png and b/administrator/templates/isis/images/admin/uparrow-1.png differ diff --git a/administrator/templates/isis/images/admin/uparrow.png b/administrator/templates/isis/images/admin/uparrow.png index 137e6f6036a65..b5b5beddd63b1 100644 Binary files a/administrator/templates/isis/images/admin/uparrow.png and b/administrator/templates/isis/images/admin/uparrow.png differ diff --git a/administrator/templates/isis/images/admin/uparrow0.png b/administrator/templates/isis/images/admin/uparrow0.png index 137e6f6036a65..b5b5beddd63b1 100644 Binary files a/administrator/templates/isis/images/admin/uparrow0.png and b/administrator/templates/isis/images/admin/uparrow0.png differ diff --git a/administrator/templates/isis/images/emailButton.png b/administrator/templates/isis/images/emailButton.png index 60310fa9d51ee..cd7ff64b8ac67 100644 Binary files a/administrator/templates/isis/images/emailButton.png and b/administrator/templates/isis/images/emailButton.png differ diff --git a/administrator/templates/isis/images/joomla.png b/administrator/templates/isis/images/joomla.png index 1cfba359cd293..239f577864f24 100644 Binary files a/administrator/templates/isis/images/joomla.png and b/administrator/templates/isis/images/joomla.png differ diff --git a/administrator/templates/isis/images/login-joomla-inverse.png b/administrator/templates/isis/images/login-joomla-inverse.png index 8dba7b518ba3b..04050ad37e237 100644 Binary files a/administrator/templates/isis/images/login-joomla-inverse.png and b/administrator/templates/isis/images/login-joomla-inverse.png differ diff --git a/administrator/templates/isis/images/login-joomla.png b/administrator/templates/isis/images/login-joomla.png index cc16657bed6d1..edd17ca9f7e40 100644 Binary files a/administrator/templates/isis/images/login-joomla.png and b/administrator/templates/isis/images/login-joomla.png differ diff --git a/administrator/templates/isis/images/logo-inverse.png b/administrator/templates/isis/images/logo-inverse.png index 9b14b502a906b..4e60f8676d2f3 100644 Binary files a/administrator/templates/isis/images/logo-inverse.png and b/administrator/templates/isis/images/logo-inverse.png differ diff --git a/administrator/templates/isis/images/logo.png b/administrator/templates/isis/images/logo.png index 62c2d4f5d7224..8c1c265a194ab 100644 Binary files a/administrator/templates/isis/images/logo.png and b/administrator/templates/isis/images/logo.png differ diff --git a/administrator/templates/isis/images/pdf_button.png b/administrator/templates/isis/images/pdf_button.png index b324079f3d207..c4a1d044e2f1d 100644 Binary files a/administrator/templates/isis/images/pdf_button.png and b/administrator/templates/isis/images/pdf_button.png differ diff --git a/administrator/templates/isis/images/printButton.png b/administrator/templates/isis/images/printButton.png index 65591a136e9d4..e56670c172f96 100644 Binary files a/administrator/templates/isis/images/printButton.png and b/administrator/templates/isis/images/printButton.png differ diff --git a/administrator/templates/isis/images/system/sort_asc.png b/administrator/templates/isis/images/system/sort_asc.png index 298940cac789d..677424496d7d3 100644 Binary files a/administrator/templates/isis/images/system/sort_asc.png and b/administrator/templates/isis/images/system/sort_asc.png differ diff --git a/administrator/templates/isis/images/system/sort_desc.png b/administrator/templates/isis/images/system/sort_desc.png index e19ad106f948f..c38b9803d21e1 100644 Binary files a/administrator/templates/isis/images/system/sort_desc.png and b/administrator/templates/isis/images/system/sort_desc.png differ diff --git a/administrator/templates/isis/img/glyphicons-halflings-white.png b/administrator/templates/isis/img/glyphicons-halflings-white.png index cec126351bfe4..c1ab58151c472 100644 Binary files a/administrator/templates/isis/img/glyphicons-halflings-white.png and b/administrator/templates/isis/img/glyphicons-halflings-white.png differ diff --git a/administrator/templates/isis/img/glyphicons-halflings.png b/administrator/templates/isis/img/glyphicons-halflings.png index 73da3899f502f..f241c76f9adb7 100644 Binary files a/administrator/templates/isis/img/glyphicons-halflings.png and b/administrator/templates/isis/img/glyphicons-halflings.png differ diff --git a/administrator/templates/isis/index.php b/administrator/templates/isis/index.php index bc94071e868e4..8f98d4139c096 100644 --- a/administrator/templates/isis/index.php +++ b/administrator/templates/isis/index.php @@ -2,7 +2,7 @@ /** * @package Joomla.Administrator * @subpackage Templates.isis - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * @since 3.0 */ @@ -183,7 +183,7 @@ function colorIsLight($color) - + diff --git a/administrator/templates/isis/js/template.js b/administrator/templates/isis/js/template.js index 22e6607d81465..86fb1adbcc599 100644 --- a/administrator/templates/isis/js/template.js +++ b/administrator/templates/isis/js/template.js @@ -1,7 +1,7 @@ /** * @package Joomla.Administrator * @subpackage Templates.isis - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt * @since 3.0 */ @@ -55,6 +55,60 @@ }); + /** + * Append submenu items to empty UL on hover allowing a scrollable dropdown + */ + var menuScroll = $('#menu > li > ul') + var emptyMenu = $('#nav-empty'); + var menuWidth; + + $('#menu > li > a').on('click mouseenter', function() { + + menuWidth = $(this).next('ul').width() - 10; + emptyMenu.empty().hide(); + + }); + + menuScroll.find('.dropdown-submenu > a').on('mouseenter', function() { + + var $self = $(this); + var dropdown = $self.next('.dropdown-menu'); + var offset = $self.offset(); + var scroll = $(window).scrollTop(); + var width = menuWidth; + + // Set the submenu position + if ($('html').attr('dir') == 'rtl') + { + emptyMenu.css({ + top : offset.top - scroll, + left: offset.left - width + }); + } + else + { + emptyMenu.css({ + top : offset.top - scroll, + left: offset.left + width + }); + } + + // Append items to empty
      and show it + dropdown.hide(); + emptyMenu.show().html(dropdown.html()); + + }); + menuScroll.find('a.no-dropdown').on('mouseenter', function() { + + emptyMenu.empty().hide(); + + }); + $(document).on('click', function() { + + emptyMenu.empty().hide(); + + }); + /** * USED IN: All views with toolbar and sticky bar enabled */ diff --git a/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.ini b/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.ini index 38c537e20286e..29cfccfd8caa3 100644 --- a/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.ini +++ b/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -35,4 +35,4 @@ TPL_ISIS_STATUS_TOP="Top" TPL_ISIS_STICKY_DESC="Optionally set the toolbar to a fixed (pinned) location." TPL_ISIS_STICKY_LABEL="Pinned Toolbar" TPL_ISIS_TOOLBAR="Toolbar" -TPL_ISIS_XML_DESCRIPTION="Continuing the Egyptian god/goddess theme (Khepri from 1.5 and Hathor from 1.6), Isis is the Joomla 3 administrator template based on Bootstrap from Twitter and the launch of the Joomla User Interface library (JUI)." +TPL_ISIS_XML_DESCRIPTION="Continuing the Egyptian god/goddess theme (Khepri from 1.5 and Hathor from 1.6), Isis is the Joomla 3 administrator template based on Bootstrap and the launch of the Joomla User Interface library (JUI)." diff --git a/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.sys.ini b/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.sys.ini index 41f25471f7997..6f8a6742c0066 100644 --- a/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.sys.ini +++ b/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -17,4 +17,4 @@ TPL_ISIS_POSITION_STATUS="Status" TPL_ISIS_POSITION_SUBMENU="Submenu" TPL_ISIS_POSITION_TITLE="Title" TPL_ISIS_POSITION_TOOLBAR="Toolbar" -TPL_ISIS_XML_DESCRIPTION="Continuing the Egyptian god/goddess theme (Khepri from 1.5 and Hathor from 1.6), Isis is the Joomla 3 administrator template based on Bootstrap from Twitter and the launch of the Joomla User Interface library (JUI)." \ No newline at end of file +TPL_ISIS_XML_DESCRIPTION="Continuing the Egyptian god/goddess theme (Khepri from 1.5 and Hathor from 1.6), Isis is the Joomla 3 administrator template based on Bootstrap and the launch of the Joomla User Interface library (JUI)." diff --git a/administrator/templates/isis/less/template-rtl.less b/administrator/templates/isis/less/template-rtl.less index 2dd8f680d4072..160404e8f1f83 100644 --- a/administrator/templates/isis/less/template-rtl.less +++ b/administrator/templates/isis/less/template-rtl.less @@ -15,6 +15,30 @@ > li > a { padding: 6px 10px; } + > li ul { + overflow-y: auto; + overflow-x: hidden; + -webkit-overflow-scrolling: touch; + -moz-overflow-scrolling: touch; + -ms-overflow-scrolling: touch; + -o-overflow-scrolling: touch; + overflow-scrolling: touch; + height: auto; + max-height: 500px; + margin: 0; + &::-webkit-scrollbar { + -webkit-appearance: none; + width: 7px; + } + &::-webkit-scrollbar-thumb { + border-radius: 4px; + background-color: rgba(0,0,0,.5); + -webkit-box-shadow: 0 0 1px rgba(255,255,255,.5); + } + } + } + .empty-nav { + display: none; } } @@ -246,3 +270,8 @@ a.grid_true { } } } + +/* Stats plugin */ +.js-pstats-data-details dd { + margin-right: 240px; +} \ No newline at end of file diff --git a/administrator/templates/isis/less/template.less b/administrator/templates/isis/less/template.less index 9ad09da746ca8..5872bb9c04461 100644 --- a/administrator/templates/isis/less/template.less +++ b/administrator/templates/isis/less/template.less @@ -226,6 +226,30 @@ body .navbar-fixed-top { .nav-user { font-size: 13px; } + .nav > li ul { + overflow-y: auto; + overflow-x: hidden; + -webkit-overflow-scrolling: touch; + -moz-overflow-scrolling: touch; + -ms-overflow-scrolling: touch; + -o-overflow-scrolling: touch; + overflow-scrolling: touch; + height: auto; + max-height: 500px; + margin: 0; + &::-webkit-scrollbar { + -webkit-appearance: none; + width: 7px; + } + &::-webkit-scrollbar-thumb { + border-radius: 4px; + background-color: rgba(0,0,0,.5); + -webkit-box-shadow: 0 0 1px rgba(255,255,255,.5); + } + } + .empty-nav { + display: none; + } } .navbar-fixed-top, @@ -368,6 +392,10 @@ body .navbar-fixed-top { z-index: 100; } @media (max-width: 767px) { + /* Fix ios scrolling inside bootstrap modals */ + body { + -webkit-overflow-scrolling: touch; + } .subhead { margin-left: -20px; margin-right: -20px; @@ -445,13 +473,21 @@ h6 { } /* Sidebar */ +.sidebar-nav .nav-list { + padding-left: 25px; + padding-right: 25px; +} + .sidebar-nav .nav-list > li > a { color: #555; + padding: 3px 25px; + margin-left: -25px; + margin-right: -25px; } .sidebar-nav .nav-list > li.active > a { color: #fff; - margin-right: -16px; + margin-right: -26px; } /* Quick-icons */ .quick-icons .nav li + .nav-header { @@ -1160,6 +1196,7 @@ a.grid_true { margin: -10px 0 0 -1px; padding-top: 28px; padding-bottom: 10px; + clear: both; background-color: @wellBackground; border-bottom: 1px solid darken(@wellBackground, 7%); border-right: 1px solid darken(@wellBackground, 7%); @@ -1290,4 +1327,31 @@ textarea.noResize { body.modal-open { overflow: hidden; -ms-overflow-style: none; -} \ No newline at end of file +} + +/* Corrects the modals padding */ +.field-media-wrapper .modal .modal-body { + padding: 5px 10px; + overflow: hidden; +} + +/* Stats plugin */ +.js-pstats-data-details dd { + margin-left: 240px; +} +.js-pstats-data-details dt { + width: 220px; +} + +/* Corrects the media modal padding on small devices */ +@media (max-width: 767px) { + .field-media-wrapper .modal .modal-body { + padding: 5px 0; + } +} + +/* Fix iOS scrolling inside bootstrap modals (using iframe) */ +.modal-body { + -webkit-overflow-scrolling: touch; + overflow-y: auto !important; +} diff --git a/administrator/templates/isis/less/variables.less b/administrator/templates/isis/less/variables.less index 96c6656aca5fd..80eb86acc553c 100644 --- a/administrator/templates/isis/less/variables.less +++ b/administrator/templates/isis/less/variables.less @@ -315,7 +315,7 @@ // > Joomla JUI // Login // ------------------------- -@loginBackground: #224c8f; +@loginBackground: #17568c; // Header // ------------------------- diff --git a/administrator/templates/isis/login.php b/administrator/templates/isis/login.php index 2b9cb0edb4d5b..c24bfe8e7ba43 100644 --- a/administrator/templates/isis/login.php +++ b/administrator/templates/isis/login.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Templates.isis * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/isis/templateDetails.xml b/administrator/templates/isis/templateDetails.xml index a6b06d1b516d2..4f94210feb6f9 100644 --- a/administrator/templates/isis/templateDetails.xml +++ b/administrator/templates/isis/templateDetails.xml @@ -6,7 +6,7 @@ 3/30/2012 Kyle Ledbetter admin@joomla.org - Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. TPL_ISIS_XML_DESCRIPTION component.php @@ -67,7 +67,7 @@ label="TPL_ISIS_COLOR_LINK_LABEL" description="TPL_ISIS_COLOR_LINK_DESC" /> - diff --git a/administrator/templates/isis/template_preview.png b/administrator/templates/isis/template_preview.png index 236d692a66805..a5eb718d38234 100644 Binary files a/administrator/templates/isis/template_preview.png and b/administrator/templates/isis/template_preview.png differ diff --git a/administrator/templates/isis/template_thumbnail.png b/administrator/templates/isis/template_thumbnail.png index a3425307289af..ea155b07cdfcd 100644 Binary files a/administrator/templates/isis/template_thumbnail.png and b/administrator/templates/isis/template_thumbnail.png differ diff --git a/administrator/templates/system/component.php b/administrator/templates/system/component.php index c6293ff405d76..d00116333dd59 100644 --- a/administrator/templates/system/component.php +++ b/administrator/templates/system/component.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.system * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/system/css/error.css b/administrator/templates/system/css/error.css index c0f9a0f69e457..3c8dd0b29e8a9 100644 --- a/administrator/templates/system/css/error.css +++ b/administrator/templates/system/css/error.css @@ -1,5 +1,5 @@ /** - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/system/css/system.css b/administrator/templates/system/css/system.css index 7f2cb67a03b98..950c2607fdbb0 100644 --- a/administrator/templates/system/css/system.css +++ b/administrator/templates/system/css/system.css @@ -1,5 +1,5 @@ /** - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/system/error.php b/administrator/templates/system/error.php index 8c5829e279c8d..efa211d41ec97 100644 --- a/administrator/templates/system/error.php +++ b/administrator/templates/system/error.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.system * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/system/html/modules.php b/administrator/templates/system/html/modules.php index 779ce5e00b568..9db71b569753a 100644 --- a/administrator/templates/system/html/modules.php +++ b/administrator/templates/system/html/modules.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.system * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/administrator/templates/system/images/calendar.png b/administrator/templates/system/images/calendar.png index 5debe829b6da7..586bc28ed06b0 100644 Binary files a/administrator/templates/system/images/calendar.png and b/administrator/templates/system/images/calendar.png differ diff --git a/administrator/templates/system/index.php b/administrator/templates/system/index.php index 52bbc1ac57dad..256219c306b86 100644 --- a/administrator/templates/system/index.php +++ b/administrator/templates/system/index.php @@ -3,7 +3,7 @@ * @package Joomla.Administrator * @subpackage Template.system * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/bin/keychain.php b/bin/keychain.php index 1320b2e1b34e8..31d4c0fbea5af 100644 --- a/bin/keychain.php +++ b/bin/keychain.php @@ -3,15 +3,55 @@ /** * @package Joomla.Platform * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE */ +// Make sure we're being called from the command line, not a web interface +if (PHP_SAPI !== 'cli') +{ + die('This is a command line only application.'); +} + +// We are a valid entry point. define('_JEXEC', 1); -define('JPATH_BASE', dirname(__FILE__)); -// Load the Joomla! Platform -require_once realpath('../libraries/import.php'); +// Load system defines +if (file_exists(dirname(__DIR__) . '/defines.php')) +{ + require_once dirname(__DIR__) . '/defines.php'; +} + +if (!defined('_JDEFINES')) +{ + define('JPATH_BASE', dirname(__DIR__)); + require_once JPATH_BASE . '/includes/defines.php'; +} + +// Get the framework. +require_once JPATH_LIBRARIES . '/import.legacy.php'; + +// Bootstrap the CMS libraries. +require_once JPATH_LIBRARIES . '/cms.php'; + +// Import the configuration. +require_once JPATH_CONFIGURATION . '/configuration.php'; + +// System configuration. +$config = new JConfig; + +// Configure error reporting to maximum for CLI output. +error_reporting(E_ALL); +ini_set('display_errors', 1); + +// Load Library language +$lang = JFactory::getLanguage(); + +// Try the finder_cli file in the current language (without allowing the loading of the file in the default language) +$lang->load('finder_cli', JPATH_SITE, null, false, false) + +// Fallback to the finder_cli file in the default language +|| $lang->load('finder_cli', JPATH_SITE, null, true); /** * Keychain Manager. diff --git a/build.xml b/build.xml index 183826660d2ef..8760b18d01e86 100644 --- a/build.xml +++ b/build.xml @@ -84,7 +84,7 @@ - + diff --git a/build/build.php b/build/build.php index 769f7fa36e439..2e8b78d7784fc 100644 --- a/build/build.php +++ b/build/build.php @@ -17,7 +17,7 @@ * 4. Check the archives in the tmp directory. * * @package Joomla.Build - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -70,9 +70,6 @@ system('mkdir diffconvert'); system('mkdir packages' . $version); -echo "Copy manifest file to root directory for install packages.\n"; -system('cp ' . $fullpath . '/administrator/manifests/files/joomla.xml ' . $fullpath); - echo "Create list of changed files from git repository.\n"; /* @@ -103,8 +100,7 @@ "LICENSE.txt\n" => true, "README.txt\n" => true, "robots.txt.dist\n" => true, - "web.config.txt\n" => true, - "joomla.xml\n" => true + "web.config.txt\n" => true ); /* @@ -112,9 +108,9 @@ * These paths are from the repository root without the leading slash */ $doNotPackage = array( + '.github', '.gitignore', '.travis.yml', - 'CONTRIBUTING.md', 'README.md', 'build', 'build.xml', diff --git a/build/generatecss.php b/build/generatecss.php index d7b7631484af1..2b27a37a20149 100644 --- a/build/generatecss.php +++ b/build/generatecss.php @@ -2,7 +2,7 @@ /** * @package Joomla.Build * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/build/helpTOC.php b/build/helpTOC.php index 689fd47c371bc..342d6aa4615f8 100644 --- a/build/helpTOC.php +++ b/build/helpTOC.php @@ -2,7 +2,7 @@ /** * @package Joomla.Build * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -52,7 +52,7 @@ public function doExecute() { // Get the version data for the script $version = new JVersion; - $helpVersion = str_replace('.', '', $version->RELEASE); + $helpVersion = str_replace('.', '', $version::RELEASE); $namespace = 'Help' . $helpVersion . ':'; // Set up options for JMediawiki @@ -63,7 +63,7 @@ public function doExecute() // Get the category members (local hack) $this->out('Fetching data from docs wiki', true); - $categoryMembers = $mediawiki->categories->getCategoryMembers('Category:Help_screen_' . $version->RELEASE, null, 'max'); + $categoryMembers = $mediawiki->categories->getCategoryMembers('Category:Help_screen_' . $version::RELEASE, null, 'max'); $members = array(); diff --git a/build/phpcs/Joomla/ruleset.xml b/build/phpcs/Joomla/ruleset.xml index a89bb3b2c472a..481cc24271358 100644 --- a/build/phpcs/Joomla/ruleset.xml +++ b/build/phpcs/Joomla/ruleset.xml @@ -14,11 +14,13 @@ libraries/compat/password/* libraries/fof/* libraries/idna_convert/* + libraries/php-encryption/* libraries/phputf8/* libraries/simplepie/* libraries/phpass/* libraries/vendor/* - + + administrator/components/com_joomlaupdate/restore_finalisation.php administrator/components/com_joomlaupdate/restore.php configuration.php plugins/captcha/recaptcha/recaptchalib.php diff --git a/build/travis/phpenv/apcu-5.5.ini b/build/travis/phpenv/apcu-5.5.ini new file mode 100644 index 0000000000000..019901d1ba62c --- /dev/null +++ b/build/travis/phpenv/apcu-5.5.ini @@ -0,0 +1,2 @@ +apc.enabled=true +apc.enable_cli=true diff --git a/build/travis/phpenv/apcu-5.6.ini b/build/travis/phpenv/apcu-5.6.ini new file mode 100644 index 0000000000000..019901d1ba62c --- /dev/null +++ b/build/travis/phpenv/apcu-5.6.ini @@ -0,0 +1,2 @@ +apc.enabled=true +apc.enable_cli=true diff --git a/build/travis/phpenv/apcu-7.0.ini b/build/travis/phpenv/apcu-7.0.ini new file mode 100644 index 0000000000000..019901d1ba62c --- /dev/null +++ b/build/travis/phpenv/apcu-7.0.ini @@ -0,0 +1,2 @@ +apc.enabled=true +apc.enable_cli=true diff --git a/build/travis/phpenv/memcache.ini b/build/travis/phpenv/memcache.ini new file mode 100644 index 0000000000000..69c1880428a70 --- /dev/null +++ b/build/travis/phpenv/memcache.ini @@ -0,0 +1 @@ +extension="memcache.so" diff --git a/cli/deletefiles.php b/cli/deletefiles.php index e75ce1435efcb..0a3e74f3c76ff 100644 --- a/cli/deletefiles.php +++ b/cli/deletefiles.php @@ -2,7 +2,7 @@ /** * @package Joomla.Cli * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/cli/finder_indexer.php b/cli/finder_indexer.php index 9f0401a864992..bc05c9a705f7a 100644 --- a/cli/finder_indexer.php +++ b/cli/finder_indexer.php @@ -2,7 +2,7 @@ /** * @package Joomla.Cli * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/cli/garbagecron.php b/cli/garbagecron.php index 5d23efc7d6bf0..c3490880f2fd4 100644 --- a/cli/garbagecron.php +++ b/cli/garbagecron.php @@ -2,7 +2,7 @@ /** * @package Joomla.Cli * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/cli/update_cron.php b/cli/update_cron.php index 6b4d3d14c26e6..3ee6a7c7e4287 100644 --- a/cli/update_cron.php +++ b/cli/update_cron.php @@ -2,7 +2,7 @@ /** * @package Joomla.Cli * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_ajax/ajax.php b/components/com_ajax/ajax.php index 473c52bc49655..fb36f5320391e 100644 --- a/components/com_ajax/ajax.php +++ b/components/com_ajax/ajax.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_ajax * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_banners/banners.php b/components/com_banners/banners.php index 7764621dd5c1d..2ae2cd62d5a21 100644 --- a/components/com_banners/banners.php +++ b/components/com_banners/banners.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_banners/controller.php b/components/com_banners/controller.php index bbcd943cbdbd1..0073f6245aa8e 100644 --- a/components/com_banners/controller.php +++ b/components/com_banners/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_banners/helpers/banner.php b/components/com_banners/helpers/banner.php index f2c4d8ce563f6..3bd8ad8e0e97c 100644 --- a/components/com_banners/helpers/banner.php +++ b/components/com_banners/helpers/banner.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_banners/helpers/category.php b/components/com_banners/helpers/category.php index 4de52e699f3a9..606201578ef99 100644 --- a/components/com_banners/helpers/category.php +++ b/components/com_banners/helpers/category.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_banners/models/banner.php b/components/com_banners/models/banner.php index 06246fbf963c6..149da0c17cce6 100644 --- a/components/com_banners/models/banner.php +++ b/components/com_banners/models/banner.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_banners/models/banners.php b/components/com_banners/models/banners.php index 36efbcd78e84d..a719b038ee4eb 100644 --- a/components/com_banners/models/banners.php +++ b/components/com_banners/models/banners.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -184,7 +184,7 @@ protected function getListQuery() $query->where('a.language in (' . $db->quote(JFactory::getLanguage()->getTag()) . ',' . $db->quote('*') . ')'); } - $query->order('a.sticky DESC,' . ($randomise ? 'RAND()' : 'a.ordering')); + $query->order('a.sticky DESC,' . ($randomise ? $query->Rand() : 'a.ordering')); return $query; } diff --git a/components/com_banners/router.php b/components/com_banners/router.php index 064a4aded79be..1092e09448284 100644 --- a/components/com_banners/router.php +++ b/components/com_banners/router.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_banners * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/config.php b/components/com_config/config.php index f41590da5589d..a48f4e9fa3310 100644 --- a/components/com_config/config.php +++ b/components/com_config/config.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/controller/cancel.php b/components/com_config/controller/cancel.php index 50c7c1d3e6dc5..211b5449ef675 100644 --- a/components/com_config/controller/cancel.php +++ b/components/com_config/controller/cancel.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/controller/canceladmin.php b/components/com_config/controller/canceladmin.php index 09d3fd494ca18..b5fdb0848dcc2 100644 --- a/components/com_config/controller/canceladmin.php +++ b/components/com_config/controller/canceladmin.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/controller/cmsbase.php b/components/com_config/controller/cmsbase.php index 24212aebc58b3..177f3c8d5007d 100644 --- a/components/com_config/controller/cmsbase.php +++ b/components/com_config/controller/cmsbase.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/controller/config/display.php b/components/com_config/controller/config/display.php index 8e5655a043068..64f9fbb7c0978 100644 --- a/components/com_config/controller/config/display.php +++ b/components/com_config/controller/config/display.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/controller/config/save.php b/components/com_config/controller/config/save.php index 70d6b3ad29968..470fa06c3e5be 100644 --- a/components/com_config/controller/config/save.php +++ b/components/com_config/controller/config/save.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/controller/display.php b/components/com_config/controller/display.php index 2476801d2172d..a9049444edd48 100644 --- a/components/com_config/controller/display.php +++ b/components/com_config/controller/display.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/controller/helper.php b/components/com_config/controller/helper.php index d8838d0a16003..1799294ed91e0 100644 --- a/components/com_config/controller/helper.php +++ b/components/com_config/controller/helper.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/controller/modules/cancel.php b/components/com_config/controller/modules/cancel.php index 3d83094787b8e..f72f782b53878 100644 --- a/components/com_config/controller/modules/cancel.php +++ b/components/com_config/controller/modules/cancel.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/controller/modules/display.php b/components/com_config/controller/modules/display.php index 9aa62954361b2..3ac7459bb71b9 100644 --- a/components/com_config/controller/modules/display.php +++ b/components/com_config/controller/modules/display.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/controller/modules/save.php b/components/com_config/controller/modules/save.php index c6e08774dde5d..d3af38184b9f9 100644 --- a/components/com_config/controller/modules/save.php +++ b/components/com_config/controller/modules/save.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/controller/templates/display.php b/components/com_config/controller/templates/display.php index f1cba8e2b91ad..dd4bf9b9932d5 100644 --- a/components/com_config/controller/templates/display.php +++ b/components/com_config/controller/templates/display.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/controller/templates/save.php b/components/com_config/controller/templates/save.php index 40b186dd9a59b..df81af1334cc1 100644 --- a/components/com_config/controller/templates/save.php +++ b/components/com_config/controller/templates/save.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/model/cms.php b/components/com_config/model/cms.php index 5d93bb3450c7e..f6966288ab1a2 100644 --- a/components/com_config/model/cms.php +++ b/components/com_config/model/cms.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/model/config.php b/components/com_config/model/config.php index 54a916e32ecb6..2be2b1e187508 100644 --- a/components/com_config/model/config.php +++ b/components/com_config/model/config.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/model/form.php b/components/com_config/model/form.php index d3e58c5b24b13..a0537d2d403ce 100644 --- a/components/com_config/model/form.php +++ b/components/com_config/model/form.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/model/modules.php b/components/com_config/model/modules.php index 5b820ce87bfaf..6bbc2635a9a0e 100644 --- a/components/com_config/model/modules.php +++ b/components/com_config/model/modules.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/model/templates.php b/components/com_config/model/templates.php index b12080c831cdb..fa11999839f0c 100644 --- a/components/com_config/model/templates.php +++ b/components/com_config/model/templates.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/view/cms/html.php b/components/com_config/view/cms/html.php index 35ad30b0f0a6c..6699fef2d6fed 100644 --- a/components/com_config/view/cms/html.php +++ b/components/com_config/view/cms/html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/view/cms/json.php b/components/com_config/view/cms/json.php index 51d12e2bc0aa9..d5687bccda73f 100644 --- a/components/com_config/view/cms/json.php +++ b/components/com_config/view/cms/json.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/view/config/html.php b/components/com_config/view/config/html.php index 6e0bafeb8cfa2..d97c72b461d74 100644 --- a/components/com_config/view/config/html.php +++ b/components/com_config/view/config/html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/view/config/tmpl/default.php b/components/com_config/view/config/tmpl/default.php index 73a5c7f58da3f..161594b024e65 100644 --- a/components/com_config/view/config/tmpl/default.php +++ b/components/com_config/view/config/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/view/config/tmpl/default_metadata.php b/components/com_config/view/config/tmpl/default_metadata.php index d3bff163ce0fb..924a73f3a8bfa 100644 --- a/components/com_config/view/config/tmpl/default_metadata.php +++ b/components/com_config/view/config/tmpl/default_metadata.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/view/config/tmpl/default_seo.php b/components/com_config/view/config/tmpl/default_seo.php index 2cd77153374f8..c35cbf6c50f2b 100644 --- a/components/com_config/view/config/tmpl/default_seo.php +++ b/components/com_config/view/config/tmpl/default_seo.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/view/config/tmpl/default_site.php b/components/com_config/view/config/tmpl/default_site.php index 75f453ad33049..b7fb0344bdb17 100644 --- a/components/com_config/view/config/tmpl/default_site.php +++ b/components/com_config/view/config/tmpl/default_site.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/view/modules/html.php b/components/com_config/view/modules/html.php index 7238dd23a66d0..3a558dc3037ae 100644 --- a/components/com_config/view/modules/html.php +++ b/components/com_config/view/modules/html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/view/modules/tmpl/default.php b/components/com_config/view/modules/tmpl/default.php index b90ba06d00f78..06c7ee3ab4f13 100644 --- a/components/com_config/view/modules/tmpl/default.php +++ b/components/com_config/view/modules/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -12,7 +12,6 @@ JHtml::_('behavior.tooltip'); JHtml::_('behavior.formvalidator'); JHtml::_('behavior.keepalive'); -JHtml::_('behavior.framework', true); JHtml::_('behavior.combobox'); JHtml::_('formbehavior.chosen', 'select'); diff --git a/components/com_config/view/modules/tmpl/default_options.php b/components/com_config/view/modules/tmpl/default_options.php index b9ffd6f03357b..0589a9f31f911 100644 --- a/components/com_config/view/modules/tmpl/default_options.php +++ b/components/com_config/view/modules/tmpl/default_options.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/view/modules/tmpl/default_positions.php b/components/com_config/view/modules/tmpl/default_positions.php index 5dbafb0750c46..69bf0cbf1f532 100644 --- a/components/com_config/view/modules/tmpl/default_positions.php +++ b/components/com_config/view/modules/tmpl/default_positions.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/view/templates/html.php b/components/com_config/view/templates/html.php index 4916247903669..43716cee7f5ae 100644 --- a/components/com_config/view/templates/html.php +++ b/components/com_config/view/templates/html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/view/templates/tmpl/default.php b/components/com_config/view/templates/tmpl/default.php index d425f84a01a0d..7e33a39405c44 100644 --- a/components/com_config/view/templates/tmpl/default.php +++ b/components/com_config/view/templates/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_config/view/templates/tmpl/default_options.php b/components/com_config/view/templates/tmpl/default_options.php index 2891ec625d0e1..5813c7f034b5b 100644 --- a/components/com_config/view/templates/tmpl/default_options.php +++ b/components/com_config/view/templates/tmpl/default_options.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_config * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/contact.php b/components/com_contact/contact.php index ab8cea90103b4..5458f082450d9 100644 --- a/components/com_contact/contact.php +++ b/components/com_contact/contact.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/controller.php b/components/com_contact/controller.php index 18302d1af63c2..de91f092984e1 100644 --- a/components/com_contact/controller.php +++ b/components/com_contact/controller.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/controllers/contact.php b/components/com_contact/controllers/contact.php index 5dc58325153b1..1983264f6a798 100644 --- a/components/com_contact/controllers/contact.php +++ b/components/com_contact/controllers/contact.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -217,7 +217,7 @@ private function _sendEmail($data, $contact, $copy_email_activated) $mail = JFactory::getMailer(); $mail->addRecipient($email); - $mail->addReplyTo(array($email, $name)); + $mail->addReplyTo($email, $name); $mail->setSender(array($mailfrom, $fromname)); $mail->setSubject($copysubject); $mail->setBody($copytext); diff --git a/components/com_contact/helpers/association.php b/components/com_contact/helpers/association.php index bad98b886b9fb..fecb1810ab0a7 100644 --- a/components/com_contact/helpers/association.php +++ b/components/com_contact/helpers/association.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/helpers/category.php b/components/com_contact/helpers/category.php index cd9a45e7435ab..3001a68ccf136 100644 --- a/components/com_contact/helpers/category.php +++ b/components/com_contact/helpers/category.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/helpers/route.php b/components/com_contact/helpers/route.php index 1b05389ce7585..40861e2376db3 100644 --- a/components/com_contact/helpers/route.php +++ b/components/com_contact/helpers/route.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/layouts/joomla/form/renderfield.php b/components/com_contact/layouts/joomla/form/renderfield.php new file mode 100644 index 0000000000000..45fe6684a1db2 --- /dev/null +++ b/components/com_contact/layouts/joomla/form/renderfield.php @@ -0,0 +1,57 @@ + +
      > + +
      + + + + +
      + +
      +
      diff --git a/components/com_contact/models/categories.php b/components/com_contact/models/categories.php index 07759413d21ea..9dbdcc1ab0e12 100644 --- a/components/com_contact/models/categories.php +++ b/components/com_contact/models/categories.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/models/category.php b/components/com_contact/models/category.php index ff98e7784fd02..044d42b783d74 100644 --- a/components/com_contact/models/category.php +++ b/components/com_contact/models/category.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/models/contact.php b/components/com_contact/models/contact.php index 4a93dc79a35f5..28ceaadc475e1 100644 --- a/components/com_contact/models/contact.php +++ b/components/com_contact/models/contact.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/models/featured.php b/components/com_contact/models/featured.php index 8a10221e3ac0a..d235d7b461ed7 100644 --- a/components/com_contact/models/featured.php +++ b/components/com_contact/models/featured.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/models/forms/contact.xml b/components/com_contact/models/forms/contact.xml index 59902f82cd681..1ec9116477bee 100644 --- a/components/com_contact/models/forms/contact.xml +++ b/components/com_contact/models/forms/contact.xml @@ -1,54 +1,65 @@
      -
      - + + - - - - -
      -
      \ No newline at end of file + diff --git a/components/com_contact/models/forms/form.xml b/components/com_contact/models/forms/form.xml index 91eab7aaccc88..e271905182e86 100644 --- a/components/com_contact/models/forms/form.xml +++ b/components/com_contact/models/forms/form.xml @@ -87,7 +87,7 @@ >

      - + escape($item->title); ?> - params->get('show_cat_num_articles_cat') == 1) :?> + params->get('show_cat_items_cat') == 1) :?> +   numitems; ?> - getChildren()) > 0) : ?> - + getChildren()) > 0 && $this->maxLevelcat > 1) : ?> +

      params->get('show_subcat_desc_cat') == 1) :?> @@ -44,7 +46,7 @@ - getChildren()) > 0) :?> + getChildren()) > 0 && $this->maxLevelcat > 1) :?>
      items[$item->id] = $item->getChildren(); diff --git a/components/com_contact/views/categories/view.html.php b/components/com_contact/views/categories/view.html.php index b3b4bdcf0ecd4..90d227c9149e2 100644 --- a/components/com_contact/views/categories/view.html.php +++ b/components/com_contact/views/categories/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/views/category/tmpl/default.php b/components/com_contact/views/category/tmpl/default.php index 1ab8362f52ddd..1aea668741e07 100644 --- a/components/com_contact/views/category/tmpl/default.php +++ b/components/com_contact/views/category/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/views/category/tmpl/default_children.php b/components/com_contact/views/category/tmpl/default_children.php index db7bd9ff86883..11e0fed99afaf 100644 --- a/components/com_contact/views/category/tmpl/default_children.php +++ b/components/com_contact/views/category/tmpl/default_children.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/views/category/tmpl/default_items.php b/components/com_contact/views/category/tmpl/default_items.php index d5584aa87a4ff..e468a64d1d70f 100644 --- a/components/com_contact/views/category/tmpl/default_items.php +++ b/components/com_contact/views/category/tmpl/default_items.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -63,7 +63,7 @@ -

      +

      name; ?> @@ -93,7 +93,7 @@ params->get('show_country_headings') AND !empty($item->country)) : ?> country; ?>
      -

      +
      event->afterDisplayContent; ?> diff --git a/components/com_contact/views/category/view.feed.php b/components/com_contact/views/category/view.feed.php index f00400a3297b4..0d0a53b88bdb4 100644 --- a/components/com_contact/views/category/view.feed.php +++ b/components/com_contact/views/category/view.feed.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/views/category/view.html.php b/components/com_contact/views/category/view.html.php index afdf543e760e3..b4a37bf320004 100644 --- a/components/com_contact/views/category/view.html.php +++ b/components/com_contact/views/category/view.html.php @@ -3,12 +3,14 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('_JEXEC') or die; +use Joomla\Registry\Registry; + /** * HTML View class for the Contacts component * @@ -34,6 +36,14 @@ class ContactViewCategory extends JViewCategory */ protected $viewName = 'contact'; + /** + * Run the standard Joomla plugins + * + * @var bool + * @since 3.5 + */ + protected $runPlugins = true; + /** * Execute and display a template script. * @@ -49,8 +59,8 @@ public function display($tpl = null) // Compute the contact slug. foreach ($this->items as $item) { - $item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id; - $temp = new JRegistry; + $item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id; + $temp = new Registry; $temp->loadString($item->params); $item->params = clone($this->params); $item->params->merge($temp); diff --git a/components/com_contact/views/contact/tmpl/default.php b/components/com_contact/views/contact/tmpl/default.php index ccc562678f939..cc15ae66cdaf4 100644 --- a/components/com_contact/views/contact/tmpl/default.php +++ b/components/com_contact/views/contact/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -13,7 +13,7 @@ jimport('joomla.html.html.bootstrap'); ?> -
      +
      params->get('show_page_heading')) : ?>

      escape($this->params->get('page_heading')); ?> @@ -26,7 +26,7 @@ item->published == 0) : ?> - contact->name; ?> + contact->name; ?>

      @@ -84,13 +84,13 @@ contact->image && $this->params->get('show_image')) : ?>
      - contact->image, JText::_('COM_CONTACT_IMAGE_DETAILS'), array('align' => 'middle')); ?> + contact->image, JText::_('COM_CONTACT_IMAGE_DETAILS'), array('align' => 'middle', 'itemprop' => 'image')); ?>
      contact->con_position && $this->params->get('show_position')) : ?>
      -
      +
      contact->con_position; ?>
      @@ -120,6 +120,7 @@ params->get('presentation_style') == 'tabs') : ?> + params->get('presentation_style') == 'plain'): ?> ' . JText::_('COM_CONTACT_EMAIL_FORM') . ''; ?> diff --git a/components/com_contact/views/contact/tmpl/default_address.php b/components/com_contact/views/contact/tmpl/default_address.php index 2e628c38e72e7..e339415fd327c 100644 --- a/components/com_contact/views/contact/tmpl/default_address.php +++ b/components/com_contact/views/contact/tmpl/default_address.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -14,7 +14,7 @@ * jicon-text, jicon-none, jicon-icon */ ?> -
      +
      params->get('address_check') > 0) && ($this->contact->address || $this->contact->suburb || $this->contact->state || $this->contact->country || $this->contact->postcode)) : ?> params->get('address_check') > 0) : ?> diff --git a/components/com_contact/views/contact/tmpl/default_articles.php b/components/com_contact/views/contact/tmpl/default_articles.php index 1b7167d96501e..c8206cbd4a3f2 100644 --- a/components/com_contact/views/contact/tmpl/default_articles.php +++ b/components/com_contact/views/contact/tmpl/default_articles.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/views/contact/tmpl/default_form.php b/components/com_contact/views/contact/tmpl/default_form.php index 23055078ca3f8..243c562e750b5 100644 --- a/components/com_contact/views/contact/tmpl/default_form.php +++ b/components/com_contact/views/contact/tmpl/default_form.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -12,41 +12,42 @@ JHtml::_('behavior.keepalive'); JHtml::_('behavior.formvalidator'); -if (isset($this->error)) : ?> -
      - error; ?> -
      - +$captchaEnabled = false; -
      -
      -
      - +$captchaSet = $this->params->get('captcha', JFactory::getApplication()->get('captcha', '0')); - form->getFieldsets() as $fieldset) : ?> - form->getFieldset($fieldset->name) as $field) : ?> - name === 'contact_email_copy' && !$this->params->get('show_email_copy')) : ?> - +foreach (JPluginHelper::getPlugin('captcha') as $plugin) +{ + if ($captchaSet === $plugin->name) + { + $captchaEnabled = true; + break; + } +} +?> +
      + + form->getFieldsets() as $fieldset): ?> + name === 'captcha' && !$captchaEnabled) : ?> + + + form->getFieldset($fieldset->name); ?> + +
      + label) && strlen($legend = trim(JText::_($fieldset->label)))) : ?> + -
      - hidden) : ?> -
      - input; ?> -
      - -
      - label; ?> - required && $field->type != 'Spacer') : ?> - - -
      -
      input; ?>
      + + name === 'contact_email_copy' && !$this->params->get('show_email_copy')) : ?> + -
      - - - -
      + renderField(); ?> + +
      + + +
      +
      @@ -54,6 +55,6 @@
      -
      +
      diff --git a/components/com_contact/views/contact/tmpl/default_links.php b/components/com_contact/views/contact/tmpl/default_links.php index 60765d60bb5a7..2f9bdf4976915 100644 --- a/components/com_contact/views/contact/tmpl/default_links.php +++ b/components/com_contact/views/contact/tmpl/default_links.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/views/contact/tmpl/default_profile.php b/components/com_contact/views/contact/tmpl/default_profile.php index 5a8c188ac9858..1e699d1ad2dc1 100644 --- a/components/com_contact/views/contact/tmpl/default_profile.php +++ b/components/com_contact/views/contact/tmpl/default_profile.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/views/contact/view.html.php b/components/com_contact/views/contact/view.html.php index 4ac6ff57309f6..c2118db7d85a0 100644 --- a/components/com_contact/views/contact/view.html.php +++ b/components/com_contact/views/contact/view.html.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -52,21 +52,19 @@ class ContactViewContact extends JViewLegacy protected $return_page; /** - * Method to display the view. + * Execute and display a template script. * - * @param string $tpl A template file to load. [optional] + * @param string $tpl The name of the template file to parse; automatically searches through the template paths. * - * @return mixed Exception on failure, void on success. - * - * @since 1.5 + * @return mixed A string if successful, otherwise a Error object. */ public function display($tpl = null) { - $app = JFactory::getApplication(); - $user = JFactory::getUser(); - $state = $this->get('State'); - $item = $this->get('Item'); - $this->form = $this->get('Form'); + $app = JFactory::getApplication(); + $user = JFactory::getUser(); + $state = $this->get('State'); + $item = $this->get('Item'); + $this->form = $this->get('Form'); // Get the parameters $params = JComponentHelper::getParams('com_contact'); @@ -95,19 +93,20 @@ public function display($tpl = null) } // Check if access is not public - $groups = $user->getAuthorisedViewLevels(); + $groups = $user->getAuthorisedViewLevels(); $return = ''; if ((!in_array($item->access, $groups)) || (!in_array($item->category_access, $groups))) { - JError::raiseWarning(403, JText::_('JERROR_ALERTNOAUTHOR')); + $app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'error'); + $app->setHeader('status', 403, true); return false; } - $options['category_id'] = $item->catid; - $options['order by'] = 'a.default_con DESC, a.ordering ASC'; + $options['category_id'] = $item->catid; + $options['order by'] = 'a.default_con DESC, a.ordering ASC'; // Handle email cloaking if ($item->email_to && $params->get('show_email')) @@ -305,10 +304,10 @@ public function display($tpl = null) */ protected function _prepareDocument() { - $app = JFactory::getApplication(); - $menus = $app->getMenu(); - $pathway = $app->getPathway(); - $title = null; + $app = JFactory::getApplication(); + $menus = $app->getMenu(); + $pathway = $app->getPathway(); + $title = null; // Because the application sets a default page title, // we need to get it from the menu item itself @@ -355,15 +354,15 @@ protected function _prepareDocument() if (empty($title)) { - $title = $app->getCfg('sitename'); + $title = $app->get('sitename'); } - elseif ($app->getCfg('sitename_pagetitles', 0) == 1) + elseif ($app->get('sitename_pagetitles', 0) == 1) { - $title = JText::sprintf('JPAGETITLE', $app->getCfg('sitename'), $title); + $title = JText::sprintf('JPAGETITLE', $app->get('sitename'), $title); } - elseif ($app->getCfg('sitename_pagetitles', 0) == 2) + elseif ($app->get('sitename_pagetitles', 0) == 2) { - $title = JText::sprintf('JPAGETITLE', $title, $app->getCfg('sitename')); + $title = JText::sprintf('JPAGETITLE', $title, $app->get('sitename')); } if (empty($title)) @@ -377,7 +376,7 @@ protected function _prepareDocument() { $this->document->setDescription($this->item->metadesc); } - elseif (!$this->item->metadesc && $this->params->get('menu-meta_description')) + elseif ($this->params->get('menu-meta_description')) { $this->document->setDescription($this->params->get('menu-meta_description')); } @@ -386,7 +385,7 @@ protected function _prepareDocument() { $this->document->setMetadata('keywords', $this->item->metakey); } - elseif (!$this->item->metakey && $this->params->get('menu-meta_keywords')) + elseif ($this->params->get('menu-meta_keywords')) { $this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords')); } diff --git a/components/com_contact/views/contact/view.vcf.php b/components/com_contact/views/contact/view.vcf.php index 8776b97baf15c..a933db9486ad9 100644 --- a/components/com_contact/views/contact/view.vcf.php +++ b/components/com_contact/views/contact/view.vcf.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/views/featured/tmpl/default.php b/components/com_contact/views/featured/tmpl/default.php index 87758e5cf52f4..af91004732d64 100644 --- a/components/com_contact/views/featured/tmpl/default.php +++ b/components/com_contact/views/featured/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/components/com_contact/views/featured/tmpl/default_items.php b/components/com_contact/views/featured/tmpl/default_items.php index 3b7eb479e71bc..0e5d96a2a2086 100644 --- a/components/com_contact/views/featured/tmpl/default_items.php +++ b/components/com_contact/views/featured/tmpl/default_items.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage com_contact * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -95,7 +95,7 @@
    + suburb; ?> + state; ?> + country; ?> diff --git a/installation/view/preinstall/html.php b/installation/view/preinstall/html.php index 72a8d4a10e3b2..dd974a495f176 100644 --- a/installation/view/preinstall/html.php +++ b/installation/view/preinstall/html.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage View * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/view/preinstall/tmpl/default.php b/installation/view/preinstall/tmpl/default.php index 812e31686a646..7c570982bcc7e 100644 --- a/installation/view/preinstall/tmpl/default.php +++ b/installation/view/preinstall/tmpl/default.php @@ -2,7 +2,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/view/remove/html.php b/installation/view/remove/html.php index 1841b22682b0b..e8d72fcf414f5 100644 --- a/installation/view/remove/html.php +++ b/installation/view/remove/html.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage View * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/view/remove/tmpl/default.php b/installation/view/remove/tmpl/default.php index 9985710b138a5..4001b10f761dd 100644 --- a/installation/view/remove/tmpl/default.php +++ b/installation/view/remove/tmpl/default.php @@ -2,7 +2,7 @@ /** * @package Joomla.Installation * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/view/site/tmpl/default.php b/installation/view/site/tmpl/default.php index 8a46e6cbcc6d6..c17c7b6561385 100644 --- a/installation/view/site/tmpl/default.php +++ b/installation/view/site/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage View * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ @@ -78,6 +78,7 @@ form->getLabel('admin_password'); ?>
    + form->getInput('admin_password'); ?>

    @@ -87,6 +88,7 @@ form->getLabel('admin_password2'); ?>
    + form->getInput('admin_password2'); ?>
    diff --git a/installation/view/summary/html.php b/installation/view/summary/html.php index 0d65762e73717..6bf9c9bd3b0de 100644 --- a/installation/view/summary/html.php +++ b/installation/view/summary/html.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage View * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/installation/view/summary/tmpl/default.php b/installation/view/summary/tmpl/default.php index 6c64977d1e79a..fcfc07e8bc0fa 100644 --- a/installation/view/summary/tmpl/default.php +++ b/installation/view/summary/tmpl/default.php @@ -3,7 +3,7 @@ * @package Joomla.Installation * @subpackage View * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/language/en-GB/en-GB.com_ajax.ini b/language/en-GB/en-GB.com_ajax.ini index a45d05e383171..59fe55dbff085 100644 --- a/language/en-GB/en-GB.com_ajax.ini +++ b/language/en-GB/en-GB.com_ajax.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.com_config.ini b/language/en-GB/en-GB.com_config.ini index ff58c43680cf7..a4ca606796d74 100644 --- a/language/en-GB/en-GB.com_config.ini +++ b/language/en-GB/en-GB.com_config.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.com_contact.ini b/language/en-GB/en-GB.com_contact.ini index 826042703ec10..f70b12754503b 100644 --- a/language/en-GB/en-GB.com_contact.ini +++ b/language/en-GB/en-GB.com_contact.ini @@ -1,21 +1,22 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 - COM_CONTACT_ADDRESS="Address" COM_CONTACT_ARTICLES_HEADING="Contact's articles" COM_CONTACT_CAPTCHA_LABEL="Captcha" COM_CONTACT_CAPTCHA_DESC="Type in the textbox what you see in the image." COM_CONTACT_CAT_NUM="# of Contacts :" +COM_CONTACT_CONTACT_DEFAULT_LABEL="Send an Email" COM_CONTACT_CONTACT_EMAIL_A_COPY_DESC="Sends a copy of the message to the address you have supplied." -COM_CONTACT_CONTACT_EMAIL_A_COPY_LABEL="Send Copy to Yourself" +COM_CONTACT_CONTACT_EMAIL_A_COPY_LABEL="Send copy to yourself" COM_CONTACT_CONTACT_EMAIL_NAME_DESC="Your name." COM_CONTACT_CONTACT_EMAIL_NAME_LABEL="Name" COM_CONTACT_CONTACT_ENTER_MESSAGE_DESC="Enter your message here." COM_CONTACT_CONTACT_ENTER_MESSAGE_LABEL="Message" COM_CONTACT_CONTACT_ENTER_VALID_EMAIL="Please enter a valid email address." +COM_CONTACT_CONTACT_REQUIRED="* Required field" COM_CONTACT_CONTENT_TYPE_CONTACT="Contact" COM_CONTACT_CONTENT_TYPE_CATEGORY="Contact Category" COM_CONTACT_FILTER_LABEL="Filter Field" diff --git a/language/en-GB/en-GB.com_content.ini b/language/en-GB/en-GB.com_content.ini index f9a3d6a5dc386..0862862cd8030 100644 --- a/language/en-GB/en-GB.com_content.ini +++ b/language/en-GB/en-GB.com_content.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.com_finder.ini b/language/en-GB/en-GB.com_finder.ini index a06dd8cee3a04..813f40084da9b 100644 --- a/language/en-GB/en-GB.com_finder.ini +++ b/language/en-GB/en-GB.com_finder.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.com_mailto.ini b/language/en-GB/en-GB.com_mailto.ini index e6da73f2b9267..20603adde1eb9 100644 --- a/language/en-GB/en-GB.com_mailto.ini +++ b/language/en-GB/en-GB.com_mailto.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.com_media.ini b/language/en-GB/en-GB.com_media.ini index 88916203002b8..9a44dce5f3e27 100644 --- a/language/en-GB/en-GB.com_media.ini +++ b/language/en-GB/en-GB.com_media.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.com_messages.ini b/language/en-GB/en-GB.com_messages.ini index 18c787239549f..eaf78644889e7 100644 --- a/language/en-GB/en-GB.com_messages.ini +++ b/language/en-GB/en-GB.com_messages.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.com_newsfeeds.ini b/language/en-GB/en-GB.com_newsfeeds.ini index 2d7212eef6811..705509b2f9c8e 100644 --- a/language/en-GB/en-GB.com_newsfeeds.ini +++ b/language/en-GB/en-GB.com_newsfeeds.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.com_search.ini b/language/en-GB/en-GB.com_search.ini index 23f3735486f19..fc5ff02e3e097 100644 --- a/language/en-GB/en-GB.com_search.ini +++ b/language/en-GB/en-GB.com_search.ini @@ -1,5 +1,5 @@ ; author Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; license GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.com_tags.ini b/language/en-GB/en-GB.com_tags.ini index ffde34f5d6336..a629e6f4b98aa 100644 --- a/language/en-GB/en-GB.com_tags.ini +++ b/language/en-GB/en-GB.com_tags.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -9,4 +9,5 @@ COM_TAGS_MODIFIED_DATE="Modified Date" COM_TAGS_NO_ITEMS="No matching items were found." COM_TAGS_NO_TAGS="There are no tags." COM_TAGS_PUBLISHED_DATE="Published Date" +COM_TAGS_TAG_NOT_FOUND="Tag not found." COM_TAGS_TITLE_FILTER_LABEL="Enter Part of Title" \ No newline at end of file diff --git a/language/en-GB/en-GB.com_users.ini b/language/en-GB/en-GB.com_users.ini index 669f7edb30bc9..018ee97f90ef6 100644 --- a/language/en-GB/en-GB.com_users.ini +++ b/language/en-GB/en-GB.com_users.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.com_weblinks.ini b/language/en-GB/en-GB.com_weblinks.ini index fe54510f6020d..61e1292d6657b 100644 --- a/language/en-GB/en-GB.com_weblinks.ini +++ b/language/en-GB/en-GB.com_weblinks.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.com_wrapper.ini b/language/en-GB/en-GB.com_wrapper.ini index 8c83a953c5592..1f3de85914bc9 100644 --- a/language/en-GB/en-GB.com_wrapper.ini +++ b/language/en-GB/en-GB.com_wrapper.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.files_joomla.sys.ini b/language/en-GB/en-GB.files_joomla.sys.ini index 5beb81914bb0f..c2aed062d820d 100644 --- a/language/en-GB/en-GB.files_joomla.sys.ini +++ b/language/en-GB/en-GB.files_joomla.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.finder_cli.ini b/language/en-GB/en-GB.finder_cli.ini index 01e009c3ff21b..6af1dd0b0bd97 100644 --- a/language/en-GB/en-GB.finder_cli.ini +++ b/language/en-GB/en-GB.finder_cli.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.ini b/language/en-GB/en-GB.ini index 5cd00733f1dc6..bef1b624aa85a 100644 --- a/language/en-GB/en-GB.ini +++ b/language/en-GB/en-GB.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -62,7 +62,7 @@ JEXPIRED="Expired" JFALSE="False" JFEATURED="Featured" JHIDE="Hide" -JINVALID_TOKEN="Invalid Token" +JINVALID_TOKEN="The most recent request was denied because it contained an invalid security token. Please refresh the page and try again." JLOGIN="Log in" JLOGOUT="Log out" JNEW="New" @@ -87,7 +87,7 @@ JSITE="Site" JSTATUS="Status" JSUBMIT="Submit" JTAG="Tags" -JTAG_DESC="Add and delete tags to an item." +JTAG_DESC="Assign tags to content items. You may select a tag from the pre-defined list or enter a new tag by typing the name in the field and pressing enter." JTOOLBAR_VERSIONS="Versions" JTRASH="Trash" JTRASHED="Trashed" @@ -123,6 +123,7 @@ JERROR_LAYOUT_YOU_HAVE_NO_ACCESS_TO_THIS_PAGE="you have no accessDatabase Fixer." JLIB_DATABASE_ERROR_DELETE_CATEGORY="Left-Right data inconsistency. Can't delete category." JLIB_DATABASE_ERROR_DELETE_FAILED="%s: :delete failed - %s" JLIB_DATABASE_ERROR_DELETE_ROOT_CATEGORIES="Root categories can't be deleted." @@ -304,6 +305,7 @@ JLIB_FORM_VALIDATE_FIELD_INVALID="Invalid field: %s" JLIB_FORM_VALIDATE_FIELD_REQUIRED="Field required: %s" JLIB_FORM_VALIDATE_FIELD_RULE_MISSING="Validation Rule missing: %s" JLIB_FORM_VALUE_CACHE_APC="Alternative PHP Cache" +JLIB_FORM_VALUE_CACHE_APCU="APC User Cache" JLIB_FORM_VALUE_CACHE_CACHELITE="Cache_Lite" JLIB_FORM_VALUE_CACHE_EACCELERATOR="eAccelerator" JLIB_FORM_VALUE_CACHE_FILE="File" @@ -317,7 +319,7 @@ JLIB_FORM_VALUE_SESSION_DATABASE="Database" JLIB_FORM_VALUE_SESSION_EACCELERATOR="eAccelerator" JLIB_FORM_VALUE_SESSION_MEMCACHE="Memcache" JLIB_FORM_VALUE_SESSION_MEMCACHED="Memcached (Experimental)" -JLIB_FORM_VALUE_SESSION_NONE="None" +JLIB_FORM_VALUE_SESSION_NONE="PHP" JLIB_FORM_VALUE_SESSION_WINCACHE="Windows Cache" JLIB_FORM_VALUE_SESSION_XCACHE="XCache" JLIB_FORM_VALUE_TIMEZONE_UTC="Universal Time, Coordinated (UTC)" @@ -625,7 +627,7 @@ JLIB_MEDIA_ERROR_WARNINVALID_IMG="Not a valid image." JLIB_MEDIA_ERROR_WARNINVALID_MIME="Illegal or invalid mime type detected." JLIB_MEDIA_ERROR_WARNNOTADMIN="Uploaded file is not an image file and you do not have permission." -JLIB_NO_EDITOR_PLUGIN_PUBLISHED="We can't show an editor because no editor plugin is published." +JLIB_NO_EDITOR_PLUGIN_PUBLISHED="Unable to display an editor because no editor plugin is published." JLIB_PLUGIN_ERROR_LOADING_PLUGINS="Error loading Plugins: %s" JLIB_REGISTRY_EXCEPTION_LOAD_FORMAT_CLASS="Unable to load format class." @@ -635,6 +637,7 @@ JLIB_RULES_ALLOWED="Allowed" JLIB_RULES_ALLOWED_ADMIN="Allowed (Super User)" JLIB_RULES_CALCULATED_SETTING="Calculated Setting 2" JLIB_RULES_CONFLICT="Conflict" +JLIB_RULES_DATABASE_FAILURE="Failed storing the data to the database." JLIB_RULES_DENIED="Denied" JLIB_RULES_GROUP="%s" JLIB_RULES_GROUPS="Groups" @@ -644,6 +647,8 @@ JLIB_RULES_NOT_ALLOWED="Not Allowed." JLIB_RULES_NOT_ALLOWED_ADMIN_CONFLICT="Conflict" JLIB_RULES_NOT_ALLOWED_LOCKED="Not Allowed (Locked)" JLIB_RULES_NOT_SET="Not Set" +JLIB_RULES_REQUEST_FAILURE="Failed sending the data to server." +JLIB_RULES_SAVE_BEFORE_CHANGE_PERMISSIONS="Please save before changing permissions." JLIB_RULES_SELECT_ALLOW_DENY_GROUP="Allow or deny %s for users in the %s group." JLIB_RULES_SELECT_SETTING="Select New Setting 1" JLIB_RULES_SETTING_NOTES="1. If you change the setting, it will apply to this and all child groups, components and content. Note that Denied will overrule any inherited setting and also the setting in any child group, component or content. In the case of a setting conflict, Deny will take precedence. Not Set is equivalent to Denied but can be changed in child groups, components and content.
    2. If you select a new setting, select Save to refresh the calculated settings." diff --git a/language/en-GB/en-GB.lib_joomla.sys.ini b/language/en-GB/en-GB.lib_joomla.sys.ini index fd4562264b5c0..63bf3fe67b3f8 100644 --- a/language/en-GB/en-GB.lib_joomla.sys.ini +++ b/language/en-GB/en-GB.lib_joomla.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.lib_phpass.sys.ini b/language/en-GB/en-GB.lib_phpass.sys.ini index 2379abda7d713..0a71e680b2e8b 100644 --- a/language/en-GB/en-GB.lib_phpass.sys.ini +++ b/language/en-GB/en-GB.lib_phpass.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.lib_phputf8.sys.ini b/language/en-GB/en-GB.lib_phputf8.sys.ini index 254749f6ef609..731abfd2b36de 100644 --- a/language/en-GB/en-GB.lib_phputf8.sys.ini +++ b/language/en-GB/en-GB.lib_phputf8.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.lib_simplepie.sys.ini b/language/en-GB/en-GB.lib_simplepie.sys.ini index 2e0744fa48058..e99a5ead9257f 100644 --- a/language/en-GB/en-GB.lib_simplepie.sys.ini +++ b/language/en-GB/en-GB.lib_simplepie.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.localise.php b/language/en-GB/en-GB.localise.php index 449b10253628b..44a7c8cc52c78 100644 --- a/language/en-GB/en-GB.localise.php +++ b/language/en-GB/en-GB.localise.php @@ -2,7 +2,7 @@ /** * @package Joomla.Language * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/language/en-GB/en-GB.mod_articles_archive.ini b/language/en-GB/en-GB.mod_articles_archive.ini index 9d8f04fb850a6..0fa8056e1df2d 100644 --- a/language/en-GB/en-GB.mod_articles_archive.ini +++ b/language/en-GB/en-GB.mod_articles_archive.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_articles_archive.sys.ini b/language/en-GB/en-GB.mod_articles_archive.sys.ini index da5d75f656cad..66d9bb4a785d2 100644 --- a/language/en-GB/en-GB.mod_articles_archive.sys.ini +++ b/language/en-GB/en-GB.mod_articles_archive.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_articles_categories.ini b/language/en-GB/en-GB.mod_articles_categories.ini index 00f6e829457d6..b7d026dc15fec 100644 --- a/language/en-GB/en-GB.mod_articles_categories.ini +++ b/language/en-GB/en-GB.mod_articles_categories.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_articles_categories.sys.ini b/language/en-GB/en-GB.mod_articles_categories.sys.ini index c3686389fcdef..3103237d14acb 100644 --- a/language/en-GB/en-GB.mod_articles_categories.sys.ini +++ b/language/en-GB/en-GB.mod_articles_categories.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_articles_category.ini b/language/en-GB/en-GB.mod_articles_category.ini index 3bb04a77296fa..ecd90f1b6e4d9 100644 --- a/language/en-GB/en-GB.mod_articles_category.ini +++ b/language/en-GB/en-GB.mod_articles_category.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -87,6 +87,7 @@ MOD_ARTICLES_CATEGORY_OPTION_OFF_VALUE="Off" MOD_ARTICLES_CATEGORY_OPTION_ONLYFEATURED_VALUE="Only" MOD_ARTICLES_CATEGORY_OPTION_ORDERING_VALUE="Article Order" MOD_ARTICLES_CATEGORY_OPTION_ORDERINGFEATURED_VALUE="Featured Articles Order" +MOD_ARTICLES_CATEGORY_OPTION_RANDOM_VALUE="Random" MOD_ARTICLES_CATEGORY_OPTION_RELATIVEDAY_VALUE="Relative Date" MOD_ARTICLES_CATEGORY_OPTION_STARTPUBLISHING_VALUE="Start Publishing Date" MOD_ARTICLES_CATEGORY_OPTION_FINISHPUBLISHING_VALUE="Finish Publishing Date" diff --git a/language/en-GB/en-GB.mod_articles_category.sys.ini b/language/en-GB/en-GB.mod_articles_category.sys.ini index cb63ac69ea638..3d7ca5b4b9b83 100644 --- a/language/en-GB/en-GB.mod_articles_category.sys.ini +++ b/language/en-GB/en-GB.mod_articles_category.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_articles_latest.ini b/language/en-GB/en-GB.mod_articles_latest.ini index ed75d055315e9..ccc39e6665804 100644 --- a/language/en-GB/en-GB.mod_articles_latest.ini +++ b/language/en-GB/en-GB.mod_articles_latest.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_articles_latest.sys.ini b/language/en-GB/en-GB.mod_articles_latest.sys.ini index 8263a48ad08b7..2ffddc052afa3 100644 --- a/language/en-GB/en-GB.mod_articles_latest.sys.ini +++ b/language/en-GB/en-GB.mod_articles_latest.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_articles_news.ini b/language/en-GB/en-GB.mod_articles_news.ini index b2e82d1ac89c3..e48458414ea89 100644 --- a/language/en-GB/en-GB.mod_articles_news.ini +++ b/language/en-GB/en-GB.mod_articles_news.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_articles_news.sys.ini b/language/en-GB/en-GB.mod_articles_news.sys.ini index 86b053682af2a..d101849609b84 100644 --- a/language/en-GB/en-GB.mod_articles_news.sys.ini +++ b/language/en-GB/en-GB.mod_articles_news.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_articles_popular.ini b/language/en-GB/en-GB.mod_articles_popular.ini index 1d936dc64ee4f..2c6d5affb14c1 100644 --- a/language/en-GB/en-GB.mod_articles_popular.ini +++ b/language/en-GB/en-GB.mod_articles_popular.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_articles_popular.sys.ini b/language/en-GB/en-GB.mod_articles_popular.sys.ini index ee05465bdd28f..23e542cb5d559 100644 --- a/language/en-GB/en-GB.mod_articles_popular.sys.ini +++ b/language/en-GB/en-GB.mod_articles_popular.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_banners.ini b/language/en-GB/en-GB.mod_banners.ini index e8eda8ca71861..6731aff219fc9 100644 --- a/language/en-GB/en-GB.mod_banners.ini +++ b/language/en-GB/en-GB.mod_banners.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_banners.sys.ini b/language/en-GB/en-GB.mod_banners.sys.ini index 8f683b8b44067..6a3037f3e7ec9 100644 --- a/language/en-GB/en-GB.mod_banners.sys.ini +++ b/language/en-GB/en-GB.mod_banners.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_breadcrumbs.ini b/language/en-GB/en-GB.mod_breadcrumbs.ini index aa826c78fc0cf..dac51a3193f6a 100644 --- a/language/en-GB/en-GB.mod_breadcrumbs.ini +++ b/language/en-GB/en-GB.mod_breadcrumbs.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_breadcrumbs.sys.ini b/language/en-GB/en-GB.mod_breadcrumbs.sys.ini index b82d50fb465fd..7ef2608cda57f 100644 --- a/language/en-GB/en-GB.mod_breadcrumbs.sys.ini +++ b/language/en-GB/en-GB.mod_breadcrumbs.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_custom.ini b/language/en-GB/en-GB.mod_custom.ini index 6c15714623d79..ef0ed661d5ffb 100644 --- a/language/en-GB/en-GB.mod_custom.ini +++ b/language/en-GB/en-GB.mod_custom.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_custom.sys.ini b/language/en-GB/en-GB.mod_custom.sys.ini index fe595fcc0a06e..8166663b9352a 100644 --- a/language/en-GB/en-GB.mod_custom.sys.ini +++ b/language/en-GB/en-GB.mod_custom.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_feed.ini b/language/en-GB/en-GB.mod_feed.ini index 8758e27455206..87753ffb85e97 100644 --- a/language/en-GB/en-GB.mod_feed.ini +++ b/language/en-GB/en-GB.mod_feed.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_feed.sys.ini b/language/en-GB/en-GB.mod_feed.sys.ini index 45f2355934204..8787cca723610 100644 --- a/language/en-GB/en-GB.mod_feed.sys.ini +++ b/language/en-GB/en-GB.mod_feed.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_finder.ini b/language/en-GB/en-GB.mod_finder.ini index c05df5456a6fc..990d7c0030787 100644 --- a/language/en-GB/en-GB.mod_finder.ini +++ b/language/en-GB/en-GB.mod_finder.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_finder.sys.ini b/language/en-GB/en-GB.mod_finder.sys.ini index 7db5c410138db..a7a48a00ce4d3 100644 --- a/language/en-GB/en-GB.mod_finder.sys.ini +++ b/language/en-GB/en-GB.mod_finder.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_footer.ini b/language/en-GB/en-GB.mod_footer.ini index 351a3c19dbece..0399657c70105 100644 --- a/language/en-GB/en-GB.mod_footer.ini +++ b/language/en-GB/en-GB.mod_footer.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 ; Note : %date% will be auto replaced by current year !Don't translate diff --git a/language/en-GB/en-GB.mod_footer.sys.ini b/language/en-GB/en-GB.mod_footer.sys.ini index bd53fd79ab09d..0d2dfcf3ff667 100644 --- a/language/en-GB/en-GB.mod_footer.sys.ini +++ b/language/en-GB/en-GB.mod_footer.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 ; Note : %date% will be auto replaced by current year !Don't translate diff --git a/language/en-GB/en-GB.mod_languages.ini b/language/en-GB/en-GB.mod_languages.ini index c40c15a542e5b..699573e56e877 100644 --- a/language/en-GB/en-GB.mod_languages.ini +++ b/language/en-GB/en-GB.mod_languages.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_languages.sys.ini b/language/en-GB/en-GB.mod_languages.sys.ini index 68923d407bc56..2484ad2ba6bcb 100644 --- a/language/en-GB/en-GB.mod_languages.sys.ini +++ b/language/en-GB/en-GB.mod_languages.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_login.ini b/language/en-GB/en-GB.mod_login.ini index b28b578992acc..c7c54394e7cea 100644 --- a/language/en-GB/en-GB.mod_login.ini +++ b/language/en-GB/en-GB.mod_login.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_login.sys.ini b/language/en-GB/en-GB.mod_login.sys.ini index 296dea7f68332..745c1baaff3f8 100644 --- a/language/en-GB/en-GB.mod_login.sys.ini +++ b/language/en-GB/en-GB.mod_login.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_menu.ini b/language/en-GB/en-GB.mod_menu.ini index 6ed38527235bc..550b176282e33 100644 --- a/language/en-GB/en-GB.mod_menu.ini +++ b/language/en-GB/en-GB.mod_menu.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_menu.sys.ini b/language/en-GB/en-GB.mod_menu.sys.ini index e0641543fcd4d..94bb183c71548 100644 --- a/language/en-GB/en-GB.mod_menu.sys.ini +++ b/language/en-GB/en-GB.mod_menu.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_random_image.ini b/language/en-GB/en-GB.mod_random_image.ini index b220117ea1c59..31779f7be6192 100644 --- a/language/en-GB/en-GB.mod_random_image.ini +++ b/language/en-GB/en-GB.mod_random_image.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_random_image.sys.ini b/language/en-GB/en-GB.mod_random_image.sys.ini index f8861a9c0cb81..e7a1608b0cf77 100644 --- a/language/en-GB/en-GB.mod_random_image.sys.ini +++ b/language/en-GB/en-GB.mod_random_image.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_related_items.ini b/language/en-GB/en-GB.mod_related_items.ini index 8bfba69cbd0cd..2c178201c9b8c 100644 --- a/language/en-GB/en-GB.mod_related_items.ini +++ b/language/en-GB/en-GB.mod_related_items.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_related_items.sys.ini b/language/en-GB/en-GB.mod_related_items.sys.ini index 457b40f31a57b..9c49a94f8bcca 100644 --- a/language/en-GB/en-GB.mod_related_items.sys.ini +++ b/language/en-GB/en-GB.mod_related_items.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_search.ini b/language/en-GB/en-GB.mod_search.ini index 67946060a8889..903469ea02392 100644 --- a/language/en-GB/en-GB.mod_search.ini +++ b/language/en-GB/en-GB.mod_search.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_search.sys.ini b/language/en-GB/en-GB.mod_search.sys.ini index 20decbe4ce7c6..32a949ec1a2ad 100644 --- a/language/en-GB/en-GB.mod_search.sys.ini +++ b/language/en-GB/en-GB.mod_search.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_stats.ini b/language/en-GB/en-GB.mod_stats.ini index 4392a091caf8c..e04f930068b1f 100644 --- a/language/en-GB/en-GB.mod_stats.ini +++ b/language/en-GB/en-GB.mod_stats.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_stats.sys.ini b/language/en-GB/en-GB.mod_stats.sys.ini index a9155b4bb5bc8..b8b161085d186 100644 --- a/language/en-GB/en-GB.mod_stats.sys.ini +++ b/language/en-GB/en-GB.mod_stats.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_syndicate.ini b/language/en-GB/en-GB.mod_syndicate.ini index fe0ad750d5805..7e75565c20ca3 100644 --- a/language/en-GB/en-GB.mod_syndicate.ini +++ b/language/en-GB/en-GB.mod_syndicate.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_syndicate.sys.ini b/language/en-GB/en-GB.mod_syndicate.sys.ini index f2af1bd236512..a4c23de52d839 100644 --- a/language/en-GB/en-GB.mod_syndicate.sys.ini +++ b/language/en-GB/en-GB.mod_syndicate.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_tags_popular.ini b/language/en-GB/en-GB.mod_tags_popular.ini index 09ec5678ee2c8..ea73f1b1b9d4f 100644 --- a/language/en-GB/en-GB.mod_tags_popular.ini +++ b/language/en-GB/en-GB.mod_tags_popular.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_tags_popular.sys.ini b/language/en-GB/en-GB.mod_tags_popular.sys.ini index 82d8ebcd338bf..0cb5653aad460 100644 --- a/language/en-GB/en-GB.mod_tags_popular.sys.ini +++ b/language/en-GB/en-GB.mod_tags_popular.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_tags_similar.ini b/language/en-GB/en-GB.mod_tags_similar.ini index 30c4f992a6235..94cf6a3d3cd5c 100644 --- a/language/en-GB/en-GB.mod_tags_similar.ini +++ b/language/en-GB/en-GB.mod_tags_similar.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_tags_similar.sys.ini b/language/en-GB/en-GB.mod_tags_similar.sys.ini index 7cfc3c7ad0cdc..6c2f3c2e53c01 100644 --- a/language/en-GB/en-GB.mod_tags_similar.sys.ini +++ b/language/en-GB/en-GB.mod_tags_similar.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_users_latest.ini b/language/en-GB/en-GB.mod_users_latest.ini index ebf84889b631e..4a497cddd6828 100644 --- a/language/en-GB/en-GB.mod_users_latest.ini +++ b/language/en-GB/en-GB.mod_users_latest.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_users_latest.sys.ini b/language/en-GB/en-GB.mod_users_latest.sys.ini index 87dd18a4d62f6..cfdfbc1ead330 100644 --- a/language/en-GB/en-GB.mod_users_latest.sys.ini +++ b/language/en-GB/en-GB.mod_users_latest.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_weblinks.ini b/language/en-GB/en-GB.mod_weblinks.ini index 19233b5b5f420..35520092f19aa 100644 --- a/language/en-GB/en-GB.mod_weblinks.ini +++ b/language/en-GB/en-GB.mod_weblinks.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_weblinks.sys.ini b/language/en-GB/en-GB.mod_weblinks.sys.ini index f3147d1b4512c..a49b5a99ea7ee 100644 --- a/language/en-GB/en-GB.mod_weblinks.sys.ini +++ b/language/en-GB/en-GB.mod_weblinks.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_whosonline.ini b/language/en-GB/en-GB.mod_whosonline.ini index 9bdde63f35fc6..0160ff6ea9b5c 100644 --- a/language/en-GB/en-GB.mod_whosonline.ini +++ b/language/en-GB/en-GB.mod_whosonline.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 MOD_WHOSONLINE="Who's Online" diff --git a/language/en-GB/en-GB.mod_whosonline.sys.ini b/language/en-GB/en-GB.mod_whosonline.sys.ini index 653fab2a0a64a..c25a45a010342 100644 --- a/language/en-GB/en-GB.mod_whosonline.sys.ini +++ b/language/en-GB/en-GB.mod_whosonline.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_wrapper.ini b/language/en-GB/en-GB.mod_wrapper.ini index 0986e076f2f9f..f2453602ecb74 100644 --- a/language/en-GB/en-GB.mod_wrapper.ini +++ b/language/en-GB/en-GB.mod_wrapper.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.mod_wrapper.sys.ini b/language/en-GB/en-GB.mod_wrapper.sys.ini index 29fc10bffe001..b0a94a82be32f 100644 --- a/language/en-GB/en-GB.mod_wrapper.sys.ini +++ b/language/en-GB/en-GB.mod_wrapper.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.tpl_beez3.ini b/language/en-GB/en-GB.tpl_beez3.ini index 5eda6a9062548..cb7c2b0955f70 100644 --- a/language/en-GB/en-GB.tpl_beez3.ini +++ b/language/en-GB/en-GB.tpl_beez3.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.tpl_beez3.sys.ini b/language/en-GB/en-GB.tpl_beez3.sys.ini index 36bbf509a139e..2c74c440118e2 100644 --- a/language/en-GB/en-GB.tpl_beez3.sys.ini +++ b/language/en-GB/en-GB.tpl_beez3.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 diff --git a/language/en-GB/en-GB.tpl_protostar.ini b/language/en-GB/en-GB.tpl_protostar.ini index 92ec745f14b2d..0d7ec7e1e582d 100644 --- a/language/en-GB/en-GB.tpl_protostar.ini +++ b/language/en-GB/en-GB.tpl_protostar.ini @@ -1,9 +1,9 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 -TPL_PROTOSTAR_XML_DESCRIPTION="Continuing the space theme (Solarflare from 1.0 and Milkyway from 1.5), Protostar is the Joomla 3 site template based on Bootstrap from Twitter and the launch of the Joomla User Interface library (JUI)." +TPL_PROTOSTAR_XML_DESCRIPTION="Continuing the space theme (Solarflare from 1.0 and Milkyway from 1.5), Protostar is the Joomla 3 site template based on Bootstrap and the launch of the Joomla User Interface library (JUI)." TPL_PROTOSTAR_BACKGROUND_COLOR_DESC="Choose a background colour for static layouts. If left blank the Default (#f4f6f7) is used." TPL_PROTOSTAR_BACKGROUND_COLOR_LABEL="Background Colour" diff --git a/language/en-GB/en-GB.tpl_protostar.sys.ini b/language/en-GB/en-GB.tpl_protostar.sys.ini index 18ff60c7c05f6..223aae8ef0a5b 100644 --- a/language/en-GB/en-GB.tpl_protostar.sys.ini +++ b/language/en-GB/en-GB.tpl_protostar.sys.ini @@ -1,5 +1,5 @@ ; Joomla! Project -; Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. +; Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php ; Note : All ini files need to be saved as UTF-8 @@ -22,4 +22,4 @@ TPL_PROTOSTAR_POSITION_POSITION-7="Right" TPL_PROTOSTAR_POSITION_POSITION-8="Left" TPL_PROTOSTAR_POSITION_POSITION-9="Unused" TPL_PROTOSTAR_POSITION_FOOTER="Footer" -TPL_PROTOSTAR_XML_DESCRIPTION="Continuing the space theme (Solarflare from 1.0 and Milkyway from 1.5), Protostar is the Joomla 3 site template based on Bootstrap from Twitter and the launch of the Joomla User Interface library (JUI)." +TPL_PROTOSTAR_XML_DESCRIPTION="Continuing the space theme (Solarflare from 1.0 and Milkyway from 1.5), Protostar is the Joomla 3 site template based on Bootstrap and the launch of the Joomla User Interface library (JUI)." diff --git a/language/en-GB/en-GB.xml b/language/en-GB/en-GB.xml index 2750ff289c614..423796c0a5c2a 100644 --- a/language/en-GB/en-GB.xml +++ b/language/en-GB/en-GB.xml @@ -1,12 +1,12 @@ - + English (en-GB) - 3.4.6 - 2013-03-07 + 3.5.2 + April 2016 Joomla! Project admin@joomla.org www.joomla.org - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt en-GB site language diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml index 470747b847dc3..7fab36e319313 100644 --- a/language/en-GB/install.xml +++ b/language/en-GB/install.xml @@ -1,13 +1,13 @@ - + English (United Kingdom) en-GB - 3.4.6 + 3.5.2 2013-03-07 Joomla! Project admin@joomla.org www.joomla.org - Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved. + Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt en-GB site language diff --git a/layouts/joomla/content/associations.php b/layouts/joomla/content/associations.php index 444dc7655e0cb..9da0b950063d7 100644 --- a/layouts/joomla/content/associations.php +++ b/layouts/joomla/content/associations.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/content/blog_style_default_item_title.php b/layouts/joomla/content/blog_style_default_item_title.php index d4b75ff22da49..68c25c2139772 100644 --- a/layouts/joomla/content/blog_style_default_item_title.php +++ b/layouts/joomla/content/blog_style_default_item_title.php @@ -3,11 +3,11 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ -defined('_JEXEC') or die; +defined('JPATH_BASE') or die; // Create a shortcut for params. $params = $displayData->params; diff --git a/layouts/joomla/content/blog_style_default_links.php b/layouts/joomla/content/blog_style_default_links.php index c31ffd3e7fb83..a4bb9b5d31569 100644 --- a/layouts/joomla/content/blog_style_default_links.php +++ b/layouts/joomla/content/blog_style_default_links.php @@ -3,11 +3,11 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ -defined('_JEXEC') or die; +defined('JPATH_BASE') or die; ?>
      get('link_items') as $item) : ?> diff --git a/layouts/joomla/content/categories_default.php b/layouts/joomla/content/categories_default.php index 6fe87c7e25ef9..ea581fdd4b494 100644 --- a/layouts/joomla/content/categories_default.php +++ b/layouts/joomla/content/categories_default.php @@ -3,11 +3,11 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ -defined('_JEXEC') or die; +defined('JPATH_BASE') or die; ?> params->get('show_page_heading')) : ?> diff --git a/layouts/joomla/content/categories_default_items.php b/layouts/joomla/content/categories_default_items.php index cdd445ebdc58a..972c8ae960be6 100644 --- a/layouts/joomla/content/categories_default_items.php +++ b/layouts/joomla/content/categories_default_items.php @@ -3,11 +3,11 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ -defined('_JEXEC') or die; +defined('JPATH_BASE') or die; $class = ' class="first"'; JHtml::_('bootstrap.tooltip'); diff --git a/layouts/joomla/content/category_default.php b/layouts/joomla/content/category_default.php index 96ce2012c8893..0e72e65ea227a 100644 --- a/layouts/joomla/content/category_default.php +++ b/layouts/joomla/content/category_default.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/content/icons.php b/layouts/joomla/content/icons.php index b54e78f40ac57..70acbf0956948 100644 --- a/layouts/joomla/content/icons.php +++ b/layouts/joomla/content/icons.php @@ -3,7 +3,7 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ diff --git a/layouts/joomla/content/info_block/author.php b/layouts/joomla/content/info_block/author.php index 66b97a9256044..8c8d332e92b0d 100644 --- a/layouts/joomla/content/info_block/author.php +++ b/layouts/joomla/content/info_block/author.php @@ -3,14 +3,14 @@ * @package Joomla.Site * @subpackage Layout * - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ defined('JPATH_BASE') or die; ?> -
    "+(g.ie?" ":"
    ")+"
    ",e.undoManager.transact(function(){e.insertContent(f),h=e.dom.get("__mce"),e.dom.setAttrib(h,"id",null),e.dom.setAttribs(h,e.settings.table_default_attributes||{}),e.dom.setStyles(h,e.settings.table_default_styles||{})}),h}function i(a,b){function c(){a.disabled(!e.dom.getParent(e.selection.getStart(),b)),e.selection.selectorChanged(b,function(b){a.disabled(!b)})}e.initialized?c():e.on("init",c)}function k(){i(this,"table")}function l(){i(this,"td,th")}function m(){var a="";a='';for(var b=0;10>b;b++){a+="";for(var c=0;10>c;c++)a+='';a+=""}return a+="
    ",a+=''}function n(a,b,c){var d,f,g,h,i,j=c.getEl().getElementsByTagName("table")[0],k=c.isRtl()||"tl-tr"==c.parent().rel;for(j.nextSibling.innerHTML=a+1+" x "+(b+1),k&&(a=9-a),f=0;10>f;f++)for(d=0;10>d;d++)h=j.rows[f].childNodes[d].firstChild,i=(k?d>=a:a>=d)&&b>=f,e.dom.toggleClass(h,"mce-active",i),i&&(g=h);return g.parentNode}var o,p=this,q=new d(e);e.settings.table_grid===!1?e.addMenuItem("inserttable",{text:"Insert table",icon:"table",context:"table",onclick:q.table}):e.addMenuItem("inserttable",{text:"Insert table",icon:"table",context:"table",ariaHideMenu:!0,onclick:function(a){a.aria&&(this.parent().hideAll(),a.stopImmediatePropagation(),q.table())},onshow:function(){n(0,0,this.menu.items()[0])},onhide:function(){var a=this.menu.items()[0].getEl().getElementsByTagName("a");e.dom.removeClass(a,"mce-active"),e.dom.addClass(a[0],"mce-active")},menu:[{type:"container",html:m(),onPostRender:function(){this.lastX=this.lastY=0},onmousemove:function(a){var b,c,d=a.target;"A"==d.tagName.toUpperCase()&&(b=parseInt(d.getAttribute("data-mce-x"),10),c=parseInt(d.getAttribute("data-mce-y"),10),(this.isRtl()||"tl-tr"==this.parent().rel)&&(b=9-b),(b!==this.lastX||c!==this.lastY)&&(n(b,c,a.control),this.lastX=b,this.lastY=c))},onclick:function(a){var b=this;"A"==a.target.tagName.toUpperCase()&&(a.preventDefault(),a.stopPropagation(),b.parent().cancel(),e.undoManager.transact(function(){h(b.lastX+1,b.lastY+1)}),e.addVisual())}}]}),e.addMenuItem("tableprops",{text:"Table properties",context:"table",onPostRender:k,onclick:q.tableProps}),e.addMenuItem("deletetable",{text:"Delete table",context:"table",onPostRender:k,cmd:"mceTableDelete"}),e.addMenuItem("cell",{separator:"before",text:"Cell",context:"table",menu:[{text:"Cell properties",onclick:f("mceTableCellProps"),onPostRender:l},{text:"Merge cells",onclick:f("mceTableMergeCells"),onPostRender:l},{text:"Split cell",onclick:f("mceTableSplitCells"),onPostRender:l}]}),e.addMenuItem("row",{text:"Row",context:"table",menu:[{text:"Insert row before",onclick:f("mceTableInsertRowBefore"),onPostRender:l},{text:"Insert row after",onclick:f("mceTableInsertRowAfter"),onPostRender:l},{text:"Delete row",onclick:f("mceTableDeleteRow"),onPostRender:l},{text:"Row properties",onclick:f("mceTableRowProps"),onPostRender:l},{text:"-"},{text:"Cut row",onclick:f("mceTableCutRow"),onPostRender:l},{text:"Copy row",onclick:f("mceTableCopyRow"),onPostRender:l},{text:"Paste row before",onclick:f("mceTablePasteRowBefore"),onPostRender:l},{text:"Paste row after",onclick:f("mceTablePasteRowAfter"),onPostRender:l}]}),e.addMenuItem("column",{text:"Column",context:"table",menu:[{text:"Insert column before",onclick:f("mceTableInsertColBefore"),onPostRender:l},{text:"Insert column after",onclick:f("mceTableInsertColAfter"),onPostRender:l},{text:"Delete column",onclick:f("mceTableDeleteCol"),onPostRender:l}]});var r=[];j("inserttable tableprops deletetable | cell row column".split(" "),function(a){"|"==a?r.push({text:"-"}):r.push(e.menuItems[a])}),e.addButton("table",{type:"menubutton",title:"Table",menu:r}),g.isIE||e.on("click",function(a){a=a.target,"TABLE"===a.nodeName&&(e.selection.select(a),e.nodeChanged())}),p.quirks=new b(e),e.on("Init",function(){p.cellSelection=new c(e)}),e.on("PreInit",function(){e.serializer.addAttributeFilter("data-mce-cell-padding,data-mce-border,data-mce-border-color",function(a,b){for(var c=a.length;c--;)a[c].attr(b,null)})}),j({mceTableSplitCells:function(a){a.split()},mceTableMergeCells:function(a){var b;b=e.dom.getParent(e.selection.getStart(),"th,td"),e.dom.select("td.mce-item-selected,th.mce-item-selected").length?a.merge():q.merge(a,b)},mceTableInsertRowBefore:function(a){a.insertRow(!0)},mceTableInsertRowAfter:function(a){a.insertRow()},mceTableInsertColBefore:function(a){a.insertCol(!0)},mceTableInsertColAfter:function(a){a.insertCol()},mceTableDeleteCol:function(a){a.deleteCols()},mceTableDeleteRow:function(a){a.deleteRows()},mceTableCutRow:function(a){o=a.cutRows()},mceTableCopyRow:function(a){o=a.copyRows()},mceTablePasteRowBefore:function(a){a.pasteRows(o,!0)},mceTablePasteRowAfter:function(a){a.pasteRows(o)},mceTableDelete:function(a){a.deleteTable()}},function(b,c){e.addCommand(c,function(){var c=new a(e);c&&(b(c),e.execCommand("mceRepaint"),p.cellSelection.clear())})}),j({mceInsertTable:q.table,mceTableProps:function(){q.table(!0)},mceTableRowProps:q.row,mceTableCellProps:q.cell},function(a,b){e.addCommand(b,function(b,c){a(c)})}),e.settings.table_tab_navigation!==!1&&e.on("keydown",function(b){var c,d,f;9==b.keyCode&&(c=e.dom.getParent(e.selection.getStart(),"th,td"),c&&(b.preventDefault(),d=new a(e),f=b.shiftKey?-1:1,e.undoManager.transact(function(){!d.moveRelIdx(c,f)&&f>0&&(d.insertRow(),d.refresh(),d.moveRelIdx(c,f))})))}),p.insertTable=h}var j=e.each;h.add("table",i)})}(this); \ No newline at end of file +!function(e,t){"use strict";function n(e,t){for(var n,r=[],a=0;a9)&&(t.innerHTML='
    ')}return{getSpanVal:t,paddCell:n}}),r("tinymce/tableplugin/TableGrid",["tinymce/util/Tools","tinymce/Env","tinymce/tableplugin/Utils"],function(e,n,r){var i=e.each,o=r.getSpanVal;return function(a,s){function l(e){return e===a.getBody()}function c(){var e=0;L=[],H=0,i(["thead","tbody","tfoot"],function(t){var n=W.select("> "+t+" tr",s);i(n,function(n,r){r+=e,i(W.select("> td, > th",n),function(e,n){var i,a,s,l;if(L[r])for(;L[r][n];)n++;for(s=o(e,"rowspan"),l=o(e,"colspan"),a=r;r+s>a;a++)for(L[a]||(L[a]=[]),i=n;n+l>i;i++)L[a][i]={part:t,real:a==r&&i==n,elm:e,rowspan:s,colspan:l};H=Math.max(H,n+1)})}),e+=n.length})}function u(e,t){return e=e.cloneNode(t),e.removeAttribute("id"),e}function d(e,t){var n;return n=L[t],n?n[e]:void 0}function f(e,t,n){e&&(n=parseInt(n,10),1===n?e.removeAttribute(t,1):e.setAttribute(t,n,1))}function h(e){return e&&(W.hasClass(e.elm,"mce-item-selected")||e==F)}function m(){var e=[];return i(s.rows,function(t){i(t.cells,function(n){return W.hasClass(n,"mce-item-selected")||F&&n==F.elm?(e.push(t),!1):void 0})}),e}function p(){var e=W.createRng();l(s)||(e.setStartAfter(s),e.setEndAfter(s),z.setRng(e),W.remove(s))}function g(t){var o,s={};return a.settings.table_clone_elements!==!1&&(s=e.makeMap((a.settings.table_clone_elements||"strong em b i span font h1 h2 h3 h4 h5 h6 p div").toUpperCase(),/[ ,]/)),e.walk(t,function(e){var r;return 3==e.nodeType?(i(W.getParents(e.parentNode,null,t).reverse(),function(e){s[e.nodeName]&&(e=u(e,!1),o?r&&r.appendChild(e):o=r=e,r=e)}),r&&(r.innerHTML=n.ie&&n.ie<10?" ":'
    '),!1):void 0},"childNodes"),t=u(t,!1),f(t,"rowSpan",1),f(t,"colSpan",1),o?t.appendChild(o):r.paddCell(t),t}function v(){var e,t=W.createRng();return i(W.select("tr",s),function(e){0===e.cells.length&&W.remove(e)}),0===W.select("tr",s).length?(t.setStartBefore(s),t.setEndBefore(s),z.setRng(t),void W.remove(s)):(i(W.select("thead,tbody,tfoot",s),function(e){0===e.rows.length&&W.remove(e)}),c(),void(I&&(e=L[Math.min(L.length-1,I.y)],e&&(z.select(e[Math.min(e.length-1,I.x)].elm,!0),z.collapse(!0)))))}function y(e,t,n,r){var i,o,a,s,l;for(i=L[t][e].elm.parentNode,a=1;n>=a;a++)if(i=W.getNext(i,"tr")){for(o=e;o>=0;o--)if(l=L[t+a][o].elm,l.parentNode==i){for(s=1;r>=s;s++)W.insertAfter(g(l),l);break}if(-1==o)for(s=1;r>=s;s++)i.insertBefore(g(i.cells[0]),i.cells[0])}}function b(){i(L,function(e,t){i(e,function(e,n){var r,i,a;if(h(e)&&(e=e.elm,r=o(e,"colspan"),i=o(e,"rowspan"),r>1||i>1)){for(f(e,"rowSpan",1),f(e,"colSpan",1),a=0;r-1>a;a++)W.insertAfter(g(e),e);y(n,t,i-1,r)}})})}function x(t,n,r){var o,a,s,l,u,m,p,g,y,x,C;if(t?(o=A(t),a=o.x,s=o.y,l=a+(n-1),u=s+(r-1)):(I=O=null,i(L,function(e,t){i(e,function(e,n){h(e)&&(I||(I={x:n,y:t}),O={x:n,y:t})})}),I&&(a=I.x,s=I.y,l=O.x,u=O.y)),g=d(a,s),y=d(l,u),g&&y&&g.part==y.part){for(b(),c(),g=d(a,s).elm,f(g,"colSpan",l-a+1),f(g,"rowSpan",u-s+1),p=s;u>=p;p++)for(m=a;l>=m;m++)L[p]&&L[p][m]&&(t=L[p][m].elm,t!=g&&(x=e.grep(t.childNodes),i(x,function(e){g.appendChild(e)}),x.length&&(x=e.grep(g.childNodes),C=0,i(x,function(e){"BR"==e.nodeName&&C++0&&L[n-1][s]&&(m=L[n-1][s].elm,p=o(m,"rowSpan"),p>1)){f(m,"rowSpan",p+1);continue}}else if(p=o(r,"rowspan"),p>1){f(r,"rowSpan",p+1);continue}d=g(r),f(d,"colSpan",r.colSpan),c.appendChild(d),a=r}c.hasChildNodes()&&(e?l.parentNode.insertBefore(c,l):W.insertAfter(c,l))}}function w(e){var t,n;i(L,function(n){return i(n,function(n,r){return h(n)&&(t=r,e)?!1:void 0}),e?!t:void 0}),i(L,function(r,i){var a,s,l;r[t]&&(a=r[t].elm,a!=n&&(l=o(a,"colspan"),s=o(a,"rowspan"),1==l?e?(a.parentNode.insertBefore(g(a),a),y(t,i,s-1,l)):(W.insertAfter(g(a),a),y(t,i,s-1,l)):f(a,"colSpan",a.colSpan+1),n=a))})}function N(t){return e.grep(E(t),h)}function E(e){var t=[];return i(e,function(e){i(e,function(e){t.push(e)})}),t}function _(){var t=[];if(l(s)){if(1==L[0].length)return;if(N(L).length==E(L).length)return}i(L,function(n){i(n,function(n,r){h(n)&&-1===e.inArray(t,r)&&(i(L,function(e){var t,n=e[r].elm;t=o(n,"colSpan"),t>1?f(n,"colSpan",t-1):W.remove(n)}),t.push(r))})}),v()}function S(){function e(e){var t,n;i(e.cells,function(e){var n=o(e,"rowSpan");n>1&&(f(e,"rowSpan",n-1),t=A(e),y(t.x,t.y,1,1))}),t=A(e.cells[0]),i(L[t.y],function(e){var t;e=e.elm,e!=n&&(t=o(e,"rowSpan"),1>=t?W.remove(e):f(e,"rowSpan",t-1),n=e)})}var t;t=m(),l(s)&&t.length==s.rows.length||(i(t.reverse(),function(t){e(t)}),v())}function k(){var e=m();if(!l(s)||e.length!=s.rows.length)return W.remove(e),v(),e}function T(){var e=m();return i(e,function(t,n){e[n]=u(t,!0)}),e}function R(e,t){var n=m(),r=n[t?0:n.length-1],o=r.cells.length;e&&(i(L,function(e){var t;return o=0,i(e,function(e){e.real&&(o+=e.colspan),e.elm.parentNode==r&&(t=1)}),t?!1:void 0}),t||e.reverse(),i(e,function(e){var n,i,a=e.cells.length;for(n=0;a>n;n++)i=e.cells[n],f(i,"colSpan",1),f(i,"rowSpan",1);for(n=a;o>n;n++)e.appendChild(g(e.cells[a-1]));for(n=o;a>n;n++)W.remove(e.cells[n]);t?r.parentNode.insertBefore(e,r):W.insertAfter(e,r)}),W.removeClass(W.select("td.mce-item-selected,th.mce-item-selected"),"mce-item-selected"))}function A(e){var t;return i(L,function(n,r){return i(n,function(n,i){return n.elm==e?(t={x:i,y:r},!1):void 0}),!t}),t}function B(e){I=A(e)}function D(){var e,t;return e=t=0,i(L,function(n,r){i(n,function(n,i){var o,a;h(n)&&(n=L[r][i],i>e&&(e=i),r>t&&(t=r),n.real&&(o=n.colspan-1,a=n.rowspan-1,o&&i+o>e&&(e=i+o),a&&r+a>t&&(t=r+a)))})}),{x:e,y:t}}function M(e){var t,n,r,i,o,a,s,l,c,u;if(O=A(e),I&&O){for(t=Math.min(I.x,O.x),n=Math.min(I.y,O.y),r=Math.max(I.x,O.x),i=Math.max(I.y,O.y),o=r,a=i,u=n;a>=u;u++)e=L[u][t],e.real||t-(e.colspan-1)=c;c++)e=L[n][c],e.real||n-(e.rowspan-1)=u;u++)for(c=t;r>=c;c++)e=L[u][c],e.real&&(s=e.colspan-1,l=e.rowspan-1,s&&c+s>o&&(o=c+s),l&&u+l>a&&(a=u+l));for(W.removeClass(W.select("td.mce-item-selected,th.mce-item-selected"),"mce-item-selected"),u=n;a>=u;u++)for(c=t;o>=c;c++)L[u][c]&&W.addClass(L[u][c].elm,"mce-item-selected")}}function P(e,t){var n,r,i;n=A(e),r=n.y*H+n.x;do{if(r+=t,i=d(r%H,Math.floor(r/H)),!i)break;if(i.elm!=e)return z.select(i.elm,!0),W.isEmpty(i.elm)&&z.collapse(!0),!0}while(i.elm==e);return!1}var L,H,I,O,F,z=a.selection,W=z.dom;s=s||W.getParent(z.getStart(!0),"table"),c(),F=W.getParent(z.getStart(!0),"th,td"),F&&(I=A(F),O=D(),F=d(I.x,I.y)),e.extend(this,{deleteTable:p,split:b,merge:x,insertRow:C,insertCol:w,deleteCols:_,deleteRows:S,cutRows:k,copyRows:T,pasteRows:R,getPos:A,setStartCell:B,setEndCell:M,moveRelIdx:P,refresh:c})}}),r("tinymce/tableplugin/Quirks",["tinymce/util/VK","tinymce/util/Delay","tinymce/Env","tinymce/util/Tools","tinymce/tableplugin/Utils"],function(e,t,n,r,i){var o=r.each,a=i.getSpanVal;return function(s){function l(){function n(n){function r(e,t){var r=e?"previousSibling":"nextSibling",o=s.dom.getParent(t,"tr"),a=o[r];if(a)return v(s,t,a,e),n.preventDefault(),!0;var l=s.dom.getParent(o,"table"),d=o.parentNode,f=d.nodeName.toLowerCase();if("tbody"===f||f===(e?"tfoot":"thead")){var h=i(e,l,d,"tbody");if(null!==h)return c(e,h,t)}return u(e,o,r,l)}function i(e,t,n,r){var i=s.dom.select(">"+r,t),o=i.indexOf(n);if(e&&0===o||!e&&o===i.length-1)return l(e,t);if(-1===o){var a="thead"===n.tagName.toLowerCase()?0:i.length-1;return i[a]}return i[o+(e?-1:1)]}function l(e,t){var n=e?"thead":"tfoot",r=s.dom.select(">"+n,t);return 0!==r.length?r[0]:null}function c(e,t,r){var i=d(t,e);return i&&v(s,r,i,e),n.preventDefault(),!0}function u(e,t,i,o){var a=o[i];if(a)return f(a),!0;var l=s.dom.getParent(o,"td,th");if(l)return r(e,l,n);var c=d(t,!e);return f(c),n.preventDefault(),!1}function d(e,t){var n=e&&e[t?"lastChild":"firstChild"];return n&&"BR"===n.nodeName?s.dom.getParent(n,"td,th"):n}function f(e){s.selection.setCursorLocation(e,0)}function h(){return x==e.UP||x==e.DOWN}function m(e){var t=e.selection.getNode(),n=e.dom.getParent(t,"tr");return null!==n}function p(e){for(var t=0,n=e;n.previousSibling;)n=n.previousSibling,t+=a(n,"colspan");return t}function g(e,t){var n=0,r=0;return o(e.children,function(e,i){return n+=a(e,"colspan"),r=i,n>t?!1:void 0}),r}function v(e,t,n,r){var i=p(s.dom.getParent(t,"td,th")),o=g(n,i),a=n.childNodes[o],l=d(a,r);f(l||a)}function y(e){var t=s.selection.getNode(),n=s.dom.getParent(t,"td,th"),r=s.dom.getParent(e,"td,th");return n&&n!==r&&b(n,r)}function b(e,t){return s.dom.getParent(e,"TABLE")===s.dom.getParent(t,"TABLE")}var x=n.keyCode;if(h()&&m(s)){var C=s.selection.getNode();t.setEditorTimeout(s,function(){y(C)&&r(!n.shiftKey&&x===e.UP,C,n)},0)}}s.on("KeyDown",function(e){n(e)})}function c(){function e(e,t){var n,r=t.ownerDocument,i=r.createRange();return i.setStartBefore(t),i.setEnd(e.endContainer,e.endOffset),n=r.createElement("body"),n.appendChild(i.cloneContents()),0===n.innerHTML.replace(/<(br|img|object|embed|input|textarea)[^>]*>/gi,"-").replace(/<[^>]+>/g,"").length}s.on("KeyDown",function(t){var n,r,i=s.dom;(37==t.keyCode||38==t.keyCode)&&(n=s.selection.getRng(),r=i.getParent(n.startContainer,"table"),r&&s.getBody().firstChild==r&&e(n,r)&&(n=i.createRng(),n.setStartBefore(r),n.setEndBefore(r),s.selection.setRng(n),t.preventDefault()))})}function u(){s.on("KeyDown SetContent VisualAid",function(){var e;for(e=s.getBody().lastChild;e;e=e.previousSibling)if(3==e.nodeType){if(e.nodeValue.length>0)break}else if(1==e.nodeType&&("BR"==e.tagName||!e.getAttribute("data-mce-bogus")))break;e&&"TABLE"==e.nodeName&&(s.settings.forced_root_block?s.dom.add(s.getBody(),s.settings.forced_root_block,s.settings.forced_root_block_attrs,n.ie&&n.ie<10?" ":'
    '):s.dom.add(s.getBody(),"br",{"data-mce-bogus":"1"}))}),s.on("PreProcess",function(e){var t=e.node.lastChild;t&&("BR"==t.nodeName||1==t.childNodes.length&&("BR"==t.firstChild.nodeName||"\xa0"==t.firstChild.nodeValue))&&t.previousSibling&&"TABLE"==t.previousSibling.nodeName&&s.dom.remove(t)})}function d(){function e(e,t,n,r){var i,o,a,s=3,l=e.dom.getParent(t.startContainer,"TABLE");return l&&(i=l.parentNode),o=t.startContainer.nodeType==s&&0===t.startOffset&&0===t.endOffset&&r&&("TR"==n.nodeName||n==i),a=("TD"==n.nodeName||"TH"==n.nodeName)&&!r,o||a}function t(){var t=s.selection.getRng(),n=s.selection.getNode(),r=s.dom.getParent(t.startContainer,"TD,TH");if(e(s,t,n,r)){r||(r=n);for(var i=r.lastChild;i.lastChild;)i=i.lastChild;3==i.nodeType&&(t.setEnd(i,i.data.length),s.selection.setRng(t))}}s.on("KeyDown",function(){t()}),s.on("MouseDown",function(e){2!=e.button&&t()})}function f(){function t(e){s.selection.select(e,!0),s.selection.collapse(!0)}function n(e){s.$(e).empty(),i.paddCell(e)}s.on("keydown",function(i){if((i.keyCode==e.DELETE||i.keyCode==e.BACKSPACE)&&!i.isDefaultPrevented()){var o,a,l,c;if(o=s.dom.getParent(s.selection.getStart(),"table")){if(a=s.dom.select("td,th",o),l=r.grep(a,function(e){return s.dom.hasClass(e,"mce-item-selected")}),0===l.length)return c=s.dom.getParent(s.selection.getStart(),"td,th"),void(s.selection.isCollapsed()&&c&&s.dom.isEmpty(c)&&(i.preventDefault(),n(c),t(c)));i.preventDefault(),s.undoManager.transact(function(){a.length==l.length?s.execCommand("mceTableDelete"):(r.each(l,n),t(l[0]))})}}})}f(),n.webkit&&(l(),d()),n.gecko&&(c(),u()),n.ie>9&&(c(),u())}}),r("tinymce/tableplugin/CellSelection",["tinymce/tableplugin/TableGrid","tinymce/dom/TreeWalker","tinymce/util/Tools"],function(e,t,n){return function(r){function i(e){r.getBody().style.webkitUserSelect="",(e||d)&&(r.dom.removeClass(r.dom.select("td.mce-item-selected,th.mce-item-selected"),"mce-item-selected"),d=!1)}function o(t){var n,i,o=t.target;if(!c&&s&&(a||o!=s)&&("TD"==o.nodeName||"TH"==o.nodeName)){i=u.getParent(o,"table"),i==l&&(a||(a=new e(r,i),a.setStartCell(s),r.getBody().style.webkitUserSelect="none"),a.setEndCell(o),d=!0),n=r.selection.getSel();try{n.removeAllRanges?n.removeAllRanges():n.empty()}catch(f){}t.preventDefault()}}var a,s,l,c,u=r.dom,d=!0;return r.on("MouseDown",function(e){2==e.button||c||(i(),s=u.getParent(e.target,"td,th"),l=u.getParent(s,"table"))}),r.on("mouseover",o),r.on("remove",function(){u.unbind(r.getDoc(),"mouseover",o)}),r.on("MouseUp",function(){function e(e,r){var o=new t(e,e);do{if(3==e.nodeType&&0!==n.trim(e.nodeValue).length)return void(r?i.setStart(e,0):i.setEnd(e,e.nodeValue.length));if("BR"==e.nodeName)return void(r?i.setStartBefore(e):i.setEndBefore(e))}while(e=r?o.next():o.prev())}var i,o,c,d,f,h=r.selection;if(s){if(a&&(r.getBody().style.webkitUserSelect=""),o=u.select("td.mce-item-selected,th.mce-item-selected"),o.length>0){i=u.createRng(),d=o[0],i.setStartBefore(d),i.setEndAfter(d),e(d,1),c=new t(d,u.getParent(o[0],"table"));do if("TD"==d.nodeName||"TH"==d.nodeName){if(!u.hasClass(d,"mce-item-selected"))break;f=d}while(d=c.next());e(f),h.setRng(i)}r.nodeChanged(),s=a=l=null}}),r.on("KeyUp Drop SetContent",function(e){i("setcontent"==e.type),s=a=l=null,c=!1}),r.on("ObjectResizeStart ObjectResized",function(e){c="objectresized"!=e.type}),{clear:i}}}),r("tinymce/tableplugin/Dialogs",["tinymce/util/Tools","tinymce/Env"],function(e,t){var n=e.each;return function(r){function i(){var e=r.settings.color_picker_callback;return e?function(){var t=this;e.call(r,function(e){t.value(e).fire("change")},t.value())}:void 0}function o(e){return{title:"Advanced",type:"form",defaults:{onchange:function(){d(e,this.parents().reverse()[0],"style"==this.name())}},items:[{label:"Style",name:"style",type:"textbox"},{type:"form",padding:0,formItemDefaults:{layout:"grid",alignH:["start","right"]},defaults:{size:7},items:[{label:"Border color",type:"colorbox",name:"borderColor",onaction:i()},{label:"Background color",type:"colorbox",name:"backgroundColor",onaction:i()}]}]}}function a(e){return e?e.replace(/px$/,""):""}function s(e){return/^[0-9]+$/.test(e)&&(e+="px"),e}function l(e){n("left center right".split(" "),function(t){r.formatter.remove("align"+t,{},e)})}function c(e){n("top middle bottom".split(" "),function(t){r.formatter.remove("valign"+t,{},e)})}function u(t,n,r){function i(t,r){return r=r||[],e.each(t,function(e){var t={text:e.text||e.title};e.menu?t.menu=i(e.menu):(t.value=e.value,n&&n(t)),r.push(t)}),r}return i(t,r||[])}function d(e,t,n){var r=t.toJSON(),i=e.parseStyle(r.style);n?(t.find("#borderColor").value(i["border-color"]||"")[0].fire("change"),t.find("#backgroundColor").value(i["background-color"]||"")[0].fire("change")):(i["border-color"]=r.borderColor,i["background-color"]=r.backgroundColor),t.find("#style").value(e.serializeStyle(e.parseStyle(e.serializeStyle(i))))}function f(e,t,n){var r=e.parseStyle(e.getAttrib(n,"style"));r["border-color"]&&(t.borderColor=r["border-color"]),r["background-color"]&&(t.backgroundColor=r["background-color"]),t.style=e.serializeStyle(r)}function h(e,t,r){var i=e.parseStyle(e.getAttrib(t,"style"));n(r,function(e){i[e.name]=e.value}),e.setAttrib(t,"style",e.serializeStyle(e.parseStyle(e.serializeStyle(i))))}var m=this;m.tableProps=function(){m.table(!0)},m.table=function(i){function c(){function n(e,t,r){if("TD"===e.tagName||"TH"===e.tagName)C.setStyle(e,t,r);else if(e.children)for(var i=0;i',p.insertBefore(i,p.firstChild)),l(p),w.align&&r.formatter.apply("align"+w.align,{},p),r.focus(),r.addVisual()})}function m(e,t){function n(e,n){for(var r=0;rr;r++)n.push(r);return n}function k(e,t,n){for(var r,i=e(),o=0;o0?y(i,o,a):[],u=s.length>0?y(d,f,s):[];w(c,e.offsetWidth,l),N(u,e.offsetHeight,l)}function B(e,t,n,r){if(0>t||t>=e.length-1)return"";var i=e[t];if(i)i={value:i,delta:0};else for(var o=e.slice(0,t).reverse(),a=0;a0?i:o}function P(t,n,r){for(var i=T(t),o=e.map(i,function(e){return d(e.colIndex,e.element).x}),a=[],s=0;s1?B(o,s):M(i[s].element,n,r);c=c?c:Ce,a.push(c)}return a}function L(e){var t=D(e,"height"),n=parseInt(t,10);return U(t)&&(n=0),!isNaN(n)&&n>0?n:m(e,"height")}function H(t){for(var n=R(t),r=e.map(n,function(e){return i(e.rowIndex,e.element).y}),o=[],a=0;a1?B(r,a):L(n[a].element);l=l?l:we,o.push(l)}return o}function I(t,n,r,i,o){function a(t){return e.map(t,function(){return 0})}function s(){var e;if(o)e=[100-d[0]];else{var t=Math.max(i,d[0]+r);e=[t-d[0]]}return e}function l(e,t){var n,o=a(d.slice(0,e)),s=a(d.slice(t+1));if(r>=0){var l=Math.max(i,d[t]-r);n=o.concat([r,l-d[t]]).concat(s)}else{var c=Math.max(i,d[e]+r),u=d[e]-c;n=o.concat([c-d[e],u]).concat(s)}return n}function c(e,t){var n,o=a(d.slice(0,t));if(r>=0)n=o.concat([r]);else{var s=Math.max(i,d[t]+r);n=o.concat([s-d[t]])}return n}var u,d=t.slice(0);return u=0===t.length?[]:1===t.length?s():0===n?l(0,1):n>0&&ni;i++)r+=n[i];return r}function F(t,n){var r=t.getAllCells();return e.map(r,function(e){var t=O(e.colIndex,e.colIndex+e.colspan,n);return{element:e.element,width:t,colspan:e.colspan}})}function z(t,n){var r=t.getAllCells();return e.map(r,function(e){var t=O(e.rowIndex,e.rowIndex+e.rowspan,n);return{element:e.element,height:t,rowspan:e.rowspan}})}function W(t,n){var r=t.getAllRows();return e.map(r,function(e,t){return{element:e.element,height:n[t]}})}function U(e){return Ee.test(e)}function V(e){return _e.test(e)}function $(t,n,i){function o(t,n){e.each(t,function(e){r.dom.setStyle(e.element,"width",e.width+n),r.dom.setAttrib(e.element,"width",null)})}function a(){return in;n++){for(i+="
    "+(s.ie&&s.ie<10?" ":"
    ")+"
    ",o.undoManager.transact(function(){o.insertContent(i),a=o.dom.get("__mce"),o.dom.setAttrib(a,"id",null),o.dom.setAttribs(a,o.settings.table_default_attributes||{}),o.dom.setStyles(a,o.settings.table_default_styles||{})}),a}function c(e,t){function n(){e.disabled(!o.dom.getParent(o.selection.getStart(),t)),o.selection.selectorChanged(t,function(t){e.disabled(!t)})}o.initialized?n():o.on("init",n)}function d(){c(this,"table")}function f(){c(this,"td,th")}function h(){var e="";e='';for(var t=0;10>t;t++){e+="";for(var n=0;10>n;n++)e+='';e+=""}return e+="
    ",e+=''}function m(e,t,n){var r,i,a,s,l,c=n.getEl().getElementsByTagName("table")[0],u=n.isRtl()||"tl-tr"==n.parent().rel;for(c.nextSibling.innerHTML=e+1+" x "+(t+1),u&&(e=9-e),i=0;10>i;i++)for(r=0;10>r;r++)s=c.rows[i].childNodes[r].firstChild,l=(u?r>=e:e>=r)&&t>=i,o.dom.toggleClass(s,"mce-active",l),l&&(a=s);return a.parentNode}function p(){o.addButton("tableprops",{title:"Table properties",onclick:C.tableProps,icon:"table"}),o.addButton("tabledelete",{title:"Delete table",onclick:a("mceTableDelete")}),o.addButton("tablecellprops",{title:"Cell properties",onclick:a("mceTableCellProps")}),o.addButton("tablemergecells",{title:"Merge cells",onclick:a("mceTableMergeCells")}),o.addButton("tablesplitcells",{title:"Split cell",onclick:a("mceTableSplitCells")}),o.addButton("tableinsertrowbefore",{title:"Insert row before",onclick:a("mceTableInsertRowBefore")}),o.addButton("tableinsertrowafter",{title:"Insert row after",onclick:a("mceTableInsertRowAfter")}),o.addButton("tabledeleterow",{title:"Delete row",onclick:a("mceTableDeleteRow")}),o.addButton("tablerowprops",{title:"Row properties",onclick:a("mceTableRowProps")}),o.addButton("tablecutrow",{title:"Cut row",onclick:a("mceTableCutRow")}),o.addButton("tablecopyrow",{title:"Copy row",onclick:a("mceTableCopyRow")}),o.addButton("tablepasterowbefore",{title:"Paste row before",onclick:a("mceTablePasteRowBefore")}),o.addButton("tablepasterowafter",{title:"Paste row after",onclick:a("mceTablePasteRowAfter")}),o.addButton("tableinsertcolbefore",{title:"Insert column before",onclick:a("mceTableInsertColBefore")}),o.addButton("tableinsertcolafter",{title:"Insert column after",onclick:a("mceTableInsertColAfter")}),o.addButton("tabledeletecol",{title:"Delete column",onclick:a("mceTableDeleteCol")})}function g(e){var t=o.dom.is(e,"table")&&o.getBody().contains(e);return t}function v(){var e=o.settings.table_toolbar;""!==e&&e!==!1&&(e||(e="tableprops tabledelete | tableinsertrowbefore tableinsertrowafter tabledeleterow | tableinsertcolbefore tableinsertcolafter tabledeletecol"),o.addContextToolbar(g,e))}var y,b,x=this,C=new r(o);!o.settings.object_resizing||o.settings.table_resize_bars===!1||o.settings.object_resizing!==!0&&"table"!==o.settings.object_resizing||(b=i(o)),o.settings.table_grid===!1?o.addMenuItem("inserttable",{text:"Insert table",icon:"table",context:"table",onclick:C.table}):o.addMenuItem("inserttable",{text:"Insert table",icon:"table",context:"table",ariaHideMenu:!0,onclick:function(e){e.aria&&(this.parent().hideAll(),e.stopImmediatePropagation(),C.table())},onshow:function(){m(0,0,this.menu.items()[0])},onhide:function(){var e=this.menu.items()[0].getEl().getElementsByTagName("a");o.dom.removeClass(e,"mce-active"),o.dom.addClass(e[0],"mce-active")},menu:[{type:"container",html:h(),onPostRender:function(){this.lastX=this.lastY=0},onmousemove:function(e){var t,n,r=e.target;"A"==r.tagName.toUpperCase()&&(t=parseInt(r.getAttribute("data-mce-x"),10),n=parseInt(r.getAttribute("data-mce-y"),10),(this.isRtl()||"tl-tr"==this.parent().rel)&&(t=9-t),(t!==this.lastX||n!==this.lastY)&&(m(t,n,e.control),this.lastX=t,this.lastY=n))},onclick:function(e){var t=this;"A"==e.target.tagName.toUpperCase()&&(e.preventDefault(),e.stopPropagation(),t.parent().cancel(),o.undoManager.transact(function(){l(t.lastX+1,t.lastY+1)}),o.addVisual())}}]}),o.addMenuItem("tableprops",{text:"Table properties",context:"table",onPostRender:d,onclick:C.tableProps}),o.addMenuItem("deletetable",{text:"Delete table",context:"table",onPostRender:d,cmd:"mceTableDelete"}),o.addMenuItem("cell",{separator:"before",text:"Cell",context:"table",menu:[{text:"Cell properties",onclick:a("mceTableCellProps"),onPostRender:f},{text:"Merge cells",onclick:a("mceTableMergeCells"),onPostRender:f},{text:"Split cell",onclick:a("mceTableSplitCells"),onPostRender:f}]}),o.addMenuItem("row",{text:"Row",context:"table",menu:[{text:"Insert row before",onclick:a("mceTableInsertRowBefore"),onPostRender:f},{text:"Insert row after",onclick:a("mceTableInsertRowAfter"),onPostRender:f},{text:"Delete row",onclick:a("mceTableDeleteRow"),onPostRender:f},{text:"Row properties",onclick:a("mceTableRowProps"),onPostRender:f},{text:"-"},{text:"Cut row",onclick:a("mceTableCutRow"),onPostRender:f},{text:"Copy row",onclick:a("mceTableCopyRow"),onPostRender:f},{text:"Paste row before",onclick:a("mceTablePasteRowBefore"),onPostRender:f},{text:"Paste row after",onclick:a("mceTablePasteRowAfter"),onPostRender:f}]}),o.addMenuItem("column",{text:"Column",context:"table",menu:[{text:"Insert column before",onclick:a("mceTableInsertColBefore"),onPostRender:f},{text:"Insert column after",onclick:a("mceTableInsertColAfter"),onPostRender:f},{text:"Delete column",onclick:a("mceTableDeleteCol"),onPostRender:f}]});var w=[];u("inserttable tableprops deletetable | cell row column".split(" "),function(e){"|"==e?w.push({text:"-"}):w.push(o.menuItems[e])}),o.addButton("table",{type:"menubutton",title:"Table",menu:w}),s.isIE||o.on("click",function(e){e=e.target,"TABLE"===e.nodeName&&(o.selection.select(e),o.nodeChanged())}),x.quirks=new t(o),o.on("Init",function(){x.cellSelection=new n(o),x.resizeBars=b}),o.on("PreInit",function(){o.serializer.addAttributeFilter("data-mce-cell-padding,data-mce-border,data-mce-border-color",function(e,t){for(var n=e.length;n--;)e[n].attr(t,null)})}),u({mceTableSplitCells:function(e){e.split()},mceTableMergeCells:function(e){var t;t=o.dom.getParent(o.selection.getStart(),"th,td"),o.dom.select("td.mce-item-selected,th.mce-item-selected").length?e.merge():C.merge(e,t)},mceTableInsertRowBefore:function(e){e.insertRow(!0)},mceTableInsertRowAfter:function(e){e.insertRow()},mceTableInsertColBefore:function(e){e.insertCol(!0)},mceTableInsertColAfter:function(e){e.insertCol()},mceTableDeleteCol:function(e){e.deleteCols()},mceTableDeleteRow:function(e){e.deleteRows()},mceTableCutRow:function(e){y=e.cutRows()},mceTableCopyRow:function(e){y=e.copyRows()},mceTablePasteRowBefore:function(e){e.pasteRows(y,!0)},mceTablePasteRowAfter:function(e){e.pasteRows(y)},mceTableDelete:function(e){b&&b.clearBars(),e.deleteTable()}},function(t,n){o.addCommand(n,function(){var n=new e(o);n&&(t(n),o.execCommand("mceRepaint"),x.cellSelection.clear())})}),u({mceInsertTable:C.table,mceTableProps:function(){C.table(!0)},mceTableRowProps:C.row,mceTableCellProps:C.cell},function(e,t){o.addCommand(t,function(t,n){e(n)})}),p(),v(),o.settings.table_tab_navigation!==!1&&o.on("keydown",function(t){var n,r,i;9==t.keyCode&&(n=o.dom.getParent(o.selection.getStart(),"th,td"),n&&(t.preventDefault(),r=new e(o),i=t.shiftKey?-1:1,o.undoManager.transact(function(){!r.moveRelIdx(n,i)&&i>0&&(r.insertRow(),r.refresh(),r.moveRelIdx(n,i))})))}),x.insertTable=l}var u=o.each;l.add("table",c)})}(this); \ No newline at end of file diff --git a/media/editors/tinymce/plugins/template/plugin.min.js b/media/editors/tinymce/plugins/template/plugin.min.js index 2f15d8e37bb38..c3d3c69f68c6f 100644 --- a/media/editors/tinymce/plugins/template/plugin.min.js +++ b/media/editors/tinymce/plugins/template/plugin.min.js @@ -1 +1 @@ -tinymce.PluginManager.add("template",function(a){function b(b){return function(){var c=a.settings.templates;"string"==typeof c?tinymce.util.XHR.send({url:c,success:function(a){b(tinymce.util.JSON.parse(a))}}):b(c)}}function c(b){function c(b){function c(b){if(-1==b.indexOf("")){var c="";tinymce.each(a.contentCSS,function(b){c+=''}),b=""+c+""+b+""}b=f(b,"template_preview_replace_values");var e=d.find("iframe")[0].getEl().contentWindow.document;e.open(),e.write(b),e.close()}var g=b.control.value();g.url?tinymce.util.XHR.send({url:g.url,success:function(a){e=a,c(e)}}):(e=g.content,c(e)),d.find("#description")[0].text(b.control.value().description)}var d,e,h=[];return b&&0!==b.length?(tinymce.each(b,function(a){h.push({selected:!h.length,text:a.title,value:{url:a.url,content:a.content,description:a.description}})}),d=a.windowManager.open({title:"Insert template",layout:"flex",direction:"column",align:"stretch",padding:15,spacing:10,items:[{type:"form",flex:0,padding:0,items:[{type:"container",label:"Templates",items:{type:"listbox",label:"Templates",name:"template",values:h,onselect:c}}]},{type:"label",name:"description",label:"Description",text:"\xa0"},{type:"iframe",flex:1,border:1}],onsubmit:function(){g(!1,e)},width:a.getParam("template_popup_width",600),height:a.getParam("template_popup_height",500)}),void d.find("listbox")[0].fire("select")):void a.windowManager.alert("No templates defined")}function d(b,c){function d(a,b){if(a=""+a,a.length0&&(i=k.create("div",null),i.appendChild(j[0].cloneNode(!0))),h(k.select("*",i),function(b){g(b,a.getParam("template_cdate_classes","cdate").replace(/\s+/g,"|"))&&(b.innerHTML=d(a.getParam("template_cdate_format",a.getLang("template.cdate_format")))),g(b,a.getParam("template_mdate_classes","mdate").replace(/\s+/g,"|"))&&(b.innerHTML=d(a.getParam("template_mdate_format",a.getLang("template.mdate_format")))),g(b,a.getParam("template_selected_content_classes","selcontent").replace(/\s+/g,"|"))&&(b.innerHTML=l)}),e(i),a.execCommand("mceInsertContent",!1,i.innerHTML),a.addVisual()}var h=tinymce.each;a.addCommand("mceInsertTemplate",g),a.addButton("template",{title:"Insert template",onclick:b(c)}),a.addMenuItem("template",{text:"Insert template",onclick:b(c),context:"insert"}),a.on("PreProcess",function(b){var c=a.dom;h(c.select("div",b.node),function(b){c.hasClass(b,"mceTmpl")&&(h(c.select("*",b),function(b){c.hasClass(b,a.getParam("template_mdate_classes","mdate").replace(/\s+/g,"|"))&&(b.innerHTML=d(a.getParam("template_mdate_format",a.getLang("template.mdate_format"))))}),e(b))})})}); \ No newline at end of file +tinymce.PluginManager.add("template",function(a){function b(b){return function(){var c=a.settings.templates;"string"==typeof c?tinymce.util.XHR.send({url:c,success:function(a){b(tinymce.util.JSON.parse(a))}}):b(c)}}function c(b){function c(b){function c(b){if(-1==b.indexOf("")){var c="";tinymce.each(a.contentCSS,function(b){c+=''}),b=""+c+""+b+""}b=f(b,"template_preview_replace_values");var e=d.find("iframe")[0].getEl().contentWindow.document;e.open(),e.write(b),e.close()}var g=b.control.value();g.url?tinymce.util.XHR.send({url:g.url,success:function(a){e=a,c(e)}}):(e=g.content,c(e)),d.find("#description")[0].text(b.control.value().description)}var d,e,h=[];if(!b||0===b.length){var i=a.translate("No templates defined.");return void a.notificationManager.open({text:i,type:"info"})}tinymce.each(b,function(a){h.push({selected:!h.length,text:a.title,value:{url:a.url,content:a.content,description:a.description}})}),d=a.windowManager.open({title:"Insert template",layout:"flex",direction:"column",align:"stretch",padding:15,spacing:10,items:[{type:"form",flex:0,padding:0,items:[{type:"container",label:"Templates",items:{type:"listbox",label:"Templates",name:"template",values:h,onselect:c}}]},{type:"label",name:"description",label:"Description",text:"\xa0"},{type:"iframe",flex:1,border:1}],onsubmit:function(){g(!1,e)},width:a.getParam("template_popup_width",600),height:a.getParam("template_popup_height",500)}),d.find("listbox")[0].fire("select")}function d(b,c){function d(a,b){if(a=""+a,a.length0&&(i=k.create("div",null),i.appendChild(j[0].cloneNode(!0))),h(k.select("*",i),function(b){g(b,a.getParam("template_cdate_classes","cdate").replace(/\s+/g,"|"))&&(b.innerHTML=d(a.getParam("template_cdate_format",a.getLang("template.cdate_format")))),g(b,a.getParam("template_mdate_classes","mdate").replace(/\s+/g,"|"))&&(b.innerHTML=d(a.getParam("template_mdate_format",a.getLang("template.mdate_format")))),g(b,a.getParam("template_selected_content_classes","selcontent").replace(/\s+/g,"|"))&&(b.innerHTML=l)}),e(i),a.execCommand("mceInsertContent",!1,i.innerHTML),a.addVisual()}var h=tinymce.each;a.addCommand("mceInsertTemplate",g),a.addButton("template",{title:"Insert template",onclick:b(c)}),a.addMenuItem("template",{text:"Insert template",onclick:b(c),context:"insert"}),a.on("PreProcess",function(b){var c=a.dom;h(c.select("div",b.node),function(b){c.hasClass(b,"mceTmpl")&&(h(c.select("*",b),function(b){c.hasClass(b,a.getParam("template_mdate_classes","mdate").replace(/\s+/g,"|"))&&(b.innerHTML=d(a.getParam("template_mdate_format",a.getLang("template.mdate_format"))))}),e(b))})})}); \ No newline at end of file diff --git a/media/editors/tinymce/plugins/textcolor/plugin.min.js b/media/editors/tinymce/plugins/textcolor/plugin.min.js index 7ca105af4a6e2..777a2bdb36760 100644 --- a/media/editors/tinymce/plugins/textcolor/plugin.min.js +++ b/media/editors/tinymce/plugins/textcolor/plugin.min.js @@ -1 +1 @@ -tinymce.PluginManager.add("textcolor",function(a){function b(b){var c;return a.dom.getParents(a.selection.getStart(),function(a){var d;(d=a.style["forecolor"==b?"color":"background-color"])&&(c=d)}),c}function c(){var b,c,d=[];for(c=a.settings.textcolor_map||["000000","Black","993300","Burnt orange","333300","Dark olive","003300","Dark green","003366","Dark azure","000080","Navy Blue","333399","Indigo","333333","Very dark gray","800000","Maroon","FF6600","Orange","808000","Olive","008000","Green","008080","Teal","0000FF","Blue","666699","Grayish blue","808080","Gray","FF0000","Red","FF9900","Amber","99CC00","Yellow green","339966","Sea green","33CCCC","Turquoise","3366FF","Royal blue","800080","Purple","999999","Medium gray","FF00FF","Magenta","FFCC00","Gold","FFFF00","Yellow","00FF00","Lime","00FFFF","Aqua","00CCFF","Sky blue","993366","Red violet","FFFFFF","White","FF99CC","Pink","FFCC99","Peach","FFFF99","Light yellow","CCFFCC","Pale green","CCFFFF","Pale cyan","99CCFF","Light sky blue","CC99FF","Plum"],b=0;b
    '+(c?"×":"")+"
    ',g=d.length-1,k=0;j>k;k++){for(f+="",h=0;i>h;h++)l=k*i+h,l>g?f+="":(e=d[l],f+=b(e.color,e.text));f+=""}if(a.settings.color_picker_callback){for(f+='",f+="",h=0;i>h;h++)f+=b("","Custom color");f+=""}return f+="
    "}function e(b,c){a.undoManager.transact(function(){a.focus(),a.formatter.apply(b,{value:c}),a.nodeChanged()})}function f(b){a.undoManager.transact(function(){a.focus(),a.formatter.remove(b,{value:null},null,!0),a.nodeChanged()})}function g(c){function d(a){k.hidePanel(),k.color(a),e(k.settings.format,a)}function g(){k.hidePanel(),k.resetColor(),f(k.settings.format)}function h(a,b){a.style.background=b,a.setAttribute("data-mce-color",b)}var j,k=this.parent();tinymce.DOM.getParent(c.target,".mce-custom-color-btn")&&(k.hidePanel(),a.settings.color_picker_callback.call(a,function(a){var b,c,e,f=k.panel.getEl().getElementsByTagName("table")[0];for(b=tinymce.map(f.rows[f.rows.length-1].childNodes,function(a){return a.firstChild}),e=0;ee;e++)h(b[e],b[e+1].getAttribute("data-mce-color"));h(c,a),d(a)},b(k.settings.format))),j=c.target.getAttribute("data-mce-color"),j?(this.lastId&&document.getElementById(this.lastId).setAttribute("aria-selected",!1),c.target.setAttribute("aria-selected",!0),this.lastId=c.target.id,"transparent"==j?g():d(j)):null!==j&&k.hidePanel()}function h(){var a=this;a._color?e(a.settings.format,a._color):f(a.settings.format)}var i,j;j=a.settings.textcolor_rows||5,i=a.settings.textcolor_cols||8,a.addButton("forecolor",{type:"colorbutton",tooltip:"Text color",format:"forecolor",panel:{role:"application",ariaRemember:!0,html:d,onclick:g},onclick:h}),a.addButton("backcolor",{type:"colorbutton",tooltip:"Background color",format:"hilitecolor",panel:{role:"application",ariaRemember:!0,html:d,onclick:g},onclick:h})}); \ No newline at end of file +tinymce.PluginManager.add("textcolor",function(e){function t(t){var n;return e.dom.getParents(e.selection.getStart(),function(e){var r;(r=e.style["forecolor"==t?"color":"background-color"])&&(n=r)}),n}function n(){var t,n,r=[];for(n=e.settings.textcolor_map||["000000","Black","993300","Burnt orange","333300","Dark olive","003300","Dark green","003366","Dark azure","000080","Navy Blue","333399","Indigo","333333","Very dark gray","800000","Maroon","FF6600","Orange","808000","Olive","008000","Green","008080","Teal","0000FF","Blue","666699","Grayish blue","808080","Gray","FF0000","Red","FF9900","Amber","99CC00","Yellow green","339966","Sea green","33CCCC","Turquoise","3366FF","Royal blue","800080","Purple","999999","Medium gray","FF00FF","Magenta","FFCC00","Gold","FFFF00","Yellow","00FF00","Lime","00FFFF","Aqua","00CCFF","Sky blue","993366","Red violet","FFFFFF","White","FF99CC","Pink","FFCC99","Peach","FFFF99","Light yellow","CCFFCC","Pale green","CCFFFF","Pale cyan","99CCFF","Light sky blue","CC99FF","Plum"],t=0;t
    '+(n?"×":"")+"
    "}var r,i,o,a,s,u,d,f=this,h=f._id,m=0;for(r=n(),r.push({text:tinymce.translate("No color"),color:"transparent"}),o='',a=r.length-1,u=0;c>u;u++){for(o+="",s=0;l>s;s++)d=u*l+s,d>a?o+="":(i=r[d],o+=t(i.color,i.text));o+=""}if(e.settings.color_picker_callback){for(o+='",o+="",s=0;l>s;s++)o+=t("","Custom color");o+=""}return o+="
    "}function i(t,n){e.undoManager.transact(function(){e.focus(),e.formatter.apply(t,{value:n}),e.nodeChanged()})}function o(t){e.undoManager.transact(function(){e.focus(),e.formatter.remove(t,{value:null},null,!0),e.nodeChanged()})}function a(n){function r(e){u.hidePanel(),u.color(e),i(u.settings.format,e)}function a(){u.hidePanel(),u.resetColor(),o(u.settings.format)}function s(e,t){e.style.background=t,e.setAttribute("data-mce-color",t)}var c,u=this.parent();tinymce.DOM.getParent(n.target,".mce-custom-color-btn")&&(u.hidePanel(),e.settings.color_picker_callback.call(e,function(e){var t,n,i,o=u.panel.getEl().getElementsByTagName("table")[0];for(t=tinymce.map(o.rows[o.rows.length-1].childNodes,function(e){return e.firstChild}),i=0;ii;i++)s(t[i],t[i+1].getAttribute("data-mce-color"));s(n,e),r(e)},t(u.settings.format))),c=n.target.getAttribute("data-mce-color"),c?(this.lastId&&document.getElementById(this.lastId).setAttribute("aria-selected",!1),n.target.setAttribute("aria-selected",!0),this.lastId=n.target.id,"transparent"==c?a():r(c)):null!==c&&u.hidePanel()}function s(){var e=this;e._color?i(e.settings.format,e._color):o(e.settings.format)}var l,c;c=e.settings.textcolor_rows||5,l=e.settings.textcolor_cols||8,e.addButton("forecolor",{type:"colorbutton",tooltip:"Text color",format:"forecolor",panel:{role:"application",ariaRemember:!0,html:r,onclick:a},onclick:s}),e.addButton("backcolor",{type:"colorbutton",tooltip:"Background color",format:"hilitecolor",panel:{role:"application",ariaRemember:!0,html:r,onclick:a},onclick:s})}); \ No newline at end of file diff --git a/media/editors/tinymce/plugins/textpattern/plugin.min.js b/media/editors/tinymce/plugins/textpattern/plugin.min.js index 8af96cd22de1d..cdef6c8ee1bb2 100644 --- a/media/editors/tinymce/plugins/textpattern/plugin.min.js +++ b/media/editors/tinymce/plugins/textpattern/plugin.min.js @@ -1 +1 @@ -tinymce.PluginManager.add("textpattern",function(a){function b(){return j&&(i.sort(function(a,b){return a.start.length>b.start.length?-1:a.start.lengtht.start.length?-1:e.start.length'+a+""}function f(){var a,b="";for(a in n)b+=a;return new RegExp("["+b+"]","g")}function g(){var a,b="";for(a in n)b&&(b+=","),b+="span.mce-"+n[a];return b}var h,i,j,k,l,m,n,o,p=a.getBody(),q=a.selection;if(n={"\xa0":"nbsp","\xad":"shy"},d=!d,e.state=d,a.fire("VisualChars",{state:d}),o=f(),b&&(m=q.getBookmark()),d)for(i=[],tinymce.walk(p,function(a){3==a.nodeType&&a.nodeValue&&o.test(a.nodeValue)&&i.push(a)},"childNodes"),j=0;j=0;j--)a.dom.remove(i[j],1);q.moveToBookmark(m)}function c(){var b=this;a.on("VisualChars",function(a){b.active(a.state)})}var d,e=this;a.addCommand("mceVisualChars",b),a.addButton("visualchars",{title:"Show invisible characters",cmd:"mceVisualChars",onPostRender:c}),a.addMenuItem("visualchars",{text:"Show invisible characters",cmd:"mceVisualChars",onPostRender:c,selectable:!0,context:"view",prependToContext:!0}),a.on("beforegetcontent",function(a){d&&"raw"!=a.format&&!a.draft&&(d=!0,b(!1))})}); \ No newline at end of file +tinymce.PluginManager.add("visualchars",function(e){function t(t){function n(e){return''+e+""}function o(){var e,t="";for(e in h)t+=e;return new RegExp("["+t+"]","g")}function a(){var e,t="";for(e in h)t&&(t+=","),t+="span.mce-"+h[e];return t}var s,l,c,u,d,f,h,m,p=e.getBody(),g=e.selection;if(h={"\xa0":"nbsp","\xad":"shy"},r=!r,i.state=r,e.fire("VisualChars",{state:r}),m=o(),t&&(f=g.getBookmark()),r)for(l=[],tinymce.walk(p,function(e){3==e.nodeType&&e.nodeValue&&m.test(e.nodeValue)&&l.push(e)},"childNodes"),c=0;c=0;c--)e.dom.remove(l[c],1);g.moveToBookmark(f)}function n(){var t=this;e.on("VisualChars",function(e){t.active(e.state)})}var r,i=this;e.addCommand("mceVisualChars",t),e.addButton("visualchars",{title:"Show invisible characters",cmd:"mceVisualChars",onPostRender:n}),e.addMenuItem("visualchars",{text:"Show invisible characters",cmd:"mceVisualChars",onPostRender:n,selectable:!0,context:"view",prependToContext:!0}),e.on("beforegetcontent",function(e){r&&"raw"!=e.format&&!e.draft&&(r=!0,t(!1))})}); \ No newline at end of file diff --git a/media/editors/tinymce/plugins/wordcount/plugin.min.js b/media/editors/tinymce/plugins/wordcount/plugin.min.js index e0d43bb64f2f1..d31b92603b2ec 100644 --- a/media/editors/tinymce/plugins/wordcount/plugin.min.js +++ b/media/editors/tinymce/plugins/wordcount/plugin.min.js @@ -1 +1 @@ -tinymce.PluginManager.add("wordcount",function(a){function b(){a.theme.panel.find("#wordcount").text(["Words: {0}",e.getCount()])}var c,d,e=this;c=a.getParam("wordcount_countregex",/[\w\u2019\x27\-\u00C0-\u1FFF]+/g),d=a.getParam("wordcount_cleanregex",/[0-9.(),;:!?%#$?\x27\x22_+=\\\/\-]*/g),a.on("init",function(){var c=a.theme.panel&&a.theme.panel.find("#statusbar")[0];c&&window.setTimeout(function(){c.insert({type:"label",name:"wordcount",text:["Words: {0}",e.getCount()],classes:"wordcount",disabled:a.settings.readonly},0),a.on("setcontent beforeaddundo",b),a.on("keyup",function(a){32==a.keyCode&&b()})},0)}),e.getCount=function(){var b=a.getContent({format:"raw"}),e=0;if(b){b=b.replace(/\.\.\./g," "),b=b.replace(/<.[^<>]*?>/g," ").replace(/ | /gi," "),b=b.replace(/(\w+)(&#?[a-z0-9]+;)+(\w+)/i,"$1$3").replace(/&.+?;/g," "),b=b.replace(d,"");var f=b.match(c);f&&(e=f.length)}return e}}); \ No newline at end of file +tinymce.PluginManager.add("wordcount",function(e){function t(){e.theme.panel.find("#wordcount").text(["Words: {0}",i.getCount()])}var n,r,i=this;n=e.getParam("wordcount_countregex",/[\w\u2019\x27\-\u00C0-\u1FFF]+/g),r=e.getParam("wordcount_cleanregex",/[0-9.(),;:!?%#$?\x27\x22_+=\\\/\-]*/g),e.on("init",function(){var n=e.theme.panel&&e.theme.panel.find("#statusbar")[0];n&&tinymce.util.Delay.setEditorTimeout(e,function(){n.insert({type:"label",name:"wordcount",text:["Words: {0}",i.getCount()],classes:"wordcount",disabled:e.settings.readonly},0),e.on("setcontent beforeaddundo",t),e.on("keyup",function(e){32==e.keyCode&&t()})},0)}),i.getCount=function(){var t=e.getContent({format:"raw"}),i=0;if(t){t=t.replace(/\.\.\./g," "),t=t.replace(/<.[^<>]*?>/g," ").replace(/ | /gi," "),t=t.replace(/(\w+)(&#?[a-z0-9]+;)+(\w+)/i,"$1$3").replace(/&.+?;/g," "),t=t.replace(r,"");var o=t.match(n);o&&(i=o.length)}return i}}); \ No newline at end of file diff --git a/media/editors/tinymce/skins/lightgray/content.inline.min.css b/media/editors/tinymce/skins/lightgray/content.inline.min.css index c0dc150c4577e..71b3e105c52a9 100644 --- a/media/editors/tinymce/skins/lightgray/content.inline.min.css +++ b/media/editors/tinymce/skins/lightgray/content.inline.min.css @@ -1 +1 @@ -.mce-content-body .mce-reset{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:0 0;text-decoration:none;color:#000;font-family:Arial;font-size:11px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;line-height:normal;font-weight:400;text-align:left;-webkit-tap-highlight-color:transparent;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr;max-width:none}.mce-object{border:1px dotted #3A3A3A;background:#d5d5d5 url(img/object.gif) no-repeat center}.mce-pagebreak{cursor:default;display:block;border:0;width:100%;height:5px;border:1px dashed #666;margin-top:15px;page-break-before:always}@media print{.mce-pagebreak{border:0}}.mce-item-anchor{cursor:default;display:inline-block;-webkit-user-select:all;-webkit-user-modify:read-only;-moz-user-select:all;-moz-user-modify:read-only;user-select:all;user-modify:read-only;width:9px!important;height:9px!important;border:1px dotted #3A3A3A;background:#d5d5d5 url(img/anchor.gif) no-repeat center}.mce-nbsp,.mce-shy{background:#AAA}.mce-shy::after{content:'-'}hr{cursor:default}.mce-match-marker{background:#AAA;color:#fff}.mce-match-marker-selected{background:#39f;color:#fff}.mce-spellchecker-word{border-bottom:2px solid red;cursor:default}.mce-spellchecker-grammar{border-bottom:2px solid green;cursor:default}.mce-item-table,.mce-item-table td,.mce-item-table th,.mce-item-table caption{border:1px dashed #BBB}td.mce-item-selected,th.mce-item-selected{background-color:#39f!important}.mce-edit-focus{outline:1px dotted #333} \ No newline at end of file +.mce-content-body .mce-reset{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:black;font-family:Arial;font-size:11px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;line-height:normal;font-weight:normal;text-align:left;-webkit-tap-highlight-color:transparent;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr;max-width:none}.mce-object{border:1px dotted #3a3a3a;background:#d5d5d5 url(img/object.gif) no-repeat center}.mce-preview-object{display:inline-block;position:relative;margin:0 2px 0 2px;line-height:0;border:1px solid gray}.mce-preview-object .mce-shim{position:absolute;top:0;left:0;width:100%;height:100%;background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)}figure.align-left{float:left}figure.align-right{float:right}figure.image.align-center{display:table;margin-left:auto;margin-right:auto}figure.image{display:inline-block;border:1px solid gray;margin:0 2px 0 1px;background:#f5f2f0}figure.image img{margin:8px 8px 0 8px}figure.image figcaption{margin:6px 8px 6px 8px;text-align:center}.mce-preview-object[data-mce-selected] .mce-shim{display:none}.mce-pagebreak{cursor:default;display:block;border:0;width:100%;height:5px;border:1px dashed #666;margin-top:15px;page-break-before:always}@media print{.mce-pagebreak{border:0}}.mce-item-anchor{cursor:default;display:inline-block;-webkit-user-select:all;-webkit-user-modify:read-only;-moz-user-select:all;-moz-user-modify:read-only;user-select:all;user-modify:read-only;width:9px !important;height:9px !important;border:1px dotted #3a3a3a;background:#d5d5d5 url(img/anchor.gif) no-repeat center}.mce-nbsp,.mce-shy{background:#aaa}.mce-shy::after{content:'-'}hr{cursor:default}.mce-match-marker{background:#aaa;color:#fff}.mce-match-marker-selected{background:#39f;color:#fff}.mce-spellchecker-word{border-bottom:2px solid #f00;cursor:default}.mce-spellchecker-grammar{border-bottom:2px solid #008000;cursor:default}.mce-item-table,.mce-item-table td,.mce-item-table th,.mce-item-table caption{border:1px dashed #bbb}td.mce-item-selected,th.mce-item-selected{background-color:#39f !important}.mce-edit-focus{outline:1px dotted #333}.mce-content-body *[contentEditable=false] *[contentEditable=true]:focus{outline:2px solid #2d8ac7}.mce-content-body *[contentEditable=false] *[contentEditable=true]:hover{outline:2px solid #7acaff}.mce-content-body *[contentEditable=false][data-mce-selected]{outline:2px solid #2d8ac7}.mce-resize-bar-dragging{background-color:blue;opacity:.25;filter:alpha(opacity=25);zoom:1} \ No newline at end of file diff --git a/media/editors/tinymce/skins/lightgray/content.min.css b/media/editors/tinymce/skins/lightgray/content.min.css index b65aa3efe16e6..68c3737025938 100644 --- a/media/editors/tinymce/skins/lightgray/content.min.css +++ b/media/editors/tinymce/skins/lightgray/content.min.css @@ -1 +1 @@ -body{background-color:#FFF;color:#000;font-family:Verdana,Arial,Helvetica,sans-serif;font-size:11px;scrollbar-3dlight-color:#F0F0EE;scrollbar-arrow-color:#676662;scrollbar-base-color:#F0F0EE;scrollbar-darkshadow-color:#DDD;scrollbar-face-color:#E0E0DD;scrollbar-highlight-color:#F0F0EE;scrollbar-shadow-color:#F0F0EE;scrollbar-track-color:#F5F5F5}td,th{font-family:Verdana,Arial,Helvetica,sans-serif;font-size:11px}.mce-content-body .mce-reset{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:0 0;text-decoration:none;color:#000;font-family:Arial;font-size:11px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;line-height:normal;font-weight:400;text-align:left;-webkit-tap-highlight-color:transparent;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr;max-width:none}.mce-object{border:1px dotted #3A3A3A;background:#d5d5d5 url(img/object.gif) no-repeat center}.mce-pagebreak{cursor:default;display:block;border:0;width:100%;height:5px;border:1px dashed #666;margin-top:15px;page-break-before:always}@media print{.mce-pagebreak{border:0}}.mce-item-anchor{cursor:default;display:inline-block;-webkit-user-select:all;-webkit-user-modify:read-only;-moz-user-select:all;-moz-user-modify:read-only;user-select:all;user-modify:read-only;width:9px!important;height:9px!important;border:1px dotted #3A3A3A;background:#d5d5d5 url(img/anchor.gif) no-repeat center}.mce-nbsp,.mce-shy{background:#AAA}.mce-shy::after{content:'-'}hr{cursor:default}.mce-match-marker{background:#AAA;color:#fff}.mce-match-marker-selected{background:#39f;color:#fff}.mce-spellchecker-word{border-bottom:2px solid red;cursor:default}.mce-spellchecker-grammar{border-bottom:2px solid green;cursor:default}.mce-item-table,.mce-item-table td,.mce-item-table th,.mce-item-table caption{border:1px dashed #BBB}td.mce-item-selected,th.mce-item-selected{background-color:#39f!important}.mce-edit-focus{outline:1px dotted #333} \ No newline at end of file +body{background-color:#fff;color:#000;font-family:Verdana,Arial,Helvetica,sans-serif;font-size:11px;scrollbar-3dlight-color:#f0f0ee;scrollbar-arrow-color:#676662;scrollbar-base-color:#f0f0ee;scrollbar-darkshadow-color:#ddd;scrollbar-face-color:#e0e0dd;scrollbar-highlight-color:#f0f0ee;scrollbar-shadow-color:#f0f0ee;scrollbar-track-color:#f5f5f5}td,th{font-family:Verdana,Arial,Helvetica,sans-serif;font-size:11px}.mce-content-body .mce-reset{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:black;font-family:Arial;font-size:11px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;line-height:normal;font-weight:normal;text-align:left;-webkit-tap-highlight-color:transparent;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr;max-width:none}.mce-object{border:1px dotted #3a3a3a;background:#d5d5d5 url(img/object.gif) no-repeat center}.mce-preview-object{display:inline-block;position:relative;margin:0 2px 0 2px;line-height:0;border:1px solid gray}.mce-preview-object .mce-shim{position:absolute;top:0;left:0;width:100%;height:100%;background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)}figure.align-left{float:left}figure.align-right{float:right}figure.image.align-center{display:table;margin-left:auto;margin-right:auto}figure.image{display:inline-block;border:1px solid gray;margin:0 2px 0 1px;background:#f5f2f0}figure.image img{margin:8px 8px 0 8px}figure.image figcaption{margin:6px 8px 6px 8px;text-align:center}.mce-preview-object[data-mce-selected] .mce-shim{display:none}.mce-pagebreak{cursor:default;display:block;border:0;width:100%;height:5px;border:1px dashed #666;margin-top:15px;page-break-before:always}@media print{.mce-pagebreak{border:0}}.mce-item-anchor{cursor:default;display:inline-block;-webkit-user-select:all;-webkit-user-modify:read-only;-moz-user-select:all;-moz-user-modify:read-only;user-select:all;user-modify:read-only;width:9px !important;height:9px !important;border:1px dotted #3a3a3a;background:#d5d5d5 url(img/anchor.gif) no-repeat center}.mce-nbsp,.mce-shy{background:#aaa}.mce-shy::after{content:'-'}hr{cursor:default}.mce-match-marker{background:#aaa;color:#fff}.mce-match-marker-selected{background:#39f;color:#fff}.mce-spellchecker-word{border-bottom:2px solid #f00;cursor:default}.mce-spellchecker-grammar{border-bottom:2px solid #008000;cursor:default}.mce-item-table,.mce-item-table td,.mce-item-table th,.mce-item-table caption{border:1px dashed #bbb}td.mce-item-selected,th.mce-item-selected{background-color:#39f !important}.mce-edit-focus{outline:1px dotted #333}.mce-content-body *[contentEditable=false] *[contentEditable=true]:focus{outline:2px solid #2d8ac7}.mce-content-body *[contentEditable=false] *[contentEditable=true]:hover{outline:2px solid #7acaff}.mce-content-body *[contentEditable=false][data-mce-selected]{outline:2px solid #2d8ac7}.mce-resize-bar-dragging{background-color:blue;opacity:.25;filter:alpha(opacity=25);zoom:1} \ No newline at end of file diff --git a/media/editors/tinymce/skins/lightgray/fonts/tinymce-small.eot b/media/editors/tinymce/skins/lightgray/fonts/tinymce-small.eot index c8abe592bdb5e..b144ba0bd949d 100644 Binary files a/media/editors/tinymce/skins/lightgray/fonts/tinymce-small.eot and b/media/editors/tinymce/skins/lightgray/fonts/tinymce-small.eot differ diff --git a/media/editors/tinymce/skins/lightgray/fonts/tinymce-small.svg b/media/editors/tinymce/skins/lightgray/fonts/tinymce-small.svg index df07ee7b898e4..a9076ca858e4e 100644 --- a/media/editors/tinymce/skins/lightgray/fonts/tinymce-small.svg +++ b/media/editors/tinymce/skins/lightgray/fonts/tinymce-small.svg @@ -6,57 +6,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/media/editors/tinymce/skins/lightgray/fonts/tinymce-small.ttf b/media/editors/tinymce/skins/lightgray/fonts/tinymce-small.ttf index 31554f69222a0..a983e2dc4cb30 100644 Binary files a/media/editors/tinymce/skins/lightgray/fonts/tinymce-small.ttf and b/media/editors/tinymce/skins/lightgray/fonts/tinymce-small.ttf differ diff --git a/media/editors/tinymce/skins/lightgray/fonts/tinymce-small.woff b/media/editors/tinymce/skins/lightgray/fonts/tinymce-small.woff index 6be9a1d82dcbd..d8962df76e504 100644 Binary files a/media/editors/tinymce/skins/lightgray/fonts/tinymce-small.woff and b/media/editors/tinymce/skins/lightgray/fonts/tinymce-small.woff differ diff --git a/media/editors/tinymce/skins/lightgray/fonts/tinymce.eot b/media/editors/tinymce/skins/lightgray/fonts/tinymce.eot index e1162423413c2..8838c8dc9762b 100644 Binary files a/media/editors/tinymce/skins/lightgray/fonts/tinymce.eot and b/media/editors/tinymce/skins/lightgray/fonts/tinymce.eot differ diff --git a/media/editors/tinymce/skins/lightgray/fonts/tinymce.svg b/media/editors/tinymce/skins/lightgray/fonts/tinymce.svg index a4c92e0b592b3..d7004a9799f89 100644 --- a/media/editors/tinymce/skins/lightgray/fonts/tinymce.svg +++ b/media/editors/tinymce/skins/lightgray/fonts/tinymce.svg @@ -6,78 +6,93 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/media/editors/tinymce/skins/lightgray/fonts/tinymce.ttf b/media/editors/tinymce/skins/lightgray/fonts/tinymce.ttf index 422ff56f8dfcc..ab4487febe5b9 100644 Binary files a/media/editors/tinymce/skins/lightgray/fonts/tinymce.ttf and b/media/editors/tinymce/skins/lightgray/fonts/tinymce.ttf differ diff --git a/media/editors/tinymce/skins/lightgray/fonts/tinymce.woff b/media/editors/tinymce/skins/lightgray/fonts/tinymce.woff index bb780bdce6e22..171a2a2df1d3b 100644 Binary files a/media/editors/tinymce/skins/lightgray/fonts/tinymce.woff and b/media/editors/tinymce/skins/lightgray/fonts/tinymce.woff differ diff --git a/media/editors/tinymce/skins/lightgray/img/loader.gif b/media/editors/tinymce/skins/lightgray/img/loader.gif index c69e937232b24..15c045ae82408 100644 Binary files a/media/editors/tinymce/skins/lightgray/img/loader.gif and b/media/editors/tinymce/skins/lightgray/img/loader.gif differ diff --git a/media/editors/tinymce/skins/lightgray/skin.ie7.min.css b/media/editors/tinymce/skins/lightgray/skin.ie7.min.css index 80380fb8c994c..525ac63d4d306 100644 --- a/media/editors/tinymce/skins/lightgray/skin.ie7.min.css +++ b/media/editors/tinymce/skins/lightgray/skin.ie7.min.css @@ -1 +1 @@ -.mce-container,.mce-container *,.mce-widget,.mce-widget *,.mce-reset{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:#333;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;-webkit-tap-highlight-color:transparent;line-height:normal;font-weight:normal;text-align:left;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr;max-width:none}.mce-widget button{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.mce-container *[unselectable]{-moz-user-select:none;-webkit-user-select:none;-o-user-select:none;user-select:none}.mce-fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.mce-fade.mce-in{opacity:1}.mce-tinymce{visibility:inherit !important;position:relative}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;height:100%;z-index:100}div.mce-fullscreen{position:fixed;top:0;left:0;width:100%;height:auto}.mce-tinymce{display:block}.mce-wordcount{position:absolute;top:0;right:0;padding:8px}div.mce-edit-area{background:#FFF;filter:none}.mce-statusbar{position:relative}.mce-statusbar .mce-container-body{position:relative}.mce-fullscreen .mce-resizehandle{display:none}.mce-charmap{border-collapse:collapse}.mce-charmap td{cursor:default;border:1px solid rgba(0,0,0,0.2);width:20px;height:20px;line-height:20px;text-align:center;vertical-align:middle;padding:2px}.mce-charmap td div{text-align:center}.mce-charmap td:hover{background:#d9d9d9}.mce-grid td.mce-grid-cell div{border:1px solid #d6d6d6;width:15px;height:15px;margin:0px;cursor:pointer}.mce-grid td.mce-grid-cell div:focus{border-color:#3498db}.mce-grid td.mce-grid-cell div[disabled]{cursor:not-allowed}.mce-grid{border-spacing:2px;border-collapse:separate}.mce-grid a{display:block;border:1px solid transparent}.mce-grid a:hover,.mce-grid a:focus{border-color:#3498db}.mce-grid-border{margin:0 4px 0 4px}.mce-grid-border a{border-color:#d6d6d6;width:13px;height:13px}.mce-grid-border a:hover,.mce-grid-border a.mce-active{border-color:#3498db;background:#3498db}.mce-text-center{text-align:center}div.mce-tinymce-inline{width:100%}.mce-colorbtn-trans div{text-align:center;vertical-align:middle;font-weight:bold;font-size:20px;line-height:16px;color:#707070}.mce-toolbar-grp{padding:2px 0}.mce-toolbar-grp .mce-flow-layout-item{margin-bottom:0}.mce-rtl .mce-wordcount{left:0;right:auto}.mce-croprect-container{position:absolute;top:0;left:0}.mce-croprect-handle{position:absolute;top:0;left:0;width:20px;height:20px;border:2px solid white}.mce-croprect-handle-nw{border-width:2px 0 0 2px;margin:-2px 0 0 -2px;cursor:nw-resize;top:100px;left:100px}.mce-croprect-handle-ne{border-width:2px 2px 0 0;margin:-2px 0 0 -20px;cursor:ne-resize;top:100px;left:200px}.mce-croprect-handle-sw{border-width:0 0 2px 2px;margin:-20px 2px 0 -2px;cursor:sw-resize;top:200px;left:100px}.mce-croprect-handle-se{border-width:0 2px 2px 0;margin:-20px 0 0 -20px;cursor:se-resize;top:200px;left:200px}.mce-croprect-handle-move{position:absolute;cursor:move;border:0}.mce-croprect-block{opacity:.3;filter:alpha(opacity=30);zoom:1;position:absolute;background:black}.mce-imagepanel{overflow:auto;background:black}.mce-imagepanel img{position:absolute}.mce-imagetool.mce-btn .mce-ico{display:block;width:20px;height:20px;text-align:center;line-height:20px;font-size:20px;padding:5px}.mce-container,.mce-container-body{display:block}.mce-autoscroll{overflow:hidden}.mce-scrollbar{position:absolute;width:7px;height:100%;top:2px;right:2px;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-scrollbar-h{top:auto;right:auto;left:2px;bottom:2px;width:100%;height:7px}.mce-scrollbar-thumb{position:absolute;background-color:#000;border:1px solid #888;border-color:rgba(85,85,85,0.6);width:5px;height:100%}.mce-scrollbar-h .mce-scrollbar-thumb{width:100%;height:5px}.mce-scrollbar:hover,.mce-scrollbar.mce-active{background-color:#AAA;opacity:.6;filter:alpha(opacity=60);zoom:1}.mce-scroll{position:relative}.mce-panel{border:0 solid #cacaca;border:0 solid rgba(0,0,0,0.2);background-color:#f0f0f0}.mce-floatpanel{position:absolute}.mce-floatpanel.mce-fixed{position:fixed}.mce-floatpanel .mce-arrow,.mce-floatpanel .mce-arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.mce-floatpanel .mce-arrow{border-width:11px}.mce-floatpanel .mce-arrow:after{border-width:10px;content:""}.mce-floatpanel.mce-popover{filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;top:0;left:0;background:#fff;border:1px solid rgba(0,0,0,0.2);border:1px solid rgba(0,0,0,0.25)}.mce-floatpanel.mce-popover.mce-bottom{margin-top:10px;*margin-top:0}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow{left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:rgba(0,0,0,0.2);border-bottom-color:rgba(0,0,0,0.25);top:-11px}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow:after{top:1px;margin-left:-10px;border-top-width:0;border-bottom-color:#fff}.mce-floatpanel.mce-popover.mce-bottom.mce-start{margin-left:-22px}.mce-floatpanel.mce-popover.mce-bottom.mce-start>.mce-arrow{left:20px}.mce-floatpanel.mce-popover.mce-bottom.mce-end{margin-left:22px}.mce-floatpanel.mce-popover.mce-bottom.mce-end>.mce-arrow{right:10px;left:auto}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;height:100%}div.mce-fullscreen{position:fixed;top:0;left:0}#mce-modal-block{opacity:0;filter:alpha(opacity=0);zoom:1;position:fixed;left:0;top:0;width:100%;height:100%;background:#000}#mce-modal-block.mce-in{opacity:.3;filter:alpha(opacity=30);zoom:1}.mce-window-move{cursor:move}.mce-window{filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;background:#fff;position:fixed;top:0;left:0;opacity:0;-webkit-transition:opacity 150ms ease-in;transition:opacity 150ms ease-in}.mce-window.mce-in{opacity:1}.mce-window-head{padding:9px 15px;border-bottom:1px solid #c5c5c5;position:relative}.mce-window-head .mce-close{position:absolute;right:15px;top:9px;font-size:20px;font-weight:bold;line-height:20px;color:#858585;cursor:pointer;height:20px;overflow:hidden}.mce-close:hover{color:#adadad}.mce-window-head .mce-title{line-height:20px;font-size:20px;font-weight:bold;text-rendering:optimizelegibility;padding-right:10px}.mce-window .mce-container-body{display:block}.mce-foot{display:block;background-color:#fff;border-top:1px solid #c5c5c5}.mce-window-head .mce-dragh{position:absolute;top:0;left:0;cursor:move;width:90%;height:100%}.mce-window iframe{width:100%;height:100%}.mce-window-body .mce-listbox{border-color:#ccc}.mce-rtl .mce-window-head .mce-close{position:absolute;right:auto;left:15px}.mce-rtl .mce-window-head .mce-dragh{left:auto;right:0}.mce-rtl .mce-window-head .mce-title{direction:rtl;text-align:right}.mce-abs-layout{position:relative}body .mce-abs-layout-item,.mce-abs-end{position:absolute}.mce-abs-end{width:1px;height:1px}.mce-container-body.mce-abs-layout{overflow:hidden}.mce-tooltip{position:absolute;padding:5px;opacity:.8;filter:alpha(opacity=80);zoom:1}.mce-tooltip-inner{font-size:11px;background-color:#000;color:#fff;max-width:200px;padding:5px 8px 4px 8px;text-align:center;white-space:normal}.mce-tooltip-arrow{position:absolute;width:0;height:0;line-height:0;border:5px dashed #000}.mce-tooltip-arrow-n{border-bottom-color:#000}.mce-tooltip-arrow-s{border-top-color:#000}.mce-tooltip-arrow-e{border-left-color:#000}.mce-tooltip-arrow-w{border-right-color:#000}.mce-tooltip-nw,.mce-tooltip-sw{margin-left:-14px}.mce-tooltip-n .mce-tooltip-arrow{top:0px;left:50%;margin-left:-5px;border-bottom-style:solid;border-top:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-nw .mce-tooltip-arrow{top:0;left:10px;border-bottom-style:solid;border-top:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-ne .mce-tooltip-arrow{top:0;right:10px;border-bottom-style:solid;border-top:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-s .mce-tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-style:solid;border-bottom:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-sw .mce-tooltip-arrow{bottom:0;left:10px;border-top-style:solid;border-bottom:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-se .mce-tooltip-arrow{bottom:0;right:10px;border-top-style:solid;border-bottom:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-e .mce-tooltip-arrow{right:0;top:50%;margin-top:-5px;border-left-style:solid;border-right:none;border-top-color:transparent;border-bottom-color:transparent}.mce-tooltip-w .mce-tooltip-arrow{left:0;top:50%;margin-top:-5px;border-right-style:solid;border-left:none;border-top-color:transparent;border-bottom-color:transparent}.mce-btn{border:1px solid #b1b1b1;border-color:transparent transparent transparent transparent;position:relative;text-shadow:0 1px 1px rgba(255,255,255,0.75);display:inline-block;*display:inline;*zoom:1;background-color:#f0f0f0}.mce-btn:hover,.mce-btn:focus{color:#333;background-color:#e3e3e3;border-color:#ccc}.mce-btn.mce-disabled button,.mce-btn.mce-disabled:hover button{cursor:default;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-btn.mce-active,.mce-btn.mce-active:hover{background-color:#dbdbdb;border-color:#ccc}.mce-btn:active{background-color:#e0e0e0;border-color:#ccc}.mce-btn button{padding:4px 8px;font-size:14px;line-height:20px;*line-height:16px;cursor:pointer;color:#333;text-align:center;overflow:visible;-webkit-appearance:none}.mce-btn button::-moz-focus-inner{border:0;padding:0}.mce-btn i{text-shadow:1px 1px none}.mce-primary{min-width:50px;color:#fff;border:1px solid transparent;border-color:transparent;background-color:#2d8ac7}.mce-primary:hover,.mce-primary:focus{background-color:#257cb6;border-color:transparent}.mce-primary.mce-disabled button,.mce-primary.mce-disabled:hover button{cursor:default;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-primary.mce-active,.mce-primary.mce-active:hover,.mce-primary:not(.mce-disabled):active{background-color:#206ea1}.mce-primary button,.mce-primary button i{color:#fff;text-shadow:1px 1px none}.mce-btn-large button{padding:9px 14px;font-size:16px;line-height:normal}.mce-btn-large i{margin-top:2px}.mce-btn-small button{padding:1px 5px;font-size:12px;*padding-bottom:2px}.mce-btn-small i{line-height:20px;vertical-align:top;*line-height:18px}.mce-btn .mce-caret{margin-top:8px;margin-left:0}.mce-btn-small .mce-caret{margin-top:8px;margin-left:0}.mce-caret{display:inline-block;*display:inline;*zoom:1;width:0;height:0;vertical-align:top;border-top:4px solid #333;border-right:4px solid transparent;border-left:4px solid transparent;content:""}.mce-disabled .mce-caret{border-top-color:#aaa}.mce-caret.mce-up{border-bottom:4px solid #333;border-top:0}.mce-btn-flat{border:0;background:transparent;filter:none}.mce-btn-flat:hover,.mce-btn-flat.mce-active,.mce-btn-flat:focus,.mce-btn-flat:active{border:0;background:#e6e6e6;filter:none}.mce-btn-has-text .mce-ico{padding-right:5px}.mce-rtl .mce-btn button{direction:rtl}.mce-btn-group .mce-btn{border-width:1px;margin:0;margin-left:2px}.mce-btn-group:not(:first-child){border-left:1px solid #d9d9d9;padding-left:3px;margin-left:3px}.mce-btn-group .mce-first{margin-left:0}.mce-btn-group .mce-btn.mce-flow-layout-item{margin:0}.mce-rtl .mce-btn-group .mce-btn{margin-left:0;margin-right:2px}.mce-rtl .mce-btn-group .mce-first{margin-right:0}.mce-rtl .mce-btn-group:not(:first-child){border-left:none;border-right:1px solid #d9d9d9;padding-right:4px;margin-right:4px}.mce-checkbox{cursor:pointer}i.mce-i-checkbox{margin:0 3px 0 0;border:1px solid #c5c5c5;background-color:#f0f0f0;text-indent:-10em;*font-size:0;*line-height:0;*text-indent:0;overflow:hidden}.mce-checked i.mce-i-checkbox{color:#333;font-size:16px;line-height:16px;text-indent:0}.mce-checkbox:focus i.mce-i-checkbox,.mce-checkbox.mce-focus i.mce-i-checkbox{border:1px solid rgba(82,168,236,0.8)}.mce-checkbox.mce-disabled .mce-label,.mce-checkbox.mce-disabled i.mce-i-checkbox{color:#acacac}.mce-checkbox .mce-label{vertical-align:middle}.mce-rtl .mce-checkbox{direction:rtl;text-align:right}.mce-rtl i.mce-i-checkbox{margin:0 0 0 3px}.mce-combobox{display:inline-block;*display:inline;*zoom:1;*height:32px}.mce-combobox input{border:1px solid #c5c5c5;border-right-color:#c5c5c5;height:28px}.mce-combobox.mce-disabled input{color:#adadad}.mce-combobox .mce-btn{border:1px solid #c5c5c5;border-left:0}.mce-combobox button{padding-right:8px;padding-left:8px}.mce-combobox.mce-disabled .mce-btn button{cursor:default;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-colorbox i{border:1px solid #c5c5c5;width:14px;height:14px}.mce-colorbutton .mce-ico{position:relative}.mce-colorbutton-grid{margin:4px}.mce-colorbutton button{padding-right:6px;padding-left:6px}.mce-colorbutton .mce-preview{padding-right:3px;display:block;position:absolute;left:50%;top:50%;margin-left:-17px;margin-top:7px;background:gray;width:13px;height:2px;overflow:hidden}.mce-colorbutton.mce-btn-small .mce-preview{margin-left:-16px;padding-right:0;width:16px}.mce-colorbutton .mce-open{padding-left:4px;padding-right:4px;border-left:1px solid transparent}.mce-colorbutton:hover .mce-open{border-color:#ccc}.mce-colorbutton.mce-btn-small .mce-open{padding:0 3px 0 3px}.mce-rtl .mce-colorbutton{direction:rtl}.mce-rtl .mce-colorbutton .mce-preview{margin-left:0;padding-right:0;padding-left:3px}.mce-rtl .mce-colorbutton.mce-btn-small .mce-preview{margin-left:0;padding-right:0;padding-left:2px}.mce-rtl .mce-colorbutton .mce-open{padding-left:4px;padding-right:4px;border-left:0}.mce-colorpicker{position:relative;width:250px;height:220px}.mce-colorpicker-sv{position:absolute;top:0;left:0;width:90%;height:100%;border:1px solid #c5c5c5;cursor:crosshair;overflow:hidden}.mce-colorpicker-h-chunk{width:100%}.mce-colorpicker-overlay1,.mce-colorpicker-overlay2{width:100%;height:100%;position:absolute;top:0;left:0}.mce-colorpicker-overlay1{filter:progid:DXImageTransform.Microsoft.gradient(GradientType=1, startColorstr='#ffffff', endColorstr='#00ffffff');-ms-filter:"progid:DXImageTransform.Microsoft.gradient(GradientType=1,startColorstr='#ffffff', endColorstr='#00ffffff')";background:linear-gradient(to right, #fff, rgba(255,255,255,0))}.mce-colorpicker-overlay2{filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#00000000', endColorstr='#000000');-ms-filter:"progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#00000000', endColorstr='#000000')";background:linear-gradient(to bottom, rgba(0,0,0,0), #000)}.mce-colorpicker-selector1{background:none;position:absolute;width:12px;height:12px;margin:-8px 0 0 -8px;border:1px solid black;border-radius:50%}.mce-colorpicker-selector2{position:absolute;width:10px;height:10px;border:1px solid white;border-radius:50%}.mce-colorpicker-h{position:absolute;top:0;right:0;width:6.5%;height:100%;border:1px solid #c5c5c5;cursor:crosshair}.mce-colorpicker-h-marker{margin-top:-4px;position:absolute;top:0;left:-1px;width:100%;border:1px solid #333;background:#fff;height:4px;z-index:100}.mce-path{display:inline-block;*display:inline;*zoom:1;padding:8px;white-space:normal}.mce-path .mce-txt{display:inline-block;padding-right:3px}.mce-path .mce-path-body{display:inline-block}.mce-path-item{display:inline-block;*display:inline;*zoom:1;cursor:pointer;color:#333}.mce-path-item:hover{text-decoration:underline}.mce-path-item:focus{background:#666;color:#fff}.mce-path .mce-divider{display:inline}.mce-disabled .mce-path-item{color:#aaa}.mce-rtl .mce-path{direction:rtl}.mce-fieldset{border:0 solid #9E9E9E}.mce-fieldset>.mce-container-body{margin-top:-15px}.mce-fieldset-title{margin-left:5px;padding:0 5px 0 5px}.mce-fit-layout{display:inline-block;*display:inline;*zoom:1}.mce-fit-layout-item{position:absolute}.mce-flow-layout-item{display:inline-block;*display:inline;*zoom:1}.mce-flow-layout-item{margin:2px 0 2px 2px}.mce-flow-layout-item.mce-last{margin-right:2px}.mce-flow-layout{white-space:normal}.mce-tinymce-inline .mce-flow-layout{white-space:nowrap}.mce-rtl .mce-flow-layout{text-align:right;direction:rtl}.mce-rtl .mce-flow-layout-item{margin:2px 2px 2px 0}.mce-rtl .mce-flow-layout-item.mce-last{margin-left:2px}.mce-iframe{border:0 solid rgba(0,0,0,0.2);width:100%;height:100%}.mce-label{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 1px rgba(255,255,255,0.75);overflow:hidden}.mce-label.mce-autoscroll{overflow:auto}.mce-label.mce-disabled{color:#aaa}.mce-label.mce-multiline{white-space:pre-wrap}.mce-label.mce-error{color:#a00}.mce-rtl .mce-label{text-align:right;direction:rtl}.mce-menubar .mce-menubtn{border-color:transparent;background:transparent;filter:none}.mce-menubar .mce-menubtn button{color:#333}.mce-menubar{border:1px solid rgba(217,217,217,0.52)}.mce-menubar .mce-menubtn button span{color:#333}.mce-menubar .mce-caret{border-top-color:#333}.mce-menubar .mce-menubtn:hover,.mce-menubar .mce-menubtn.mce-active,.mce-menubar .mce-menubtn:focus{border-color:#ccc;background:#fff;filter:none}.mce-menubtn button{color:#333}.mce-menubtn.mce-btn-small span{font-size:12px}.mce-menubtn.mce-fixed-width span{display:inline-block;overflow-x:hidden;text-overflow:ellipsis;width:90px}.mce-menubtn.mce-fixed-width.mce-btn-small span{width:70px}.mce-menubtn .mce-caret{*margin-top:6px}.mce-rtl .mce-menubtn button{direction:rtl;text-align:right}.mce-menu-item{display:block;padding:6px 15px 6px 12px;clear:both;font-weight:normal;line-height:20px;color:#333;white-space:nowrap;cursor:pointer;line-height:normal;border-left:4px solid transparent;margin-bottom:1px}.mce-menu-item .mce-ico,.mce-menu-item .mce-text{color:#333}.mce-menu-item.mce-disabled .mce-text,.mce-menu-item.mce-disabled .mce-ico{color:#adadad}.mce-menu-item:hover .mce-text,.mce-menu-item.mce-selected .mce-text,.mce-menu-item:focus .mce-text{color:#fff}.mce-menu-item:hover .mce-ico,.mce-menu-item.mce-selected .mce-ico,.mce-menu-item:focus .mce-ico{color:#fff}.mce-menu-item.mce-disabled:hover{background:#ccc}.mce-menu-shortcut{display:inline-block;color:#adadad}.mce-menu-shortcut{display:inline-block;*display:inline;*zoom:1;padding:0 15px 0 20px}.mce-menu-item:hover .mce-menu-shortcut,.mce-menu-item.mce-selected .mce-menu-shortcut,.mce-menu-item:focus .mce-menu-shortcut{color:#fff}.mce-menu-item .mce-caret{margin-top:4px;*margin-top:3px;margin-right:6px;border-top:4px solid transparent;border-bottom:4px solid transparent;border-left:4px solid #333}.mce-menu-item.mce-selected .mce-caret,.mce-menu-item:focus .mce-caret,.mce-menu-item:hover .mce-caret{border-left-color:#fff}.mce-menu-align .mce-menu-shortcut{*margin-top:-2px}.mce-menu-align .mce-menu-shortcut,.mce-menu-align .mce-caret{position:absolute;right:0}.mce-menu-item.mce-active i{visibility:visible}.mce-menu-item-normal.mce-active{background-color:#3498db}.mce-menu-item-preview.mce-active{border-left:5px solid #aaa}.mce-menu-item-normal.mce-active .mce-text{color:#fff}.mce-menu-item-normal.mce-active:hover .mce-text,.mce-menu-item-normal.mce-active:hover .mce-ico{color:#fff}.mce-menu-item-normal.mce-active:focus .mce-text,.mce-menu-item-normal.mce-active:focus .mce-ico{color:#fff}.mce-menu-item:hover,.mce-menu-item.mce-selected,.mce-menu-item:focus{text-decoration:none;color:#fff;background-color:#2d8ac7}div.mce-menu .mce-menu-item-sep,.mce-menu-item-sep:hover{border:0;padding:0;height:1px;margin:9px 1px;overflow:hidden;background:transparent;border-bottom:1px solid rgba(0,0,0,0.1);cursor:default;filter:none}.mce-menu.mce-rtl{direction:rtl}.mce-rtl .mce-menu-item{text-align:right;direction:rtl;padding:6px 12px 6px 15px}.mce-menu-align.mce-rtl .mce-menu-shortcut,.mce-menu-align.mce-rtl .mce-caret{right:auto;left:0}.mce-rtl .mce-menu-item .mce-caret{margin-left:6px;margin-right:0;border-right:4px solid #333;border-left:0}.mce-rtl .mce-menu-item.mce-selected .mce-caret,.mce-rtl .mce-menu-item:focus .mce-caret,.mce-rtl .mce-menu-item:hover .mce-caret{border-left-color:transparent;border-right-color:#fff}.mce-menu{position:absolute;left:0;top:0;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;z-index:1000;padding:5px 0 5px 0;margin:-1px 0 0;min-width:160px;background:#fff;border:1px solid #989898;border:1px solid rgba(0,0,0,0.2);z-index:1002;max-height:400px;overflow:auto;overflow-x:hidden}.mce-menu i{display:none}.mce-menu-has-icons i{display:inline-block;*display:inline}.mce-menu-sub-tr-tl{margin:-6px 0 0 -1px}.mce-menu-sub-br-bl{margin:6px 0 0 -1px}.mce-menu-sub-tl-tr{margin:-6px 0 0 1px}.mce-menu-sub-bl-br{margin:6px 0 0 1px}.mce-listbox button{text-align:left;padding-right:20px;position:relative}.mce-listbox .mce-caret{position:absolute;margin-top:-2px;right:8px;top:50%}.mce-rtl .mce-listbox .mce-caret{right:auto;left:8px}.mce-rtl .mce-listbox button{padding-right:10px;padding-left:20px}.mce-container-body .mce-resizehandle{position:absolute;right:0;bottom:0;width:16px;height:16px;visibility:visible;cursor:s-resize;margin:0}.mce-container-body .mce-resizehandle-both{cursor:se-resize}i.mce-i-resize{color:#333}.mce-slider{border:1px solid #aaa;background:#eee;width:100px;height:10px;position:relative;display:block}.mce-slider.mce-vertical{width:10px;height:100px}.mce-slider-handle{border:1px solid #bbb;background:#ddd;display:block;width:13px;height:13px;position:absolute;top:0;left:0;margin-left:-1px;margin-top:-2px}.mce-spacer{visibility:hidden}.mce-splitbtn .mce-open{border-left:1px solid transparent}.mce-splitbtn:hover .mce-open{border-left-color:#ccc}.mce-splitbtn button{padding-right:6px;padding-left:6px}.mce-splitbtn .mce-open{padding-right:4px;padding-left:4px}.mce-splitbtn .mce-open.mce-active{background-color:#dbdbdb;outline:1px solid #ccc}.mce-splitbtn.mce-btn-small .mce-open{padding:0 3px 0 3px}.mce-rtl .mce-splitbtn{direction:rtl;text-align:right}.mce-rtl .mce-splitbtn button{padding-right:4px;padding-left:4px}.mce-rtl .mce-splitbtn .mce-open{border-left:0}.mce-stack-layout-item{display:block}.mce-tabs{display:block;border-bottom:1px solid #c5c5c5}.mce-tabs,.mce-tabs+.mce-container-body{background:#fff}.mce-tab{display:inline-block;*display:inline;*zoom:1;border:1px solid #c5c5c5;border-width:0 1px 0 0;background:#fff;padding:8px;text-shadow:0 1px 1px rgba(255,255,255,0.75);height:13px;cursor:pointer}.mce-tab:hover{background:#fdfdfd}.mce-tab.mce-active{background:#fdfdfd;border-bottom-color:transparent;margin-bottom:-1px;height:14px}.mce-rtl .mce-tabs{text-align:right;direction:rtl}.mce-rtl .mce-tab{border-width:0 0 0 1px}.mce-textbox{background:#fff;border:1px solid #c5c5c5;display:inline-block;-webkit-transition:border linear .2s, box-shadow linear .2s;transition:border linear .2s, box-shadow linear .2s;height:28px;resize:none;padding:0 4px 0 4px;white-space:pre-wrap;*white-space:pre;color:#333}.mce-textbox:focus,.mce-textbox.mce-focus{border-color:#3498db}.mce-placeholder .mce-textbox{color:#aaa}.mce-textbox.mce-multiline{padding:4px}.mce-textbox.mce-disabled{color:#adadad}.mce-rtl .mce-textbox{text-align:right;direction:rtl}.mce-throbber{position:absolute;top:0;left:0;width:100%;height:100%;opacity:.6;filter:alpha(opacity=60);zoom:1;background:#fff url('img/loader.gif') no-repeat center center}.mce-throbber-inline{position:static;height:50px}@font-face{font-family:'tinymce';src:url('fonts/tinymce.eot');src:url('fonts/tinymce.eot?#iefix') format('embedded-opentype'),url('fonts/tinymce.woff') format('woff'),url('fonts/tinymce.ttf') format('truetype'),url('fonts/tinymce.svg#tinymce') format('svg');font-weight:normal;font-style:normal}@font-face{font-family:'tinymce-small';src:url('fonts/tinymce-small.eot');src:url('fonts/tinymce-small.eot?#iefix') format('embedded-opentype'),url('fonts/tinymce-small.woff') format('woff'),url('fonts/tinymce-small.ttf') format('truetype'),url('fonts/tinymce-small.svg#tinymce') format('svg');font-weight:normal;font-style:normal}.mce-ico{font-family:'tinymce';font-style:normal;font-weight:normal;font-size:16px;line-height:16px;vertical-align:text-top;-webkit-font-smoothing:antialiased;display:inline-block;background:transparent center center;width:16px;height:16px;color:#333;-ie7-icon:' '}.mce-btn-small .mce-ico{font-family:'tinymce-small'}.mce-ico,i.mce-i-checkbox{zoom:expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = this.currentStyle['-ie7-icon'].substr(1, 1) + ' ')}.mce-i-save{-ie7-icon:"\e000"}.mce-i-newdocument{-ie7-icon:"\e001"}.mce-i-fullpage{-ie7-icon:"\e002"}.mce-i-alignleft{-ie7-icon:"\e003"}.mce-i-aligncenter{-ie7-icon:"\e004"}.mce-i-alignright{-ie7-icon:"\e005"}.mce-i-alignjustify{-ie7-icon:"\e006"}.mce-i-alignnone{-ie7-icon:"\e003"}.mce-i-cut{-ie7-icon:"\e007"}.mce-i-paste{-ie7-icon:"\e008"}.mce-i-searchreplace{-ie7-icon:"\e009"}.mce-i-bullist{-ie7-icon:"\e00a"}.mce-i-numlist{-ie7-icon:"\e00b"}.mce-i-indent{-ie7-icon:"\e00c"}.mce-i-outdent{-ie7-icon:"\e00d"}.mce-i-blockquote{-ie7-icon:"\e00e"}.mce-i-undo{-ie7-icon:"\e00f"}.mce-i-redo{-ie7-icon:"\e010"}.mce-i-link{-ie7-icon:"\e011"}.mce-i-unlink{-ie7-icon:"\e012"}.mce-i-anchor{-ie7-icon:"\e013"}.mce-i-image{-ie7-icon:"\e014"}.mce-i-media{-ie7-icon:"\e015"}.mce-i-help{-ie7-icon:"\e016"}.mce-i-code{-ie7-icon:"\e017"}.mce-i-insertdatetime{-ie7-icon:"\e018"}.mce-i-preview{-ie7-icon:"\e019"}.mce-i-forecolor{-ie7-icon:"\e01a"}.mce-i-backcolor{-ie7-icon:"\e01a"}.mce-i-table{-ie7-icon:"\e01b"}.mce-i-hr{-ie7-icon:"\e01c"}.mce-i-removeformat{-ie7-icon:"\e01d"}.mce-i-subscript{-ie7-icon:"\e01e"}.mce-i-superscript{-ie7-icon:"\e01f"}.mce-i-charmap{-ie7-icon:"\e020"}.mce-i-emoticons{-ie7-icon:"\e021"}.mce-i-print{-ie7-icon:"\e022"}.mce-i-fullscreen{-ie7-icon:"\e023"}.mce-i-spellchecker{-ie7-icon:"\e024"}.mce-i-nonbreaking{-ie7-icon:"\e025"}.mce-i-template{-ie7-icon:"\e026"}.mce-i-pagebreak{-ie7-icon:"\e027"}.mce-i-restoredraft{-ie7-icon:"\e028"}.mce-i-untitled{-ie7-icon:"\e029"}.mce-i-bold{-ie7-icon:"\e02a"}.mce-i-italic{-ie7-icon:"\e02b"}.mce-i-underline{-ie7-icon:"\e02c"}.mce-i-strikethrough{-ie7-icon:"\e02d"}.mce-i-visualchars{-ie7-icon:"\e02e"}.mce-i-ltr{-ie7-icon:"\e02f"}.mce-i-rtl{-ie7-icon:"\e030"}.mce-i-copy{-ie7-icon:"\e031"}.mce-i-resize{-ie7-icon:"\e032"}.mce-i-browse{-ie7-icon:"\e034"}.mce-i-pastetext{-ie7-icon:"\e035"}.mce-i-rotateleft{-ie7-icon:"\eaa8"}.mce-i-rotateright{-ie7-icon:"\eaa9"}.mce-i-crop{-ie7-icon:"\ee78"}.mce-i-editimage{-ie7-icon:"\e914"}.mce-i-options{-ie7-icon:"\ec6a"}.mce-i-flipv{-ie7-icon:"\eaaa"}.mce-i-fliph{-ie7-icon:"\eaac"}.mce-i-zoomin{-ie7-icon:"\eb35"}.mce-i-zoomout{-ie7-icon:"\eb36"}.mce-i-sun{-ie7-icon:"\eccc"}.mce-i-moon{-ie7-icon:"\eccd"}.mce-i-arrowleft{-ie7-icon:"\edc0"}.mce-i-arrowright{-ie7-icon:"\edb8"}.mce-i-drop{-ie7-icon:"\e934"}.mce-i-contrast{-ie7-icon:"\ecd4"}.mce-i-sharpen{-ie7-icon:"\eba7"}.mce-i-palette{-ie7-icon:"\e92a"}.mce-i-resize2{-ie7-icon:"\edf9"}.mce-i-orientation{-ie7-icon:"\e601"}.mce-i-invert{-ie7-icon:"\e602"}.mce-i-gamma{-ie7-icon:"\e600"}.mce-i-remove{-ie7-icon:"\ed6a"}.mce-i-checkbox,.mce-i-selected{-ie7-icon:"\e033"}.mce-i-selected{visibility:hidden}.mce-i-backcolor{background:#BBB} \ No newline at end of file +.mce-container,.mce-container *,.mce-widget,.mce-widget *,.mce-reset{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:#333;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;-webkit-tap-highlight-color:transparent;line-height:normal;font-weight:normal;text-align:left;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr;max-width:none}.mce-widget button{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.mce-container *[unselectable]{-moz-user-select:none;-webkit-user-select:none;-o-user-select:none;user-select:none}.mce-fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.mce-fade.mce-in{opacity:1}.mce-tinymce{visibility:inherit !important;position:relative}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;height:100%;z-index:100}div.mce-fullscreen{position:fixed;top:0;left:0;width:100%;height:auto}.mce-tinymce{display:block}.mce-wordcount{position:absolute;top:0;right:0;padding:8px}div.mce-edit-area{background:#fff;filter:none}.mce-statusbar{position:relative}.mce-statusbar .mce-container-body{position:relative}.mce-fullscreen .mce-resizehandle{display:none}.mce-charmap{border-collapse:collapse}.mce-charmap td{cursor:default;border:1px solid rgba(0,0,0,0.2);width:20px;height:20px;line-height:20px;text-align:center;vertical-align:middle;padding:2px}.mce-charmap td div{text-align:center}.mce-charmap td:hover{background:#d9d9d9}.mce-grid td.mce-grid-cell div{border:1px solid #d6d6d6;width:15px;height:15px;margin:0;cursor:pointer}.mce-grid td.mce-grid-cell div:focus{border-color:#3498db}.mce-grid td.mce-grid-cell div[disabled]{cursor:not-allowed}.mce-grid{border-spacing:2px;border-collapse:separate}.mce-grid a{display:block;border:1px solid transparent}.mce-grid a:hover,.mce-grid a:focus{border-color:#3498db}.mce-grid-border{margin:0 4px 0 4px}.mce-grid-border a{border-color:#d6d6d6;width:13px;height:13px}.mce-grid-border a:hover,.mce-grid-border a.mce-active{border-color:#3498db;background:#3498db}.mce-text-center{text-align:center}div.mce-tinymce-inline{width:100%}.mce-colorbtn-trans div{text-align:center;vertical-align:middle;font-weight:bold;font-size:20px;line-height:16px;color:#707070}.mce-monospace{font-family:"Courier New",Courier,monospace}.mce-toolbar-grp{padding:2px 0}.mce-toolbar-grp .mce-flow-layout-item{margin-bottom:0}.mce-rtl .mce-wordcount{left:0;right:auto}.mce-croprect-container{position:absolute;top:0;left:0}.mce-croprect-handle{position:absolute;top:0;left:0;width:20px;height:20px;border:2px solid white}.mce-croprect-handle-nw{border-width:2px 0 0 2px;margin:-2px 0 0 -2px;cursor:nw-resize;top:100px;left:100px}.mce-croprect-handle-ne{border-width:2px 2px 0 0;margin:-2px 0 0 -20px;cursor:ne-resize;top:100px;left:200px}.mce-croprect-handle-sw{border-width:0 0 2px 2px;margin:-20px 2px 0 -2px;cursor:sw-resize;top:200px;left:100px}.mce-croprect-handle-se{border-width:0 2px 2px 0;margin:-20px 0 0 -20px;cursor:se-resize;top:200px;left:200px}.mce-croprect-handle-move{position:absolute;cursor:move;border:0}.mce-croprect-block{opacity:.3;filter:alpha(opacity=30);zoom:1;position:absolute;background:black}.mce-imagepanel{overflow:auto;background:black}.mce-imagepanel img{position:absolute}.mce-imagetool.mce-btn .mce-ico{display:block;width:20px;height:20px;text-align:center;line-height:20px;font-size:20px;padding:5px}.mce-container,.mce-container-body{display:block}.mce-autoscroll{overflow:hidden}.mce-scrollbar{position:absolute;width:7px;height:100%;top:2px;right:2px;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-scrollbar-h{top:auto;right:auto;left:2px;bottom:2px;width:100%;height:7px}.mce-scrollbar-thumb{position:absolute;background-color:#000;border:1px solid #888;border-color:rgba(85,85,85,0.6);width:5px;height:100%}.mce-scrollbar-h .mce-scrollbar-thumb{width:100%;height:5px}.mce-scrollbar:hover,.mce-scrollbar.mce-active{background-color:#aaa;opacity:.6;filter:alpha(opacity=60);zoom:1}.mce-scroll{position:relative}.mce-panel{border:0 solid #cacaca;border:0 solid rgba(0,0,0,0.2);background-color:#f0f0f0}.mce-floatpanel{position:absolute}.mce-floatpanel.mce-fixed{position:fixed}.mce-floatpanel .mce-arrow,.mce-floatpanel .mce-arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.mce-floatpanel .mce-arrow{border-width:11px}.mce-floatpanel .mce-arrow:after{border-width:10px;content:""}.mce-floatpanel.mce-popover{filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;top:0;left:0;background:#fff;border:1px solid rgba(0,0,0,0.2);border:1px solid rgba(0,0,0,0.25)}.mce-floatpanel.mce-popover.mce-bottom{margin-top:10px;*margin-top:0}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow{left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:rgba(0,0,0,0.2);border-bottom-color:rgba(0,0,0,0.25);top:-11px}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow:after{top:1px;margin-left:-10px;border-top-width:0;border-bottom-color:#fff}.mce-floatpanel.mce-popover.mce-bottom.mce-start{margin-left:-22px}.mce-floatpanel.mce-popover.mce-bottom.mce-start>.mce-arrow{left:20px}.mce-floatpanel.mce-popover.mce-bottom.mce-end{margin-left:22px}.mce-floatpanel.mce-popover.mce-bottom.mce-end>.mce-arrow{right:10px;left:auto}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;height:100%}div.mce-fullscreen{position:fixed;top:0;left:0}#mce-modal-block{opacity:0;filter:alpha(opacity=0);zoom:1;position:fixed;left:0;top:0;width:100%;height:100%;background:#000}#mce-modal-block.mce-in{opacity:.3;filter:alpha(opacity=30);zoom:1}.mce-window-move{cursor:move}.mce-window{filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;background:#fff;position:fixed;top:0;left:0;opacity:0;-webkit-transition:opacity 150ms ease-in;transition:opacity 150ms ease-in}.mce-window.mce-in{opacity:1}.mce-window-head{padding:9px 15px;border-bottom:1px solid #c5c5c5;position:relative}.mce-window-head .mce-close{position:absolute;right:15px;top:9px;font-size:20px;font-weight:bold;line-height:20px;color:#858585;cursor:pointer;height:20px;overflow:hidden}.mce-close:hover{color:#adadad}.mce-window-head .mce-title{line-height:20px;font-size:20px;font-weight:bold;text-rendering:optimizelegibility;padding-right:10px}.mce-window .mce-container-body{display:block}.mce-foot{display:block;background-color:#fff;border-top:1px solid #c5c5c5}.mce-window-head .mce-dragh{position:absolute;top:0;left:0;cursor:move;width:90%;height:100%}.mce-window iframe{width:100%;height:100%}.mce-window-body .mce-listbox{border-color:#ccc}.mce-rtl .mce-window-head .mce-close{position:absolute;right:auto;left:15px}.mce-rtl .mce-window-head .mce-dragh{left:auto;right:0}.mce-rtl .mce-window-head .mce-title{direction:rtl;text-align:right}.mce-tooltip{position:absolute;padding:5px;opacity:.8;filter:alpha(opacity=80);zoom:1}.mce-tooltip-inner{font-size:11px;background-color:#000;color:white;max-width:200px;padding:5px 8px 4px 8px;text-align:center;white-space:normal}.mce-tooltip-arrow{position:absolute;width:0;height:0;line-height:0;border:5px dashed #000}.mce-tooltip-arrow-n{border-bottom-color:#000}.mce-tooltip-arrow-s{border-top-color:#000}.mce-tooltip-arrow-e{border-left-color:#000}.mce-tooltip-arrow-w{border-right-color:#000}.mce-tooltip-nw,.mce-tooltip-sw{margin-left:-14px}.mce-tooltip-n .mce-tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-style:solid;border-top:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-nw .mce-tooltip-arrow{top:0;left:10px;border-bottom-style:solid;border-top:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-ne .mce-tooltip-arrow{top:0;right:10px;border-bottom-style:solid;border-top:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-s .mce-tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-style:solid;border-bottom:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-sw .mce-tooltip-arrow{bottom:0;left:10px;border-top-style:solid;border-bottom:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-se .mce-tooltip-arrow{bottom:0;right:10px;border-top-style:solid;border-bottom:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-e .mce-tooltip-arrow{right:0;top:50%;margin-top:-5px;border-left-style:solid;border-right:none;border-top-color:transparent;border-bottom-color:transparent}.mce-tooltip-w .mce-tooltip-arrow{left:0;top:50%;margin-top:-5px;border-right-style:solid;border-left:none;border-top-color:transparent;border-bottom-color:transparent}.mce-progress{display:inline-block;position:relative;height:20px}.mce-progress .mce-bar-container{display:inline-block;width:100px;height:100%;margin-right:8px;border:1px solid #ccc;overflow:hidden}.mce-progress .mce-text{display:inline-block;margin-top:auto;margin-bottom:auto;font-size:14px;width:40px;color:#333}.mce-bar{display:block;width:0;height:100%;background-color:#d7d7d7;-webkit-transition:width .2s ease;transition:width .2s ease}.mce-notification{position:absolute;background-color:#f0f0f0;padding:5px;margin-top:5px;opacity:.8;filter:alpha(opacity=80);zoom:1;border-width:1px;border-style:solid;border-color:#ccc}.mce-notification-success{background-color:#dff0d8;border-color:#d6e9c6}.mce-notification-info{background-color:#d9edf7;border-color:#779ecb}.mce-notification-warning{background-color:#fcf8e3;border-color:#faebcc}.mce-notification-error{background-color:#f2dede;border-color:#ebccd1}.mce-notification.mce-has-close{padding-right:15px}.mce-notification .mce-ico{margin-top:5px}.mce-notification-inner{display:inline-block;font-size:14px;margin:5px 8px 4px 8px;text-align:center;white-space:normal;color:#31708f}.mce-notification-inner a{text-decoration:underline;cursor:pointer}.mce-notification .mce-progress{margin-right:8px}.mce-notification .mce-progress .mce-text{margin-top:5px}.mce-notification *,.mce-notification .mce-progress .mce-text{color:#333}.mce-notification .mce-progress .mce-bar-container{border-color:#ccc}.mce-notification .mce-progress .mce-bar-container .mce-bar{background-color:#333}.mce-notification-success *,.mce-notification-success .mce-progress .mce-text{color:#3c763d}.mce-notification-success .mce-progress .mce-bar-container{border-color:#d6e9c6}.mce-notification-success .mce-progress .mce-bar-container .mce-bar{background-color:#3c763d}.mce-notification-info *,.mce-notification-info .mce-progress .mce-text{color:#31708f}.mce-notification-info .mce-progress .mce-bar-container{border-color:#779ecb}.mce-notification-info .mce-progress .mce-bar-container .mce-bar{background-color:#31708f}.mce-notification-warning *,.mce-notification-warning .mce-progress .mce-text{color:#8a6d3b}.mce-notification-warning .mce-progress .mce-bar-container{border-color:#faebcc}.mce-notification-warning .mce-progress .mce-bar-container .mce-bar{background-color:#8a6d3b}.mce-notification-error *,.mce-notification-error .mce-progress .mce-text{color:#a94442}.mce-notification-error .mce-progress .mce-bar-container{border-color:#ebccd1}.mce-notification-error .mce-progress .mce-bar-container .mce-bar{background-color:#a94442}.mce-notification .mce-close{position:absolute;top:6px;right:8px;font-size:20px;font-weight:bold;line-height:20px;color:#858585;cursor:pointer;height:20px;overflow:hidden}.mce-abs-layout{position:relative}body .mce-abs-layout-item,.mce-abs-end{position:absolute}.mce-abs-end{width:1px;height:1px}.mce-container-body.mce-abs-layout{overflow:hidden}.mce-btn{border:1px solid #b1b1b1;border-color:transparent transparent transparent transparent;position:relative;text-shadow:0 1px 1px rgba(255,255,255,0.75);display:inline-block;*display:inline;*zoom:1;background-color:#f0f0f0}.mce-btn:hover,.mce-btn:focus{color:#333;background-color:#e3e3e3;border-color:#ccc}.mce-btn.mce-disabled button,.mce-btn.mce-disabled:hover button{cursor:default;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-btn.mce-active,.mce-btn.mce-active:hover{background-color:#dbdbdb;border-color:#ccc}.mce-btn:active{background-color:#e0e0e0;border-color:#ccc}.mce-btn button{padding:4px 8px;font-size:14px;line-height:20px;*line-height:16px;cursor:pointer;color:#333;text-align:center;overflow:visible;-webkit-appearance:none}.mce-btn button::-moz-focus-inner{border:0;padding:0}.mce-btn i{text-shadow:1px 1px none}.mce-primary{min-width:50px;color:#fff;border:1px solid transparent;border-color:transparent;background-color:#2d8ac7}.mce-primary:hover,.mce-primary:focus{background-color:#257cb6;border-color:transparent}.mce-primary.mce-disabled button,.mce-primary.mce-disabled:hover button{cursor:default;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-primary.mce-active,.mce-primary.mce-active:hover,.mce-primary:not(.mce-disabled):active{background-color:#206ea1}.mce-primary button,.mce-primary button i{color:#fff;text-shadow:1px 1px none}.mce-btn .mce-txt{font-size:inherit;line-height:inherit;color:inherit}.mce-btn-large button{padding:9px 14px;font-size:16px;line-height:normal}.mce-btn-large i{margin-top:2px}.mce-btn-small button{padding:1px 5px;font-size:12px;*padding-bottom:2px}.mce-btn-small i{line-height:20px;vertical-align:top;*line-height:18px}.mce-btn .mce-caret{margin-top:8px;margin-left:0}.mce-btn-small .mce-caret{margin-top:8px;margin-left:0}.mce-caret{display:inline-block;*display:inline;*zoom:1;width:0;height:0;vertical-align:top;border-top:4px solid #333;border-right:4px solid transparent;border-left:4px solid transparent;content:""}.mce-disabled .mce-caret{border-top-color:#aaa}.mce-caret.mce-up{border-bottom:4px solid #333;border-top:0}.mce-btn-flat{border:0;background:transparent;filter:none}.mce-btn-flat:hover,.mce-btn-flat.mce-active,.mce-btn-flat:focus,.mce-btn-flat:active{border:0;background:#e6e6e6;filter:none}.mce-btn-has-text .mce-ico{padding-right:5px}.mce-rtl .mce-btn button{direction:rtl}.mce-btn-group .mce-btn{border-width:1px;margin:0;margin-left:2px}.mce-btn-group:not(:first-child){border-left:1px solid #d9d9d9;padding-left:3px;margin-left:3px}.mce-btn-group .mce-first{margin-left:0}.mce-btn-group .mce-btn.mce-flow-layout-item{margin:0}.mce-rtl .mce-btn-group .mce-btn{margin-left:0;margin-right:2px}.mce-rtl .mce-btn-group .mce-first{margin-right:0}.mce-rtl .mce-btn-group:not(:first-child){border-left:none;border-right:1px solid #d9d9d9;padding-right:4px;margin-right:4px}.mce-checkbox{cursor:pointer}i.mce-i-checkbox{margin:0 3px 0 0;border:1px solid #c5c5c5;background-color:#f0f0f0;text-indent:-10em;*font-size:0;*line-height:0;*text-indent:0;overflow:hidden}.mce-checked i.mce-i-checkbox{color:#333;font-size:16px;line-height:16px;text-indent:0}.mce-checkbox:focus i.mce-i-checkbox,.mce-checkbox.mce-focus i.mce-i-checkbox{border:1px solid rgba(82,168,236,0.8)}.mce-checkbox.mce-disabled .mce-label,.mce-checkbox.mce-disabled i.mce-i-checkbox{color:#acacac}.mce-checkbox .mce-label{vertical-align:middle}.mce-rtl .mce-checkbox{direction:rtl;text-align:right}.mce-rtl i.mce-i-checkbox{margin:0 0 0 3px}.mce-combobox{display:inline-block;*display:inline;*zoom:1;*height:32px}.mce-combobox input{border:1px solid #c5c5c5;border-right-color:#c5c5c5;height:28px}.mce-combobox.mce-disabled input{color:#adadad}.mce-combobox .mce-btn{border:1px solid #c5c5c5;border-left:0}.mce-combobox button{padding-right:8px;padding-left:8px}.mce-combobox.mce-disabled .mce-btn button{cursor:default;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-colorbox i{border:1px solid #c5c5c5;width:14px;height:14px}.mce-colorbutton .mce-ico{position:relative}.mce-colorbutton-grid{margin:4px}.mce-colorbutton button{padding-right:6px;padding-left:6px}.mce-colorbutton .mce-preview{padding-right:3px;display:block;position:absolute;left:50%;top:50%;margin-left:-17px;margin-top:7px;background:gray;width:13px;height:2px;overflow:hidden}.mce-colorbutton.mce-btn-small .mce-preview{margin-left:-16px;padding-right:0;width:16px}.mce-colorbutton .mce-open{padding-left:4px;padding-right:4px;border-left:1px solid transparent}.mce-colorbutton:hover .mce-open{border-color:#ccc}.mce-colorbutton.mce-btn-small .mce-open{padding:0 3px 0 3px}.mce-rtl .mce-colorbutton{direction:rtl}.mce-rtl .mce-colorbutton .mce-preview{margin-left:0;padding-right:0;padding-left:3px}.mce-rtl .mce-colorbutton.mce-btn-small .mce-preview{margin-left:0;padding-right:0;padding-left:2px}.mce-rtl .mce-colorbutton .mce-open{padding-left:4px;padding-right:4px;border-left:0}.mce-colorpicker{position:relative;width:250px;height:220px}.mce-colorpicker-sv{position:absolute;top:0;left:0;width:90%;height:100%;border:1px solid #c5c5c5;cursor:crosshair;overflow:hidden}.mce-colorpicker-h-chunk{width:100%}.mce-colorpicker-overlay1,.mce-colorpicker-overlay2{width:100%;height:100%;position:absolute;top:0;left:0}.mce-colorpicker-overlay1{filter:progid:DXImageTransform.Microsoft.gradient(GradientType=1, startColorstr='#ffffff', endColorstr='#00ffffff');-ms-filter:"progid:DXImageTransform.Microsoft.gradient(GradientType=1,startColorstr='#ffffff', endColorstr='#00ffffff')";background:linear-gradient(to right, #fff, rgba(255,255,255,0))}.mce-colorpicker-overlay2{filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#00000000', endColorstr='#000000');-ms-filter:"progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#00000000', endColorstr='#000000')";background:linear-gradient(to bottom, rgba(0,0,0,0), #000)}.mce-colorpicker-selector1{background:none;position:absolute;width:12px;height:12px;margin:-8px 0 0 -8px;border:1px solid black;border-radius:50%}.mce-colorpicker-selector2{position:absolute;width:10px;height:10px;border:1px solid white;border-radius:50%}.mce-colorpicker-h{position:absolute;top:0;right:0;width:6.5%;height:100%;border:1px solid #c5c5c5;cursor:crosshair}.mce-colorpicker-h-marker{margin-top:-4px;position:absolute;top:0;left:-1px;width:100%;border:1px solid #333;background:#fff;height:4px;z-index:100}.mce-path{display:inline-block;*display:inline;*zoom:1;padding:8px;white-space:normal}.mce-path .mce-txt{display:inline-block;padding-right:3px}.mce-path .mce-path-body{display:inline-block}.mce-path-item{display:inline-block;*display:inline;*zoom:1;cursor:pointer;color:#333}.mce-path-item:hover{text-decoration:underline}.mce-path-item:focus{background:#666;color:#fff}.mce-path .mce-divider{display:inline}.mce-disabled .mce-path-item{color:#aaa}.mce-rtl .mce-path{direction:rtl}.mce-fieldset{border:0 solid #9e9e9e}.mce-fieldset>.mce-container-body{margin-top:-15px}.mce-fieldset-title{margin-left:5px;padding:0 5px 0 5px}.mce-fit-layout{display:inline-block;*display:inline;*zoom:1}.mce-fit-layout-item{position:absolute}.mce-flow-layout-item{display:inline-block;*display:inline;*zoom:1}.mce-flow-layout-item{margin:2px 0 2px 2px}.mce-flow-layout-item.mce-last{margin-right:2px}.mce-flow-layout{white-space:normal}.mce-tinymce-inline .mce-flow-layout{white-space:nowrap}.mce-rtl .mce-flow-layout{text-align:right;direction:rtl}.mce-rtl .mce-flow-layout-item{margin:2px 2px 2px 0}.mce-rtl .mce-flow-layout-item.mce-last{margin-left:2px}.mce-iframe{border:0 solid rgba(0,0,0,0.2);width:100%;height:100%}.mce-label{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 1px rgba(255,255,255,0.75);overflow:hidden}.mce-label.mce-autoscroll{overflow:auto}.mce-label.mce-disabled{color:#aaa}.mce-label.mce-multiline{white-space:pre-wrap}.mce-label.mce-error{color:#a00}.mce-rtl .mce-label{text-align:right;direction:rtl}.mce-menubar .mce-menubtn{border-color:transparent;background:transparent;filter:none}.mce-menubar .mce-menubtn button{color:#333}.mce-menubar{border:1px solid rgba(217,217,217,0.52)}.mce-menubar .mce-menubtn button span{color:#333}.mce-menubar .mce-caret{border-top-color:#333}.mce-menubar .mce-menubtn:hover,.mce-menubar .mce-menubtn.mce-active,.mce-menubar .mce-menubtn:focus{border-color:#ccc;background:#fff;filter:none}.mce-menubtn button{color:#333}.mce-menubtn.mce-btn-small span{font-size:12px}.mce-menubtn.mce-fixed-width span{display:inline-block;overflow-x:hidden;text-overflow:ellipsis;width:90px}.mce-menubtn.mce-fixed-width.mce-btn-small span{width:70px}.mce-menubtn .mce-caret{*margin-top:6px}.mce-rtl .mce-menubtn button{direction:rtl;text-align:right}.mce-menu-item{display:block;padding:6px 15px 6px 12px;clear:both;font-weight:normal;line-height:20px;color:#333;white-space:nowrap;cursor:pointer;line-height:normal;border-left:4px solid transparent;margin-bottom:1px}.mce-menu-item .mce-ico,.mce-menu-item .mce-text{color:#333}.mce-menu-item.mce-disabled .mce-text,.mce-menu-item.mce-disabled .mce-ico{color:#adadad}.mce-menu-item:hover .mce-text,.mce-menu-item.mce-selected .mce-text,.mce-menu-item:focus .mce-text{color:white}.mce-menu-item:hover .mce-ico,.mce-menu-item.mce-selected .mce-ico,.mce-menu-item:focus .mce-ico{color:white}.mce-menu-item.mce-disabled:hover{background:#ccc}.mce-menu-shortcut{display:inline-block;color:#adadad}.mce-menu-shortcut{display:inline-block;*display:inline;*zoom:1;padding:0 15px 0 20px}.mce-menu-item:hover .mce-menu-shortcut,.mce-menu-item.mce-selected .mce-menu-shortcut,.mce-menu-item:focus .mce-menu-shortcut{color:white}.mce-menu-item .mce-caret{margin-top:4px;*margin-top:3px;margin-right:6px;border-top:4px solid transparent;border-bottom:4px solid transparent;border-left:4px solid #333}.mce-menu-item.mce-selected .mce-caret,.mce-menu-item:focus .mce-caret,.mce-menu-item:hover .mce-caret{border-left-color:white}.mce-menu-align .mce-menu-shortcut{*margin-top:-2px}.mce-menu-align .mce-menu-shortcut,.mce-menu-align .mce-caret{position:absolute;right:0}.mce-menu-item.mce-active i{visibility:visible}.mce-menu-item-normal.mce-active{background-color:#3498db}.mce-menu-item-preview.mce-active{border-left:5px solid #aaa}.mce-menu-item-normal.mce-active .mce-text{color:white}.mce-menu-item-normal.mce-active:hover .mce-text,.mce-menu-item-normal.mce-active:hover .mce-ico{color:white}.mce-menu-item-normal.mce-active:focus .mce-text,.mce-menu-item-normal.mce-active:focus .mce-ico{color:white}.mce-menu-item:hover,.mce-menu-item.mce-selected,.mce-menu-item:focus{text-decoration:none;color:white;background-color:#2d8ac7}div.mce-menu .mce-menu-item-sep,.mce-menu-item-sep:hover{border:0;padding:0;height:1px;margin:9px 1px;overflow:hidden;background:transparent;border-bottom:1px solid rgba(0,0,0,0.1);cursor:default;filter:none}.mce-menu.mce-rtl{direction:rtl}.mce-rtl .mce-menu-item{text-align:right;direction:rtl;padding:6px 12px 6px 15px}.mce-menu-align.mce-rtl .mce-menu-shortcut,.mce-menu-align.mce-rtl .mce-caret{right:auto;left:0}.mce-rtl .mce-menu-item .mce-caret{margin-left:6px;margin-right:0;border-right:4px solid #333;border-left:0}.mce-rtl .mce-menu-item.mce-selected .mce-caret,.mce-rtl .mce-menu-item:focus .mce-caret,.mce-rtl .mce-menu-item:hover .mce-caret{border-left-color:transparent;border-right-color:white}.mce-menu{position:absolute;left:0;top:0;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;z-index:1000;padding:5px 0 5px 0;margin:-1px 0 0;min-width:160px;background:#fff;border:1px solid #989898;border:1px solid rgba(0,0,0,0.2);z-index:1002;max-height:400px;overflow:auto;overflow-x:hidden}.mce-menu i{display:none}.mce-menu-has-icons i{display:inline-block;*display:inline}.mce-menu-sub-tr-tl{margin:-6px 0 0 -1px}.mce-menu-sub-br-bl{margin:6px 0 0 -1px}.mce-menu-sub-tl-tr{margin:-6px 0 0 1px}.mce-menu-sub-bl-br{margin:6px 0 0 1px}.mce-listbox button{text-align:left;padding-right:20px;position:relative}.mce-listbox .mce-caret{position:absolute;margin-top:-2px;right:8px;top:50%}.mce-rtl .mce-listbox .mce-caret{right:auto;left:8px}.mce-rtl .mce-listbox button{padding-right:10px;padding-left:20px}.mce-container-body .mce-resizehandle{position:absolute;right:0;bottom:0;width:16px;height:16px;visibility:visible;cursor:s-resize;margin:0}.mce-container-body .mce-resizehandle-both{cursor:se-resize}i.mce-i-resize{color:#333}.mce-selectbox{background:#fff;border:1px solid #c5c5c5}.mce-slider{border:1px solid #aaa;background:#eee;width:100px;height:10px;position:relative;display:block}.mce-slider.mce-vertical{width:10px;height:100px}.mce-slider-handle{border:1px solid #bbb;background:#ddd;display:block;width:13px;height:13px;position:absolute;top:0;left:0;margin-left:-1px;margin-top:-2px}.mce-spacer{visibility:hidden}.mce-splitbtn .mce-open{border-left:1px solid transparent}.mce-splitbtn:hover .mce-open{border-left-color:#ccc}.mce-splitbtn button{padding-right:6px;padding-left:6px}.mce-splitbtn .mce-open{padding-right:4px;padding-left:4px}.mce-splitbtn .mce-open.mce-active{background-color:#dbdbdb;outline:1px solid #ccc}.mce-splitbtn.mce-btn-small .mce-open{padding:0 3px 0 3px}.mce-rtl .mce-splitbtn{direction:rtl;text-align:right}.mce-rtl .mce-splitbtn button{padding-right:4px;padding-left:4px}.mce-rtl .mce-splitbtn .mce-open{border-left:0}.mce-stack-layout-item{display:block}.mce-tabs{display:block;border-bottom:1px solid #c5c5c5}.mce-tabs,.mce-tabs+.mce-container-body{background:#fff}.mce-tab{display:inline-block;*display:inline;*zoom:1;border:1px solid #c5c5c5;border-width:0 1px 0 0;background:#fff;padding:8px;text-shadow:0 1px 1px rgba(255,255,255,0.75);height:13px;cursor:pointer}.mce-tab:hover{background:#fdfdfd}.mce-tab.mce-active{background:#fdfdfd;border-bottom-color:transparent;margin-bottom:-1px;height:14px}.mce-rtl .mce-tabs{text-align:right;direction:rtl}.mce-rtl .mce-tab{border-width:0 0 0 1px}.mce-textbox{background:#fff;border:1px solid #c5c5c5;display:inline-block;-webkit-transition:border linear .2s, box-shadow linear .2s;transition:border linear .2s, box-shadow linear .2s;height:28px;resize:none;padding:0 4px 0 4px;white-space:pre-wrap;*white-space:pre;color:#333}.mce-textbox:focus,.mce-textbox.mce-focus{border-color:#3498db}.mce-placeholder .mce-textbox{color:#aaa}.mce-textbox.mce-multiline{padding:4px;height:auto}.mce-textbox.mce-disabled{color:#adadad}.mce-rtl .mce-textbox{text-align:right;direction:rtl}.mce-throbber{position:absolute;top:0;left:0;width:100%;height:100%;opacity:.6;filter:alpha(opacity=60);zoom:1;background:#fff url('img/loader.gif') no-repeat center center}.mce-throbber-inline{position:static;height:50px}@font-face{font-family:'tinymce';src:url('fonts/tinymce.eot');src:url('fonts/tinymce.eot?#iefix') format('embedded-opentype'),url('fonts/tinymce.woff') format('woff'),url('fonts/tinymce.ttf') format('truetype'),url('fonts/tinymce.svg#tinymce') format('svg');font-weight:normal;font-style:normal}@font-face{font-family:'tinymce-small';src:url('fonts/tinymce-small.eot');src:url('fonts/tinymce-small.eot?#iefix') format('embedded-opentype'),url('fonts/tinymce-small.woff') format('woff'),url('fonts/tinymce-small.ttf') format('truetype'),url('fonts/tinymce-small.svg#tinymce') format('svg');font-weight:normal;font-style:normal}.mce-ico{font-family:'tinymce';font-style:normal;font-weight:normal;font-size:16px;line-height:16px;vertical-align:text-top;-webkit-font-smoothing:antialiased;display:inline-block;background:transparent center center;width:16px;height:16px;color:#333;-ie7-icon:' '}.mce-btn-small .mce-ico{font-family:'tinymce-small'}.mce-ico,i.mce-i-checkbox{zoom:expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = this.currentStyle['-ie7-icon'].substr(1, 1) + ' ')}.mce-i-save{-ie7-icon:"\e000"}.mce-i-newdocument{-ie7-icon:"\e001"}.mce-i-fullpage{-ie7-icon:"\e002"}.mce-i-alignleft{-ie7-icon:"\e003"}.mce-i-aligncenter{-ie7-icon:"\e004"}.mce-i-alignright{-ie7-icon:"\e005"}.mce-i-alignjustify{-ie7-icon:"\e006"}.mce-i-alignnone{-ie7-icon:"\e003"}.mce-i-cut{-ie7-icon:"\e007"}.mce-i-paste{-ie7-icon:"\e008"}.mce-i-searchreplace{-ie7-icon:"\e009"}.mce-i-bullist{-ie7-icon:"\e00a"}.mce-i-numlist{-ie7-icon:"\e00b"}.mce-i-indent{-ie7-icon:"\e00c"}.mce-i-outdent{-ie7-icon:"\e00d"}.mce-i-blockquote{-ie7-icon:"\e00e"}.mce-i-undo{-ie7-icon:"\e00f"}.mce-i-redo{-ie7-icon:"\e010"}.mce-i-link{-ie7-icon:"\e011"}.mce-i-unlink{-ie7-icon:"\e012"}.mce-i-anchor{-ie7-icon:"\e013"}.mce-i-image{-ie7-icon:"\e014"}.mce-i-media{-ie7-icon:"\e015"}.mce-i-help{-ie7-icon:"\e016"}.mce-i-code{-ie7-icon:"\e017"}.mce-i-insertdatetime{-ie7-icon:"\e018"}.mce-i-preview{-ie7-icon:"\e019"}.mce-i-forecolor{-ie7-icon:"\e01a"}.mce-i-backcolor{-ie7-icon:"\e01a"}.mce-i-table{-ie7-icon:"\e01b"}.mce-i-hr{-ie7-icon:"\e01c"}.mce-i-removeformat{-ie7-icon:"\e01d"}.mce-i-subscript{-ie7-icon:"\e01e"}.mce-i-superscript{-ie7-icon:"\e01f"}.mce-i-charmap{-ie7-icon:"\e020"}.mce-i-emoticons{-ie7-icon:"\e021"}.mce-i-print{-ie7-icon:"\e022"}.mce-i-fullscreen{-ie7-icon:"\e023"}.mce-i-spellchecker{-ie7-icon:"\e024"}.mce-i-nonbreaking{-ie7-icon:"\e025"}.mce-i-template{-ie7-icon:"\e026"}.mce-i-pagebreak{-ie7-icon:"\e027"}.mce-i-restoredraft{-ie7-icon:"\e028"}.mce-i-untitled{-ie7-icon:"\e029"}.mce-i-bold{-ie7-icon:"\e02a"}.mce-i-italic{-ie7-icon:"\e02b"}.mce-i-underline{-ie7-icon:"\e02c"}.mce-i-strikethrough{-ie7-icon:"\e02d"}.mce-i-visualchars{-ie7-icon:"\e02e"}.mce-i-ltr{-ie7-icon:"\e02f"}.mce-i-rtl{-ie7-icon:"\e030"}.mce-i-copy{-ie7-icon:"\e031"}.mce-i-resize{-ie7-icon:"\e032"}.mce-i-browse{-ie7-icon:"\e034"}.mce-i-pastetext{-ie7-icon:"\e035"}.mce-i-rotateleft{-ie7-icon:"\eaa8"}.mce-i-rotateright{-ie7-icon:"\eaa9"}.mce-i-crop{-ie7-icon:"\ee78"}.mce-i-editimage{-ie7-icon:"\e914"}.mce-i-options{-ie7-icon:"\ec6a"}.mce-i-flipv{-ie7-icon:"\eaaa"}.mce-i-fliph{-ie7-icon:"\eaac"}.mce-i-zoomin{-ie7-icon:"\eb35"}.mce-i-zoomout{-ie7-icon:"\eb36"}.mce-i-sun{-ie7-icon:"\eccc"}.mce-i-moon{-ie7-icon:"\eccd"}.mce-i-arrowleft{-ie7-icon:"\edc0"}.mce-i-arrowright{-ie7-icon:"\edb8"}.mce-i-drop{-ie7-icon:"\e934"}.mce-i-contrast{-ie7-icon:"\ecd4"}.mce-i-sharpen{-ie7-icon:"\eba7"}.mce-i-palette{-ie7-icon:"\e92a"}.mce-i-resize2{-ie7-icon:"\edf9"}.mce-i-orientation{-ie7-icon:"\e601"}.mce-i-invert{-ie7-icon:"\e602"}.mce-i-gamma{-ie7-icon:"\e600"}.mce-i-remove{-ie7-icon:"\ed6a"}.mce-i-codesample{-ie7-icon:"\e603"}.mce-i-checkbox,.mce-i-selected{-ie7-icon:"\e033"}.mce-i-selected{visibility:hidden}.mce-i-backcolor{background:#bbb} \ No newline at end of file diff --git a/media/editors/tinymce/skins/lightgray/skin.min.css b/media/editors/tinymce/skins/lightgray/skin.min.css index f314cd61f3454..42fb63302228a 100644 --- a/media/editors/tinymce/skins/lightgray/skin.min.css +++ b/media/editors/tinymce/skins/lightgray/skin.min.css @@ -1 +1 @@ -.mce-container,.mce-container *,.mce-widget,.mce-widget *,.mce-reset{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:0 0;text-decoration:none;color:#333;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;-webkit-tap-highlight-color:transparent;line-height:normal;font-weight:400;text-align:left;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr;max-width:none}.mce-widget button{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.mce-container [unselectable]{-moz-user-select:none;-webkit-user-select:none;-o-user-select:none;user-select:none}.mce-fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.mce-fade.mce-in{opacity:1}.mce-tinymce{visibility:inherit!important;position:relative}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;height:100%;z-index:100}div.mce-fullscreen{position:fixed;top:0;left:0;width:100%;height:auto}.mce-tinymce{display:block}.mce-wordcount{position:absolute;top:0;right:0;padding:8px}div.mce-edit-area{background:#FFF;filter:none}.mce-statusbar{position:relative}.mce-statusbar .mce-container-body{position:relative}.mce-fullscreen .mce-resizehandle{display:none}.mce-charmap{border-collapse:collapse}.mce-charmap td{cursor:default;border:1px solid rgba(0,0,0,.2);width:20px;height:20px;line-height:20px;text-align:center;vertical-align:middle;padding:2px}.mce-charmap td div{text-align:center}.mce-charmap td:hover{background:#d9d9d9}.mce-grid td.mce-grid-cell div{border:1px solid #d6d6d6;width:15px;height:15px;margin:0;cursor:pointer}.mce-grid td.mce-grid-cell div:focus{border-color:#3498db}.mce-grid td.mce-grid-cell div[disabled]{cursor:not-allowed}.mce-grid{border-spacing:2px;border-collapse:separate}.mce-grid a{display:block;border:1px solid transparent}.mce-grid a:hover,.mce-grid a:focus{border-color:#3498db}.mce-grid-border{margin:0 4px 0 4px}.mce-grid-border a{border-color:#d6d6d6;width:13px;height:13px}.mce-grid-border a:hover,.mce-grid-border a.mce-active{border-color:#3498db;background:#3498db}.mce-text-center{text-align:center}div.mce-tinymce-inline{width:100%}.mce-colorbtn-trans div{text-align:center;vertical-align:middle;font-weight:700;font-size:20px;line-height:16px;color:#707070}.mce-toolbar-grp{padding:2px 0}.mce-toolbar-grp .mce-flow-layout-item{margin-bottom:0}.mce-rtl .mce-wordcount{left:0;right:auto}.mce-croprect-container{position:absolute;top:0;left:0}.mce-croprect-handle{position:absolute;top:0;left:0;width:20px;height:20px;border:2px solid #fff}.mce-croprect-handle-nw{border-width:2px 0 0 2px;margin:-2px 0 0 -2px;cursor:nw-resize;top:100px;left:100px}.mce-croprect-handle-ne{border-width:2px 2px 0 0;margin:-2px 0 0 -20px;cursor:ne-resize;top:100px;left:200px}.mce-croprect-handle-sw{border-width:0 0 2px 2px;margin:-20px 2px 0 -2px;cursor:sw-resize;top:200px;left:100px}.mce-croprect-handle-se{border-width:0 2px 2px 0;margin:-20px 0 0 -20px;cursor:se-resize;top:200px;left:200px}.mce-croprect-handle-move{position:absolute;cursor:move;border:0}.mce-croprect-block{opacity:.3;filter:alpha(opacity=30);zoom:1;position:absolute;background:#000}.mce-imagepanel{overflow:auto;background:#000}.mce-imagepanel img{position:absolute}.mce-imagetool.mce-btn .mce-ico{display:block;width:20px;height:20px;text-align:center;line-height:20px;font-size:20px;padding:5px}.mce-container,.mce-container-body{display:block}.mce-autoscroll{overflow:hidden}.mce-scrollbar{position:absolute;width:7px;height:100%;top:2px;right:2px;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-scrollbar-h{top:auto;right:auto;left:2px;bottom:2px;width:100%;height:7px}.mce-scrollbar-thumb{position:absolute;background-color:#000;border:1px solid #888;border-color:rgba(85,85,85,.6);width:5px;height:100%}.mce-scrollbar-h .mce-scrollbar-thumb{width:100%;height:5px}.mce-scrollbar:hover,.mce-scrollbar.mce-active{background-color:#AAA;opacity:.6;filter:alpha(opacity=60);zoom:1}.mce-scroll{position:relative}.mce-panel{border:0 solid #cacaca;border:0 solid rgba(0,0,0,.2);background-color:#f0f0f0}.mce-floatpanel{position:absolute}.mce-floatpanel.mce-fixed{position:fixed}.mce-floatpanel .mce-arrow,.mce-floatpanel .mce-arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.mce-floatpanel .mce-arrow{border-width:11px}.mce-floatpanel .mce-arrow:after{border-width:10px;content:""}.mce-floatpanel.mce-popover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background:0 0;top:0;left:0;background:#fff;border:1px solid rgba(0,0,0,.2);border:1px solid rgba(0,0,0,.25)}.mce-floatpanel.mce-popover.mce-bottom{margin-top:10px;}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow{left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:rgba(0,0,0,.2);border-bottom-color:rgba(0,0,0,.25);top:-11px}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow:after{top:1px;margin-left:-10px;border-top-width:0;border-bottom-color:#fff}.mce-floatpanel.mce-popover.mce-bottom.mce-start{margin-left:-22px}.mce-floatpanel.mce-popover.mce-bottom.mce-start>.mce-arrow{left:20px}.mce-floatpanel.mce-popover.mce-bottom.mce-end{margin-left:22px}.mce-floatpanel.mce-popover.mce-bottom.mce-end>.mce-arrow{right:10px;left:auto}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;height:100%}div.mce-fullscreen{position:fixed;top:0;left:0}#mce-modal-block{opacity:0;filter:alpha(opacity=0);zoom:1;position:fixed;left:0;top:0;width:100%;height:100%;background:#000}#mce-modal-block.mce-in{opacity:.3;filter:alpha(opacity=30);zoom:1}.mce-window-move{cursor:move}.mce-window{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background:0 0;background:#fff;position:fixed;top:0;left:0;opacity:0;-webkit-transition:opacity 150ms ease-in;transition:opacity 150ms ease-in}.mce-window.mce-in{opacity:1}.mce-window-head{padding:9px 15px;border-bottom:1px solid #c5c5c5;position:relative}.mce-window-head .mce-close{position:absolute;right:15px;top:9px;font-size:20px;font-weight:700;line-height:20px;color:#858585;cursor:pointer;height:20px;overflow:hidden}.mce-close:hover{color:#adadad}.mce-window-head .mce-title{line-height:20px;font-size:20px;font-weight:700;text-rendering:optimizelegibility;padding-right:10px}.mce-window .mce-container-body{display:block}.mce-foot{display:block;background-color:#fff;border-top:1px solid #c5c5c5}.mce-window-head .mce-dragh{position:absolute;top:0;left:0;cursor:move;width:90%;height:100%}.mce-window iframe{width:100%;height:100%}.mce-window-body .mce-listbox{border-color:#ccc}.mce-rtl .mce-window-head .mce-close{position:absolute;right:auto;left:15px}.mce-rtl .mce-window-head .mce-dragh{left:auto;right:0}.mce-rtl .mce-window-head .mce-title{direction:rtl;text-align:right}.mce-abs-layout{position:relative}body .mce-abs-layout-item,.mce-abs-end{position:absolute}.mce-abs-end{width:1px;height:1px}.mce-container-body.mce-abs-layout{overflow:hidden}.mce-tooltip{position:absolute;padding:5px;opacity:.8;filter:alpha(opacity=80);zoom:1}.mce-tooltip-inner{font-size:11px;background-color:#000;color:#fff;max-width:200px;padding:5px 8px 4px 8px;text-align:center;white-space:normal}.mce-tooltip-arrow{position:absolute;width:0;height:0;line-height:0;border:5px dashed #000}.mce-tooltip-arrow-n{border-bottom-color:#000}.mce-tooltip-arrow-s{border-top-color:#000}.mce-tooltip-arrow-e{border-left-color:#000}.mce-tooltip-arrow-w{border-right-color:#000}.mce-tooltip-nw,.mce-tooltip-sw{margin-left:-14px}.mce-tooltip-n .mce-tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-style:solid;border-top:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-nw .mce-tooltip-arrow{top:0;left:10px;border-bottom-style:solid;border-top:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-ne .mce-tooltip-arrow{top:0;right:10px;border-bottom-style:solid;border-top:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-s .mce-tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-style:solid;border-bottom:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-sw .mce-tooltip-arrow{bottom:0;left:10px;border-top-style:solid;border-bottom:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-se .mce-tooltip-arrow{bottom:0;right:10px;border-top-style:solid;border-bottom:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-e .mce-tooltip-arrow{right:0;top:50%;margin-top:-5px;border-left-style:solid;border-right:none;border-top-color:transparent;border-bottom-color:transparent}.mce-tooltip-w .mce-tooltip-arrow{left:0;top:50%;margin-top:-5px;border-right-style:solid;border-left:none;border-top-color:transparent;border-bottom-color:transparent}.mce-btn{border:1px solid #b1b1b1;border-color:transparent transparent transparent transparent;position:relative;text-shadow:0 1px 1px rgba(255,255,255,.75);display:inline-block;;;background-color:#f0f0f0}.mce-btn:hover,.mce-btn:focus{color:#333;background-color:#e3e3e3;border-color:#ccc}.mce-btn.mce-disabled button,.mce-btn.mce-disabled:hover button{cursor:default;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-btn.mce-active,.mce-btn.mce-active:hover{background-color:#dbdbdb;border-color:#ccc}.mce-btn:active{background-color:#e0e0e0;border-color:#ccc}.mce-btn button{padding:4px 8px;font-size:14px;line-height:20px;;cursor:pointer;color:#333;text-align:center;overflow:visible;-webkit-appearance:none}.mce-btn button::-moz-focus-inner{border:0;padding:0}.mce-btn i{text-shadow:1px 1px none}.mce-primary{min-width:50px;color:#fff;border:1px solid transparent;border-color:transparent;background-color:#2d8ac7}.mce-primary:hover,.mce-primary:focus{background-color:#257cb6;border-color:transparent}.mce-primary.mce-disabled button,.mce-primary.mce-disabled:hover button{cursor:default;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-primary.mce-active,.mce-primary.mce-active:hover,.mce-primary:not(.mce-disabled):active{background-color:#206ea1}.mce-primary button,.mce-primary button i{color:#fff;text-shadow:1px 1px none}.mce-btn-large button{padding:9px 14px;font-size:16px;line-height:normal}.mce-btn-large i{margin-top:2px}.mce-btn-small button{padding:1px 5px;font-size:12px;}.mce-btn-small i{line-height:20px;vertical-align:top;}.mce-btn .mce-caret{margin-top:8px;margin-left:0}.mce-btn-small .mce-caret{margin-top:8px;margin-left:0}.mce-caret{display:inline-block;;;width:0;height:0;vertical-align:top;border-top:4px solid #333;border-right:4px solid transparent;border-left:4px solid transparent;content:""}.mce-disabled .mce-caret{border-top-color:#aaa}.mce-caret.mce-up{border-bottom:4px solid #333;border-top:0}.mce-btn-flat{border:0;background:0 0;filter:none}.mce-btn-flat:hover,.mce-btn-flat.mce-active,.mce-btn-flat:focus,.mce-btn-flat:active{border:0;background:#e6e6e6;filter:none}.mce-btn-has-text .mce-ico{padding-right:5px}.mce-rtl .mce-btn button{direction:rtl}.mce-btn-group .mce-btn{border-width:1px;margin:0;margin-left:2px}.mce-btn-group:not(:first-child){border-left:1px solid #d9d9d9;padding-left:3px;margin-left:3px}.mce-btn-group .mce-first{margin-left:0}.mce-btn-group .mce-btn.mce-flow-layout-item{margin:0}.mce-rtl .mce-btn-group .mce-btn{margin-left:0;margin-right:2px}.mce-rtl .mce-btn-group .mce-first{margin-right:0}.mce-rtl .mce-btn-group:not(:first-child){border-left:none;border-right:1px solid #d9d9d9;padding-right:4px;margin-right:4px}.mce-checkbox{cursor:pointer}i.mce-i-checkbox{margin:0 3px 0 0;border:1px solid #c5c5c5;background-color:#f0f0f0;text-indent:-10em;;;;overflow:hidden}.mce-checked i.mce-i-checkbox{color:#333;font-size:16px;line-height:16px;text-indent:0}.mce-checkbox:focus i.mce-i-checkbox,.mce-checkbox.mce-focus i.mce-i-checkbox{border:1px solid rgba(82,168,236,.8)}.mce-checkbox.mce-disabled .mce-label,.mce-checkbox.mce-disabled i.mce-i-checkbox{color:#acacac}.mce-checkbox .mce-label{vertical-align:middle}.mce-rtl .mce-checkbox{direction:rtl;text-align:right}.mce-rtl i.mce-i-checkbox{margin:0 0 0 3px}.mce-combobox{display:inline-block;;;}.mce-combobox input{border:1px solid #c5c5c5;border-right-color:#c5c5c5;height:28px}.mce-combobox.mce-disabled input{color:#adadad}.mce-combobox .mce-btn{border:1px solid #c5c5c5;border-left:0}.mce-combobox button{padding-right:8px;padding-left:8px}.mce-combobox.mce-disabled .mce-btn button{cursor:default;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-colorbox i{border:1px solid #c5c5c5;width:14px;height:14px}.mce-colorbutton .mce-ico{position:relative}.mce-colorbutton-grid{margin:4px}.mce-colorbutton button{padding-right:6px;padding-left:6px}.mce-colorbutton .mce-preview{padding-right:3px;display:block;position:absolute;left:50%;top:50%;margin-left:-17px;margin-top:7px;background:gray;width:13px;height:2px;overflow:hidden}.mce-colorbutton.mce-btn-small .mce-preview{margin-left:-16px;padding-right:0;width:16px}.mce-colorbutton .mce-open{padding-left:4px;padding-right:4px;border-left:1px solid transparent}.mce-colorbutton:hover .mce-open{border-color:#ccc}.mce-colorbutton.mce-btn-small .mce-open{padding:0 3px 0 3px}.mce-rtl .mce-colorbutton{direction:rtl}.mce-rtl .mce-colorbutton .mce-preview{margin-left:0;padding-right:0;padding-left:3px}.mce-rtl .mce-colorbutton.mce-btn-small .mce-preview{margin-left:0;padding-right:0;padding-left:2px}.mce-rtl .mce-colorbutton .mce-open{padding-left:4px;padding-right:4px;border-left:0}.mce-colorpicker{position:relative;width:250px;height:220px}.mce-colorpicker-sv{position:absolute;top:0;left:0;width:90%;height:100%;border:1px solid #c5c5c5;cursor:crosshair;overflow:hidden}.mce-colorpicker-h-chunk{width:100%}.mce-colorpicker-overlay1,.mce-colorpicker-overlay2{width:100%;height:100%;position:absolute;top:0;left:0}.mce-colorpicker-overlay1{filter:progid:DXImageTransform.Microsoft.gradient(GradientType=1, startColorstr='#ffffff', endColorstr='#00ffffff');-ms-filter:"progid:DXImageTransform.Microsoft.gradient(GradientType=1,startColorstr='#ffffff', endColorstr='#00ffffff')";background:linear-gradient(to right,#fff,rgba(255,255,255,0))}.mce-colorpicker-overlay2{filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#00000000', endColorstr='#000000');-ms-filter:"progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#00000000', endColorstr='#000000')";background:linear-gradient(to bottom,rgba(0,0,0,0),#000)}.mce-colorpicker-selector1{background:0 0;position:absolute;width:12px;height:12px;margin:-8px 0 0 -8px;border:1px solid #000;border-radius:50%}.mce-colorpicker-selector2{position:absolute;width:10px;height:10px;border:1px solid #fff;border-radius:50%}.mce-colorpicker-h{position:absolute;top:0;right:0;width:6.5%;height:100%;border:1px solid #c5c5c5;cursor:crosshair}.mce-colorpicker-h-marker{margin-top:-4px;position:absolute;top:0;left:-1px;width:100%;border:1px solid #333;background:#fff;height:4px;z-index:100}.mce-path{display:inline-block;;;padding:8px;white-space:normal}.mce-path .mce-txt{display:inline-block;padding-right:3px}.mce-path .mce-path-body{display:inline-block}.mce-path-item{display:inline-block;;;cursor:pointer;color:#333}.mce-path-item:hover{text-decoration:underline}.mce-path-item:focus{background:#666;color:#fff}.mce-path .mce-divider{display:inline}.mce-disabled .mce-path-item{color:#aaa}.mce-rtl .mce-path{direction:rtl}.mce-fieldset{border:0 solid #9E9E9E}.mce-fieldset>.mce-container-body{margin-top:-15px}.mce-fieldset-title{margin-left:5px;padding:0 5px 0 5px}.mce-fit-layout{display:inline-block;;}.mce-fit-layout-item{position:absolute}.mce-flow-layout-item{display:inline-block;;}.mce-flow-layout-item{margin:2px 0 2px 2px}.mce-flow-layout-item.mce-last{margin-right:2px}.mce-flow-layout{white-space:normal}.mce-tinymce-inline .mce-flow-layout{white-space:nowrap}.mce-rtl .mce-flow-layout{text-align:right;direction:rtl}.mce-rtl .mce-flow-layout-item{margin:2px 2px 2px 0}.mce-rtl .mce-flow-layout-item.mce-last{margin-left:2px}.mce-iframe{border:0 solid rgba(0,0,0,.2);width:100%;height:100%}.mce-label{display:inline-block;;;text-shadow:0 1px 1px rgba(255,255,255,.75);overflow:hidden}.mce-label.mce-autoscroll{overflow:auto}.mce-label.mce-disabled{color:#aaa}.mce-label.mce-multiline{white-space:pre-wrap}.mce-label.mce-error{color:#a00}.mce-rtl .mce-label{text-align:right;direction:rtl}.mce-menubar .mce-menubtn{border-color:transparent;background:0 0;filter:none}.mce-menubar .mce-menubtn button{color:#333}.mce-menubar{border:1px solid rgba(217,217,217,.52)}.mce-menubar .mce-menubtn button span{color:#333}.mce-menubar .mce-caret{border-top-color:#333}.mce-menubar .mce-menubtn:hover,.mce-menubar .mce-menubtn.mce-active,.mce-menubar .mce-menubtn:focus{border-color:#ccc;background:#fff;filter:none}.mce-menubtn button{color:#333}.mce-menubtn.mce-btn-small span{font-size:12px}.mce-menubtn.mce-fixed-width span{display:inline-block;overflow-x:hidden;text-overflow:ellipsis;width:90px}.mce-menubtn.mce-fixed-width.mce-btn-small span{width:70px}.mce-rtl .mce-menubtn button{direction:rtl;text-align:right}.mce-menu-item{display:block;padding:6px 15px 6px 12px;clear:both;font-weight:400;line-height:20px;color:#333;white-space:nowrap;cursor:pointer;line-height:normal;border-left:4px solid transparent;margin-bottom:1px}.mce-menu-item .mce-ico,.mce-menu-item .mce-text{color:#333}.mce-menu-item.mce-disabled .mce-text,.mce-menu-item.mce-disabled .mce-ico{color:#adadad}.mce-menu-item:hover .mce-text,.mce-menu-item.mce-selected .mce-text,.mce-menu-item:focus .mce-text{color:#fff}.mce-menu-item:hover .mce-ico,.mce-menu-item.mce-selected .mce-ico,.mce-menu-item:focus .mce-ico{color:#fff}.mce-menu-item.mce-disabled:hover{background:#ccc}.mce-menu-shortcut{display:inline-block;color:#adadad}.mce-menu-shortcut{display:inline-block;;;padding:0 15px 0 20px}.mce-menu-item:hover .mce-menu-shortcut,.mce-menu-item.mce-selected .mce-menu-shortcut,.mce-menu-item:focus .mce-menu-shortcut{color:#fff}.mce-menu-item .mce-caret{margin-top:4px;;margin-right:6px;border-top:4px solid transparent;border-bottom:4px solid transparent;border-left:4px solid #333}.mce-menu-item.mce-selected .mce-caret,.mce-menu-item:focus .mce-caret,.mce-menu-item:hover .mce-caret{border-left-color:#fff}.mce-menu-align .mce-menu-shortcut,.mce-menu-align .mce-caret{position:absolute;right:0}.mce-menu-item.mce-active i{visibility:visible}.mce-menu-item-normal.mce-active{background-color:#3498db}.mce-menu-item-preview.mce-active{border-left:5px solid #aaa}.mce-menu-item-normal.mce-active .mce-text{color:#fff}.mce-menu-item-normal.mce-active:hover .mce-text,.mce-menu-item-normal.mce-active:hover .mce-ico{color:#fff}.mce-menu-item-normal.mce-active:focus .mce-text,.mce-menu-item-normal.mce-active:focus .mce-ico{color:#fff}.mce-menu-item:hover,.mce-menu-item.mce-selected,.mce-menu-item:focus{text-decoration:none;color:#fff;background-color:#2d8ac7}div.mce-menu .mce-menu-item-sep,.mce-menu-item-sep:hover{border:0;padding:0;height:1px;margin:9px 1px;overflow:hidden;background:0 0;border-bottom:1px solid rgba(0,0,0,.1);cursor:default;filter:none}.mce-menu.mce-rtl{direction:rtl}.mce-rtl .mce-menu-item{text-align:right;direction:rtl;padding:6px 12px 6px 15px}.mce-menu-align.mce-rtl .mce-menu-shortcut,.mce-menu-align.mce-rtl .mce-caret{right:auto;left:0}.mce-rtl .mce-menu-item .mce-caret{margin-left:6px;margin-right:0;border-right:4px solid #333;border-left:0}.mce-rtl .mce-menu-item.mce-selected .mce-caret,.mce-rtl .mce-menu-item:focus .mce-caret,.mce-rtl .mce-menu-item:hover .mce-caret{border-left-color:transparent;border-right-color:#fff}.mce-menu{position:absolute;left:0;top:0;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background:0 0;z-index:1000;padding:5px 0 5px 0;margin:-1px 0 0;min-width:160px;background:#fff;border:1px solid #989898;border:1px solid rgba(0,0,0,.2);z-index:1002;max-height:400px;overflow:auto;overflow-x:hidden}.mce-menu i{display:none}.mce-menu-has-icons i{display:inline-block;}.mce-menu-sub-tr-tl{margin:-6px 0 0 -1px}.mce-menu-sub-br-bl{margin:6px 0 0 -1px}.mce-menu-sub-tl-tr{margin:-6px 0 0 1px}.mce-menu-sub-bl-br{margin:6px 0 0 1px}.mce-listbox button{text-align:left;padding-right:20px;position:relative}.mce-listbox .mce-caret{position:absolute;margin-top:-2px;right:8px;top:50%}.mce-rtl .mce-listbox .mce-caret{right:auto;left:8px}.mce-rtl .mce-listbox button{padding-right:10px;padding-left:20px}.mce-container-body .mce-resizehandle{position:absolute;right:0;bottom:0;width:16px;height:16px;visibility:visible;cursor:s-resize;margin:0}.mce-container-body .mce-resizehandle-both{cursor:se-resize}i.mce-i-resize{color:#333}.mce-slider{border:1px solid #aaa;background:#eee;width:100px;height:10px;position:relative;display:block}.mce-slider.mce-vertical{width:10px;height:100px}.mce-slider-handle{border:1px solid #bbb;background:#ddd;display:block;width:13px;height:13px;position:absolute;top:0;left:0;margin-left:-1px;margin-top:-2px}.mce-spacer{visibility:hidden}.mce-splitbtn .mce-open{border-left:1px solid transparent}.mce-splitbtn:hover .mce-open{border-left-color:#ccc}.mce-splitbtn button{padding-right:6px;padding-left:6px}.mce-splitbtn .mce-open{padding-right:4px;padding-left:4px}.mce-splitbtn .mce-open.mce-active{background-color:#dbdbdb;outline:1px solid #ccc}.mce-splitbtn.mce-btn-small .mce-open{padding:0 3px 0 3px}.mce-rtl .mce-splitbtn{direction:rtl;text-align:right}.mce-rtl .mce-splitbtn button{padding-right:4px;padding-left:4px}.mce-rtl .mce-splitbtn .mce-open{border-left:0}.mce-stack-layout-item{display:block}.mce-tabs{display:block;border-bottom:1px solid #c5c5c5}.mce-tabs,.mce-tabs+.mce-container-body{background:#fff}.mce-tab{display:inline-block;;;border:1px solid #c5c5c5;border-width:0 1px 0 0;background:#fff;padding:8px;text-shadow:0 1px 1px rgba(255,255,255,.75);height:13px;cursor:pointer}.mce-tab:hover{background:#fdfdfd}.mce-tab.mce-active{background:#fdfdfd;border-bottom-color:transparent;margin-bottom:-1px;height:14px}.mce-rtl .mce-tabs{text-align:right;direction:rtl}.mce-rtl .mce-tab{border-width:0 0 0 1px}.mce-textbox{background:#fff;border:1px solid #c5c5c5;display:inline-block;-webkit-transition:border linear .2s,box-shadow linear .2s;transition:border linear .2s,box-shadow linear .2s;height:28px;resize:none;padding:0 4px 0 4px;white-space:pre-wrap;;color:#333}.mce-textbox:focus,.mce-textbox.mce-focus{border-color:#3498db}.mce-placeholder .mce-textbox{color:#aaa}.mce-textbox.mce-multiline{padding:4px}.mce-textbox.mce-disabled{color:#adadad}.mce-rtl .mce-textbox{text-align:right;direction:rtl}.mce-throbber{position:absolute;top:0;left:0;width:100%;height:100%;opacity:.6;filter:alpha(opacity=60);zoom:1;background:#fff url(img/loader.gif) no-repeat center center}.mce-throbber-inline{position:static;height:50px}@font-face{font-family:tinymce;src:url(fonts/tinymce.eot);src:url(fonts/tinymce.eot?#iefix) format('embedded-opentype'),url(fonts/tinymce.woff) format('woff'),url(fonts/tinymce.ttf) format('truetype'),url(fonts/tinymce.svg#tinymce) format('svg');font-weight:400;font-style:normal}@font-face{font-family:tinymce-small;src:url(fonts/tinymce-small.eot);src:url(fonts/tinymce-small.eot?#iefix) format('embedded-opentype'),url(fonts/tinymce-small.woff) format('woff'),url(fonts/tinymce-small.ttf) format('truetype'),url(fonts/tinymce-small.svg#tinymce) format('svg');font-weight:400;font-style:normal}.mce-ico{font-family:tinymce,Arial;font-style:normal;font-weight:400;font-variant:normal;font-size:16px;line-height:16px;speak:none;vertical-align:text-top;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;display:inline-block;background:transparent center center;background-size:cover;width:16px;height:16px;color:#333}.mce-btn-small .mce-ico{font-family:tinymce-small,Arial}.mce-i-save:before{content:"\e000"}.mce-i-newdocument:before{content:"\e001"}.mce-i-fullpage:before{content:"\e002"}.mce-i-alignleft:before{content:"\e003"}.mce-i-aligncenter:before{content:"\e004"}.mce-i-alignright:before{content:"\e005"}.mce-i-alignjustify:before{content:"\e006"}.mce-i-alignnone:before{content:"\e003"}.mce-i-cut:before{content:"\e007"}.mce-i-paste:before{content:"\e008"}.mce-i-searchreplace:before{content:"\e009"}.mce-i-bullist:before{content:"\e00a"}.mce-i-numlist:before{content:"\e00b"}.mce-i-indent:before{content:"\e00c"}.mce-i-outdent:before{content:"\e00d"}.mce-i-blockquote:before{content:"\e00e"}.mce-i-undo:before{content:"\e00f"}.mce-i-redo:before{content:"\e010"}.mce-i-link:before{content:"\e011"}.mce-i-unlink:before{content:"\e012"}.mce-i-anchor:before{content:"\e013"}.mce-i-image:before{content:"\e014"}.mce-i-media:before{content:"\e015"}.mce-i-help:before{content:"\e016"}.mce-i-code:before{content:"\e017"}.mce-i-insertdatetime:before{content:"\e018"}.mce-i-preview:before{content:"\e019"}.mce-i-forecolor:before{content:"\e01a"}.mce-i-backcolor:before{content:"\e01a"}.mce-i-table:before{content:"\e01b"}.mce-i-hr:before{content:"\e01c"}.mce-i-removeformat:before{content:"\e01d"}.mce-i-subscript:before{content:"\e01e"}.mce-i-superscript:before{content:"\e01f"}.mce-i-charmap:before{content:"\e020"}.mce-i-emoticons:before{content:"\e021"}.mce-i-print:before{content:"\e022"}.mce-i-fullscreen:before{content:"\e023"}.mce-i-spellchecker:before{content:"\e024"}.mce-i-nonbreaking:before{content:"\e025"}.mce-i-template:before{content:"\e026"}.mce-i-pagebreak:before{content:"\e027"}.mce-i-restoredraft:before{content:"\e028"}.mce-i-untitled:before{content:"\e029"}.mce-i-bold:before{content:"\e02a"}.mce-i-italic:before{content:"\e02b"}.mce-i-underline:before{content:"\e02c"}.mce-i-strikethrough:before{content:"\e02d"}.mce-i-visualchars:before{content:"\e02e"}.mce-i-visualblocks:before{content:"\e02e"}.mce-i-ltr:before{content:"\e02f"}.mce-i-rtl:before{content:"\e030"}.mce-i-copy:before{content:"\e031"}.mce-i-resize:before{content:"\e032"}.mce-i-browse:before{content:"\e034"}.mce-i-pastetext:before{content:"\e035"}.mce-i-rotateleft:before{content:"\eaa8"}.mce-i-rotateright:before{content:"\eaa9"}.mce-i-crop:before{content:"\ee78"}.mce-i-editimage:before{content:"\e914"}.mce-i-options:before{content:"\ec6a"}.mce-i-flipv:before{content:"\eaaa"}.mce-i-fliph:before{content:"\eaac"}.mce-i-zoomin:before{content:"\eb35"}.mce-i-zoomout:before{content:"\eb36"}.mce-i-sun:before{content:"\eccc"}.mce-i-moon:before{content:"\eccd"}.mce-i-arrowleft:before{content:"\edc0"}.mce-i-arrowright:before{content:"\edb8"}.mce-i-drop:before{content:"\e934"}.mce-i-contrast:before{content:"\ecd4"}.mce-i-sharpen:before{content:"\eba7"}.mce-i-palette:before{content:"\e92a"}.mce-i-resize2:before{content:"\edf9"}.mce-i-orientation:before{content:"\e601"}.mce-i-invert:before{content:"\e602"}.mce-i-gamma:before{content:"\e600"}.mce-i-remove:before{content:"\ed6a"}.mce-i-checkbox:before,.mce-i-selected:before{content:"\e033"}.mce-i-selected{visibility:hidden}i.mce-i-backcolor{text-shadow:none;background:#bbb} \ No newline at end of file +.mce-container,.mce-container *,.mce-widget,.mce-widget *,.mce-reset{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:#333;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;-webkit-tap-highlight-color:transparent;line-height:normal;font-weight:normal;text-align:left;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr;max-width:none}.mce-widget button{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.mce-container *[unselectable]{-moz-user-select:none;-webkit-user-select:none;-o-user-select:none;user-select:none}.mce-fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.mce-fade.mce-in{opacity:1}.mce-tinymce{visibility:inherit !important;position:relative}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;height:100%;z-index:100}div.mce-fullscreen{position:fixed;top:0;left:0;width:100%;height:auto}.mce-tinymce{display:block}.mce-wordcount{position:absolute;top:0;right:0;padding:8px}div.mce-edit-area{background:#fff;filter:none}.mce-statusbar{position:relative}.mce-statusbar .mce-container-body{position:relative}.mce-fullscreen .mce-resizehandle{display:none}.mce-charmap{border-collapse:collapse}.mce-charmap td{cursor:default;border:1px solid rgba(0,0,0,0.2);width:20px;height:20px;line-height:20px;text-align:center;vertical-align:middle;padding:2px}.mce-charmap td div{text-align:center}.mce-charmap td:hover{background:#d9d9d9}.mce-grid td.mce-grid-cell div{border:1px solid #d6d6d6;width:15px;height:15px;margin:0;cursor:pointer}.mce-grid td.mce-grid-cell div:focus{border-color:#3498db}.mce-grid td.mce-grid-cell div[disabled]{cursor:not-allowed}.mce-grid{border-spacing:2px;border-collapse:separate}.mce-grid a{display:block;border:1px solid transparent}.mce-grid a:hover,.mce-grid a:focus{border-color:#3498db}.mce-grid-border{margin:0 4px 0 4px}.mce-grid-border a{border-color:#d6d6d6;width:13px;height:13px}.mce-grid-border a:hover,.mce-grid-border a.mce-active{border-color:#3498db;background:#3498db}.mce-text-center{text-align:center}div.mce-tinymce-inline{width:100%}.mce-colorbtn-trans div{text-align:center;vertical-align:middle;font-weight:bold;font-size:20px;line-height:16px;color:#707070}.mce-monospace{font-family:"Courier New",Courier,monospace}.mce-toolbar-grp{padding:2px 0}.mce-toolbar-grp .mce-flow-layout-item{margin-bottom:0}.mce-rtl .mce-wordcount{left:0;right:auto}.mce-croprect-container{position:absolute;top:0;left:0}.mce-croprect-handle{position:absolute;top:0;left:0;width:20px;height:20px;border:2px solid white}.mce-croprect-handle-nw{border-width:2px 0 0 2px;margin:-2px 0 0 -2px;cursor:nw-resize;top:100px;left:100px}.mce-croprect-handle-ne{border-width:2px 2px 0 0;margin:-2px 0 0 -20px;cursor:ne-resize;top:100px;left:200px}.mce-croprect-handle-sw{border-width:0 0 2px 2px;margin:-20px 2px 0 -2px;cursor:sw-resize;top:200px;left:100px}.mce-croprect-handle-se{border-width:0 2px 2px 0;margin:-20px 0 0 -20px;cursor:se-resize;top:200px;left:200px}.mce-croprect-handle-move{position:absolute;cursor:move;border:0}.mce-croprect-block{opacity:.3;filter:alpha(opacity=30);zoom:1;position:absolute;background:black}.mce-imagepanel{overflow:auto;background:black}.mce-imagepanel img{position:absolute}.mce-imagetool.mce-btn .mce-ico{display:block;width:20px;height:20px;text-align:center;line-height:20px;font-size:20px;padding:5px}.mce-container,.mce-container-body{display:block}.mce-autoscroll{overflow:hidden}.mce-scrollbar{position:absolute;width:7px;height:100%;top:2px;right:2px;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-scrollbar-h{top:auto;right:auto;left:2px;bottom:2px;width:100%;height:7px}.mce-scrollbar-thumb{position:absolute;background-color:#000;border:1px solid #888;border-color:rgba(85,85,85,0.6);width:5px;height:100%}.mce-scrollbar-h .mce-scrollbar-thumb{width:100%;height:5px}.mce-scrollbar:hover,.mce-scrollbar.mce-active{background-color:#aaa;opacity:.6;filter:alpha(opacity=60);zoom:1}.mce-scroll{position:relative}.mce-panel{border:0 solid #cacaca;border:0 solid rgba(0,0,0,0.2);background-color:#f0f0f0}.mce-floatpanel{position:absolute}.mce-floatpanel.mce-fixed{position:fixed}.mce-floatpanel .mce-arrow,.mce-floatpanel .mce-arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.mce-floatpanel .mce-arrow{border-width:11px}.mce-floatpanel .mce-arrow:after{border-width:10px;content:""}.mce-floatpanel.mce-popover{filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;top:0;left:0;background:#fff;border:1px solid rgba(0,0,0,0.2);border:1px solid rgba(0,0,0,0.25)}.mce-floatpanel.mce-popover.mce-bottom{margin-top:10px;*margin-top:0}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow{left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:rgba(0,0,0,0.2);border-bottom-color:rgba(0,0,0,0.25);top:-11px}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow:after{top:1px;margin-left:-10px;border-top-width:0;border-bottom-color:#fff}.mce-floatpanel.mce-popover.mce-bottom.mce-start{margin-left:-22px}.mce-floatpanel.mce-popover.mce-bottom.mce-start>.mce-arrow{left:20px}.mce-floatpanel.mce-popover.mce-bottom.mce-end{margin-left:22px}.mce-floatpanel.mce-popover.mce-bottom.mce-end>.mce-arrow{right:10px;left:auto}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;height:100%}div.mce-fullscreen{position:fixed;top:0;left:0}#mce-modal-block{opacity:0;filter:alpha(opacity=0);zoom:1;position:fixed;left:0;top:0;width:100%;height:100%;background:#000}#mce-modal-block.mce-in{opacity:.3;filter:alpha(opacity=30);zoom:1}.mce-window-move{cursor:move}.mce-window{filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;background:#fff;position:fixed;top:0;left:0;opacity:0;-webkit-transition:opacity 150ms ease-in;transition:opacity 150ms ease-in}.mce-window.mce-in{opacity:1}.mce-window-head{padding:9px 15px;border-bottom:1px solid #c5c5c5;position:relative}.mce-window-head .mce-close{position:absolute;right:15px;top:9px;font-size:20px;font-weight:bold;line-height:20px;color:#858585;cursor:pointer;height:20px;overflow:hidden}.mce-close:hover{color:#adadad}.mce-window-head .mce-title{line-height:20px;font-size:20px;font-weight:bold;text-rendering:optimizelegibility;padding-right:10px}.mce-window .mce-container-body{display:block}.mce-foot{display:block;background-color:#fff;border-top:1px solid #c5c5c5}.mce-window-head .mce-dragh{position:absolute;top:0;left:0;cursor:move;width:90%;height:100%}.mce-window iframe{width:100%;height:100%}.mce-window-body .mce-listbox{border-color:#ccc}.mce-rtl .mce-window-head .mce-close{position:absolute;right:auto;left:15px}.mce-rtl .mce-window-head .mce-dragh{left:auto;right:0}.mce-rtl .mce-window-head .mce-title{direction:rtl;text-align:right}.mce-tooltip{position:absolute;padding:5px;opacity:.8;filter:alpha(opacity=80);zoom:1}.mce-tooltip-inner{font-size:11px;background-color:#000;color:white;max-width:200px;padding:5px 8px 4px 8px;text-align:center;white-space:normal}.mce-tooltip-arrow{position:absolute;width:0;height:0;line-height:0;border:5px dashed #000}.mce-tooltip-arrow-n{border-bottom-color:#000}.mce-tooltip-arrow-s{border-top-color:#000}.mce-tooltip-arrow-e{border-left-color:#000}.mce-tooltip-arrow-w{border-right-color:#000}.mce-tooltip-nw,.mce-tooltip-sw{margin-left:-14px}.mce-tooltip-n .mce-tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-style:solid;border-top:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-nw .mce-tooltip-arrow{top:0;left:10px;border-bottom-style:solid;border-top:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-ne .mce-tooltip-arrow{top:0;right:10px;border-bottom-style:solid;border-top:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-s .mce-tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-style:solid;border-bottom:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-sw .mce-tooltip-arrow{bottom:0;left:10px;border-top-style:solid;border-bottom:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-se .mce-tooltip-arrow{bottom:0;right:10px;border-top-style:solid;border-bottom:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-e .mce-tooltip-arrow{right:0;top:50%;margin-top:-5px;border-left-style:solid;border-right:none;border-top-color:transparent;border-bottom-color:transparent}.mce-tooltip-w .mce-tooltip-arrow{left:0;top:50%;margin-top:-5px;border-right-style:solid;border-left:none;border-top-color:transparent;border-bottom-color:transparent}.mce-progress{display:inline-block;position:relative;height:20px}.mce-progress .mce-bar-container{display:inline-block;width:100px;height:100%;margin-right:8px;border:1px solid #ccc;overflow:hidden}.mce-progress .mce-text{display:inline-block;margin-top:auto;margin-bottom:auto;font-size:14px;width:40px;color:#333}.mce-bar{display:block;width:0;height:100%;background-color:#d7d7d7;-webkit-transition:width .2s ease;transition:width .2s ease}.mce-notification{position:absolute;background-color:#f0f0f0;padding:5px;margin-top:5px;opacity:.8;filter:alpha(opacity=80);zoom:1;border-width:1px;border-style:solid;border-color:#ccc}.mce-notification-success{background-color:#dff0d8;border-color:#d6e9c6}.mce-notification-info{background-color:#d9edf7;border-color:#779ecb}.mce-notification-warning{background-color:#fcf8e3;border-color:#faebcc}.mce-notification-error{background-color:#f2dede;border-color:#ebccd1}.mce-notification.mce-has-close{padding-right:15px}.mce-notification .mce-ico{margin-top:5px}.mce-notification-inner{display:inline-block;font-size:14px;margin:5px 8px 4px 8px;text-align:center;white-space:normal;color:#31708f}.mce-notification-inner a{text-decoration:underline;cursor:pointer}.mce-notification .mce-progress{margin-right:8px}.mce-notification .mce-progress .mce-text{margin-top:5px}.mce-notification *,.mce-notification .mce-progress .mce-text{color:#333}.mce-notification .mce-progress .mce-bar-container{border-color:#ccc}.mce-notification .mce-progress .mce-bar-container .mce-bar{background-color:#333}.mce-notification-success *,.mce-notification-success .mce-progress .mce-text{color:#3c763d}.mce-notification-success .mce-progress .mce-bar-container{border-color:#d6e9c6}.mce-notification-success .mce-progress .mce-bar-container .mce-bar{background-color:#3c763d}.mce-notification-info *,.mce-notification-info .mce-progress .mce-text{color:#31708f}.mce-notification-info .mce-progress .mce-bar-container{border-color:#779ecb}.mce-notification-info .mce-progress .mce-bar-container .mce-bar{background-color:#31708f}.mce-notification-warning *,.mce-notification-warning .mce-progress .mce-text{color:#8a6d3b}.mce-notification-warning .mce-progress .mce-bar-container{border-color:#faebcc}.mce-notification-warning .mce-progress .mce-bar-container .mce-bar{background-color:#8a6d3b}.mce-notification-error *,.mce-notification-error .mce-progress .mce-text{color:#a94442}.mce-notification-error .mce-progress .mce-bar-container{border-color:#ebccd1}.mce-notification-error .mce-progress .mce-bar-container .mce-bar{background-color:#a94442}.mce-notification .mce-close{position:absolute;top:6px;right:8px;font-size:20px;font-weight:bold;line-height:20px;color:#858585;cursor:pointer;height:20px;overflow:hidden}.mce-abs-layout{position:relative}body .mce-abs-layout-item,.mce-abs-end{position:absolute}.mce-abs-end{width:1px;height:1px}.mce-container-body.mce-abs-layout{overflow:hidden}.mce-btn{border:1px solid #b1b1b1;border-color:transparent transparent transparent transparent;position:relative;text-shadow:0 1px 1px rgba(255,255,255,0.75);display:inline-block;*display:inline;*zoom:1;background-color:#f0f0f0}.mce-btn:hover,.mce-btn:focus{color:#333;background-color:#e3e3e3;border-color:#ccc}.mce-btn.mce-disabled button,.mce-btn.mce-disabled:hover button{cursor:default;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-btn.mce-active,.mce-btn.mce-active:hover{background-color:#dbdbdb;border-color:#ccc}.mce-btn:active{background-color:#e0e0e0;border-color:#ccc}.mce-btn button{padding:4px 8px;font-size:14px;line-height:20px;*line-height:16px;cursor:pointer;color:#333;text-align:center;overflow:visible;-webkit-appearance:none}.mce-btn button::-moz-focus-inner{border:0;padding:0}.mce-btn i{text-shadow:1px 1px none}.mce-primary{min-width:50px;color:#fff;border:1px solid transparent;border-color:transparent;background-color:#2d8ac7}.mce-primary:hover,.mce-primary:focus{background-color:#257cb6;border-color:transparent}.mce-primary.mce-disabled button,.mce-primary.mce-disabled:hover button{cursor:default;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-primary.mce-active,.mce-primary.mce-active:hover,.mce-primary:not(.mce-disabled):active{background-color:#206ea1}.mce-primary button,.mce-primary button i{color:#fff;text-shadow:1px 1px none}.mce-btn .mce-txt{font-size:inherit;line-height:inherit;color:inherit}.mce-btn-large button{padding:9px 14px;font-size:16px;line-height:normal}.mce-btn-large i{margin-top:2px}.mce-btn-small button{padding:1px 5px;font-size:12px;*padding-bottom:2px}.mce-btn-small i{line-height:20px;vertical-align:top;*line-height:18px}.mce-btn .mce-caret{margin-top:8px;margin-left:0}.mce-btn-small .mce-caret{margin-top:8px;margin-left:0}.mce-caret{display:inline-block;*display:inline;*zoom:1;width:0;height:0;vertical-align:top;border-top:4px solid #333;border-right:4px solid transparent;border-left:4px solid transparent;content:""}.mce-disabled .mce-caret{border-top-color:#aaa}.mce-caret.mce-up{border-bottom:4px solid #333;border-top:0}.mce-btn-flat{border:0;background:transparent;filter:none}.mce-btn-flat:hover,.mce-btn-flat.mce-active,.mce-btn-flat:focus,.mce-btn-flat:active{border:0;background:#e6e6e6;filter:none}.mce-btn-has-text .mce-ico{padding-right:5px}.mce-rtl .mce-btn button{direction:rtl}.mce-btn-group .mce-btn{border-width:1px;margin:0;margin-left:2px}.mce-btn-group:not(:first-child){border-left:1px solid #d9d9d9;padding-left:3px;margin-left:3px}.mce-btn-group .mce-first{margin-left:0}.mce-btn-group .mce-btn.mce-flow-layout-item{margin:0}.mce-rtl .mce-btn-group .mce-btn{margin-left:0;margin-right:2px}.mce-rtl .mce-btn-group .mce-first{margin-right:0}.mce-rtl .mce-btn-group:not(:first-child){border-left:none;border-right:1px solid #d9d9d9;padding-right:4px;margin-right:4px}.mce-checkbox{cursor:pointer}i.mce-i-checkbox{margin:0 3px 0 0;border:1px solid #c5c5c5;background-color:#f0f0f0;text-indent:-10em;*font-size:0;*line-height:0;*text-indent:0;overflow:hidden}.mce-checked i.mce-i-checkbox{color:#333;font-size:16px;line-height:16px;text-indent:0}.mce-checkbox:focus i.mce-i-checkbox,.mce-checkbox.mce-focus i.mce-i-checkbox{border:1px solid rgba(82,168,236,0.8)}.mce-checkbox.mce-disabled .mce-label,.mce-checkbox.mce-disabled i.mce-i-checkbox{color:#acacac}.mce-checkbox .mce-label{vertical-align:middle}.mce-rtl .mce-checkbox{direction:rtl;text-align:right}.mce-rtl i.mce-i-checkbox{margin:0 0 0 3px}.mce-combobox{display:inline-block;*display:inline;*zoom:1;*height:32px}.mce-combobox input{border:1px solid #c5c5c5;border-right-color:#c5c5c5;height:28px}.mce-combobox.mce-disabled input{color:#adadad}.mce-combobox .mce-btn{border:1px solid #c5c5c5;border-left:0}.mce-combobox button{padding-right:8px;padding-left:8px}.mce-combobox.mce-disabled .mce-btn button{cursor:default;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-colorbox i{border:1px solid #c5c5c5;width:14px;height:14px}.mce-colorbutton .mce-ico{position:relative}.mce-colorbutton-grid{margin:4px}.mce-colorbutton button{padding-right:6px;padding-left:6px}.mce-colorbutton .mce-preview{padding-right:3px;display:block;position:absolute;left:50%;top:50%;margin-left:-17px;margin-top:7px;background:gray;width:13px;height:2px;overflow:hidden}.mce-colorbutton.mce-btn-small .mce-preview{margin-left:-16px;padding-right:0;width:16px}.mce-colorbutton .mce-open{padding-left:4px;padding-right:4px;border-left:1px solid transparent}.mce-colorbutton:hover .mce-open{border-color:#ccc}.mce-colorbutton.mce-btn-small .mce-open{padding:0 3px 0 3px}.mce-rtl .mce-colorbutton{direction:rtl}.mce-rtl .mce-colorbutton .mce-preview{margin-left:0;padding-right:0;padding-left:3px}.mce-rtl .mce-colorbutton.mce-btn-small .mce-preview{margin-left:0;padding-right:0;padding-left:2px}.mce-rtl .mce-colorbutton .mce-open{padding-left:4px;padding-right:4px;border-left:0}.mce-colorpicker{position:relative;width:250px;height:220px}.mce-colorpicker-sv{position:absolute;top:0;left:0;width:90%;height:100%;border:1px solid #c5c5c5;cursor:crosshair;overflow:hidden}.mce-colorpicker-h-chunk{width:100%}.mce-colorpicker-overlay1,.mce-colorpicker-overlay2{width:100%;height:100%;position:absolute;top:0;left:0}.mce-colorpicker-overlay1{filter:progid:DXImageTransform.Microsoft.gradient(GradientType=1, startColorstr='#ffffff', endColorstr='#00ffffff');-ms-filter:"progid:DXImageTransform.Microsoft.gradient(GradientType=1,startColorstr='#ffffff', endColorstr='#00ffffff')";background:linear-gradient(to right, #fff, rgba(255,255,255,0))}.mce-colorpicker-overlay2{filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#00000000', endColorstr='#000000');-ms-filter:"progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr='#00000000', endColorstr='#000000')";background:linear-gradient(to bottom, rgba(0,0,0,0), #000)}.mce-colorpicker-selector1{background:none;position:absolute;width:12px;height:12px;margin:-8px 0 0 -8px;border:1px solid black;border-radius:50%}.mce-colorpicker-selector2{position:absolute;width:10px;height:10px;border:1px solid white;border-radius:50%}.mce-colorpicker-h{position:absolute;top:0;right:0;width:6.5%;height:100%;border:1px solid #c5c5c5;cursor:crosshair}.mce-colorpicker-h-marker{margin-top:-4px;position:absolute;top:0;left:-1px;width:100%;border:1px solid #333;background:#fff;height:4px;z-index:100}.mce-path{display:inline-block;*display:inline;*zoom:1;padding:8px;white-space:normal}.mce-path .mce-txt{display:inline-block;padding-right:3px}.mce-path .mce-path-body{display:inline-block}.mce-path-item{display:inline-block;*display:inline;*zoom:1;cursor:pointer;color:#333}.mce-path-item:hover{text-decoration:underline}.mce-path-item:focus{background:#666;color:#fff}.mce-path .mce-divider{display:inline}.mce-disabled .mce-path-item{color:#aaa}.mce-rtl .mce-path{direction:rtl}.mce-fieldset{border:0 solid #9e9e9e}.mce-fieldset>.mce-container-body{margin-top:-15px}.mce-fieldset-title{margin-left:5px;padding:0 5px 0 5px}.mce-fit-layout{display:inline-block;*display:inline;*zoom:1}.mce-fit-layout-item{position:absolute}.mce-flow-layout-item{display:inline-block;*display:inline;*zoom:1}.mce-flow-layout-item{margin:2px 0 2px 2px}.mce-flow-layout-item.mce-last{margin-right:2px}.mce-flow-layout{white-space:normal}.mce-tinymce-inline .mce-flow-layout{white-space:nowrap}.mce-rtl .mce-flow-layout{text-align:right;direction:rtl}.mce-rtl .mce-flow-layout-item{margin:2px 2px 2px 0}.mce-rtl .mce-flow-layout-item.mce-last{margin-left:2px}.mce-iframe{border:0 solid rgba(0,0,0,0.2);width:100%;height:100%}.mce-label{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 1px rgba(255,255,255,0.75);overflow:hidden}.mce-label.mce-autoscroll{overflow:auto}.mce-label.mce-disabled{color:#aaa}.mce-label.mce-multiline{white-space:pre-wrap}.mce-label.mce-error{color:#a00}.mce-rtl .mce-label{text-align:right;direction:rtl}.mce-menubar .mce-menubtn{border-color:transparent;background:transparent;filter:none}.mce-menubar .mce-menubtn button{color:#333}.mce-menubar{border:1px solid rgba(217,217,217,0.52)}.mce-menubar .mce-menubtn button span{color:#333}.mce-menubar .mce-caret{border-top-color:#333}.mce-menubar .mce-menubtn:hover,.mce-menubar .mce-menubtn.mce-active,.mce-menubar .mce-menubtn:focus{border-color:#ccc;background:#fff;filter:none}.mce-menubtn button{color:#333}.mce-menubtn.mce-btn-small span{font-size:12px}.mce-menubtn.mce-fixed-width span{display:inline-block;overflow-x:hidden;text-overflow:ellipsis;width:90px}.mce-menubtn.mce-fixed-width.mce-btn-small span{width:70px}.mce-menubtn .mce-caret{*margin-top:6px}.mce-rtl .mce-menubtn button{direction:rtl;text-align:right}.mce-menu-item{display:block;padding:6px 15px 6px 12px;clear:both;font-weight:normal;line-height:20px;color:#333;white-space:nowrap;cursor:pointer;line-height:normal;border-left:4px solid transparent;margin-bottom:1px}.mce-menu-item .mce-ico,.mce-menu-item .mce-text{color:#333}.mce-menu-item.mce-disabled .mce-text,.mce-menu-item.mce-disabled .mce-ico{color:#adadad}.mce-menu-item:hover .mce-text,.mce-menu-item.mce-selected .mce-text,.mce-menu-item:focus .mce-text{color:white}.mce-menu-item:hover .mce-ico,.mce-menu-item.mce-selected .mce-ico,.mce-menu-item:focus .mce-ico{color:white}.mce-menu-item.mce-disabled:hover{background:#ccc}.mce-menu-shortcut{display:inline-block;color:#adadad}.mce-menu-shortcut{display:inline-block;*display:inline;*zoom:1;padding:0 15px 0 20px}.mce-menu-item:hover .mce-menu-shortcut,.mce-menu-item.mce-selected .mce-menu-shortcut,.mce-menu-item:focus .mce-menu-shortcut{color:white}.mce-menu-item .mce-caret{margin-top:4px;*margin-top:3px;margin-right:6px;border-top:4px solid transparent;border-bottom:4px solid transparent;border-left:4px solid #333}.mce-menu-item.mce-selected .mce-caret,.mce-menu-item:focus .mce-caret,.mce-menu-item:hover .mce-caret{border-left-color:white}.mce-menu-align .mce-menu-shortcut{*margin-top:-2px}.mce-menu-align .mce-menu-shortcut,.mce-menu-align .mce-caret{position:absolute;right:0}.mce-menu-item.mce-active i{visibility:visible}.mce-menu-item-normal.mce-active{background-color:#3498db}.mce-menu-item-preview.mce-active{border-left:5px solid #aaa}.mce-menu-item-normal.mce-active .mce-text{color:white}.mce-menu-item-normal.mce-active:hover .mce-text,.mce-menu-item-normal.mce-active:hover .mce-ico{color:white}.mce-menu-item-normal.mce-active:focus .mce-text,.mce-menu-item-normal.mce-active:focus .mce-ico{color:white}.mce-menu-item:hover,.mce-menu-item.mce-selected,.mce-menu-item:focus{text-decoration:none;color:white;background-color:#2d8ac7}div.mce-menu .mce-menu-item-sep,.mce-menu-item-sep:hover{border:0;padding:0;height:1px;margin:9px 1px;overflow:hidden;background:transparent;border-bottom:1px solid rgba(0,0,0,0.1);cursor:default;filter:none}.mce-menu.mce-rtl{direction:rtl}.mce-rtl .mce-menu-item{text-align:right;direction:rtl;padding:6px 12px 6px 15px}.mce-menu-align.mce-rtl .mce-menu-shortcut,.mce-menu-align.mce-rtl .mce-caret{right:auto;left:0}.mce-rtl .mce-menu-item .mce-caret{margin-left:6px;margin-right:0;border-right:4px solid #333;border-left:0}.mce-rtl .mce-menu-item.mce-selected .mce-caret,.mce-rtl .mce-menu-item:focus .mce-caret,.mce-rtl .mce-menu-item:hover .mce-caret{border-left-color:transparent;border-right-color:white}.mce-menu{position:absolute;left:0;top:0;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;z-index:1000;padding:5px 0 5px 0;margin:-1px 0 0;min-width:160px;background:#fff;border:1px solid #989898;border:1px solid rgba(0,0,0,0.2);z-index:1002;max-height:400px;overflow:auto;overflow-x:hidden}.mce-menu i{display:none}.mce-menu-has-icons i{display:inline-block;*display:inline}.mce-menu-sub-tr-tl{margin:-6px 0 0 -1px}.mce-menu-sub-br-bl{margin:6px 0 0 -1px}.mce-menu-sub-tl-tr{margin:-6px 0 0 1px}.mce-menu-sub-bl-br{margin:6px 0 0 1px}.mce-listbox button{text-align:left;padding-right:20px;position:relative}.mce-listbox .mce-caret{position:absolute;margin-top:-2px;right:8px;top:50%}.mce-rtl .mce-listbox .mce-caret{right:auto;left:8px}.mce-rtl .mce-listbox button{padding-right:10px;padding-left:20px}.mce-container-body .mce-resizehandle{position:absolute;right:0;bottom:0;width:16px;height:16px;visibility:visible;cursor:s-resize;margin:0}.mce-container-body .mce-resizehandle-both{cursor:se-resize}i.mce-i-resize{color:#333}.mce-selectbox{background:#fff;border:1px solid #c5c5c5}.mce-slider{border:1px solid #aaa;background:#eee;width:100px;height:10px;position:relative;display:block}.mce-slider.mce-vertical{width:10px;height:100px}.mce-slider-handle{border:1px solid #bbb;background:#ddd;display:block;width:13px;height:13px;position:absolute;top:0;left:0;margin-left:-1px;margin-top:-2px}.mce-spacer{visibility:hidden}.mce-splitbtn .mce-open{border-left:1px solid transparent}.mce-splitbtn:hover .mce-open{border-left-color:#ccc}.mce-splitbtn button{padding-right:6px;padding-left:6px}.mce-splitbtn .mce-open{padding-right:4px;padding-left:4px}.mce-splitbtn .mce-open.mce-active{background-color:#dbdbdb;outline:1px solid #ccc}.mce-splitbtn.mce-btn-small .mce-open{padding:0 3px 0 3px}.mce-rtl .mce-splitbtn{direction:rtl;text-align:right}.mce-rtl .mce-splitbtn button{padding-right:4px;padding-left:4px}.mce-rtl .mce-splitbtn .mce-open{border-left:0}.mce-stack-layout-item{display:block}.mce-tabs{display:block;border-bottom:1px solid #c5c5c5}.mce-tabs,.mce-tabs+.mce-container-body{background:#fff}.mce-tab{display:inline-block;*display:inline;*zoom:1;border:1px solid #c5c5c5;border-width:0 1px 0 0;background:#fff;padding:8px;text-shadow:0 1px 1px rgba(255,255,255,0.75);height:13px;cursor:pointer}.mce-tab:hover{background:#fdfdfd}.mce-tab.mce-active{background:#fdfdfd;border-bottom-color:transparent;margin-bottom:-1px;height:14px}.mce-rtl .mce-tabs{text-align:right;direction:rtl}.mce-rtl .mce-tab{border-width:0 0 0 1px}.mce-textbox{background:#fff;border:1px solid #c5c5c5;display:inline-block;-webkit-transition:border linear .2s, box-shadow linear .2s;transition:border linear .2s, box-shadow linear .2s;height:28px;resize:none;padding:0 4px 0 4px;white-space:pre-wrap;*white-space:pre;color:#333}.mce-textbox:focus,.mce-textbox.mce-focus{border-color:#3498db}.mce-placeholder .mce-textbox{color:#aaa}.mce-textbox.mce-multiline{padding:4px;height:auto}.mce-textbox.mce-disabled{color:#adadad}.mce-rtl .mce-textbox{text-align:right;direction:rtl}.mce-throbber{position:absolute;top:0;left:0;width:100%;height:100%;opacity:.6;filter:alpha(opacity=60);zoom:1;background:#fff url('img/loader.gif') no-repeat center center}.mce-throbber-inline{position:static;height:50px}@font-face{font-family:'tinymce';src:url('fonts/tinymce.eot');src:url('fonts/tinymce.eot?#iefix') format('embedded-opentype'),url('fonts/tinymce.woff') format('woff'),url('fonts/tinymce.ttf') format('truetype'),url('fonts/tinymce.svg#tinymce') format('svg');font-weight:normal;font-style:normal}@font-face{font-family:'tinymce-small';src:url('fonts/tinymce-small.eot');src:url('fonts/tinymce-small.eot?#iefix') format('embedded-opentype'),url('fonts/tinymce-small.woff') format('woff'),url('fonts/tinymce-small.ttf') format('truetype'),url('fonts/tinymce-small.svg#tinymce') format('svg');font-weight:normal;font-style:normal}.mce-ico{font-family:'tinymce',Arial;font-style:normal;font-weight:normal;font-variant:normal;font-size:16px;line-height:16px;speak:none;vertical-align:text-top;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;display:inline-block;background:transparent center center;background-size:cover;width:16px;height:16px;color:#333}.mce-btn-small .mce-ico{font-family:'tinymce-small',Arial}.mce-i-save:before{content:"\e000"}.mce-i-newdocument:before{content:"\e001"}.mce-i-fullpage:before{content:"\e002"}.mce-i-alignleft:before{content:"\e003"}.mce-i-aligncenter:before{content:"\e004"}.mce-i-alignright:before{content:"\e005"}.mce-i-alignjustify:before{content:"\e006"}.mce-i-alignnone:before{content:"\e003"}.mce-i-cut:before{content:"\e007"}.mce-i-paste:before{content:"\e008"}.mce-i-searchreplace:before{content:"\e009"}.mce-i-bullist:before{content:"\e00a"}.mce-i-numlist:before{content:"\e00b"}.mce-i-indent:before{content:"\e00c"}.mce-i-outdent:before{content:"\e00d"}.mce-i-blockquote:before{content:"\e00e"}.mce-i-undo:before{content:"\e00f"}.mce-i-redo:before{content:"\e010"}.mce-i-link:before{content:"\e011"}.mce-i-unlink:before{content:"\e012"}.mce-i-anchor:before{content:"\e013"}.mce-i-image:before{content:"\e014"}.mce-i-media:before{content:"\e015"}.mce-i-help:before{content:"\e016"}.mce-i-code:before{content:"\e017"}.mce-i-insertdatetime:before{content:"\e018"}.mce-i-preview:before{content:"\e019"}.mce-i-forecolor:before{content:"\e01a"}.mce-i-backcolor:before{content:"\e01a"}.mce-i-table:before{content:"\e01b"}.mce-i-hr:before{content:"\e01c"}.mce-i-removeformat:before{content:"\e01d"}.mce-i-subscript:before{content:"\e01e"}.mce-i-superscript:before{content:"\e01f"}.mce-i-charmap:before{content:"\e020"}.mce-i-emoticons:before{content:"\e021"}.mce-i-print:before{content:"\e022"}.mce-i-fullscreen:before{content:"\e023"}.mce-i-spellchecker:before{content:"\e024"}.mce-i-nonbreaking:before{content:"\e025"}.mce-i-template:before{content:"\e026"}.mce-i-pagebreak:before{content:"\e027"}.mce-i-restoredraft:before{content:"\e028"}.mce-i-untitled:before{content:"\e029"}.mce-i-bold:before{content:"\e02a"}.mce-i-italic:before{content:"\e02b"}.mce-i-underline:before{content:"\e02c"}.mce-i-strikethrough:before{content:"\e02d"}.mce-i-visualchars:before{content:"\e02e"}.mce-i-visualblocks:before{content:"\e02e"}.mce-i-ltr:before{content:"\e02f"}.mce-i-rtl:before{content:"\e030"}.mce-i-copy:before{content:"\e031"}.mce-i-resize:before{content:"\e032"}.mce-i-browse:before{content:"\e034"}.mce-i-pastetext:before{content:"\e035"}.mce-i-rotateleft:before{content:"\eaa8"}.mce-i-rotateright:before{content:"\eaa9"}.mce-i-crop:before{content:"\ee78"}.mce-i-editimage:before{content:"\e914"}.mce-i-options:before{content:"\ec6a"}.mce-i-flipv:before{content:"\eaaa"}.mce-i-fliph:before{content:"\eaac"}.mce-i-zoomin:before{content:"\eb35"}.mce-i-zoomout:before{content:"\eb36"}.mce-i-sun:before{content:"\eccc"}.mce-i-moon:before{content:"\eccd"}.mce-i-arrowleft:before{content:"\edc0"}.mce-i-arrowright:before{content:"\edb8"}.mce-i-drop:before{content:"\e934"}.mce-i-contrast:before{content:"\ecd4"}.mce-i-sharpen:before{content:"\eba7"}.mce-i-palette:before{content:"\e92a"}.mce-i-resize2:before{content:"\edf9"}.mce-i-orientation:before{content:"\e601"}.mce-i-invert:before{content:"\e602"}.mce-i-gamma:before{content:"\e600"}.mce-i-remove:before{content:"\ed6a"}.mce-i-tablerowprops:before{content:"\e604"}.mce-i-tablecellprops:before{content:"\e605"}.mce-i-table2:before{content:"\e606"}.mce-i-tablemergecells:before{content:"\e607"}.mce-i-tableinsertcolbefore:before{content:"\e608"}.mce-i-tableinsertcolafter:before{content:"\e609"}.mce-i-tableinsertrowbefore:before{content:"\e60a"}.mce-i-tableinsertrowafter:before{content:"\e60b"}.mce-i-tablesplitcells:before{content:"\e60d"}.mce-i-tabledelete:before{content:"\e60e"}.mce-i-tableleftheader:before{content:"\e62a"}.mce-i-tabletopheader:before{content:"\e62b"}.mce-i-tabledeleterow:before{content:"\e800"}.mce-i-tabledeletecol:before{content:"\e801"}.mce-i-codesample:before{content:"\e603"}.mce-i-checkbox:before,.mce-i-selected:before{content:"\e033"}.mce-i-selected{visibility:hidden}i.mce-i-backcolor{text-shadow:none;background:#bbb} \ No newline at end of file diff --git a/media/editors/tinymce/themes/modern/theme.min.js b/media/editors/tinymce/themes/modern/theme.min.js index 8b7f4cd82afab..a838dc653b601 100644 --- a/media/editors/tinymce/themes/modern/theme.min.js +++ b/media/editors/tinymce/themes/modern/theme.min.js @@ -1 +1 @@ -tinymce.ThemeManager.add("modern",function(a){function b(b,c){var d,e=[];if(b)return n(b.split(/[ ,]/),function(b){function f(){var c=a.selection;"bullist"==g&&c.selectorChanged("ul > li",function(a,c){for(var d,e=c.parents.length;e--&&(d=c.parents[e].nodeName,"OL"!=d&&"UL"!=d););b.active(a&&"UL"==d)}),"numlist"==g&&c.selectorChanged("ol > li",function(a,c){for(var d,e=c.parents.length;e--&&(d=c.parents[e].nodeName,"OL"!=d&&"UL"!=d););b.active(a&&"OL"==d)}),b.settings.stateSelector&&c.selectorChanged(b.settings.stateSelector,function(a){b.active(a)},!0),b.settings.disabledStateSelector&&c.selectorChanged(b.settings.disabledStateSelector,function(a){b.disabled(a)})}var g;"|"==b?d=null:m.has(b)?(b={type:b,size:c},e.push(b),d=null):(d||(d={type:"buttongroup",items:[]},e.push(d)),a.buttons[b]&&(g=b,b=a.buttons[g],"function"==typeof b&&(b=b()),b.type=b.type||"button",b.size=c,b=m.create(b),d.items.push(b),a.initialized?f():a.on("init",f)))}),{type:"toolbar",layout:"flow",items:e}}function c(a){function c(c){return c?(d.push(b(c,a)),!0):void 0}var d=[];if(tinymce.isArray(l.toolbar)){if(0===l.toolbar.length)return;tinymce.each(l.toolbar,function(a,b){l["toolbar"+(b+1)]=a}),delete l.toolbar}for(var e=1;10>e&&c(l["toolbar"+e]);e++);return d.length||l.toolbar===!1||c(l.toolbar||s),d.length?{type:"panel",layout:"stack",classes:"toolbar-grp",ariaRoot:!0,ariaRemember:!0,items:d}:void 0}function d(){function b(b){var c;return"|"==b?{text:"|"}:c=a.menuItems[b]}function c(c){var d,e,f,g,h;if(h=tinymce.makeMap((l.removed_menuitems||"").split(/[ ,]/)),l.menu?(e=l.menu[c],g=!0):e=r[c],e){d={text:e.title},f=[],n((e.items||"").split(/[ ,]/),function(a){var c=b(a);c&&!h[a]&&f.push(b(a))}),g||n(a.menuItems,function(a){a.context==c&&("before"==a.separator&&f.push({text:"|"}),a.prependToContext?f.unshift(a):f.push(a),"after"==a.separator&&f.push({text:"|"}))});for(var i=0;i=0;d--)for(e=g.length-1;e>=0;e--)if(g[e].predicate(f[d]))return{toolbar:g[e],element:f[d]};return null}var l;a.on("click keyup",function(){window.setTimeout(function(){var b;a.removed||(b=k(a.selection.getNode()),b?i(b):j())},0)}),a.on("blur hide",j),a.on("ObjectResizeStart",function(){var b=k(a.selection.getNode());b&&b.toolbar.panel&&b.toolbar.panel.hide()}),a.on("nodeChange ResizeEditor ResizeWindow",g),a.on("remove",function(){tinymce.each(c(),function(a){a.panel&&a.panel.remove()}),a.contextToolbars={}})}function i(b){function f(){if(n&&n.moveRel&&n.visible()&&!n._fixed){var b=a.selection.getScrollContainer(),c=a.getBody(),d=0,e=0;if(b){var f=o.getPos(c),g=o.getPos(b);d=Math.max(0,g.x-f.x),e=Math.max(0,g.y-f.y)}n.fixed(!1).moveRel(c,a.rtl?["tr-br","br-tr"]:["tl-bl","bl-tl","tr-br"]).moveBy(d,e)}}function g(){n&&(n.show(),f(),o.addClass(a.getBody(),"mce-edit-focus"))}function i(){n&&(n.hide(),q.hideAll(),o.removeClass(a.getBody(),"mce-edit-focus"))}function j(){return n?void(n.visible()||g()):(n=k.panel=m.create({type:p?"panel":"floatpanel",role:"application",classes:"tinymce tinymce-inline",layout:"flex",direction:"column",align:"stretch",autohide:!1,autofix:!0,fixed:!!p,border:1,items:[l.menubar===!1?null:{type:"menubar",border:"0 0 1 0",items:d()},c(l.toolbar_items_size)]}),a.fire("BeforeRenderUI"),n.renderTo(p||document.body).reflow(),e(n),g(),h(),a.on("nodeChange",f),a.on("activate",g),a.on("deactivate",i),void a.nodeChanged())}var n,p;return l.fixed_toolbar_container&&(p=o.select(l.fixed_toolbar_container)[0]),l.content_editable=!0,a.on("focus",function(){b.skinUiCss?tinymce.DOM.styleSheetLoader.load(b.skinUiCss,j,j):j()}),a.on("blur hide",i),a.on("remove",function(){n&&(n.remove(),n=null)}),b.skinUiCss&&tinymce.DOM.styleSheetLoader.load(b.skinUiCss),{}}function j(b){var g,i,j;return b.skinUiCss&&tinymce.DOM.loadCSS(b.skinUiCss),g=k.panel=m.create({type:"panel",role:"application",classes:"tinymce",style:"visibility: hidden",layout:"stack",border:1,items:[l.menubar===!1?null:{type:"menubar",border:"0 0 1 0",items:d()},c(l.toolbar_items_size),{type:"panel",name:"iframe",layout:"stack",classes:"edit-area",html:"",border:"1 0 0 0"}]}),l.resize!==!1&&(i={type:"resizehandle",direction:l.resize,onResizeStart:function(){var b=a.getContentAreaContainer().firstChild;j={width:b.clientWidth,height:b.clientHeight}},onResize:function(a){"both"==l.resize?f(j.width+a.deltaX,j.height+a.deltaY):f(null,j.height+a.deltaY)}}),l.statusbar!==!1&&g.add({type:"panel",name:"statusbar",classes:"statusbar",layout:"flow",border:"1 0 0 0",ariaRoot:!0,items:[{type:"elementpath"},i]}),l.readonly&&g.find("*").disabled(!0),a.fire("BeforeRenderUI"),g.renderBefore(b.targetNode).reflow(),l.width&&tinymce.DOM.setStyle(g.getEl(),"width",l.width),a.on("remove",function(){g.remove(),g=null}),e(g),h(),{iframeContainer:g.find("#iframe")[0].getEl(),editorContainer:g.getEl()}}var k=this,l=a.settings,m=tinymce.ui.Factory,n=tinymce.each,o=tinymce.DOM,p=tinymce.ui.Rect,q=tinymce.ui.FloatPanel,r={file:{title:"File",items:"newdocument"},edit:{title:"Edit",items:"undo redo | cut copy paste pastetext | selectall"},insert:{title:"Insert",items:"|"},view:{title:"View",items:"visualaid |"},format:{title:"Format",items:"bold italic underline strikethrough superscript subscript | formats | removeformat"},table:{title:"Table"},tools:{title:"Tools"}},s="undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image";k.renderUI=function(b){var c=l.skin!==!1?l.skin||"lightgray":!1;if(c){var d=l.skin_url;d=d?a.documentBaseURI.toAbsolute(d):tinymce.baseURL+"/skins/"+c,tinymce.Env.documentMode<=7?b.skinUiCss=d+"/skin.ie7.min.css":b.skinUiCss=d+"/skin.min.css",a.contentCSS.push(d+"/content"+(a.inline?".inline":"")+".min.css")}return a.on("ProgressState",function(a){k.throbber=k.throbber||new tinymce.ui.Throbber(k.panel.getEl("body")),a.state?k.throbber.show(a.time):k.throbber.hide()}),l.inline?i(b):j(b)},k.resizeTo=f,k.resizeBy=g}); \ No newline at end of file +tinymce.ThemeManager.add("modern",function(e){function t(t,n){var r,i=[];if(t)return h(t.split(/[ ,]/),function(t){function o(){function n(e){return function(n,r){for(var i,o=r.parents.length;o--&&(i=r.parents[o].nodeName,"OL"!=i&&"UL"!=i););t.active(n&&i==e)}}var r=e.selection;"bullist"==a&&r.selectorChanged("ul > li",n("UL")),"numlist"==a&&r.selectorChanged("ol > li",n("OL")),t.settings.stateSelector&&r.selectorChanged(t.settings.stateSelector,function(e){t.active(e)},!0),t.settings.disabledStateSelector&&r.selectorChanged(t.settings.disabledStateSelector,function(e){t.disabled(e)})}var a;"|"==t?r=null:f.has(t)?(t={type:t,size:n},i.push(t),r=null):(r||(r={type:"buttongroup",items:[]},i.push(r)),e.buttons[t]&&(a=t,t=e.buttons[a],"function"==typeof t&&(t=t()),t.type=t.type||"button",t.size=n,t=f.create(t),r.items.push(t),e.initialized?o():e.on("init",o)))}),{type:"toolbar",layout:"flow",items:i}}function n(e){function n(n){return n?(r.push(t(n,e)),!0):void 0}var r=[];if(tinymce.isArray(d.toolbar)){if(0===d.toolbar.length)return;tinymce.each(d.toolbar,function(e,t){d["toolbar"+(t+1)]=e}),delete d.toolbar}for(var i=1;10>i&&n(d["toolbar"+i]);i++);return r.length||d.toolbar===!1||n(d.toolbar||y),r.length?{type:"panel",layout:"stack",classes:"toolbar-grp",ariaRoot:!0,ariaRemember:!0,items:r}:void 0}function r(){function t(t){var n;return"|"==t?{text:"|"}:n=e.menuItems[t]}function n(n){var r,i,o,a,s;if(s=tinymce.makeMap((d.removed_menuitems||"").split(/[ ,]/)),d.menu?(i=d.menu[n],a=!0):i=v[n],i){r={text:i.title},o=[],h((i.items||"").split(/[ ,]/),function(e){var n=t(e);n&&!s[e]&&o.push(t(e))}),a||h(e.menuItems,function(e){e.context==n&&("before"==e.separator&&o.push({text:"|"}),e.prependToContext?o.unshift(e):o.push(e),"after"==e.separator&&o.push({text:"|"}))});for(var l=0;l=0;r--)for(i=a.length-1;i>=0;i--)if(a[i].predicate(o[r]))return{toolbar:a[i],element:o[r]};return null}var d;e.on("click keyup setContent",function(t){("setcontent"!=t.type||t.selection)&&tinymce.util.Delay.setEditorTimeout(e,function(){var t;t=u(e.selection.getNode()),t?(c(),l(t)):c()})}),e.on("blur hide",c),e.on("ObjectResizeStart",function(){var t=u(e.selection.getNode());t&&t.toolbar.panel&&t.toolbar.panel.hide()}),e.on("nodeChange ResizeEditor ResizeWindow",a),e.on("remove",function(){tinymce.each(n(),function(e){e.panel&&e.panel.remove()}),e.contextToolbars={}})}function l(t){function o(){if(h&&h.moveRel&&h.visible()&&!h._fixed){var t=e.selection.getScrollContainer(),n=e.getBody(),r=0,i=0;if(t){var o=m.getPos(n),a=m.getPos(t);r=Math.max(0,a.x-o.x),i=Math.max(0,a.y-o.y)}h.fixed(!1).moveRel(n,e.rtl?["tr-br","br-tr"]:["tl-bl","bl-tl","tr-br"]).moveBy(r,i)}}function a(){h&&(h.show(),o(),m.addClass(e.getBody(),"mce-edit-focus"))}function l(){h&&(h.hide(),g.hideAll(),m.removeClass(e.getBody(),"mce-edit-focus"))}function c(){return h?void(h.visible()||a()):(h=u.panel=f.create({type:p?"panel":"floatpanel",role:"application",classes:"tinymce tinymce-inline",layout:"flex",direction:"column",align:"stretch",autohide:!1,autofix:!0,fixed:!!p,border:1,items:[d.menubar===!1?null:{type:"menubar",border:"0 0 1 0",items:r()},n(d.toolbar_items_size)]}),e.fire("BeforeRenderUI"),h.renderTo(p||document.body).reflow(),i(h),a(),s(),e.on("nodeChange",o),e.on("activate",a),e.on("deactivate",l),void e.nodeChanged())}var h,p;return d.fixed_toolbar_container&&(p=m.select(d.fixed_toolbar_container)[0]),d.content_editable=!0,e.on("focus",function(){t.skinUiCss?tinymce.DOM.styleSheetLoader.load(t.skinUiCss,c,c):c()}),e.on("blur hide",l),e.on("remove",function(){h&&(h.remove(),h=null)}),t.skinUiCss&&tinymce.DOM.styleSheetLoader.load(t.skinUiCss),{}}function c(t){function a(){return function(e){"readonly"==e.mode?l.find("*").disabled(!0):l.find("*").disabled(!1)}}var l,c,h;return t.skinUiCss&&tinymce.DOM.loadCSS(t.skinUiCss),l=u.panel=f.create({type:"panel",role:"application",classes:"tinymce",style:"visibility: hidden",layout:"stack",border:1,items:[d.menubar===!1?null:{type:"menubar",border:"0 0 1 0",items:r()},n(d.toolbar_items_size),{type:"panel",name:"iframe",layout:"stack",classes:"edit-area",html:"",border:"1 0 0 0"}]}),d.resize!==!1&&(c={type:"resizehandle",direction:d.resize,onResizeStart:function(){var t=e.getContentAreaContainer().firstChild;h={width:t.clientWidth,height:t.clientHeight}},onResize:function(e){"both"==d.resize?o(h.width+e.deltaX,h.height+e.deltaY):o(null,h.height+e.deltaY)}}),d.statusbar!==!1&&l.add({type:"panel",name:"statusbar",classes:"statusbar",layout:"flow",border:"1 0 0 0",ariaRoot:!0,items:[{type:"elementpath"},c]}),d.readonly&&l.find("*").disabled(!0),e.fire("BeforeRenderUI"),e.on("SwitchMode",a()),l.renderBefore(t.targetNode).reflow(),d.width&&tinymce.DOM.setStyle(l.getEl(),"width",d.width),e.on("remove",function(){l.remove(),l=null}),i(l),s(),{iframeContainer:l.find("#iframe")[0].getEl(),editorContainer:l.getEl()}}var u=this,d=e.settings,f=tinymce.ui.Factory,h=tinymce.each,m=tinymce.DOM,p=tinymce.geom.Rect,g=tinymce.ui.FloatPanel,v={file:{title:"File",items:"newdocument"},edit:{title:"Edit",items:"undo redo | cut copy paste pastetext | selectall"},insert:{title:"Insert",items:"|"},view:{title:"View",items:"visualaid |"},format:{title:"Format",items:"bold italic underline strikethrough superscript subscript | formats | removeformat"},table:{title:"Table"},tools:{title:"Tools"}},y="undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image";u.renderUI=function(t){var n=d.skin!==!1?d.skin||"lightgray":!1;if(n){var r=d.skin_url;r=r?e.documentBaseURI.toAbsolute(r):tinymce.baseURL+"/skins/"+n,tinymce.Env.documentMode<=7?t.skinUiCss=r+"/skin.ie7.min.css":t.skinUiCss=r+"/skin.min.css",e.contentCSS.push(r+"/content"+(e.inline?".inline":"")+".min.css")}return e.on("ProgressState",function(e){u.throbber=u.throbber||new tinymce.ui.Throbber(u.panel.getEl("body")),e.state?u.throbber.show(e.time):u.throbber.hide()}),d.inline?l(t):c(t)},u.resizeTo=o,u.resizeBy=a}); \ No newline at end of file diff --git a/media/editors/tinymce/tinymce.min.js b/media/editors/tinymce/tinymce.min.js index f55021f21c0ae..d14d273082ea7 100644 --- a/media/editors/tinymce/tinymce.min.js +++ b/media/editors/tinymce/tinymce.min.js @@ -1,12 +1,13 @@ -// 4.2.6 (2015-09-28) -!function(e,t){"use strict";function n(e,t){for(var n,r=[],i=0;ir;r++)if(o=n[r],o&&o.func.call(o.scope,e)===!1&&e.preventDefault(),e.isImmediatePropagationStopped())return}var a=this,s={},l,c,u,d,f;c=o+(+new Date).toString(32),d="onmouseenter"in document.documentElement,u="onfocusin"in document.documentElement,f={mouseenter:"mouseover",mouseleave:"mouseout"},l=1,a.domLoaded=!1,a.events=s,a.bind=function(t,o,h,p){function m(e){i(n(e||_.event),g)}var g,v,y,b,x,C,w,_=window;if(t&&3!==t.nodeType&&8!==t.nodeType){for(t[c]?g=t[c]:(g=l++,t[c]=g,s[g]={}),p=p||t,o=o.split(" "),y=o.length;y--;)b=o[y],C=m,x=w=!1,"DOMContentLoaded"===b&&(b="ready"),a.domLoaded&&"ready"===b&&"complete"==t.readyState?h.call(p,n({type:b})):(d||(x=f[b],x&&(C=function(e){var t,r;if(t=e.currentTarget,r=e.relatedTarget,r&&t.contains)r=t.contains(r);else for(;r&&r!==t;)r=r.parentNode;r||(e=n(e||_.event),e.type="mouseout"===e.type?"mouseleave":"mouseenter",e.target=t,i(e,g))})),u||"focusin"!==b&&"focusout"!==b||(w=!0,x="focusin"===b?"focus":"blur",C=function(e){e=n(e||_.event),e.type="focus"===e.type?"focusin":"focusout",i(e,g)}),v=s[g][b],v?"ready"===b&&a.domLoaded?h({type:b}):v.push({func:h,scope:p}):(s[g][b]=v=[{func:h,scope:p}],v.fakeName=x,v.capture=w,v.nativeHandler=C,"ready"===b?r(t,C,a):e(t,x||b,C,w)));return t=v=0,h}},a.unbind=function(e,n,r){var i,o,l,u,d,f;if(!e||3===e.nodeType||8===e.nodeType)return a;if(i=e[c]){if(f=s[i],n){for(n=n.split(" "),l=n.length;l--;)if(d=n[l],o=f[d]){if(r)for(u=o.length;u--;)if(o[u].func===r){var h=o.nativeHandler,p=o.fakeName,m=o.capture;o=o.slice(0,u).concat(o.slice(u+1)),o.nativeHandler=h,o.fakeName=p,o.capture=m,f[d]=o}r&&0!==o.length||(delete f[d],t(e,o.fakeName||d,o.nativeHandler,o.capture))}}else{for(d in f)o=f[d],t(e,o.fakeName||d,o.nativeHandler,o.capture);f={}}for(d in f)return a;delete s[i];try{delete e[c]}catch(g){e[c]=null}}return a},a.fire=function(e,t,r){var o;if(!e||3===e.nodeType||8===e.nodeType)return a;r=n(null,r),r.type=t,r.target=e;do o=e[c],o&&i(r,o),e=e.parentNode||e.ownerDocument||e.defaultView||e.parentWindow;while(e&&!r.isPropagationStopped());return a},a.clean=function(e){var t,n,r=a.unbind;if(!e||3===e.nodeType||8===e.nodeType)return a;if(e[c]&&r(e),e.getElementsByTagName||(e=e.document),e&&e.getElementsByTagName)for(r(e),n=e.getElementsByTagName("*"),t=n.length;t--;)e=n[t],e[c]&&r(e);return a},a.destroy=function(){s={}},a.cancel=function(e){return e&&(e.preventDefault(),e.stopImmediatePropagation()),!1}}var o="mce-data-",a=/^(?:mouse|contextmenu)|click/,s={keyLocation:1,layerX:1,layerY:1,returnValue:1,webkitMovementX:1,webkitMovementY:1};return i.Event=new i,i.Event.bind(window,"ready",function(){}),i}),r(c,[],function(){function e(e,t,n,r){var i,o,a,s,l,c,d,h,p,m;if((t?t.ownerDocument||t:z)!==D&&B(t),t=t||D,n=n||[],!e||"string"!=typeof e)return n;if(1!==(s=t.nodeType)&&9!==s)return[];if(L&&!r){if(i=ve.exec(e))if(a=i[1]){if(9===s){if(o=t.getElementById(a),!o||!o.parentNode)return n;if(o.id===a)return n.push(o),n}else if(t.ownerDocument&&(o=t.ownerDocument.getElementById(a))&&I(t,o)&&o.id===a)return n.push(o),n}else{if(i[2])return Z.apply(n,t.getElementsByTagName(e)),n;if((a=i[3])&&C.getElementsByClassName)return Z.apply(n,t.getElementsByClassName(a)),n}if(C.qsa&&(!H||!H.test(e))){if(h=d=F,p=t,m=9===s&&e,1===s&&"object"!==t.nodeName.toLowerCase()){for(c=N(e),(d=t.getAttribute("id"))?h=d.replace(be,"\\$&"):t.setAttribute("id",h),h="[id='"+h+"'] ",l=c.length;l--;)c[l]=h+f(c[l]);p=ye.test(e)&&u(t.parentNode)||t,m=c.join(",")}if(m)try{return Z.apply(n,p.querySelectorAll(m)),n}catch(g){}finally{d||t.removeAttribute("id")}}}return k(e.replace(se,"$1"),t,n,r)}function n(){function e(n,r){return t.push(n+" ")>w.cacheLength&&delete e[t.shift()],e[n+" "]=r}var t=[];return e}function r(e){return e[F]=!0,e}function i(e){var t=D.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function o(e,t){for(var n=e.split("|"),r=e.length;r--;)w.attrHandle[n[r]]=t}function a(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||Y)-(~e.sourceIndex||Y);if(r)return r;if(n)for(;n=n.nextSibling;)if(n===t)return-1;return e?1:-1}function s(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function l(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function c(e){return r(function(t){return t=+t,r(function(n,r){for(var i,o=e([],n.length,t),a=o.length;a--;)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function u(e){return e&&typeof e.getElementsByTagName!==K&&e}function d(){}function f(e){for(var t=0,n=e.length,r="";n>t;t++)r+=e[t].value;return r}function h(e,t,n){var r=t.dir,i=n&&"parentNode"===r,o=V++;return t.first?function(t,n,o){for(;t=t[r];)if(1===t.nodeType||i)return e(t,n,o)}:function(t,n,a){var s,l,c=[W,o];if(a){for(;t=t[r];)if((1===t.nodeType||i)&&e(t,n,a))return!0}else for(;t=t[r];)if(1===t.nodeType||i){if(l=t[F]||(t[F]={}),(s=l[r])&&s[0]===W&&s[1]===o)return c[2]=s[2];if(l[r]=c,c[2]=e(t,n,a))return!0}}}function p(e){return e.length>1?function(t,n,r){for(var i=e.length;i--;)if(!e[i](t,n,r))return!1;return!0}:e[0]}function m(t,n,r){for(var i=0,o=n.length;o>i;i++)e(t,n[i],r);return r}function g(e,t,n,r,i){for(var o,a=[],s=0,l=e.length,c=null!=t;l>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),c&&t.push(s));return a}function v(e,t,n,i,o,a){return i&&!i[F]&&(i=v(i)),o&&!o[F]&&(o=v(o,a)),r(function(r,a,s,l){var c,u,d,f=[],h=[],p=a.length,v=r||m(t||"*",s.nodeType?[s]:s,[]),y=!e||!r&&t?v:g(v,f,e,s,l),b=n?o||(r?e:p||i)?[]:a:y;if(n&&n(y,b,s,l),i)for(c=g(b,h),i(c,[],s,l),u=c.length;u--;)(d=c[u])&&(b[h[u]]=!(y[h[u]]=d));if(r){if(o||e){if(o){for(c=[],u=b.length;u--;)(d=b[u])&&c.push(y[u]=d);o(null,b=[],c,l)}for(u=b.length;u--;)(d=b[u])&&(c=o?te.call(r,d):f[u])>-1&&(r[c]=!(a[c]=d))}}else b=g(b===a?b.splice(p,b.length):b),o?o(null,a,b,l):Z.apply(a,b)})}function y(e){for(var t,n,r,i=e.length,o=w.relative[e[0].type],a=o||w.relative[" "],s=o?1:0,l=h(function(e){return e===t},a,!0),c=h(function(e){return te.call(t,e)>-1},a,!0),u=[function(e,n,r){return!o&&(r||n!==T)||((t=n).nodeType?l(e,n,r):c(e,n,r))}];i>s;s++)if(n=w.relative[e[s].type])u=[h(p(u),n)];else{if(n=w.filter[e[s].type].apply(null,e[s].matches),n[F]){for(r=++s;i>r&&!w.relative[e[r].type];r++);return v(s>1&&p(u),s>1&&f(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace(se,"$1"),n,r>s&&y(e.slice(s,r)),i>r&&y(e=e.slice(r)),i>r&&f(e))}u.push(n)}return p(u)}function b(t,n){var i=n.length>0,o=t.length>0,a=function(r,a,s,l,c){var u,d,f,h=0,p="0",m=r&&[],v=[],y=T,b=r||o&&w.find.TAG("*",c),x=W+=null==y?1:Math.random()||.1,C=b.length;for(c&&(T=a!==D&&a);p!==C&&null!=(u=b[p]);p++){if(o&&u){for(d=0;f=t[d++];)if(f(u,a,s)){l.push(u);break}c&&(W=x)}i&&((u=!f&&u)&&h--,r&&m.push(u))}if(h+=p,i&&p!==h){for(d=0;f=n[d++];)f(m,v,a,s);if(r){if(h>0)for(;p--;)m[p]||v[p]||(v[p]=J.call(l));v=g(v)}Z.apply(l,v),c&&!r&&v.length>0&&h+n.length>1&&e.uniqueSort(l)}return c&&(W=x,T=y),m};return i?r(a):a}var x,C,w,_,E,N,S,k,T,R,A,B,D,M,L,H,P,O,I,F="sizzle"+-new Date,z=window.document,W=0,V=0,U=n(),$=n(),q=n(),j=function(e,t){return e===t&&(A=!0),0},K=typeof t,Y=1<<31,G={}.hasOwnProperty,X=[],J=X.pop,Q=X.push,Z=X.push,ee=X.slice,te=X.indexOf||function(e){for(var t=0,n=this.length;n>t;t++)if(this[t]===e)return t;return-1},ne="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",re="[\\x20\\t\\r\\n\\f]",ie="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",oe="\\["+re+"*("+ie+")(?:"+re+"*([*^$|!~]?=)"+re+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+ie+"))|)"+re+"*\\]",ae=":("+ie+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+oe+")*)|.*)\\)|)",se=new RegExp("^"+re+"+|((?:^|[^\\\\])(?:\\\\.)*)"+re+"+$","g"),le=new RegExp("^"+re+"*,"+re+"*"),ce=new RegExp("^"+re+"*([>+~]|"+re+")"+re+"*"),ue=new RegExp("="+re+"*([^\\]'\"]*?)"+re+"*\\]","g"),de=new RegExp(ae),fe=new RegExp("^"+ie+"$"),he={ID:new RegExp("^#("+ie+")"),CLASS:new RegExp("^\\.("+ie+")"),TAG:new RegExp("^("+ie+"|[*])"),ATTR:new RegExp("^"+oe),PSEUDO:new RegExp("^"+ae),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+re+"*(even|odd|(([+-]|)(\\d*)n|)"+re+"*(?:([+-]|)"+re+"*(\\d+)|))"+re+"*\\)|)","i"),bool:new RegExp("^(?:"+ne+")$","i"),needsContext:new RegExp("^"+re+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+re+"*((?:-\\d)?\\d*)"+re+"*\\)|)(?=[^-]|$)","i")},pe=/^(?:input|select|textarea|button)$/i,me=/^h\d$/i,ge=/^[^{]+\{\s*\[native \w/,ve=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ye=/[+~]/,be=/'|\\/g,xe=new RegExp("\\\\([\\da-f]{1,6}"+re+"?|("+re+")|.)","ig"),Ce=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:0>r?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)};try{Z.apply(X=ee.call(z.childNodes),z.childNodes),X[z.childNodes.length].nodeType}catch(we){Z={apply:X.length?function(e,t){Q.apply(e,ee.call(t))}:function(e,t){for(var n=e.length,r=0;e[n++]=t[r++];);e.length=n-1}}}C=e.support={},E=e.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},B=e.setDocument=function(e){var t,n=e?e.ownerDocument||e:z,r=n.defaultView;return n!==D&&9===n.nodeType&&n.documentElement?(D=n,M=n.documentElement,L=!E(n),r&&r!==r.top&&(r.addEventListener?r.addEventListener("unload",function(){B()},!1):r.attachEvent&&r.attachEvent("onunload",function(){B()})),C.attributes=i(function(e){return e.className="i",!e.getAttribute("className")}),C.getElementsByTagName=i(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),C.getElementsByClassName=ge.test(n.getElementsByClassName),C.getById=i(function(e){return M.appendChild(e).id=F,!n.getElementsByName||!n.getElementsByName(F).length}),C.getById?(w.find.ID=function(e,t){if(typeof t.getElementById!==K&&L){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},w.filter.ID=function(e){var t=e.replace(xe,Ce);return function(e){return e.getAttribute("id")===t}}):(delete w.find.ID,w.filter.ID=function(e){var t=e.replace(xe,Ce);return function(e){var n=typeof e.getAttributeNode!==K&&e.getAttributeNode("id");return n&&n.value===t}}),w.find.TAG=C.getElementsByTagName?function(e,t){return typeof t.getElementsByTagName!==K?t.getElementsByTagName(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){for(;n=o[i++];)1===n.nodeType&&r.push(n);return r}return o},w.find.CLASS=C.getElementsByClassName&&function(e,t){return L?t.getElementsByClassName(e):void 0},P=[],H=[],(C.qsa=ge.test(n.querySelectorAll))&&(i(function(e){e.innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&H.push("[*^$]="+re+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||H.push("\\["+re+"*(?:value|"+ne+")"),e.querySelectorAll(":checked").length||H.push(":checked")}),i(function(e){var t=n.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&H.push("name"+re+"*[*^$|!~]?="),e.querySelectorAll(":enabled").length||H.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),H.push(",.*:")})),(C.matchesSelector=ge.test(O=M.matches||M.webkitMatchesSelector||M.mozMatchesSelector||M.oMatchesSelector||M.msMatchesSelector))&&i(function(e){C.disconnectedMatch=O.call(e,"div"),O.call(e,"[s!='']:x"),P.push("!=",ae)}),H=H.length&&new RegExp(H.join("|")),P=P.length&&new RegExp(P.join("|")),t=ge.test(M.compareDocumentPosition),I=t||ge.test(M.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)for(;t=t.parentNode;)if(t===e)return!0;return!1},j=t?function(e,t){if(e===t)return A=!0,0;var r=!e.compareDocumentPosition-!t.compareDocumentPosition;return r?r:(r=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1,1&r||!C.sortDetached&&t.compareDocumentPosition(e)===r?e===n||e.ownerDocument===z&&I(z,e)?-1:t===n||t.ownerDocument===z&&I(z,t)?1:R?te.call(R,e)-te.call(R,t):0:4&r?-1:1)}:function(e,t){if(e===t)return A=!0,0;var r,i=0,o=e.parentNode,s=t.parentNode,l=[e],c=[t];if(!o||!s)return e===n?-1:t===n?1:o?-1:s?1:R?te.call(R,e)-te.call(R,t):0;if(o===s)return a(e,t);for(r=e;r=r.parentNode;)l.unshift(r);for(r=t;r=r.parentNode;)c.unshift(r);for(;l[i]===c[i];)i++;return i?a(l[i],c[i]):l[i]===z?-1:c[i]===z?1:0},n):D},e.matches=function(t,n){return e(t,null,null,n)},e.matchesSelector=function(t,n){if((t.ownerDocument||t)!==D&&B(t),n=n.replace(ue,"='$1']"),C.matchesSelector&&L&&(!P||!P.test(n))&&(!H||!H.test(n)))try{var r=O.call(t,n);if(r||C.disconnectedMatch||t.document&&11!==t.document.nodeType)return r}catch(i){}return e(n,D,null,[t]).length>0},e.contains=function(e,t){return(e.ownerDocument||e)!==D&&B(e),I(e,t)},e.attr=function(e,n){(e.ownerDocument||e)!==D&&B(e);var r=w.attrHandle[n.toLowerCase()],i=r&&G.call(w.attrHandle,n.toLowerCase())?r(e,n,!L):t;return i!==t?i:C.attributes||!L?e.getAttribute(n):(i=e.getAttributeNode(n))&&i.specified?i.value:null},e.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},e.uniqueSort=function(e){var t,n=[],r=0,i=0;if(A=!C.detectDuplicates,R=!C.sortStable&&e.slice(0),e.sort(j),A){for(;t=e[i++];)t===e[i]&&(r=n.push(i));for(;r--;)e.splice(n[r],1)}return R=null,e},_=e.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=_(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r++];)n+=_(t);return n},w=e.selectors={cacheLength:50,createPseudo:r,match:he,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(xe,Ce),e[3]=(e[3]||e[4]||e[5]||"").replace(xe,Ce),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(t){return t[1]=t[1].toLowerCase(),"nth"===t[1].slice(0,3)?(t[3]||e.error(t[0]),t[4]=+(t[4]?t[5]+(t[6]||1):2*("even"===t[3]||"odd"===t[3])),t[5]=+(t[7]+t[8]||"odd"===t[3])):t[3]&&e.error(t[0]),t},PSEUDO:function(e){var t,n=!e[6]&&e[2];return he.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&de.test(n)&&(t=N(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(xe,Ce).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=U[e+" "];return t||(t=new RegExp("(^|"+re+")"+e+"("+re+"|$)"))&&U(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==K&&e.getAttribute("class")||"")})},ATTR:function(t,n,r){return function(i){var o=e.attr(i,t);return null==o?"!="===n:n?(o+="","="===n?o===r:"!="===n?o!==r:"^="===n?r&&0===o.indexOf(r):"*="===n?r&&o.indexOf(r)>-1:"$="===n?r&&o.slice(-r.length)===r:"~="===n?(" "+o+" ").indexOf(r)>-1:"|="===n?o===r||o.slice(0,r.length+1)===r+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,l){var c,u,d,f,h,p,m=o!==a?"nextSibling":"previousSibling",g=t.parentNode,v=s&&t.nodeName.toLowerCase(),y=!l&&!s;if(g){if(o){for(;m;){for(d=t;d=d[m];)if(s?d.nodeName.toLowerCase()===v:1===d.nodeType)return!1;p=m="only"===e&&!p&&"nextSibling"}return!0}if(p=[a?g.firstChild:g.lastChild],a&&y){for(u=g[F]||(g[F]={}),c=u[e]||[],h=c[0]===W&&c[1],f=c[0]===W&&c[2],d=h&&g.childNodes[h];d=++h&&d&&d[m]||(f=h=0)||p.pop();)if(1===d.nodeType&&++f&&d===t){u[e]=[W,h,f];break}}else if(y&&(c=(t[F]||(t[F]={}))[e])&&c[0]===W)f=c[1];else for(;(d=++h&&d&&d[m]||(f=h=0)||p.pop())&&((s?d.nodeName.toLowerCase()!==v:1!==d.nodeType)||!++f||(y&&((d[F]||(d[F]={}))[e]=[W,f]),d!==t)););return f-=i,f===r||f%r===0&&f/r>=0}}},PSEUDO:function(t,n){var i,o=w.pseudos[t]||w.setFilters[t.toLowerCase()]||e.error("unsupported pseudo: "+t);return o[F]?o(n):o.length>1?(i=[t,t,"",n],w.setFilters.hasOwnProperty(t.toLowerCase())?r(function(e,t){for(var r,i=o(e,n),a=i.length;a--;)r=te.call(e,i[a]),e[r]=!(t[r]=i[a])}):function(e){return o(e,0,i)}):o}},pseudos:{not:r(function(e){var t=[],n=[],i=S(e.replace(se,"$1"));return i[F]?r(function(e,t,n,r){for(var o,a=i(e,null,r,[]),s=e.length;s--;)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,r,o){return t[0]=e,i(t,null,o,n),!n.pop()}}),has:r(function(t){return function(n){return e(t,n).length>0}}),contains:r(function(e){return e=e.replace(xe,Ce),function(t){return(t.textContent||t.innerText||_(t)).indexOf(e)>-1}}),lang:r(function(t){return fe.test(t||"")||e.error("unsupported lang: "+t),t=t.replace(xe,Ce).toLowerCase(),function(e){var n;do if(n=L?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return n=n.toLowerCase(),n===t||0===n.indexOf(t+"-");while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=window.location&&window.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===M},focus:function(e){return e===D.activeElement&&(!D.hasFocus||D.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!w.pseudos.empty(e)},header:function(e){return me.test(e.nodeName)},input:function(e){return pe.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:c(function(){return[0]}),last:c(function(e,t){return[t-1]}),eq:c(function(e,t,n){return[0>n?n+t:n]}),even:c(function(e,t){for(var n=0;t>n;n+=2)e.push(n);return e}),odd:c(function(e,t){for(var n=1;t>n;n+=2)e.push(n);return e}),lt:c(function(e,t,n){for(var r=0>n?n+t:n;--r>=0;)e.push(r);return e}),gt:c(function(e,t,n){for(var r=0>n?n+t:n;++r2&&"ID"===(a=o[0]).type&&C.getById&&9===t.nodeType&&L&&w.relative[o[1].type]){if(t=(w.find.ID(a.matches[0].replace(xe,Ce),t)||[])[0],!t)return n;c&&(t=t.parentNode),e=e.slice(o.shift().value.length)}for(i=he.needsContext.test(e)?0:o.length;i--&&(a=o[i],!w.relative[s=a.type]);)if((l=w.find[s])&&(r=l(a.matches[0].replace(xe,Ce),ye.test(o[0].type)&&u(t.parentNode)||t))){if(o.splice(i,1),e=r.length&&f(o),!e)return Z.apply(n,r),n;break}}return(c||S(e,d))(r,t,!L,n,ye.test(e)&&u(t.parentNode)||t),n},C.sortStable=F.split("").sort(j).join("")===F,C.detectDuplicates=!!A,B(),C.sortDetached=i(function(e){return 1&e.compareDocumentPosition(D.createElement("div"))}),i(function(e){return e.innerHTML="","#"===e.firstChild.getAttribute("href")})||o("type|href|height|width",function(e,t,n){return n?void 0:e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),C.attributes&&i(function(e){return e.innerHTML="",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||o("value",function(e,t,n){return n||"input"!==e.nodeName.toLowerCase()?void 0:e.defaultValue}),i(function(e){return null==e.getAttribute("disabled")})||o(ne,function(e,t,n){var r;return n?void 0:e[t]===!0?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),e}),r(u,[],function(){var e=navigator,t=e.userAgent,n,r,i,o,a,s,l,c,u,d;n=window.opera&&window.opera.buildNumber,u=/Android/.test(t),r=/WebKit/.test(t),i=!r&&!n&&/MSIE/gi.test(t)&&/Explorer/gi.test(e.appName),i=i&&/MSIE (\w+)\./.exec(t)[1],o=-1==t.indexOf("Trident/")||-1==t.indexOf("rv:")&&-1==e.appName.indexOf("Netscape")?!1:11,a=-1==t.indexOf("Edge/")||i||o?!1:12,i=i||o||a,s=!r&&!o&&/Gecko/.test(t),l=-1!=t.indexOf("Mac"),c=/(iPad|iPhone)/.test(t),d="FormData"in window&&"FileReader"in window&&"URL"in window&&!!URL.createObjectURL,a&&(r=!1);var f=!c||d||t.match(/AppleWebKit\/(\d*)/)[1]>=534;return{opera:n,webkit:r,ie:i,gecko:s,mac:l,iOS:c,android:u,contentEditable:f,transparentSrc:"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7",caretAfter:8!=i,range:window.getSelection&&"Range"in window,documentMode:i&&!a?document.documentMode||7:10,fileApi:d}}),r(d,[],function(){function e(e){var t=e,n,r;if(!s(e))for(t=[],n=0,r=e.length;r>n;n++)t[n]=e[n];return t}function n(e,n,r){var i,o;if(!e)return 0;if(r=r||e,e.length!==t){for(i=0,o=e.length;o>i;i++)if(n.call(r,e[i],i,e)===!1)return 0}else for(i in e)if(e.hasOwnProperty(i)&&n.call(r,e[i],i,e)===!1)return 0;return 1}function r(e,t){var r=[];return n(e,function(n,i){r.push(t(n,i,e))}),r}function i(e,t){var r=[];return n(e,function(e){(!t||t(e))&&r.push(e)}),r}function o(e,t){var n,r;if(e)for(n=0,r=e.length;r>n;n++)if(e[n]===t)return n;return-1}function a(e,t,n,r){var i=0;for(arguments.length<3&&(n=e[0],i=1);ir;r++){n=a[r];for(o in n)n.hasOwnProperty(o)&&(s=n[o],s!==t&&(e[o]=s))}return e}function l(e,t,r,i){i=i||this,e&&(r&&(e=e[r]),n.each(e,function(e,n){return t.call(i,e,n,r)===!1?!1:void l(e,t,r,i)}))}function c(e,t){var n,r;for(t=t||window,e=e.split("."),n=0;nn&&(t=t[e[n]],t);n++);return t}function d(e,t){return!e||i(e,"array")?e:n.map(e.split(t||","),r)}function f(t){var n=e.cacheSuffix;return n&&(t+=(-1===t.indexOf("?")?"?":"&")+n),t}var h=/^\s*|\s*$/g;return{trim:r,isArray:n.isArray,is:i,toArray:n.toArray,makeMap:o,each:n.each,map:n.map,grep:n.filter,inArray:n.indexOf,extend:s,create:a,walk:l,createNS:c,resolve:u,explode:d,_addCacheSuffix:f}}),r(h,[l,c,f,u],function(e,n,r,i){function o(e){return"undefined"!=typeof e}function a(e){return"string"==typeof e}function s(e){return e&&e==e.window}function l(e,t){var n,r,i;for(t=t||w,i=t.createElement("div"),n=t.createDocumentFragment(),i.innerHTML=e;r=i.firstChild;)n.appendChild(r);return n}function c(e,t,n,r){var i;if(a(t))t=l(t,v(e[0]));else if(t.length&&!t.nodeType){if(t=f.makeArray(t),r)for(i=t.length-1;i>=0;i--)c(e,t[i],n,r);else for(i=0;ii&&(a=e[i],t.call(a,i,a)!==!1);i++);return e}function g(e,t){var n=[];return m(e,function(e,r){t(r,e)&&n.push(r)}),n}function v(e){return e?9==e.nodeType?e:e.ownerDocument:w}function y(e,n,r){var i=[],o=e[n];for("string"!=typeof r&&r instanceof f&&(r=r[0]);o&&9!==o.nodeType;){if(r!==t){if(o===r)break;if("string"==typeof r&&f(o).is(r))break}1===o.nodeType&&i.push(o),o=o[n]}return i}function b(e,n,r,i){var o=[];for(i instanceof f&&(i=i[0]);e;e=e[n])if(!r||e.nodeType===r){if(i!==t){if(e===i)break;if("string"==typeof i&&f(e).is(i))break}o.push(e)}return o}function x(e,t,n){for(e=e[t];e;e=e[t])if(e.nodeType==n)return e;return null}function C(e,t,n){m(n,function(n,r){e[n]=e[n]||{},e[n][t]=r})}var w=document,_=Array.prototype.push,E=Array.prototype.slice,N=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,S=e.Event,k,T=r.makeMap("children,contents,next,prev"),R=r.makeMap("fillOpacity fontWeight lineHeight opacity orphans widows zIndex zoom"," "),A=r.makeMap("checked compact declare defer disabled ismap multiple nohref noshade nowrap readonly selected"," "),B={ -"for":"htmlFor","class":"className",readonly:"readOnly"},D={"float":"cssFloat"},M={},L={},H=/^\s*|\s*$/g;return f.fn=f.prototype={constructor:f,selector:"",context:null,length:0,init:function(e,t){var n=this,r,i;if(!e)return n;if(e.nodeType)return n.context=n[0]=e,n.length=1,n;if(t&&t.nodeType)n.context=t;else{if(t)return f(e).attr(t);n.context=t=document}if(a(e)){if(n.selector=e,r="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!r)return f(t).find(e);if(r[1])for(i=l(e,v(t)).firstChild;i;)_.call(n,i),i=i.nextSibling;else{if(i=v(t).getElementById(r[2]),!i)return n;if(i.id!==r[2])return n.find(e);n.length=1,n[0]=i}}else this.add(e,!1);return n},toArray:function(){return r.toArray(this)},add:function(e,t){var n=this,r,i;if(a(e))return n.add(f(e));if(t!==!1)for(r=f.unique(n.toArray().concat(f.makeArray(e))),n.length=r.length,i=0;it;t++)f.find(e,this[t],r);return f(r)},filter:function(e){return f("function"==typeof e?g(this.toArray(),function(t,n){return e(n,t)}):f.filter(e,this.toArray()))},closest:function(e){var t=[];return e instanceof f&&(e=e[0]),this.each(function(n,r){for(;r;){if("string"==typeof e&&f(r).is(e)){t.push(r);break}if(r==e){t.push(r);break}r=r.parentNode}}),f(t)},offset:function(e){var t,n,r,i=0,o=0,a;return e?this.css(e):(t=this[0],t&&(n=t.ownerDocument,r=n.documentElement,t.getBoundingClientRect&&(a=t.getBoundingClientRect(),i=a.left+(r.scrollLeft||n.body.scrollLeft)-r.clientLeft,o=a.top+(r.scrollTop||n.body.scrollTop)-r.clientTop)),{left:i,top:o})},push:_,sort:[].sort,splice:[].splice},r.extend(f,{extend:r.extend,makeArray:function(e){return s(e)||e.nodeType?[e]:r.toArray(e)},inArray:h,isArray:r.isArray,each:m,trim:p,grep:g,find:n,expr:n.selectors,unique:n.uniqueSort,text:n.getText,contains:n.contains,filter:function(e,t,n){var r=t.length;for(n&&(e=":not("+e+")");r--;)1!=t[r].nodeType&&t.splice(r,1);return t=1===t.length?f.find.matchesSelector(t[0],e)?[t[0]]:[]:f.find.matches(e,t)}}),m({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return y(e,"parentNode")},next:function(e){return x(e,"nextSibling",1)},prev:function(e){return x(e,"previousSibling",1)},children:function(e){return b(e.firstChild,"nextSibling",1)},contents:function(e){return r.toArray(("iframe"===e.nodeName?e.contentDocument||e.contentWindow.document:e).childNodes)}},function(e,t){f.fn[e]=function(n){var r=this,i=[];return r.each(function(){var e=t.call(i,this,n,i);e&&(f.isArray(e)?i.push.apply(i,e):i.push(e))}),this.length>1&&(T[e]||(i=f.unique(i)),0===e.indexOf("parents")&&(i=i.reverse())),i=f(i),n?i.filter(n):i}}),m({parentsUntil:function(e,t){return y(e,"parentNode",t)},nextUntil:function(e,t){return b(e,"nextSibling",1,t).slice(1)},prevUntil:function(e,t){return b(e,"previousSibling",1,t).slice(1)}},function(e,t){f.fn[e]=function(n,r){var i=this,o=[];return i.each(function(){var e=t.call(o,this,n,o);e&&(f.isArray(e)?o.push.apply(o,e):o.push(e))}),this.length>1&&(o=f.unique(o),(0===e.indexOf("parents")||"prevUntil"===e)&&(o=o.reverse())),o=f(o),r?o.filter(r):o}}),f.fn.is=function(e){return!!e&&this.filter(e).length>0},f.fn.init.prototype=f.fn,f.overrideDefaults=function(e){function t(r,i){return n=n||e(),0===arguments.length&&(r=n.element),i||(i=n.context),new t.fn.init(r,i)}var n;return f.extend(t,this),t},i.ie&&i.ie<8&&(C(M,"get",{maxlength:function(e){var t=e.maxLength;return 2147483647===t?k:t},size:function(e){var t=e.size;return 20===t?k:t},"class":function(e){return e.className},style:function(e){var t=e.style.cssText;return 0===t.length?k:t}}),C(M,"set",{"class":function(e,t){e.className=t},style:function(e,t){e.style.cssText=t}})),i.ie&&i.ie<9&&(D["float"]="styleFloat",C(L,"set",{opacity:function(e,t){var n=e.style;null===t||""===t?n.removeAttribute("filter"):(n.zoom=1,n.filter="alpha(opacity="+100*t+")")}})),f.attrHooks=M,f.cssHooks=L,f}),r(p,[],function(){return function(e,t){function n(e,t,n,r){function i(e){return e=parseInt(e,10).toString(16),e.length>1?e:"0"+e}return"#"+i(t)+i(n)+i(r)}var r=/rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*\)/gi,i=/(?:url(?:(?:\(\s*\"([^\"]+)\"\s*\))|(?:\(\s*\'([^\']+)\'\s*\))|(?:\(\s*([^)\s]+)\s*\))))|(?:\'([^\']+)\')|(?:\"([^\"]+)\")/gi,o=/\s*([^:]+):\s*([^;]+);?/g,a=/\s+$/,s,l,c={},u,d,f,h="\ufeff";for(e=e||{},t&&(d=t.getValidStyles(),f=t.getInvalidStyles()),u=("\\\" \\' \\; \\: ; : "+h).split(" "),l=0;l-1&&n||(m[e+t]=-1==l?s[0]:s.join(" "),delete m[e+"-top"+t],delete m[e+"-right"+t],delete m[e+"-bottom"+t],delete m[e+"-left"+t])}}function u(e){var t=m[e],n;if(t){for(t=t.split(" "),n=t.length;n--;)if(t[n]!==t[0])return!1;return m[e]=t[0],!0}}function d(e,t,n,r){u(t)&&u(n)&&u(r)&&(m[e]=m[t]+" "+m[n]+" "+m[r],delete m[t],delete m[n],delete m[r])}function f(e){return b=!0,c[e]}function h(e,t){return b&&(e=e.replace(/\uFEFF[0-9]/g,function(e){return c[e]})),t||(e=e.replace(/\\([\'\";:])/g,"$1")),e}function p(t,n,r,i,o,a){if(o=o||a)return o=h(o),"'"+o.replace(/\'/g,"\\'")+"'";if(n=h(n||r||i),!e.allow_script_urls){var s=n.replace(/[\s\r\n]+/,"");if(/(java|vb)script:/i.test(s))return"";if(!e.allow_svg_data_urls&&/^data:image\/svg/i.test(s))return""}return x&&(n=x.call(C,n,"style")),"url('"+n.replace(/\'/g,"\\'")+"')"}var m={},g,v,y,b,x=e.url_converter,C=e.url_converter_scope||this;if(t){for(t=t.replace(/[\u0000-\u001F]/g,""),t=t.replace(/\\[\"\';:\uFEFF]/g,f).replace(/\"[^\"]+\"|\'[^\']+\'/g,function(e){return e.replace(/[;:]/g,f)});g=o.exec(t);){if(v=g[1].replace(a,"").toLowerCase(),y=g[2].replace(a,""),y=y.replace(/\\[0-9a-f]+/g,function(e){return String.fromCharCode(parseInt(e.substr(1),16))}),v&&y.length>0){if(!e.allow_script_urls&&("behavior"==v||/expression\s*\(|\/\*|\*\//.test(y)))continue;"font-weight"===v&&"700"===y?y="bold":("color"===v||"background-color"===v)&&(y=y.toLowerCase()),y=y.replace(r,n),y=y.replace(i,p),m[v]=b?h(y,!0):y}o.lastIndex=g.index+g[0].length}s("border","",!0),s("border","-width"),s("border","-color"),s("border","-style"),s("padding",""),s("margin",""),d("border","border-width","border-style","border-color"),"medium none"===m.border&&delete m.border,"none"===m["border-image"]&&delete m["border-image"]}return m},serialize:function(e,t){function n(t){var n,r,o,a;if(n=d[t])for(r=0,o=n.length;o>r;r++)t=n[r],a=e[t],a!==s&&a.length>0&&(i+=(i.length>0?" ":"")+t+": "+a+";")}function r(e,t){var n;return n=f["*"],n&&n[e]?!1:(n=f[t],n&&n[e]?!1:!0)}var i="",o,a;if(t&&d)n("*"),n(t);else for(o in e)a=e[o],a!==s&&a.length>0&&(!f||r(o,t))&&(i+=(i.length>0?" ":"")+o+": "+a+";");return i}}}}),r(m,[],function(){return function(e,t){function n(e,n,r,i){var o,a;if(e){if(!i&&e[n])return e[n];if(e!=t){if(o=e[r])return o;for(a=e.parentNode;a&&a!=t;a=a.parentNode)if(o=a[r])return o}}}var r=e;this.current=function(){return r},this.next=function(e){return r=n(r,"firstChild","nextSibling",e)},this.prev=function(e){return r=n(r,"lastChild","previousSibling",e)}}}),r(g,[f],function(e){function t(n){function r(){return H.createDocumentFragment()}function i(e,t){_(F,e,t)}function o(e,t){_(z,e,t)}function a(e){i(e.parentNode,j(e))}function s(e){i(e.parentNode,j(e)+1)}function l(e){o(e.parentNode,j(e))}function c(e){o(e.parentNode,j(e)+1)}function u(e){e?(L[U]=L[V],L[$]=L[W]):(L[V]=L[U],L[W]=L[$]),L.collapsed=F}function d(e){a(e),c(e)}function f(e){i(e,0),o(e,1===e.nodeType?e.childNodes.length:e.nodeValue.length)}function h(e,t){var n=L[V],r=L[W],i=L[U],o=L[$],a=t.startContainer,s=t.startOffset,l=t.endContainer,c=t.endOffset;return 0===e?w(n,r,a,s):1===e?w(i,o,a,s):2===e?w(i,o,l,c):3===e?w(n,r,l,c):void 0}function p(){E(I)}function m(){return E(P)}function g(){return E(O)}function v(e){var t=this[V],r=this[W],i,o;3!==t.nodeType&&4!==t.nodeType||!t.nodeValue?(t.childNodes.length>0&&(o=t.childNodes[r]),o?t.insertBefore(e,o):3==t.nodeType?n.insertAfter(e,t):t.appendChild(e)):r?r>=t.nodeValue.length?n.insertAfter(e,t):(i=t.splitText(r),t.parentNode.insertBefore(e,i)):t.parentNode.insertBefore(e,t)}function y(e){var t=L.extractContents();L.insertNode(e),e.appendChild(t),L.selectNode(e)}function b(){return q(new t(n),{startContainer:L[V],startOffset:L[W],endContainer:L[U],endOffset:L[$],collapsed:L.collapsed,commonAncestorContainer:L.commonAncestorContainer})}function x(e,t){var n;if(3==e.nodeType)return e;if(0>t)return e;for(n=e.firstChild;n&&t>0;)--t,n=n.nextSibling;return n?n:e}function C(){return L[V]==L[U]&&L[W]==L[$]}function w(e,t,r,i){var o,a,s,l,c,u;if(e==r)return t==i?0:i>t?-1:1;for(o=r;o&&o.parentNode!=e;)o=o.parentNode;if(o){for(a=0,s=e.firstChild;s!=o&&t>a;)a++,s=s.nextSibling;return a>=t?-1:1}for(o=e;o&&o.parentNode!=r;)o=o.parentNode;if(o){for(a=0,s=r.firstChild;s!=o&&i>a;)a++,s=s.nextSibling;return i>a?-1:1}for(l=n.findCommonAncestor(e,r),c=e;c&&c.parentNode!=l;)c=c.parentNode;for(c||(c=l),u=r;u&&u.parentNode!=l;)u=u.parentNode;if(u||(u=l),c==u)return 0;for(s=l.firstChild;s;){if(s==c)return-1;if(s==u)return 1;s=s.nextSibling}}function _(e,t,r){var i,o;for(e?(L[V]=t,L[W]=r):(L[U]=t,L[$]=r),i=L[U];i.parentNode;)i=i.parentNode;for(o=L[V];o.parentNode;)o=o.parentNode;o==i?w(L[V],L[W],L[U],L[$])>0&&L.collapse(e):L.collapse(e),L.collapsed=C(),L.commonAncestorContainer=n.findCommonAncestor(L[V],L[U])}function E(e){var t,n=0,r=0,i,o,a,s,l,c;if(L[V]==L[U])return N(e);for(t=L[U],i=t.parentNode;i;t=i,i=i.parentNode){if(i==L[V])return S(t,e);++n}for(t=L[V],i=t.parentNode;i;t=i,i=i.parentNode){if(i==L[U])return k(t,e);++r}for(o=r-n,a=L[V];o>0;)a=a.parentNode,o--;for(s=L[U];0>o;)s=s.parentNode,o++;for(l=a.parentNode,c=s.parentNode;l!=c;l=l.parentNode,c=c.parentNode)a=l,s=c;return T(a,s,e)}function N(e){var t,n,i,o,a,s,l,c,u;if(e!=I&&(t=r()),L[W]==L[$])return t;if(3==L[V].nodeType){if(n=L[V].nodeValue,i=n.substring(L[W],L[$]),e!=O&&(o=L[V],c=L[W],u=L[$]-L[W],0===c&&u>=o.nodeValue.length-1?o.parentNode.removeChild(o):o.deleteData(c,u),L.collapse(F)),e==I)return;return i.length>0&&t.appendChild(H.createTextNode(i)),t}for(o=x(L[V],L[W]),a=L[$]-L[W];o&&a>0;)s=o.nextSibling,l=D(o,e),t&&t.appendChild(l),--a,o=s;return e!=O&&L.collapse(F),t}function S(e,t){var n,i,o,a,s,l;if(t!=I&&(n=r()),i=R(e,t),n&&n.appendChild(i),o=j(e),a=o-L[W],0>=a)return t!=O&&(L.setEndBefore(e),L.collapse(z)),n;for(i=e.previousSibling;a>0;)s=i.previousSibling,l=D(i,t),n&&n.insertBefore(l,n.firstChild),--a,i=s;return t!=O&&(L.setEndBefore(e),L.collapse(z)),n}function k(e,t){var n,i,o,a,s,l;for(t!=I&&(n=r()),o=A(e,t),n&&n.appendChild(o),i=j(e),++i,a=L[$]-i,o=e.nextSibling;o&&a>0;)s=o.nextSibling,l=D(o,t),n&&n.appendChild(l),--a,o=s;return t!=O&&(L.setStartAfter(e),L.collapse(F)),n}function T(e,t,n){var i,o,a,s,l,c,u;for(n!=I&&(o=r()),i=A(e,n),o&&o.appendChild(i),a=j(e),s=j(t),++a,l=s-a,c=e.nextSibling;l>0;)u=c.nextSibling,i=D(c,n),o&&o.appendChild(i),c=u,--l;return i=R(t,n),o&&o.appendChild(i),n!=O&&(L.setStartAfter(e),L.collapse(F)),o}function R(e,t){var n=x(L[U],L[$]-1),r,i,o,a,s,l=n!=L[U];if(n==e)return B(n,l,z,t);for(r=n.parentNode,i=B(r,z,z,t);r;){for(;n;)o=n.previousSibling,a=B(n,l,z,t),t!=I&&i.insertBefore(a,i.firstChild),l=F,n=o;if(r==e)return i;n=r.previousSibling,r=r.parentNode,s=B(r,z,z,t),t!=I&&s.appendChild(i),i=s}}function A(e,t){var n=x(L[V],L[W]),r=n!=L[V],i,o,a,s,l;if(n==e)return B(n,r,F,t);for(i=n.parentNode,o=B(i,z,F,t);i;){for(;n;)a=n.nextSibling,s=B(n,r,F,t),t!=I&&o.appendChild(s),r=F,n=a;if(i==e)return o;n=i.nextSibling,i=i.parentNode,l=B(i,z,F,t),t!=I&&l.appendChild(o),o=l}}function B(e,t,r,i){var o,a,s,l,c;if(t)return D(e,i);if(3==e.nodeType){if(o=e.nodeValue,r?(l=L[W],a=o.substring(l),s=o.substring(0,l)):(l=L[$],a=o.substring(0,l),s=o.substring(l)),i!=O&&(e.nodeValue=s),i==I)return;return c=n.clone(e,z),c.nodeValue=a,c}if(i!=I)return n.clone(e,z)}function D(e,t){return t!=I?t==O?n.clone(e,F):e:void e.parentNode.removeChild(e)}function M(){return n.create("body",null,g()).outerText}var L=this,H=n.doc,P=0,O=1,I=2,F=!0,z=!1,W="startOffset",V="startContainer",U="endContainer",$="endOffset",q=e.extend,j=n.nodeIndex;return q(L,{startContainer:H,startOffset:0,endContainer:H,endOffset:0,collapsed:F,commonAncestorContainer:H,START_TO_START:0,START_TO_END:1,END_TO_END:2,END_TO_START:3,setStart:i,setEnd:o,setStartBefore:a,setStartAfter:s,setEndBefore:l,setEndAfter:c,collapse:u,selectNode:d,selectNodeContents:f,compareBoundaryPoints:h,deleteContents:p,extractContents:m,cloneContents:g,insertNode:v,surroundContents:y,cloneRange:b,toStringIE:M}),L}return t.prototype.toString=function(){return this.toStringIE()},t}),r(v,[f],function(e){function t(e){var t;return t=document.createElement("div"),t.innerHTML=e,t.textContent||t.innerText||e}function n(e,t){var n,r,i,a={};if(e){for(e=e.split(","),t=t||10,n=0;n\"\u0060\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,l=/[<>&\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,c=/[<>&\"\']/g,u=/&#([a-z0-9]+);?|&([a-z0-9]+);/gi,d={128:"\u20ac",130:"\u201a",131:"\u0192",132:"\u201e",133:"\u2026",134:"\u2020",135:"\u2021",136:"\u02c6",137:"\u2030",138:"\u0160",139:"\u2039",140:"\u0152",142:"\u017d",145:"\u2018",146:"\u2019",147:"\u201c",148:"\u201d",149:"\u2022",150:"\u2013",151:"\u2014",152:"\u02dc",153:"\u2122",154:"\u0161",155:"\u203a",156:"\u0153",158:"\u017e",159:"\u0178"};o={'"':""","'":"'","<":"<",">":">","&":"&","`":"`"},a={"<":"<",">":">","&":"&",""":'"',"'":"'"},i=n("50,nbsp,51,iexcl,52,cent,53,pound,54,curren,55,yen,56,brvbar,57,sect,58,uml,59,copy,5a,ordf,5b,laquo,5c,not,5d,shy,5e,reg,5f,macr,5g,deg,5h,plusmn,5i,sup2,5j,sup3,5k,acute,5l,micro,5m,para,5n,middot,5o,cedil,5p,sup1,5q,ordm,5r,raquo,5s,frac14,5t,frac12,5u,frac34,5v,iquest,60,Agrave,61,Aacute,62,Acirc,63,Atilde,64,Auml,65,Aring,66,AElig,67,Ccedil,68,Egrave,69,Eacute,6a,Ecirc,6b,Euml,6c,Igrave,6d,Iacute,6e,Icirc,6f,Iuml,6g,ETH,6h,Ntilde,6i,Ograve,6j,Oacute,6k,Ocirc,6l,Otilde,6m,Ouml,6n,times,6o,Oslash,6p,Ugrave,6q,Uacute,6r,Ucirc,6s,Uuml,6t,Yacute,6u,THORN,6v,szlig,70,agrave,71,aacute,72,acirc,73,atilde,74,auml,75,aring,76,aelig,77,ccedil,78,egrave,79,eacute,7a,ecirc,7b,euml,7c,igrave,7d,iacute,7e,icirc,7f,iuml,7g,eth,7h,ntilde,7i,ograve,7j,oacute,7k,ocirc,7l,otilde,7m,ouml,7n,divide,7o,oslash,7p,ugrave,7q,uacute,7r,ucirc,7s,uuml,7t,yacute,7u,thorn,7v,yuml,ci,fnof,sh,Alpha,si,Beta,sj,Gamma,sk,Delta,sl,Epsilon,sm,Zeta,sn,Eta,so,Theta,sp,Iota,sq,Kappa,sr,Lambda,ss,Mu,st,Nu,su,Xi,sv,Omicron,t0,Pi,t1,Rho,t3,Sigma,t4,Tau,t5,Upsilon,t6,Phi,t7,Chi,t8,Psi,t9,Omega,th,alpha,ti,beta,tj,gamma,tk,delta,tl,epsilon,tm,zeta,tn,eta,to,theta,tp,iota,tq,kappa,tr,lambda,ts,mu,tt,nu,tu,xi,tv,omicron,u0,pi,u1,rho,u2,sigmaf,u3,sigma,u4,tau,u5,upsilon,u6,phi,u7,chi,u8,psi,u9,omega,uh,thetasym,ui,upsih,um,piv,812,bull,816,hellip,81i,prime,81j,Prime,81u,oline,824,frasl,88o,weierp,88h,image,88s,real,892,trade,89l,alefsym,8cg,larr,8ch,uarr,8ci,rarr,8cj,darr,8ck,harr,8dl,crarr,8eg,lArr,8eh,uArr,8ei,rArr,8ej,dArr,8ek,hArr,8g0,forall,8g2,part,8g3,exist,8g5,empty,8g7,nabla,8g8,isin,8g9,notin,8gb,ni,8gf,prod,8gh,sum,8gi,minus,8gn,lowast,8gq,radic,8gt,prop,8gu,infin,8h0,ang,8h7,and,8h8,or,8h9,cap,8ha,cup,8hb,int,8hk,there4,8hs,sim,8i5,cong,8i8,asymp,8j0,ne,8j1,equiv,8j4,le,8j5,ge,8k2,sub,8k3,sup,8k4,nsub,8k6,sube,8k7,supe,8kl,oplus,8kn,otimes,8l5,perp,8m5,sdot,8o8,lceil,8o9,rceil,8oa,lfloor,8ob,rfloor,8p9,lang,8pa,rang,9ea,loz,9j0,spades,9j3,clubs,9j5,hearts,9j6,diams,ai,OElig,aj,oelig,b0,Scaron,b1,scaron,bo,Yuml,m6,circ,ms,tilde,802,ensp,803,emsp,809,thinsp,80c,zwnj,80d,zwj,80e,lrm,80f,rlm,80j,ndash,80k,mdash,80o,lsquo,80p,rsquo,80q,sbquo,80s,ldquo,80t,rdquo,80u,bdquo,810,dagger,811,Dagger,81g,permil,81p,lsaquo,81q,rsaquo,85c,euro",32);var f={encodeRaw:function(e,t){return e.replace(t?s:l,function(e){return o[e]||e})},encodeAllRaw:function(e){return(""+e).replace(c,function(e){return o[e]||e})},encodeNumeric:function(e,t){return e.replace(t?s:l,function(e){return e.length>1?"&#"+(1024*(e.charCodeAt(0)-55296)+(e.charCodeAt(1)-56320)+65536)+";":o[e]||"&#"+e.charCodeAt(0)+";"})},encodeNamed:function(e,t,n){return n=n||i,e.replace(t?s:l,function(e){return o[e]||n[e]||e})},getEncodeFunc:function(e,t){function a(e,n){return e.replace(n?s:l,function(e){return o[e]||t[e]||"&#"+e.charCodeAt(0)+";"||e})}function c(e,n){return f.encodeNamed(e,n,t)}return t=n(t)||i,e=r(e.replace(/\+/g,",")),e.named&&e.numeric?a:e.named?t?c:f.encodeNamed:e.numeric?f.encodeNumeric:f.encodeRaw},decode:function(e){return e.replace(u,function(e,n){return n?(n="x"===n.charAt(0).toLowerCase()?parseInt(n.substr(1),16):parseInt(n,10),n>65535?(n-=65536,String.fromCharCode(55296+(n>>10),56320+(1023&n))):d[n]||String.fromCharCode(n)):a[e]||i[e]||t(e)})}};return f}),r(y,[f],function(e){return function(t,n){function r(e){t.getElementsByTagName("head")[0].appendChild(e)}function i(n,i,l){function c(){for(var e=y.passed,t=e.length;t--;)e[t]();y.status=2,y.passed=[],y.failed=[]}function u(){for(var e=y.failed,t=e.length;t--;)e[t]();y.status=3,y.passed=[],y.failed=[]}function d(){var e=navigator.userAgent.match(/WebKit\/(\d*)/);return!!(e&&e[1]<536)}function f(e,t){e()||((new Date).getTime()-v0)return g=t.createElement("style"),g.textContent='@import "'+n+'"',p(),void r(g);h()}r(m),m.href=n}}var o=0,a={},s;n=n||{},s=n.maxLoadTime||5e3,this.load=i}}),r(b,[c,h,p,l,m,g,v,u,f,y],function(e,n,r,i,o,a,s,l,c,u){function d(e,t){var n={},r=t.keep_values,i;return i={set:function(n,r,i){t.url_converter&&(r=t.url_converter.call(t.url_converter_scope||e,r,i,n[0])),n.attr("data-mce-"+i,r).attr(i,r)},get:function(e,t){return e.attr("data-mce-"+t)||e.attr(t)}},n={style:{set:function(e,t){return null!==t&&"object"==typeof t?void e.css(t):(r&&e.attr("data-mce-style",t),void e.attr("style",t))},get:function(t){var n=t.attr("data-mce-style")||t.attr("style");return n=e.serializeStyle(e.parseStyle(n),t[0].nodeName)}}},r&&(n.href=n.src=i),n}function f(e,t){var n=t.attr("style");n=e.serializeStyle(e.parseStyle(n),t[0].nodeName),n||(n=null),t.attr("data-mce-style",n)}function h(e,t){var o=this,a;o.doc=e,o.win=window,o.files={},o.counter=0,o.stdMode=!y||e.documentMode>=8,o.boxModel=!y||"CSS1Compat"==e.compatMode||o.stdMode,o.styleSheetLoader=new u(e),o.boundEvents=[],o.settings=t=t||{},o.schema=t.schema,o.styles=new r({url_converter:t.url_converter,url_converter_scope:t.url_converter_scope},t.schema),o.fixDoc(e),o.events=t.ownEvents?new i(t.proxy):i.Event,o.attrHooks=d(o,t),a=t.schema?t.schema.getBlockElements():{},o.$=n.overrideDefaults(function(){return{context:e,element:o.getRoot()}}),o.isBlock=function(e){if(!e)return!1;var t=e.nodeType;return t?!(1!==t||!a[e.nodeName]):!!a[e]}}var p=c.each,m=c.is,g=c.grep,v=c.trim,y=l.ie,b=/^([a-z0-9],?)+$/i,x=/^[ \t\r\n]*$/;return h.prototype={$$:function(e){return"string"==typeof e&&(e=this.get(e)),this.$(e)},root:null,fixDoc:function(e){var t=this.settings,n;if(y&&t.schema){"abbr article aside audio canvas details figcaption figure footer header hgroup mark menu meter nav output progress section summary time video".replace(/\w+/g,function(t){e.createElement(t)});for(n in t.schema.getCustomElements())e.createElement(n)}},clone:function(e,t){var n=this,r,i;return!y||1!==e.nodeType||t?e.cloneNode(t):(i=n.doc,t?r.firstChild:(r=i.createElement(e.nodeName),p(n.getAttribs(e),function(t){n.setAttrib(r,t.nodeName,n.getAttrib(e,t.nodeName))}),r))},getRoot:function(){var e=this;return e.settings.root_element||e.doc.body},getViewPort:function(e){var t,n;return e=e?e:this.win,t=e.document,n=this.boxModel?t.documentElement:t.body,{x:e.pageXOffset||n.scrollLeft,y:e.pageYOffset||n.scrollTop,w:e.innerWidth||n.clientWidth,h:e.innerHeight||n.clientHeight}},getRect:function(e){var t=this,n,r;return e=t.get(e),n=t.getPos(e),r=t.getSize(e),{x:n.x,y:n.y,w:r.w,h:r.h}},getSize:function(e){var t=this,n,r;return e=t.get(e),n=t.getStyle(e,"width"),r=t.getStyle(e,"height"),-1===n.indexOf("px")&&(n=0),-1===r.indexOf("px")&&(r=0),{w:parseInt(n,10)||e.offsetWidth||e.clientWidth,h:parseInt(r,10)||e.offsetHeight||e.clientHeight}},getParent:function(e,t,n){return this.getParents(e,t,n,!1)},getParents:function(e,n,r,i){var o=this,a,s=[];for(e=o.get(e),i=i===t,r=r||("BODY"!=o.getRoot().nodeName?o.getRoot().parentNode:null),m(n,"string")&&(a=n,n="*"===n?function(e){return 1==e.nodeType}:function(e){return o.is(e,a)});e&&e!=r&&e.nodeType&&9!==e.nodeType;){if(!n||n(e)){if(!i)return e;s.push(e)}e=e.parentNode}return i?s:null},get:function(e){var t;return e&&this.doc&&"string"==typeof e&&(t=e,e=this.doc.getElementById(e),e&&e.id!==t)?this.doc.getElementsByName(t)[1]:e},getNext:function(e,t){return this._findSib(e,t,"nextSibling")},getPrev:function(e,t){return this._findSib(e,t,"previousSibling")},select:function(t,n){var r=this;return e(t,r.get(n)||r.settings.root_element||r.doc,[])},is:function(n,r){var i;if(n.length===t){if("*"===r)return 1==n.nodeType;if(b.test(r)){for(r=r.toLowerCase().split(/,/),n=n.nodeName.toLowerCase(),i=r.length-1;i>=0;i--)if(r[i]==n)return!0;return!1}}if(n.nodeType&&1!=n.nodeType)return!1;var o=n.nodeType?[n]:n;return e(r,o[0].ownerDocument||o[0],null,o).length>0},add:function(e,t,n,r,i){var o=this;return this.run(e,function(e){var a;return a=m(t,"string")?o.doc.createElement(t):t,o.setAttribs(a,n),r&&(r.nodeType?a.appendChild(r):o.setHTML(a,r)),i?a:e.appendChild(a)})},create:function(e,t,n){return this.add(this.doc.createElement(e),e,t,n,1)},createHTML:function(e,t,n){var r="",i;r+="<"+e;for(i in t)t.hasOwnProperty(i)&&null!==t[i]&&"undefined"!=typeof t[i]&&(r+=" "+i+'="'+this.encode(t[i])+'"');return"undefined"!=typeof n?r+">"+n+"":r+" />"},createFragment:function(e){var t,n,r=this.doc,i;for(i=r.createElement("div"),t=r.createDocumentFragment(),e&&(i.innerHTML=e);n=i.firstChild;)t.appendChild(n);return t},remove:function(e,t){return e=this.$$(e),t?e.each(function(){for(var e;e=this.firstChild;)3==e.nodeType&&0===e.data.length?this.removeChild(e):this.parentNode.insertBefore(e,this)}).remove():e.remove(),e.length>1?e.toArray():e[0]},setStyle:function(e,t,n){e=this.$$(e).css(t,n),this.settings.update_styles&&f(this,e)},getStyle:function(e,n,r){return e=this.$$(e),r?e.css(n):(n=n.replace(/-(\D)/g,function(e,t){return t.toUpperCase()}),"float"==n&&(n=l.ie&&l.ie<12?"styleFloat":"cssFloat"),e[0]&&e[0].style?e[0].style[n]:t)},setStyles:function(e,t){e=this.$$(e).css(t),this.settings.update_styles&&f(this,e)},removeAllAttribs:function(e){return this.run(e,function(e){var t,n=e.attributes;for(t=n.length-1;t>=0;t--)e.removeAttributeNode(n.item(t))})},setAttrib:function(e,t,n){var r=this,i,o,a=r.settings;""===n&&(n=null),e=r.$$(e),i=e.attr(t),e.length&&(o=r.attrHooks[t],o&&o.set?o.set(e,n,t):e.attr(t,n),i!=n&&a.onSetAttrib&&a.onSetAttrib({attrElm:e,attrName:t,attrValue:n}))},setAttribs:function(e,t){var n=this;n.$$(e).each(function(e,r){p(t,function(e,t){n.setAttrib(r,t,e)})})},getAttrib:function(e,t,n){var r=this,i,o;return e=r.$$(e),e.length&&(i=r.attrHooks[t],o=i&&i.get?i.get(e,t):e.attr(t)),"undefined"==typeof o&&(o=n||""),o},getPos:function(e,t){var r=this,i=0,o=0,a,s=r.doc,l=s.body,c;if(e=r.get(e),t=t||l,e){if(t===l&&e.getBoundingClientRect&&"static"===n(l).css("position"))return c=e.getBoundingClientRect(),t=r.boxModel?s.documentElement:l,i=c.left+(s.documentElement.scrollLeft||l.scrollLeft)-t.clientLeft,o=c.top+(s.documentElement.scrollTop||l.scrollTop)-t.clientTop,{x:i,y:o};for(a=e;a&&a!=t&&a.nodeType;)i+=a.offsetLeft||0,o+=a.offsetTop||0,a=a.offsetParent;for(a=e.parentNode;a&&a!=t&&a.nodeType;)i-=a.scrollLeft||0,o-=a.scrollTop||0,a=a.parentNode}return{x:i,y:o}},parseStyle:function(e){return this.styles.parse(e)},serializeStyle:function(e,t){return this.styles.serialize(e,t)},addStyle:function(e){var t=this,n=t.doc,r,i;if(t!==h.DOM&&n===document){var o=h.DOM.addedStyles;if(o=o||[],o[e])return;o[e]=!0,h.DOM.addedStyles=o}i=n.getElementById("mceDefaultStyles"),i||(i=n.createElement("style"),i.id="mceDefaultStyles",i.type="text/css",r=n.getElementsByTagName("head")[0],r.firstChild?r.insertBefore(i,r.firstChild):r.appendChild(i)),i.styleSheet?i.styleSheet.cssText+=e:i.appendChild(n.createTextNode(e))},loadCSS:function(e){var t=this,n=t.doc,r;return t!==h.DOM&&n===document?void h.DOM.loadCSS(e):(e||(e=""),r=n.getElementsByTagName("head")[0],void p(e.split(","),function(e){var i;e=c._addCacheSuffix(e),t.files[e]||(t.files[e]=!0,i=t.create("link",{rel:"stylesheet",href:e}),y&&n.documentMode&&n.recalc&&(i.onload=function(){n.recalc&&n.recalc(),i.onload=null}),r.appendChild(i))}))},addClass:function(e,t){this.$$(e).addClass(t)},removeClass:function(e,t){this.toggleClass(e,t,!1)},hasClass:function(e,t){return this.$$(e).hasClass(t)},toggleClass:function(e,t,r){this.$$(e).toggleClass(t,r).each(function(){""===this.className&&n(this).attr("class",null)})},show:function(e){this.$$(e).show()},hide:function(e){this.$$(e).hide()},isHidden:function(e){return"none"==this.$$(e).css("display")},uniqueId:function(e){return(e?e:"mce_")+this.counter++},setHTML:function(e,t){e=this.$$(e),y?e.each(function(e,r){if(r.canHaveHTML!==!1){for(;r.firstChild;)r.removeChild(r.firstChild);try{r.innerHTML="
    "+t,r.removeChild(r.firstChild)}catch(i){n("
    ").html("
    "+t).contents().slice(1).appendTo(r)}return t}}):e.html(t)},getOuterHTML:function(e){return e=this.get(e),1==e.nodeType&&"outerHTML"in e?e.outerHTML:n("
    ").append(n(e).clone()).html()},setOuterHTML:function(e,t){var r=this;r.$$(e).each(function(){try{if("outerHTML"in this)return void(this.outerHTML=t)}catch(e){}r.remove(n(this).html(t),!0)})},decode:s.decode,encode:s.encodeAllRaw,insertAfter:function(e,t){return t=this.get(t),this.run(e,function(e){var n,r;return n=t.parentNode,r=t.nextSibling,r?n.insertBefore(e,r):n.appendChild(e),e})},replace:function(e,t,n){var r=this;return r.run(t,function(t){return m(t,"array")&&(e=e.cloneNode(!0)),n&&p(g(t.childNodes),function(t){e.appendChild(t)}),t.parentNode.replaceChild(e,t)})},rename:function(e,t){var n=this,r;return e.nodeName!=t.toUpperCase()&&(r=n.create(t),p(n.getAttribs(e),function(t){n.setAttrib(r,t.nodeName,n.getAttrib(e,t.nodeName))}),n.replace(r,e,1)),r||e},findCommonAncestor:function(e,t){for(var n=e,r;n;){for(r=t;r&&n!=r;)r=r.parentNode;if(n==r)break;n=n.parentNode}return!n&&e.ownerDocument?e.ownerDocument.documentElement:n},toHex:function(e){return this.styles.toHex(c.trim(e))},run:function(e,t,n){var r=this,i;return"string"==typeof e&&(e=r.get(e)),e?(n=n||this,e.nodeType||!e.length&&0!==e.length?t.call(n,e):(i=[],p(e,function(e,o){e&&("string"==typeof e&&(e=r.get(e)),i.push(t.call(n,e,o)))}),i)):!1},getAttribs:function(e){var t;if(e=this.get(e),!e)return[];if(y){if(t=[],"OBJECT"==e.nodeName)return e.attributes;"OPTION"===e.nodeName&&this.getAttrib(e,"selected")&&t.push({specified:1,nodeName:"selected"});var n=/<\/?[\w:\-]+ ?|=[\"][^\"]+\"|=\'[^\']+\'|=[\w\-]+|>/gi;return e.cloneNode(!1).outerHTML.replace(n,"").replace(/[\w:\-]+/gi,function(e){t.push({specified:1,nodeName:e})}),t}return e.attributes},isEmpty:function(e,t){ -var n=this,r,i,a,s,l,c=0;if(e=e.firstChild){s=new o(e,e.parentNode),t=t||(n.schema?n.schema.getNonEmptyElements():null);do{if(a=e.nodeType,1===a){if(e.getAttribute("data-mce-bogus"))continue;if(l=e.nodeName.toLowerCase(),t&&t[l]){if("br"===l){c++;continue}return!1}for(i=n.getAttribs(e),r=i.length;r--;)if(l=i[r].nodeName,"name"===l||"data-mce-bookmark"===l)return!1}if(8==a)return!1;if(3===a&&!x.test(e.nodeValue))return!1}while(e=s.next())}return 1>=c},createRng:function(){var e=this.doc;return e.createRange?e.createRange():new a(this)},nodeIndex:function(e,t){var n=0,r,i;if(e)for(r=e.nodeType,e=e.previousSibling;e;e=e.previousSibling)i=e.nodeType,(!t||3!=i||i!=r&&e.nodeValue.length)&&(n++,r=i);return n},split:function(e,t,n){function r(e){function t(e){var t=e.previousSibling&&"SPAN"==e.previousSibling.nodeName,n=e.nextSibling&&"SPAN"==e.nextSibling.nodeName;return t&&n}var n,o=e.childNodes,a=e.nodeType;if(1!=a||"bookmark"!=e.getAttribute("data-mce-type")){for(n=o.length-1;n>=0;n--)r(o[n]);if(9!=a){if(3==a&&e.nodeValue.length>0){var s=v(e.nodeValue).length;if(!i.isBlock(e.parentNode)||s>0||0===s&&t(e))return}else if(1==a&&(o=e.childNodes,1==o.length&&o[0]&&1==o[0].nodeType&&"bookmark"==o[0].getAttribute("data-mce-type")&&e.parentNode.insertBefore(o[0],e),o.length||/^(br|hr|input|img)$/i.test(e.nodeName)))return;i.remove(e)}return e}}var i=this,o=i.createRng(),a,s,l;return e&&t?(o.setStart(e.parentNode,i.nodeIndex(e)),o.setEnd(t.parentNode,i.nodeIndex(t)),a=o.extractContents(),o=i.createRng(),o.setStart(t.parentNode,i.nodeIndex(t)+1),o.setEnd(e.parentNode,i.nodeIndex(e)+1),s=o.extractContents(),l=e.parentNode,l.insertBefore(r(a),e),n?l.replaceChild(n,t):l.insertBefore(t,e),l.insertBefore(r(s),e),i.remove(e),n||t):void 0},bind:function(e,t,n,r){var i=this;if(c.isArray(e)){for(var o=e.length;o--;)e[o]=i.bind(e[o],t,n,r);return e}return!i.settings.collect||e!==i.doc&&e!==i.win||i.boundEvents.push([e,t,n,r]),i.events.bind(e,t,n,r||i)},unbind:function(e,t,n){var r=this,i;if(c.isArray(e)){for(i=e.length;i--;)e[i]=r.unbind(e[i],t,n);return e}if(r.boundEvents&&(e===r.doc||e===r.win))for(i=r.boundEvents.length;i--;){var o=r.boundEvents[i];e!=o[0]||t&&t!=o[1]||n&&n!=o[2]||this.events.unbind(o[0],o[1],o[2])}return this.events.unbind(e,t,n)},fire:function(e,t,n){return this.events.fire(e,t,n)},getContentEditable:function(e){var t;return e&&1==e.nodeType?(t=e.getAttribute("data-mce-contenteditable"),t&&"inherit"!==t?t:"inherit"!==e.contentEditable?e.contentEditable:null):null},getContentEditableParent:function(e){for(var t=this.getRoot(),n=null;e&&e!==t&&(n=this.getContentEditable(e),null===n);e=e.parentNode);return n},destroy:function(){var t=this;if(t.boundEvents){for(var n=t.boundEvents.length;n--;){var r=t.boundEvents[n];this.events.unbind(r[0],r[1],r[2])}t.boundEvents=null}e.setDocument&&e.setDocument(),t.win=t.doc=t.root=t.events=t.frag=null},isChildOf:function(e,t){for(;e;){if(t===e)return!0;e=e.parentNode}return!1},dumpRng:function(e){return"startContainer: "+e.startContainer.nodeName+", startOffset: "+e.startOffset+", endContainer: "+e.endContainer.nodeName+", endOffset: "+e.endOffset},_findSib:function(e,t,n){var r=this,i=t;if(e)for("string"==typeof i&&(i=function(e){return r.is(e,t)}),e=e[n];e;e=e[n])if(i(e))return e;return null}},h.DOM=new h(document),h}),r(x,[b,f],function(e,t){function n(){function e(e,n){function i(){a.remove(l),s&&(s.onreadystatechange=s.onload=s=null),n()}function o(){"undefined"!=typeof console&&console.log&&console.log("Failed to load: "+e)}var a=r,s,l;l=a.uniqueId(),s=document.createElement("script"),s.id=l,s.type="text/javascript",s.src=t._addCacheSuffix(e),"onreadystatechange"in s?s.onreadystatechange=function(){/loaded|complete/.test(s.readyState)&&i()}:s.onload=i,s.onerror=o,(document.getElementsByTagName("head")[0]||document.body).appendChild(s)}var n=0,a=1,s=2,l={},c=[],u={},d=[],f=0,h;this.isDone=function(e){return l[e]==s},this.markDone=function(e){l[e]=s},this.add=this.load=function(e,t,r){var i=l[e];i==h&&(c.push(e),l[e]=n),t&&(u[e]||(u[e]=[]),u[e].push({func:t,scope:r||this}))},this.loadQueue=function(e,t){this.loadScripts(c,e,t)},this.loadScripts=function(t,n,r){function c(e){i(u[e],function(e){e.func.call(e.scope)}),u[e]=h}var p;d.push({func:n,scope:r||this}),(p=function(){var n=o(t);t.length=0,i(n,function(t){return l[t]==s?void c(t):void(l[t]!=a&&(l[t]=a,f++,e(t,function(){l[t]=s,f--,c(t),p()})))}),f||(i(d,function(e){e.func.call(e.scope)}),d.length=0)})()}}var r=e.DOM,i=t.each,o=t.grep;return n.ScriptLoader=new n,n}),r(C,[x,f],function(e,n){function r(){var e=this;e.items=[],e.urls={},e.lookup={}}var i=n.each;return r.prototype={get:function(e){return this.lookup[e]?this.lookup[e].instance:t},dependencies:function(e){var t;return this.lookup[e]&&(t=this.lookup[e].dependencies),t||[]},requireLangPack:function(t,n){var i=r.language;if(i&&r.languageLoad!==!1){if(n)if(n=","+n+",",-1!=n.indexOf(","+i.substr(0,2)+","))i=i.substr(0,2);else if(-1==n.indexOf(","+i+","))return;e.ScriptLoader.add(this.urls[t]+"/langs/"+i+".js")}},add:function(e,t,n){return this.items.push(t),this.lookup[e]={instance:t,dependencies:n},t},createUrl:function(e,t){return"object"==typeof t?t:{prefix:e.prefix,resource:t,suffix:e.suffix}},addComponents:function(t,n){var r=this.urls[t];i(n,function(t){e.ScriptLoader.add(r+"/"+t)})},load:function(n,o,a,s){function l(){var r=c.dependencies(n);i(r,function(e){var n=c.createUrl(o,e);c.load(n.resource,n,t,t)}),a&&(s?a.call(s):a.call(e))}var c=this,u=o;c.urls[n]||("object"==typeof o&&(u=o.prefix+o.resource+o.suffix),0!==u.indexOf("/")&&-1==u.indexOf("://")&&(u=r.baseURL+"/"+u),c.urls[n]=u.substring(0,u.lastIndexOf("/")),c.lookup[n]?l():e.ScriptLoader.add(u,l,s))}},r.PluginManager=new r,r.ThemeManager=new r,r}),r(w,[f,m],function(e,t){function n(e,t){var n=e.childNodes;return t--,t>n.length-1?t=n.length-1:0>t&&(t=0),n[t]||e}function r(e){this.walk=function(t,r){function o(e){var t;return t=e[0],3===t.nodeType&&t===c&&u>=t.nodeValue.length&&e.splice(0,1),t=e[e.length-1],0===f&&e.length>0&&t===d&&3===t.nodeType&&e.splice(e.length-1,1),e}function a(e,t,n){for(var r=[];e&&e!=n;e=e[t])r.push(e);return r}function s(e,t){do{if(e.parentNode==t)return e;e=e.parentNode}while(e)}function l(e,t,n){var i=n?"nextSibling":"previousSibling";for(g=e,v=g.parentNode;g&&g!=t;g=v)v=g.parentNode,y=a(g==e?g:g[i],i),y.length&&(n||y.reverse(),r(o(y)))}var c=t.startContainer,u=t.startOffset,d=t.endContainer,f=t.endOffset,h,p,m,g,v,y,b;if(b=e.select("td.mce-item-selected,th.mce-item-selected"),b.length>0)return void i(b,function(e){r([e])});if(1==c.nodeType&&c.hasChildNodes()&&(c=c.childNodes[u]),1==d.nodeType&&d.hasChildNodes()&&(d=n(d,f)),c==d)return r(o([c]));for(h=e.findCommonAncestor(c,d),g=c;g;g=g.parentNode){if(g===d)return l(c,h,!0);if(g===h)break}for(g=d;g;g=g.parentNode){if(g===c)return l(d,h);if(g===h)break}p=s(c,h)||c,m=s(d,h)||d,l(c,p,!0),y=a(p==c?p:p.nextSibling,"nextSibling",m==d?m.nextSibling:m),y.length&&r(o(y)),l(d,m)},this.split=function(e){function t(e,t){return e.splitText(t)}var n=e.startContainer,r=e.startOffset,i=e.endContainer,o=e.endOffset;return n==i&&3==n.nodeType?r>0&&rr?(o-=r,n=i=t(i,o).previousSibling,o=i.nodeValue.length,r=0):o=0):(3==n.nodeType&&r>0&&r0&&o0)return c=h,u=n?h.nodeValue.length:0,void(i=!0);if(e.isBlock(h)||p[h.nodeName.toLowerCase()])return;s=h}o&&s&&(c=s,i=!0,u=0)}var c,u,d,f=e.getRoot(),h,p,m,g;if(c=n[(r?"start":"end")+"Container"],u=n[(r?"start":"end")+"Offset"],g=1==c.nodeType&&u===c.childNodes.length,p=e.schema.getNonEmptyElements(),m=r,1==c.nodeType&&u>c.childNodes.length-1&&(m=!1),9===c.nodeType&&(c=e.getRoot(),u=0),c===f){if(m&&(h=c.childNodes[u>0?u-1:0],h&&(p[h.nodeName]||"TABLE"==h.nodeName)))return;if(c.hasChildNodes()&&(u=Math.min(!m&&u>0?u-1:u,c.childNodes.length-1),c=c.childNodes[u],u=0,c.hasChildNodes()&&!/TABLE/.test(c.nodeName))){h=c,d=new t(c,f);do{if(3===h.nodeType&&h.nodeValue.length>0){u=m?0:h.nodeValue.length,c=h,i=!0;break}if(p[h.nodeName.toLowerCase()]){u=e.nodeIndex(h),c=h.parentNode,"IMG"!=h.nodeName||m||u++,i=!0;break}}while(h=m?d.next():d.prev())}}o&&(3===c.nodeType&&0===u&&l(!0),1===c.nodeType&&(h=c.childNodes[u],h||(h=c.childNodes[u-1]),!h||"BR"!==h.nodeName||s(h,"A")||a(h)||a(h,!0)||l(!0,h))),m&&!o&&3===c.nodeType&&u===c.nodeValue.length&&l(!1),i&&n["set"+(r?"Start":"End")](c,u)}var i,o;return o=n.collapsed,r(!0),o||r(),i&&o&&n.collapse(!0),i}}var i=e.each;return r.compareRanges=function(e,t){if(e&&t){if(!e.item&&!e.duplicate)return e.startContainer==t.startContainer&&e.startOffset==t.startOffset;if(e.item&&t.item&&e.item(0)===t.item(0))return!0;if(e.isEqual&&t.isEqual&&t.isEqual(e))return!0}return!1},r.getCaretRangeFromPoint=function(e,t,n){var r,i;if(n.caretPositionFromPoint)i=n.caretPositionFromPoint(e,t),r=n.createRange(),r.setStart(i.offsetNode,i.offset),r.collapse(!0);else if(n.caretRangeFromPoint)r=n.caretRangeFromPoint(e,t);else if(n.body.createTextRange){r=n.body.createTextRange();try{r.moveToPoint(e,t),r.collapse(!0)}catch(o){r.collapse(t=e.childNodes.length&&(t=e.childNodes.length-1),e=e.childNodes[t]),e},r}),r(_,[w,u],function(e,t){return function(n){function r(e){var t,r;if(r=n.$(e).parentsUntil(n.getBody()).add(e),r.length===o.length){for(t=r.length;t>=0&&r[t]===o[t];t--);if(-1===t)return o=r,!0}return o=r,!1}var i,o=[];"onselectionchange"in n.getDoc()||n.on("NodeChange Click MouseUp KeyUp Focus",function(t){var r,o;r=n.selection.getRng(),o={startContainer:r.startContainer,startOffset:r.startOffset,endContainer:r.endContainer,endOffset:r.endOffset},"nodechange"!=t.type&&e.compareRanges(o,i)||n.fire("SelectionChange"),i=o}),n.on("contextmenu",function(){n.fire("SelectionChange")}),n.on("SelectionChange",function(){var e=n.selection.getStart(!0);(t.range||!n.selection.isCollapsed())&&!r(e)&&n.dom.isChildOf(e,n.getBody())&&n.nodeChanged({selectionChange:!0})}),n.on("MouseUp",function(e){e.isDefaultPrevented()||("IMG"==n.selection.getNode().nodeName?setTimeout(function(){n.nodeChanged()},0):n.nodeChanged())}),this.nodeChanged=function(e){var t=n.selection,r,i,o;n.initialized&&t&&!n.settings.disable_nodechange&&!n.settings.readonly&&(o=n.getBody(),r=t.getStart()||o,r=r.ownerDocument!=n.getDoc()?n.getBody():r,"IMG"==r.nodeName&&t.isCollapsed()&&(r=r.parentNode),i=[],n.dom.getParent(r,function(e){return e===o?!0:void i.push(e)}),e=e||{},e.element=r,e.parents=i,n.fire("NodeChange",e))}}}),r(E,[],function(){function e(e,t,n){var r,i,o=n?"lastChild":"firstChild",a=n?"prev":"next";if(e[o])return e[o];if(e!==t){if(r=e[a])return r;for(i=e.parent;i&&i!==t;i=i.parent)if(r=i[a])return r}}function t(e,t){this.name=e,this.type=t,1===t&&(this.attributes=[],this.attributes.map={})}var n=/^[ \t\r\n]*$/,r={"#text":3,"#comment":8,"#cdata":4,"#pi":7,"#doctype":10,"#document-fragment":11};return t.prototype={replace:function(e){var t=this;return e.parent&&e.remove(),t.insert(e,t),t.remove(),t},attr:function(e,t){var n=this,r,i,o;if("string"!=typeof e){for(i in e)n.attr(i,e[i]);return n}if(r=n.attributes){if(t!==o){if(null===t){if(e in r.map)for(delete r.map[e],i=r.length;i--;)if(r[i].name===e)return r=r.splice(i,1),n;return n}if(e in r.map){for(i=r.length;i--;)if(r[i].name===e){r[i].value=t;break}}else r.push({name:e,value:t});return r.map[e]=t,n}return r.map[e]}},clone:function(){var e=this,n=new t(e.name,e.type),r,i,o,a,s;if(o=e.attributes){for(s=[],s.map={},r=0,i=o.length;i>r;r++)a=o[r],"id"!==a.name&&(s[s.length]={name:a.name,value:a.value},s.map[a.name]=a.value);n.attributes=s}return n.value=e.value,n.shortEnded=e.shortEnded,n},wrap:function(e){var t=this;return t.parent.insert(e,t),e.append(t),t},unwrap:function(){var e=this,t,n;for(t=e.firstChild;t;)n=t.next,e.insert(t,e,!0),t=n;e.remove()},remove:function(){var e=this,t=e.parent,n=e.next,r=e.prev;return t&&(t.firstChild===e?(t.firstChild=n,n&&(n.prev=null)):r.next=n,t.lastChild===e?(t.lastChild=r,r&&(r.next=null)):n.prev=r,e.parent=e.next=e.prev=null),e},append:function(e){var t=this,n;return e.parent&&e.remove(),n=t.lastChild,n?(n.next=e,e.prev=n,t.lastChild=e):t.lastChild=t.firstChild=e,e.parent=t,e},insert:function(e,t,n){var r;return e.parent&&e.remove(),r=t.parent||this,n?(t===r.firstChild?r.firstChild=e:t.prev.next=e,e.prev=t.prev,e.next=t,t.prev=e):(t===r.lastChild?r.lastChild=e:t.next.prev=e,e.next=t.next,e.prev=t,t.next=e),e.parent=r,e},getAll:function(t){var n=this,r,i=[];for(r=n.firstChild;r;r=e(r,n))r.name===t&&i.push(r);return i},empty:function(){var t=this,n,r,i;if(t.firstChild){for(n=[],i=t.firstChild;i;i=e(i,t))n.push(i);for(r=n.length;r--;)i=n[r],i.parent=i.firstChild=i.lastChild=i.next=i.prev=null}return t.firstChild=t.lastChild=null,t},isEmpty:function(t){var r=this,i=r.firstChild,o,a;if(i)do{if(1===i.type){if(i.attributes.map["data-mce-bogus"])continue;if(t[i.name])return!1;for(o=i.attributes.length;o--;)if(a=i.attributes[o].name,"name"===a||0===a.indexOf("data-mce-bookmark"))return!1}if(8===i.type)return!1;if(3===i.type&&!n.test(i.value))return!1}while(i=e(i,r));return!0},walk:function(t){return e(this,null,t)}},t.create=function(e,n){var i,o;if(i=new t(e,r[e]||1),n)for(o in n)i.attr(o,n[o]);return i},t}),r(N,[f],function(e){function t(e,t){return e?e.split(t||" "):[]}function n(e){function n(e,n,r){function i(e,t){var n={},r,i;for(r=0,i=e.length;i>r;r++)n[e[r]]=t||{};return n}var s,c,u,d=arguments;for(r=r||[],n=n||"","string"==typeof r&&(r=t(r)),c=3;co;o++)i.attributes[n[o]]={},i.attributesOrder.push(n[o])}var a={},l,c,u,d,f,h;return i[e]?i[e]:(l=t("id accesskey class dir lang style tabindex title"),c=t("address blockquote div dl fieldset form h1 h2 h3 h4 h5 h6 hr menu ol p pre table ul"),u=t("a abbr b bdo br button cite code del dfn em embed i iframe img input ins kbd label map noscript object q s samp script select small span strong sub sup textarea u var #text #comment"),"html4"!=e&&(l.push.apply(l,t("contenteditable contextmenu draggable dropzone hidden spellcheck translate")),c.push.apply(c,t("article aside details dialog figure header footer hgroup section nav")),u.push.apply(u,t("audio canvas command datalist mark meter output picture progress time wbr video ruby bdi keygen"))),"html5-strict"!=e&&(l.push("xml:lang"),h=t("acronym applet basefont big font strike tt"),u.push.apply(u,h),s(h,function(e){n(e,"",u)}),f=t("center dir isindex noframes"),c.push.apply(c,f),d=[].concat(c,u),s(f,function(e){n(e,"",d)})),d=d||[].concat(c,u),n("html","manifest","head body"),n("head","","base command link meta noscript script style title"),n("title hr noscript br"),n("base","href target"),n("link","href rel media hreflang type sizes hreflang"),n("meta","name http-equiv content charset"),n("style","media type scoped"),n("script","src async defer type charset"),n("body","onafterprint onbeforeprint onbeforeunload onblur onerror onfocus onhashchange onload onmessage onoffline ononline onpagehide onpageshow onpopstate onresize onscroll onstorage onunload",d),n("address dt dd div caption","",d),n("h1 h2 h3 h4 h5 h6 pre p abbr code var samp kbd sub sup i b u bdo span legend em strong small s cite dfn","",u),n("blockquote","cite",d),n("ol","reversed start type","li"),n("ul","","li"),n("li","value",d),n("dl","","dt dd"),n("a","href target rel media hreflang type",u),n("q","cite",u),n("ins del","cite datetime",d),n("img","src sizes srcset alt usemap ismap width height"),n("iframe","src name width height",d),n("embed","src type width height"),n("object","data type typemustmatch name usemap form width height",d,"param"),n("param","name value"),n("map","name",d,"area"),n("area","alt coords shape href target rel media hreflang type"),n("table","border","caption colgroup thead tfoot tbody tr"+("html4"==e?" col":"")),n("colgroup","span","col"),n("col","span"),n("tbody thead tfoot","","tr"),n("tr","","td th"),n("td","colspan rowspan headers",d),n("th","colspan rowspan headers scope abbr",d),n("form","accept-charset action autocomplete enctype method name novalidate target",d),n("fieldset","disabled form name",d,"legend"),n("label","form for",u),n("input","accept alt autocomplete checked dirname disabled form formaction formenctype formmethod formnovalidate formtarget height list max maxlength min multiple name pattern readonly required size src step type value width"),n("button","disabled form formaction formenctype formmethod formnovalidate formtarget name type value","html4"==e?d:u),n("select","disabled form multiple name required size","option optgroup"),n("optgroup","disabled label","option"),n("option","disabled label selected value"),n("textarea","cols dirname disabled form maxlength name readonly required rows wrap"),n("menu","type label",d,"li"),n("noscript","",d),"html4"!=e&&(n("wbr"),n("ruby","",u,"rt rp"),n("figcaption","",d),n("mark rt rp summary bdi","",u),n("canvas","width height",d),n("video","src crossorigin poster preload autoplay mediagroup loop muted controls width height buffered",d,"track source"),n("audio","src crossorigin preload autoplay mediagroup loop muted controls buffered volume",d,"track source"),n("picture","","img source"),n("source","src srcset type media sizes"),n("track","kind src srclang label default"),n("datalist","",u,"option"),n("article section nav aside header footer","",d),n("hgroup","","h1 h2 h3 h4 h5 h6"),n("figure","",d,"figcaption"),n("time","datetime",u),n("dialog","open",d),n("command","type label icon disabled checked radiogroup command"),n("output","for form name",u),n("progress","value max",u),n("meter","value min max low high optimum",u),n("details","open",d,"summary"),n("keygen","autofocus challenge disabled form keytype name")),"html5-strict"!=e&&(r("script","language xml:space"),r("style","xml:space"),r("object","declare classid code codebase codetype archive standby align border hspace vspace"),r("embed","align name hspace vspace"),r("param","valuetype type"),r("a","charset name rev shape coords"),r("br","clear"),r("applet","codebase archive code object alt name width height align hspace vspace"),r("img","name longdesc align border hspace vspace"),r("iframe","longdesc frameborder marginwidth marginheight scrolling align"),r("font basefont","size color face"),r("input","usemap align"),r("select","onchange"),r("textarea"),r("h1 h2 h3 h4 h5 h6 div p legend caption","align"),r("ul","type compact"),r("li","type"),r("ol dl menu dir","compact"),r("pre","width xml:space"),r("hr","align noshade size width"),r("isindex","prompt"),r("table","summary width frame rules cellspacing cellpadding align bgcolor"),r("col","width align char charoff valign"),r("colgroup","width align char charoff valign"),r("thead","align char charoff valign"),r("tr","align char charoff valign bgcolor"),r("th","axis align char charoff valign nowrap bgcolor width height"),r("form","accept"),r("td","abbr axis scope align char charoff valign nowrap bgcolor width height"),r("tfoot","align char charoff valign"),r("tbody","align char charoff valign"),r("area","nohref"),r("body","background bgcolor text link vlink alink")),"html4"!=e&&(r("input button select textarea","autofocus"),r("input textarea","placeholder"),r("a","download"),r("link script img","crossorigin"),r("iframe","sandbox seamless allowfullscreen")),s(t("a form meter progress dfn"),function(e){a[e]&&delete a[e].children[e]}),delete a.caption.children.table,delete a.script,i[e]=a,a)}function r(e,t){var n;return e&&(n={},"string"==typeof e&&(e={"*":e}),s(e,function(e,r){n[r]=n[r.toUpperCase()]="map"==t?a(e,/[, ]/):c(e,/[, ]/)})),n}var i={},o={},a=e.makeMap,s=e.each,l=e.extend,c=e.explode,u=e.inArray;return function(e){function o(t,n,r){var o=e[t];return o?o=a(o,/[, ]/,a(o.toUpperCase(),/[, ]/)):(o=i[t],o||(o=a(n," ",a(n.toUpperCase()," ")),o=l(o,r),i[t]=o)),o}function d(e){return new RegExp("^"+e.replace(/([?+*])/g,".$1")+"$")}function f(e){var n,r,i,o,s,l,c,f,h,p,m,g,v,b,C,w,_,E,N,S=/^([#+\-])?([^\[!\/]+)(?:\/([^\[!]+))?(?:(!?)\[([^\]]+)\])?$/,k=/^([!\-])?(\w+::\w+|[^=:<]+)?(?:([=:<])(.*))?$/,T=/[*?+]/;if(e)for(e=t(e,","),y["@"]&&(w=y["@"].attributes,_=y["@"].attributesOrder),n=0,r=e.length;r>n;n++)if(s=S.exec(e[n])){if(b=s[1],h=s[2],C=s[3],f=s[5],g={},v=[],l={attributes:g,attributesOrder:v},"#"===b&&(l.paddEmpty=!0),"-"===b&&(l.removeEmpty=!0),"!"===s[4]&&(l.removeEmptyAttrs=!0),w){for(E in w)g[E]=w[E];v.push.apply(v,_)}if(f)for(f=t(f,"|"),i=0,o=f.length;o>i;i++)if(s=k.exec(f[i])){if(c={},m=s[1],p=s[2].replace(/::/g,":"),b=s[3],N=s[4],"!"===m&&(l.attributesRequired=l.attributesRequired||[],l.attributesRequired.push(p),c.required=!0),"-"===m){delete g[p],v.splice(u(v,p),1);continue}b&&("="===b&&(l.attributesDefault=l.attributesDefault||[],l.attributesDefault.push({name:p,value:N}),c.defaultValue=N),":"===b&&(l.attributesForced=l.attributesForced||[],l.attributesForced.push({name:p,value:N}),c.forcedValue=N),"<"===b&&(c.validValues=a(N,"?"))),T.test(p)?(l.attributePatterns=l.attributePatterns||[],c.pattern=d(p),l.attributePatterns.push(c)):(g[p]||v.push(p),g[p]=c)}w||"@"!=h||(w=g,_=v),C&&(l.outputName=h,y[C]=l),T.test(h)?(l.pattern=d(h),x.push(l)):y[h]=l}}function h(e){y={},x=[],f(e),s(_,function(e,t){b[t]=e.children})}function p(e){var n=/^(~)?(.+)$/;e&&(i.text_block_elements=i.block_elements=null,s(t(e,","),function(e){var t=n.exec(e),r="~"===t[1],i=r?"span":"div",o=t[2];if(b[o]=b[i],L[o]=i,r||(R[o.toUpperCase()]={},R[o]={}),!y[o]){var a=y[i];a=l({},a),delete a.removeEmptyAttrs,delete a.removeEmpty,y[o]=a}s(b,function(e,t){e[i]&&(b[t]=e=l({},b[t]),e[o]=e[i])})}))}function m(n){var r=/^([+\-]?)(\w+)\[([^\]]+)\]$/;i[e.schema]=null,n&&s(t(n,","),function(e){var n=r.exec(e),i,o;n&&(o=n[1],i=o?b[n[2]]:b[n[2]]={"#comment":{}},i=b[n[2]],s(t(n[3],"|"),function(e){"-"===o?delete i[e]:i[e]={}}))})}function g(e){var t=y[e],n;if(t)return t;for(n=x.length;n--;)if(t=x[n],t.pattern.test(e))return t}var v=this,y={},b={},x=[],C,w,_,E,N,S,k,T,R,A,B,D,M,L={},H={};e=e||{},_=n(e.schema),e.verify_html===!1&&(e.valid_elements="*[*]"),C=r(e.valid_styles),w=r(e.invalid_styles,"map"),T=r(e.valid_classes,"map"),E=o("whitespace_elements","pre script noscript style textarea video audio iframe object"),N=o("self_closing_elements","colgroup dd dt li option p td tfoot th thead tr"),S=o("short_ended_elements","area base basefont br col frame hr img input isindex link meta param embed source wbr track"),k=o("boolean_attributes","checked compact declare defer disabled ismap multiple nohref noresize noshade nowrap readonly selected autoplay loop controls"),A=o("non_empty_elements","td th iframe video audio object script",S),B=o("move_caret_before_on_enter_elements","table",A),D=o("text_block_elements","h1 h2 h3 h4 h5 h6 p div address pre form blockquote center dir fieldset header footer article section hgroup aside nav figure"),R=o("block_elements","hr table tbody thead tfoot th tr td li ol ul caption dl dt dd noscript menu isindex option datalist select optgroup",D),M=o("text_inline_elements","span strong b em i font strike u var cite dfn code mark q sup sub samp"),s((e.special||"script noscript style textarea").split(" "),function(e){H[e]=new RegExp("]*>","gi")}),e.valid_elements?h(e.valid_elements):(s(_,function(e,t){y[t]={attributes:e.attributes,attributesOrder:e.attributesOrder},b[t]=e.children}),"html5"!=e.schema&&s(t("strong/b em/i"),function(e){e=t(e,"/"),y[e[1]].outputName=e[0]}),y.img.attributesDefault=[{name:"alt",value:""}],s(t("ol ul sub sup blockquote span font a table tbody tr strong em b i"),function(e){y[e]&&(y[e].removeEmpty=!0)}),s(t("p h1 h2 h3 h4 h5 h6 th td pre div address caption"),function(e){y[e].paddEmpty=!0}),s(t("span"),function(e){y[e].removeEmptyAttrs=!0})),p(e.custom_elements),m(e.valid_children),f(e.extended_valid_elements),m("+ol[ul|ol],+ul[ul|ol]"),e.invalid_elements&&s(c(e.invalid_elements),function(e){y[e]&&delete y[e]}),g("span")||f("span[!data-mce-type|*]"),v.children=b,v.getValidStyles=function(){return C},v.getInvalidStyles=function(){return w},v.getValidClasses=function(){return T},v.getBoolAttrs=function(){return k},v.getBlockElements=function(){return R},v.getTextBlockElements=function(){return D},v.getTextInlineElements=function(){return M},v.getShortEndedElements=function(){return S},v.getSelfClosingElements=function(){return N},v.getNonEmptyElements=function(){return A},v.getMoveCaretBeforeOnEnterElements=function(){return B},v.getWhiteSpaceElements=function(){return E},v.getSpecialElements=function(){return H},v.isValidChild=function(e,t){var n=b[e];return!(!n||!n[t])},v.isValid=function(e,t){var n,r,i=g(e);if(i){if(!t)return!0;if(i.attributes[t])return!0;if(n=i.attributePatterns)for(r=n.length;r--;)if(n[r].pattern.test(e))return!0}return!1},v.getElementRule=g,v.getCustomElements=function(){return L},v.addValidElements=f,v.setValidElements=h,v.addCustomElements=p,v.addValidChildren=m,v.elements=y}}),r(S,[N,v,f],function(e,t,n){function r(e,t,n){var r=1,i,o,a,s;for(s=e.getShortEndedElements(),a=/<([!?\/])?([A-Za-z0-9\-_\:\.]+)((?:\s+[^"\'>]+(?:(?:"[^"]*")|(?:\'[^\']*\')|[^>]*))*|\/|\s+)>/g,a.lastIndex=i=n;o=a.exec(t);){if(i=a.lastIndex,"/"===o[1])r--;else if(!o[1]){if(o[2]in s)continue;r++}if(0===r)break}return i}function i(i,a){function s(){}var l=this;i=i||{},l.schema=a=a||new e,i.fix_self_closing!==!1&&(i.fix_self_closing=!0),o("comment cdata text start end pi doctype".split(" "),function(e){e&&(l[e]=i[e]||s)}),l.parse=function(e){function o(e){var t,n;for(t=h.length;t--&&h[t].name!==e;);if(t>=0){for(n=h.length-1;n>=t;n--)e=h[n],e.valid&&l.end(e.name);h.length=t}}function s(e,t,n,r,o){var a,s,l=/[\s\u0000-\u001F]+/g;if(t=t.toLowerCase(),n=t in C?t:z(n||r||o||""),_&&!y&&0!==t.indexOf("data-")){if(a=T[t],!a&&R){for(s=R.length;s--&&(a=R[s],!a.pattern.test(t)););-1===s&&(a=null)}if(!a)return;if(a.validValues&&!(n in a.validValues))return}if(V[t]&&!i.allow_script_urls){var c=n.replace(l,"");try{c=decodeURIComponent(c)}catch(u){c=unescape(c)}if(U.test(c))return;if(!i.allow_html_data_urls&&$.test(c)&&!/^data:image\//i.test(c))return}p.map[t]=n,p.push({name:t,value:n})}var l=this,c,u=0,d,f,h=[],p,m,g,v,y,b,x,C,w,_,E,N,S,k,T,R,A,B,D,M,L,H,P,O,I,F=0,z=t.decode,W,V=n.makeMap("src,href,data,background,formaction,poster"),U=/((java|vb)script|mhtml):/i,$=/^data:/i;for(H=new RegExp("<(?:(?:!--([\\w\\W]*?)-->)|(?:!\\[CDATA\\[([\\w\\W]*?)\\]\\]>)|(?:!DOCTYPE([\\w\\W]*?)>)|(?:\\?([^\\s\\/<>]+) ?([\\w\\W]*?)[?/]>)|(?:\\/([^>]+)>)|(?:([A-Za-z0-9\\-_\\:\\.]+)((?:\\s+[^\"'>]+(?:(?:\"[^\"]*\")|(?:'[^']*')|[^>]*))*|\\/|\\s+)>))","g"),P=/([\w:\-]+)(?:\s*=\s*(?:(?:\"((?:[^\"])*)\")|(?:\'((?:[^\'])*)\')|([^>\s]+)))?/g,x=a.getShortEndedElements(),L=i.self_closing_elements||a.getSelfClosingElements(),C=a.getBoolAttrs(),_=i.validate,b=i.remove_internals,W=i.fix_self_closing,O=a.getSpecialElements();c=H.exec(e);){if(u0&&h[h.length-1].name===d&&o(d),!_||(E=a.getElementRule(d))){if(N=!0,_&&(T=E.attributes,R=E.attributePatterns),(k=c[8])?(y=-1!==k.indexOf("data-mce-type"),y&&b&&(N=!1),p=[],p.map={},k.replace(P,s)):(p=[],p.map={}),_&&!y){if(A=E.attributesRequired,B=E.attributesDefault,D=E.attributesForced,M=E.removeEmptyAttrs,M&&!p.length&&(N=!1),D)for(m=D.length;m--;)S=D[m],v=S.name,I=S.value,"{$uid}"===I&&(I="mce_"+F++),p.map[v]=I,p.push({name:v,value:I});if(B)for(m=B.length;m--;)S=B[m],v=S.name,v in p.map||(I=S.value,"{$uid}"===I&&(I="mce_"+F++),p.map[v]=I,p.push({name:v,value:I}));if(A){for(m=A.length;m--&&!(A[m]in p.map););-1===m&&(N=!1)}if(S=p.map["data-mce-bogus"]){if("all"===S){u=r(a,e,H.lastIndex),H.lastIndex=u;continue}N=!1}}N&&l.start(d,p,w)}else N=!1;if(f=O[d]){f.lastIndex=u=c.index+c[0].length,(c=f.exec(e))?(N&&(g=e.substr(u,c.index-u)),u=c.index+c[0].length):(g=e.substr(u),u=e.length),N&&(g.length>0&&l.text(g,!0),l.end(d)),H.lastIndex=u;continue}w||(k&&k.indexOf("/")==k.length-1?N&&l.end(d):h.push({name:d,valid:N}))}else(d=c[1])?(">"===d.charAt(0)&&(d=" "+d),i.allow_conditional_comments||"[if"!==d.substr(0,3)||(d=" "+d),l.comment(d)):(d=c[2])?l.cdata(d):(d=c[3])?l.doctype(d):(d=c[4])&&l.pi(d,c[5]);u=c.index+c[0].length}for(u=0;m--)d=h[m],d.valid&&l.end(d.name)}}var o=n.each;return i.findEndTag=r,i}),r(k,[E,N,S,f],function(e,t,n,r){var i=r.makeMap,o=r.each,a=r.explode,s=r.extend;return function(r,l){function c(t){var n,r,o,a,s,c,d,f,h,p,m,g,v,y,b;for(m=i("tr,td,th,tbody,thead,tfoot,table"),p=l.getNonEmptyElements(),g=l.getTextBlockElements(),v=l.getSpecialElements(),n=0;n1){for(a.reverse(),s=c=u.filterNode(a[0].clone()),h=0;h0)return void(t.value=r);if(n=t.next){if(3==n.type&&n.value.length){t=t.prev;continue}if(!o[n.name]&&"script"!=n.name&&"style"!=n.name){ -t=t.prev;continue}}i=t.prev,t.remove(),t=i}}function g(e){var t,n={};for(t in e)"li"!==t&&"p"!=t&&(n[t]=e[t]);return n}var v,y,b,x,C,w,_,E,N,S,k,T,R,A=[],B,D,M,L,H,P,O,I;if(o=o||{},h={},p={},T=s(i("script,style,head,html,body,title,meta,param"),l.getBlockElements()),O=l.getNonEmptyElements(),P=l.children,k=r.validate,I="forced_root_block"in o?o.forced_root_block:r.forced_root_block,H=l.getWhiteSpaceElements(),R=/^[ \t\r\n]+/,D=/[ \t\r\n]+$/,M=/[ \t\r\n]+/g,L=/^[ \t\r\n]+$/,v=new n({validate:k,allow_script_urls:r.allow_script_urls,allow_conditional_comments:r.allow_conditional_comments,self_closing_elements:g(l.getSelfClosingElements()),cdata:function(e){b.append(u("#cdata",4)).value=e},text:function(e,t){var n;B||(e=e.replace(M," "),b.lastChild&&T[b.lastChild.name]&&(e=e.replace(R,""))),0!==e.length&&(n=u("#text",3),n.raw=!!t,b.append(n).value=e)},comment:function(e){b.append(u("#comment",8)).value=e},pi:function(e,t){b.append(u(e,7)).value=t,m(b)},doctype:function(e){var t;t=b.append(u("#doctype",10)),t.value=e,m(b)},start:function(e,t,n){var r,i,o,a,s;if(o=k?l.getElementRule(e):{}){for(r=u(o.outputName||e,1),r.attributes=t,r.shortEnded=n,b.append(r),s=P[b.name],s&&P[r.name]&&!s[r.name]&&A.push(r),i=f.length;i--;)a=f[i].name,a in t.map&&(N=p[a],N?N.push(r):p[a]=[r]);T[e]&&m(r),n||(b=r),!B&&H[e]&&(B=!0)}},end:function(t){var n,r,i,o,a;if(r=k?l.getElementRule(t):{}){if(T[t]&&!B){if(n=b.firstChild,n&&3===n.type)if(i=n.value.replace(R,""),i.length>0)n.value=i,n=n.next;else for(o=n.next,n.remove(),n=o;n&&3===n.type;)i=n.value,o=n.next,(0===i.length||L.test(i))&&(n.remove(),n=o),n=o;if(n=b.lastChild,n&&3===n.type)if(i=n.value.replace(D,""),i.length>0)n.value=i,n=n.prev;else for(o=n.prev,n.remove(),n=o;n&&3===n.type;)i=n.value,o=n.prev,(0===i.length||L.test(i))&&(n.remove(),n=o),n=o}if(B&&H[t]&&(B=!1),(r.removeEmpty||r.paddEmpty)&&b.isEmpty(O))if(r.paddEmpty)b.empty().append(new e("#text","3")).value="\xa0";else if(!b.attributes.map.name&&!b.attributes.map.id)return a=b.parent,T[b.name]?b.empty().remove():b.unwrap(),void(b=a);b=b.parent}}},l),y=b=new e(o.context||r.root_name,11),v.parse(t),k&&A.length&&(o.context?o.invalid=!0:c(A)),I&&("body"==y.name||o.isRootContent)&&a(),!o.invalid){for(S in h){for(N=d[S],x=h[S],_=x.length;_--;)x[_].parent||x.splice(_,1);for(C=0,w=N.length;w>C;C++)N[C](x,S,o)}for(C=0,w=f.length;w>C;C++)if(N=f[C],N.name in p){for(x=p[N.name],_=x.length;_--;)x[_].parent||x.splice(_,1);for(_=0,E=N.callbacks.length;E>_;_++)N.callbacks[_](x,N.name,o)}}return y},r.remove_trailing_brs&&u.addNodeFilter("br",function(t){var n,r=t.length,i,o=s({},l.getBlockElements()),a=l.getNonEmptyElements(),c,u,d,f,h,p;for(o.body=1,n=0;r>n;n++)if(i=t[n],c=i.parent,o[i.parent.name]&&i===c.lastChild){for(d=i.prev;d;){if(f=d.name,"span"!==f||"bookmark"!==d.attr("data-mce-type")){if("br"!==f)break;if("br"===f){i=null;break}}d=d.prev}i&&(i.remove(),c.isEmpty(a)&&(h=l.getElementRule(c.name),h&&(h.removeEmpty?c.remove():h.paddEmpty&&(c.empty().append(new e("#text",3)).value="\xa0"))))}else{for(u=i;c&&c.firstChild===u&&c.lastChild===u&&(u=c,!o[c.name]);)c=c.parent;u===c&&(p=new e("#text",3),p.value="\xa0",i.replace(p))}}),r.allow_html_in_named_anchor||u.addAttributeFilter("id,name",function(e){for(var t=e.length,n,r,i,o;t--;)if(o=e[t],"a"===o.name&&o.firstChild&&!o.attr("href")){i=o.parent,n=o.lastChild;do r=n.prev,i.insert(n,o),n=r;while(n)}}),r.validate&&l.getValidClasses()&&u.addAttributeFilter("class",function(e){for(var t=e.length,n,r,i,o,a,s=l.getValidClasses(),c,u;t--;){for(n=e[t],r=n.attr("class").split(" "),a="",i=0;i0&&(f=r[r.length-1],f.length>0&&"\n"!==f&&r.push("\n")),r.push("<",e),t)for(c=0,u=t.length;u>c;c++)d=t[c],r.push(" ",d.name,'="',s(d.value,!0),'"');!n||l?r[r.length]=">":r[r.length]=" />",n&&i&&a[e]&&r.length>0&&(f=r[r.length-1],f.length>0&&"\n"!==f&&r.push("\n"))},end:function(e){var t;r.push(""),i&&a[e]&&r.length>0&&(t=r[r.length-1],t.length>0&&"\n"!==t&&r.push("\n"))},text:function(e,t){e.length>0&&(r[r.length]=t?e:s(e))},cdata:function(e){r.push("")},comment:function(e){r.push("")},pi:function(e,t){t?r.push(""):r.push(""),i&&r.push("\n")},doctype:function(e){r.push("",i?"\n":"")},reset:function(){r.length=0},getContent:function(){return r.join("").replace(/\n$/,"")}}}}),r(R,[T,N],function(e,t){return function(n,r){var i=this,o=new e(n);n=n||{},n.validate="validate"in n?n.validate:!0,i.schema=r=r||new t,i.writer=o,i.serialize=function(e){function t(e){var n=i[e.type],s,l,c,u,d,f,h,p,m;if(n)n(e);else{if(s=e.name,l=e.shortEnded,c=e.attributes,a&&c&&c.length>1){for(f=[],f.map={},m=r.getElementRule(e.name),h=0,p=m.attributesOrder.length;p>h;h++)u=m.attributesOrder[h],u in c.map&&(d=c.map[u],f.map[u]=d,f.push({name:u,value:d}));for(h=0,p=c.length;p>h;h++)u=c[h].name,u in f.map||(d=c.map[u],f.map[u]=d,f.push({name:u,value:d}));c=f}if(o.start(e.name,c,l),!l){if(e=e.firstChild)do t(e);while(e=e.next);o.end(s)}}}var i,a;return a=n.validate,i={3:function(e){o.text(e.value,e.raw)},8:function(e){o.comment(e.value)},7:function(e){o.pi(e.name,e.value)},10:function(e){o.doctype(e.value)},4:function(e){o.cdata(e.value)},11:function(e){if(e=e.firstChild)do t(e);while(e=e.next)}},o.reset(),1!=e.type||n.inner?i[11](e):t(e),o.getContent()}}}),r(A,[b,k,v,R,E,N,u,f],function(e,t,n,r,i,o,a,s){function l(e){function t(e){return e&&"br"===e.name}var n,r;n=e.lastChild,t(n)&&(r=n.prev,t(r)&&(n.remove(),r.remove()))}var c=s.each,u=s.trim,d=e.DOM;return function(e,i){var s,f,h;return i&&(s=i.dom,f=i.schema),s=s||d,f=f||new o(e),e.entity_encoding=e.entity_encoding||"named",e.remove_trailing_brs="remove_trailing_brs"in e?e.remove_trailing_brs:!0,h=new t(e,f),h.addAttributeFilter("data-mce-tabindex",function(e,t){for(var n=e.length,r;n--;)r=e[n],r.attr("tabindex",r.attributes.map["data-mce-tabindex"]),r.attr(t,null)}),h.addAttributeFilter("src,href,style",function(t,n){for(var r=t.length,i,o,a="data-mce-"+n,l=e.url_converter,c=e.url_converter_scope,u;r--;)i=t[r],o=i.attributes.map[a],o!==u?(i.attr(n,o.length>0?o:null),i.attr(a,null)):(o=i.attributes.map[n],"style"===n?o=s.serializeStyle(s.parseStyle(o),i.name):l&&(o=l.call(c,o,n,i.name)),i.attr(n,o.length>0?o:null))}),h.addAttributeFilter("class",function(e){for(var t=e.length,n,r;t--;)n=e[t],r=n.attr("class"),r&&(r=n.attr("class").replace(/(?:^|\s)mce-item-\w+(?!\S)/g,""),n.attr("class",r.length>0?r:null))}),h.addAttributeFilter("data-mce-type",function(e,t,n){for(var r=e.length,i;r--;)i=e[r],"bookmark"!==i.attributes.map["data-mce-type"]||n.cleanup||i.remove()}),h.addNodeFilter("noscript",function(e){for(var t=e.length,r;t--;)r=e[t].firstChild,r&&(r.value=n.decode(r.value))}),h.addNodeFilter("script,style",function(e,t){function n(e){return e.replace(/()/g,"\n").replace(/^[\r\n]*|[\r\n]*$/g,"").replace(/^\s*(()?|\s*\/\/\s*\]\]>(-->)?|\/\/\s*(-->)?|\]\]>|\/\*\s*-->\s*\*\/|\s*-->\s*)\s*$/g,"")}for(var r=e.length,i,o,a;r--;)i=e[r],o=i.firstChild?i.firstChild.value:"","script"===t?(a=i.attr("type"),a&&i.attr("type","mce-no/type"==a?null:a.replace(/^mce\-/,"")),o.length>0&&(i.firstChild.value="// ")):o.length>0&&(i.firstChild.value="")}),h.addNodeFilter("#comment",function(e){for(var t=e.length,n;t--;)n=e[t],0===n.value.indexOf("[CDATA[")?(n.name="#cdata",n.type=4,n.value=n.value.replace(/^\[CDATA\[|\]\]$/g,"")):0===n.value.indexOf("mce:protected ")&&(n.name="#text",n.type=3,n.raw=!0,n.value=unescape(n.value).substr(14))}),h.addNodeFilter("xml:namespace,input",function(e,t){for(var n=e.length,r;n--;)r=e[n],7===r.type?r.remove():1===r.type&&("input"!==t||"type"in r.attributes.map||r.attr("type","text"))}),e.fix_list_elements&&h.addNodeFilter("ul,ol",function(e){for(var t=e.length,n,r;t--;)n=e[t],r=n.parent,("ul"===r.name||"ol"===r.name)&&n.prev&&"li"===n.prev.name&&n.prev.append(n)}),h.addAttributeFilter("data-mce-src,data-mce-href,data-mce-style,data-mce-selected,data-mce-expando,data-mce-type,data-mce-resize",function(e,t){for(var n=e.length;n--;)e[n].attr(t,null)}),{schema:f,addNodeFilter:h.addNodeFilter,addAttributeFilter:h.addAttributeFilter,serialize:function(t,n){var i=this,o,d,p,m,g,v;return a.ie&&s.select("script,style,select,map").length>0?(g=t.innerHTML,t=t.cloneNode(!1),s.setHTML(t,g)):t=t.cloneNode(!0),o=t.ownerDocument.implementation,o.createHTMLDocument&&(d=o.createHTMLDocument(""),c("BODY"==t.nodeName?t.childNodes:[t],function(e){d.body.appendChild(d.importNode(e,!0))}),t="BODY"!=t.nodeName?d.body.firstChild:d.body,p=s.doc,s.doc=d),n=n||{},n.format=n.format||"html",n.selection&&(n.forced_root_block=""),n.no_events||(n.node=t,i.onPreProcess(n)),v=h.parse(u(n.getInner?t.innerHTML:s.getOuterHTML(t)),n),l(v),m=new r(e,f),n.content=m.serialize(v),n.cleanup||(n.content=n.content.replace(/\uFEFF/g,"")),n.no_events||i.onPostProcess(n),p&&(s.doc=p),n.node=null,n.content},addRules:function(e){f.addValidElements(e)},setRules:function(e){f.setValidElements(e)},onPreProcess:function(e){i&&i.fire("PreProcess",e)},onPostProcess:function(e){i&&i.fire("PostProcess",e)}}}}),r(B,[],function(){function e(e){function t(t,n){var r,i=0,o,a,s,l,c,u,d=-1,f;if(r=t.duplicate(),r.collapse(n),f=r.parentElement(),f.ownerDocument===e.dom.doc){for(;"false"===f.contentEditable;)f=f.parentNode;if(!f.hasChildNodes())return{node:f,inside:1};for(s=f.children,o=s.length-1;o>=i;)if(u=Math.floor((i+o)/2),l=s[u],r.moveToElementText(l),d=r.compareEndPoints(n?"StartToStart":"EndToEnd",t),d>0)o=u-1;else{if(!(0>d))return{node:l};i=u+1}if(0>d)for(l?r.collapse(!1):(r.moveToElementText(f),r.collapse(!0),l=f,a=!0),c=0;0!==r.compareEndPoints(n?"StartToStart":"StartToEnd",t)&&0!==r.move("character",1)&&f==r.parentElement();)c++;else for(r.collapse(!0),c=0;0!==r.compareEndPoints(n?"StartToStart":"StartToEnd",t)&&0!==r.move("character",-1)&&f==r.parentElement();)c++;return{node:l,position:d,offset:c,inside:a}}}function n(){function n(e){var n=t(o,e),r,i,s=0,l,c,u;if(r=n.node,i=n.offset,n.inside&&!r.hasChildNodes())return void a[e?"setStart":"setEnd"](r,0);if(i===c)return void a[e?"setStartBefore":"setEndAfter"](r);if(n.position<0){if(l=n.inside?r.firstChild:r.nextSibling,!l)return void a[e?"setStartAfter":"setEndAfter"](r);if(!i)return void(3==l.nodeType?a[e?"setStart":"setEnd"](l,0):a[e?"setStartBefore":"setEndBefore"](l));for(;l;){if(3==l.nodeType&&(u=l.nodeValue,s+=u.length,s>=i)){r=l,s-=i,s=u.length-s;break}l=l.nextSibling}}else{if(l=r.previousSibling,!l)return a[e?"setStartBefore":"setEndBefore"](r);if(!i)return void(3==r.nodeType?a[e?"setStart":"setEnd"](l,r.nodeValue.length):a[e?"setStartAfter":"setEndAfter"](l));for(;l;){if(3==l.nodeType&&(s+=l.nodeValue.length,s>=i)){r=l,s-=i;break}l=l.previousSibling}}a[e?"setStart":"setEnd"](r,s)}var o=e.getRng(),a=i.createRng(),s,l,c,u,d;if(s=o.item?o.item(0):o.parentElement(),s.ownerDocument!=i.doc)return a;if(l=e.isCollapsed(),o.item)return a.setStart(s.parentNode,i.nodeIndex(s)),a.setEnd(a.startContainer,a.startOffset+1),a;try{n(!0),l||n()}catch(f){if(-2147024809!=f.number)throw f;d=r.getBookmark(2),c=o.duplicate(),c.collapse(!0),s=c.parentElement(),l||(c=o.duplicate(),c.collapse(!1),u=c.parentElement(),u.innerHTML=u.innerHTML),s.innerHTML=s.innerHTML,r.moveToBookmark(d),o=e.getRng(),n(!0),l||n()}return a}var r=this,i=e.dom,o=!1;this.getBookmark=function(n){function r(e){var t,n,r,o,a=[];for(t=e.parentNode,n=i.getRoot().parentNode;t!=n&&9!==t.nodeType;){for(r=t.children,o=r.length;o--;)if(e===r[o]){a.push(o);break}e=t,t=t.parentNode}return a}function o(e){var n;return n=t(a,e),n?{position:n.position,offset:n.offset,indexes:r(n.node),inside:n.inside}:void 0}var a=e.getRng(),s={};return 2===n&&(a.item?s.start={ctrl:!0,indexes:r(a.item(0))}:(s.start=o(!0),e.isCollapsed()||(s.end=o()))),s},this.moveToBookmark=function(e){function t(e){var t,n,r,o;for(t=i.getRoot(),n=e.length-1;n>=0;n--)o=t.children,r=e[n],r<=o.length-1&&(t=o[r]);return t}function n(n){var i=e[n?"start":"end"],a,s,l,c;i&&(a=i.position>0,s=o.createTextRange(),s.moveToElementText(t(i.indexes)),c=i.offset,c!==l?(s.collapse(i.inside||a),s.moveStart("character",a?-c:c)):s.collapse(n),r.setEndPoint(n?"StartToStart":"EndToStart",s),n&&r.collapse(!0))}var r,o=i.doc.body;e.start&&(e.start.ctrl?(r=o.createControlRange(),r.addElement(t(e.start.indexes)),r.select()):(r=o.createTextRange(),n(!0),n(),r.select()))},this.addRange=function(t){function n(e){var t,n,a,d,p;a=i.create("a"),t=e?s:c,n=e?l:u,d=r.duplicate(),(t==f||t==f.documentElement)&&(t=h,n=0),3==t.nodeType?(t.parentNode.insertBefore(a,t),d.moveToElementText(a),d.moveStart("character",n),i.remove(a),r.setEndPoint(e?"StartToStart":"EndToEnd",d)):(p=t.childNodes,p.length?(n>=p.length?i.insertAfter(a,p[p.length-1]):t.insertBefore(a,p[n]),d.moveToElementText(a)):t.canHaveHTML&&(t.innerHTML="",a=t.firstChild,d.moveToElementText(a),d.collapse(o)),r.setEndPoint(e?"StartToStart":"EndToEnd",d),i.remove(a))}var r,a,s,l,c,u,d,f=e.dom.doc,h=f.body,p,m;if(s=t.startContainer,l=t.startOffset,c=t.endContainer,u=t.endOffset,r=h.createTextRange(),s==c&&1==s.nodeType){if(l==u&&!s.hasChildNodes()){if(s.canHaveHTML)return d=s.previousSibling,d&&!d.hasChildNodes()&&i.isBlock(d)?d.innerHTML="":d=null,s.innerHTML="",r.moveToElementText(s.lastChild),r.select(),i.doc.selection.clear(),s.innerHTML="",void(d&&(d.innerHTML=""));l=i.nodeIndex(s),s=s.parentNode}if(l==u-1)try{if(m=s.childNodes[l],a=h.createControlRange(),a.addElement(m),a.select(),p=e.getRng(),p.item&&m===p.item(0))return}catch(g){}}n(!0),n(),r.select()},this.getRangeAt=n}return e}),r(D,[u],function(e){return{BACKSPACE:8,DELETE:46,DOWN:40,ENTER:13,LEFT:37,RIGHT:39,SPACEBAR:32,TAB:9,UP:38,modifierPressed:function(e){return e.shiftKey||e.ctrlKey||e.altKey||this.metaKeyPressed(e)},metaKeyPressed:function(t){return e.mac?t.metaKey:t.ctrlKey&&!t.altKey}}}),r(M,[D,f,u],function(e,t,n){return function(r,i){function o(e){var t=i.settings.object_resizing;return t===!1||n.iOS?!1:("string"!=typeof t&&(t="table,img,div"),"false"===e.getAttribute("data-mce-resize")?!1:i.dom.is(e,t))}function a(t){var n,r,o,a,s;n=t.screenX-T,r=t.screenY-R,P=n*S[2]+D,O=r*S[3]+M,P=5>P?5:P,O=5>O?5:O,o="IMG"==w.nodeName&&i.settings.resize_img_proportional!==!1?!e.modifierPressed(t):e.modifierPressed(t)||"IMG"==w.nodeName&&S[2]*S[3]!==0,o&&(W(n)>W(r)?(O=V(P*L),P=V(O/L)):(P=V(O/L),O=V(P*L))),x.setStyles(_,{width:P,height:O}),a=S.startPos.x+n,s=S.startPos.y+r,a=a>0?a:0,s=s>0?s:0,x.setStyles(E,{left:a,top:s,display:"block"}),E.innerHTML=P+" × "+O,S[2]<0&&_.clientWidth<=P&&x.setStyle(_,"left",A+(D-P)),S[3]<0&&_.clientHeight<=O&&x.setStyle(_,"top",B+(M-O)),n=U.scrollWidth-$,r=U.scrollHeight-q,n+r!==0&&x.setStyles(E,{left:a-n,top:s-r}),H||(i.fire("ObjectResizeStart",{target:w,width:D,height:M}),H=!0)}function s(){function e(e,t){t&&(w.style[e]||!i.schema.isValid(w.nodeName.toLowerCase(),e)?x.setStyle(w,e,t):x.setAttrib(w,e,t))}H=!1,e("width",P),e("height",O),x.unbind(I,"mousemove",a),x.unbind(I,"mouseup",s),F!=I&&(x.unbind(F,"mousemove",a),x.unbind(F,"mouseup",s)),x.remove(_),x.remove(E),z&&"TABLE"!=w.nodeName||l(w),i.fire("ObjectResized",{target:w,width:P,height:O}),x.setAttrib(w,"style",x.getAttrib(w,"style")),i.nodeChanged()}function l(e,t,r){var l,u,d,f,h;g(),l=x.getPos(e,U),A=l.x,B=l.y,h=e.getBoundingClientRect(),u=h.width||h.right-h.left,d=h.height||h.bottom-h.top,w!=e&&(m(),w=e,P=O=0),f=i.fire("ObjectSelected",{target:e}),o(e)&&!f.isDefaultPrevented()?C(N,function(e,i){function o(t){T=t.screenX,R=t.screenY,D=w.clientWidth,M=w.clientHeight,L=M/D,S=e,e.startPos={x:u*e[0]+A,y:d*e[1]+B},$=U.scrollWidth,q=U.scrollHeight,_=w.cloneNode(!0),x.addClass(_,"mce-clonedresizable"),x.setAttrib(_,"data-mce-bogus","all"),_.contentEditable=!1,_.unSelectabe=!0,x.setStyles(_,{left:A,top:B,margin:0}),_.removeAttribute("data-mce-selected"),U.appendChild(_),x.bind(I,"mousemove",a),x.bind(I,"mouseup",s),F!=I&&(x.bind(F,"mousemove",a),x.bind(F,"mouseup",s)),E=x.add(U,"div",{"class":"mce-resize-helper","data-mce-bogus":"all"},D+" × "+M)}var l;return t?void(i==t&&o(r)):(l=x.get("mceResizeHandle"+i),l&&x.remove(l),l=x.add(U,"div",{id:"mceResizeHandle"+i,"data-mce-bogus":"all","class":"mce-resizehandle",unselectable:!0,style:"cursor:"+i+"-resize; margin:0; padding:0"}),n.ie&&(l.contentEditable=!1),x.bind(l,"mousedown",function(e){e.stopImmediatePropagation(),e.preventDefault(),o(e)}),e.elm=l,void x.setStyles(l,{left:u*e[0]+A-l.offsetWidth/2,top:d*e[1]+B-l.offsetHeight/2}))}):c(),w.setAttribute("data-mce-selected","1")}function c(){var e,t;g(),w&&w.removeAttribute("data-mce-selected");for(e in N)t=x.get("mceResizeHandle"+e),t&&(x.unbind(t),x.remove(t))}function u(e){function t(e,t){if(e)do if(e===t)return!0;while(e=e.parentNode)}var n,o;if(!H&&!i.removed)return C(x.select("img[data-mce-selected],hr[data-mce-selected]"),function(e){e.removeAttribute("data-mce-selected")}),o="mousedown"==e.type?e.target:r.getNode(),o=x.$(o).closest(z?"table":"table,img,hr")[0],t(o,U)&&(v(),n=r.getStart(!0),t(n,o)&&t(r.getEnd(!0),o)&&(!z||o!=n&&"IMG"!==n.nodeName))?void l(o):void c()}function d(e,t,n){e&&e.attachEvent&&e.attachEvent("on"+t,n)}function f(e,t,n){e&&e.detachEvent&&e.detachEvent("on"+t,n)}function h(e){var t=e.srcElement,n,r,o,a,s,c,u;n=t.getBoundingClientRect(),c=k.clientX-n.left,u=k.clientY-n.top;for(r in N)if(o=N[r],a=t.offsetWidth*o[0],s=t.offsetHeight*o[1],W(a-c)<8&&W(s-u)<8){S=o;break}H=!0,i.fire("ObjectResizeStart",{target:w,width:w.clientWidth,height:w.clientHeight}),i.getDoc().selection.empty(),l(t,r,k)}function p(e){var t=e.srcElement;if(t!=w){if(i.fire("ObjectSelected",{target:t}),m(),0===t.id.indexOf("mceResizeHandle"))return void(e.returnValue=!1);("IMG"==t.nodeName||"TABLE"==t.nodeName)&&(c(),w=t,d(t,"resizestart",h))}}function m(){f(w,"resizestart",h)}function g(){for(var e in N){var t=N[e];t.elm&&(x.unbind(t.elm),delete t.elm)}}function v(){try{i.getDoc().execCommand("enableObjectResizing",!1,!1)}catch(e){}}function y(e){var t;if(z){t=I.body.createControlRange();try{return t.addElement(e),t.select(),!0}catch(n){}}}function b(){w=_=null,z&&(m(),f(U,"controlselect",p))}var x=i.dom,C=t.each,w,_,E,N,S,k,T,R,A,B,D,M,L,H,P,O,I=i.getDoc(),F=document,z=n.ie&&n.ie<11,W=Math.abs,V=Math.round,U=i.getBody(),$,q;N={nw:[0,0,-1,-1],ne:[1,0,1,-1],se:[1,1,1,1],sw:[0,1,-1,1]};var j=".mce-content-body";return i.contentStyles.push(j+" div.mce-resizehandle {position: absolute;border: 1px solid black;background: #FFF;width: 7px;height: 7px;z-index: 10000}"+j+" .mce-resizehandle:hover {background: #000}"+j+" img[data-mce-selected], hr[data-mce-selected] {outline: 1px solid black;resize: none}"+j+" .mce-clonedresizable {position: absolute;"+(n.gecko?"":"outline: 1px dashed black;")+"opacity: .5;filter: alpha(opacity=50);z-index: 10000}"+j+" .mce-resize-helper {background: #555;background: rgba(0,0,0,0.75);border-radius: 3px;border: 1px;color: white;display: none;font-family: sans-serif;font-size: 12px;white-space: nowrap;line-height: 14px;margin: 5px 10px;padding: 5px;position: absolute;z-index: 10001}"),i.on("init",function(){z?(i.on("ObjectResized",function(e){"TABLE"!=e.target.nodeName&&(c(),y(e.target))}),d(U,"controlselect",p),i.on("mousedown",function(e){k=e})):(v(),n.ie>=11&&(i.on("mousedown click",function(e){var t=e.target.nodeName;!H&&/^(TABLE|IMG|HR)$/.test(t)&&(i.selection.select(e.target,"TABLE"==t),"mousedown"==e.type&&i.nodeChanged())}),i.dom.bind(U,"mscontrolselect",function(e){/^(TABLE|IMG|HR)$/.test(e.target.nodeName)&&(e.preventDefault(),"IMG"==e.target.tagName&&window.setTimeout(function(){i.selection.select(e.target)},0))}))),i.on("nodechange ResizeEditor ResizeWindow drop",function(e){window.requestAnimationFrame?window.requestAnimationFrame(function(){u(e)}):u(e)}),i.on("keydown keyup",function(e){w&&"TABLE"==w.nodeName&&u(e)}),i.on("hide blur",c)}),i.on("remove",g),{isResizable:o,showResizeRect:l,hideResizeRect:c,updateResizeRect:u,controlSelect:y,destroy:b}}}),r(L,[u,f],function(e,t){function n(n){var r=n.dom;this.getBookmark=function(e,i){function o(e,n){var i=0;return t.each(r.select(e),function(e,t){e==n&&(i=t)}),i}function a(e){function t(t){var n,r,i,o=t?"start":"end";n=e[o+"Container"],r=e[o+"Offset"],1==n.nodeType&&"TR"==n.nodeName&&(i=n.childNodes,n=i[Math.min(t?r:r-1,i.length-1)],n&&(r=t?0:n.childNodes.length,e["set"+(t?"Start":"End")](n,r)))}return t(!0),t(),e}function s(){function e(e,t){var n=e[t?"startContainer":"endContainer"],a=e[t?"startOffset":"endOffset"],s=[],l,c,u=0;if(3==n.nodeType){if(i)for(l=n.previousSibling;l&&3==l.nodeType;l=l.previousSibling)a+=l.nodeValue.length;s.push(a)}else c=n.childNodes,a>=c.length&&c.length&&(u=1,a=Math.max(0,c.length-1)),s.push(r.nodeIndex(c[a],i)+u);for(;n&&n!=o;n=n.parentNode)s.push(r.nodeIndex(n,i));return s}var t=n.getRng(!0),o=r.getRoot(),a={};return a.start=e(t,!0),n.isCollapsed()||(a.end=e(t)),a}var l,c,u,d,f,h,p="",m;if(2==e)return h=n.getNode(),f=h?h.nodeName:null,"IMG"==f?{name:f,index:o(f,h)}:n.tridentSel?n.tridentSel.getBookmark(e):s();if(e)return{rng:n.getRng()};if(l=n.getRng(),u=r.uniqueId(),d=n.isCollapsed(),m="overflow:hidden;line-height:0px",l.duplicate||l.item){if(l.item)return h=l.item(0),f=h.nodeName,{name:f,index:o(f,h)};c=l.duplicate();try{l.collapse(),l.pasteHTML(''+p+""),d||(c.collapse(!1),l.moveToElementText(c.parentElement()),0===l.compareEndPoints("StartToEnd",c)&&c.move("character",-1),c.pasteHTML(''+p+""))}catch(g){return null}}else{if(h=n.getNode(),f=h.nodeName,"IMG"==f)return{name:f,index:o(f,h)};c=a(l.cloneRange()),d||(c.collapse(!1),c.insertNode(r.create("span",{"data-mce-type":"bookmark",id:u+"_end",style:m},p))),l=a(l),l.collapse(!0),l.insertNode(r.create("span",{"data-mce-type":"bookmark",id:u+"_start",style:m},p))}return n.moveToBookmark({id:u,keep:1}),{id:u}},this.moveToBookmark=function(i){function o(e){var t=i[e?"start":"end"],n,r,o,a;if(t){for(o=t[0],r=c,n=t.length-1;n>=1;n--){if(a=r.childNodes,t[n]>a.length-1)return;r=a[t[n]]}3===r.nodeType&&(o=Math.min(t[0],r.nodeValue.length)),1===r.nodeType&&(o=Math.min(t[0],r.childNodes.length)),e?l.setStart(r,o):l.setEnd(r,o)}return!0}function a(n){var o=r.get(i.id+"_"+n),a,s,l,c,p=i.keep;if(o&&(a=o.parentNode,"start"==n?(p?(a=o.firstChild,s=1):s=r.nodeIndex(o),u=d=a,f=h=s):(p?(a=o.firstChild,s=1):s=r.nodeIndex(o),d=a,h=s),!p)){for(c=o.previousSibling,l=o.nextSibling,t.each(t.grep(o.childNodes),function(e){3==e.nodeType&&(e.nodeValue=e.nodeValue.replace(/\uFEFF/g,""))});o=r.get(i.id+"_"+n);)r.remove(o,1);c&&l&&c.nodeType==l.nodeType&&3==c.nodeType&&!e.opera&&(s=c.nodeValue.length,c.appendData(l.nodeValue),r.remove(l),"start"==n?(u=d=c,f=h=s):(d=c,h=s))}}function s(t){return!r.isBlock(t)||t.innerHTML||e.ie||(t.innerHTML='
    '),t}var l,c,u,d,f,h;if(i)if(i.start){if(l=r.createRng(),c=r.getRoot(),n.tridentSel)return n.tridentSel.moveToBookmark(i);o(!0)&&o()&&n.setRng(l)}else i.id?(a("start"),a("end"),u&&(l=r.createRng(),l.setStart(s(u),f),l.setEnd(s(d),h),n.setRng(l))):i.name?n.select(r.select(i.name)[i.index]):i.rng&&n.setRng(i.rng)}}return n.isBookmarkNode=function(e){return e&&"SPAN"===e.tagName&&"bookmark"===e.getAttribute("data-mce-type")},n}),r(H,[m,B,M,w,L,u,f],function(e,n,r,i,o,a,s){function l(e,t,i,a){var s=this;s.dom=e,s.win=t,s.serializer=i,s.editor=a,s.bookmarkManager=new o(s),s.controlSelection=new r(s,a),s.win.getSelection||(s.tridentSel=new n(s))}var c=s.each,u=s.trim,d=a.ie;return l.prototype={setCursorLocation:function(e,t){var n=this,r=n.dom.createRng();e?(r.setStart(e,t),r.setEnd(e,t),n.setRng(r),n.collapse(!1)):(n._moveEndPoint(r,n.editor.getBody(),!0),n.setRng(r))},getContent:function(e){var n=this,r=n.getRng(),i=n.dom.create("body"),o=n.getSel(),a,s,l;return e=e||{},a=s="",e.get=!0,e.format=e.format||"html",e.selection=!0,n.editor.fire("BeforeGetContent",e),"text"==e.format?n.isCollapsed()?"":r.text||(o.toString?o.toString():""):(r.cloneContents?(l=r.cloneContents(),l&&i.appendChild(l)):r.item!==t||r.htmlText!==t?(i.innerHTML="
    "+(r.item?r.item(0).outerHTML:r.htmlText),i.removeChild(i.firstChild)):i.innerHTML=r.toString(),/^\s/.test(i.innerHTML)&&(a=" "),/\s+$/.test(i.innerHTML)&&(s=" "),e.getInner=!0,e.content=n.isCollapsed()?"":a+n.serializer.serialize(i,e)+s,n.editor.fire("GetContent",e),e.content)},setContent:function(e,t){var n=this,r=n.getRng(),i,o=n.win.document,a,s;if(t=t||{format:"html"},t.set=!0,t.selection=!0,e=t.content=e,t.no_events||n.editor.fire("BeforeSetContent",t),e=t.content,r.insertNode){e+='_',r.startContainer==o&&r.endContainer==o?o.body.innerHTML=e:(r.deleteContents(),0===o.body.childNodes.length?o.body.innerHTML=e:r.createContextualFragment?r.insertNode(r.createContextualFragment(e)):(a=o.createDocumentFragment(),s=o.createElement("div"),a.appendChild(s),s.outerHTML=e,r.insertNode(a))),i=n.dom.get("__caret"),r=o.createRange(),r.setStartBefore(i),r.setEndBefore(i),n.setRng(r),n.dom.remove("__caret");try{n.setRng(r)}catch(l){}}else r.item&&(o.execCommand("Delete",!1,null),r=n.getRng()),/^\s+/.test(e)?(r.pasteHTML('_'+e),n.dom.remove("__mce_tmp")):r.pasteHTML(e);t.no_events||n.editor.fire("SetContent",t)},getStart:function(e){var t=this,n=t.getRng(),r,i,o,a;if(n.duplicate||n.item){if(n.item)return n.item(0);for(o=n.duplicate(),o.collapse(1),r=o.parentElement(),r.ownerDocument!==t.dom.doc&&(r=t.dom.getRoot()),i=a=n.parentElement();a=a.parentNode;)if(a==r){r=i;break}return r}return r=n.startContainer,1==r.nodeType&&r.hasChildNodes()&&(e&&n.collapsed||(r=r.childNodes[Math.min(r.childNodes.length-1,n.startOffset)])),r&&3==r.nodeType?r.parentNode:r},getEnd:function(e){var t=this,n=t.getRng(),r,i;return n.duplicate||n.item?n.item?n.item(0):(n=n.duplicate(),n.collapse(0),r=n.parentElement(),r.ownerDocument!==t.dom.doc&&(r=t.dom.getRoot()),r&&"BODY"==r.nodeName?r.lastChild||r:r):(r=n.endContainer,i=n.endOffset,1==r.nodeType&&r.hasChildNodes()&&(e&&n.collapsed||(r=r.childNodes[i>0?i-1:i])),r&&3==r.nodeType?r.parentNode:r)},getBookmark:function(e,t){return this.bookmarkManager.getBookmark(e,t)},moveToBookmark:function(e){return this.bookmarkManager.moveToBookmark(e)},select:function(e,t){var n=this,r=n.dom,i=r.createRng(),o;if(n.lastFocusBookmark=null,e){if(!t&&n.controlSelection.controlSelect(e))return;o=r.nodeIndex(e),i.setStart(e.parentNode,o),i.setEnd(e.parentNode,o+1),t&&(n._moveEndPoint(i,e,!0),n._moveEndPoint(i,e)),n.setRng(i)}return e},isCollapsed:function(){var e=this,t=e.getRng(),n=e.getSel();return!t||t.item?!1:t.compareEndPoints?0===t.compareEndPoints("StartToEnd",t):!n||t.collapsed},collapse:function(e){var t=this,n=t.getRng(),r;n.item&&(r=n.item(0),n=t.win.document.body.createTextRange(),n.moveToElementText(r)),n.collapse(!!e),t.setRng(n)},getSel:function(){var e=this.win;return e.getSelection?e.getSelection():e.document.selection},getRng:function(e){function t(e,t,n){try{return t.compareBoundaryPoints(e,n)}catch(r){return-1}}var n=this,r,i,o,a=n.win.document,s;if(!e&&n.lastFocusBookmark){var l=n.lastFocusBookmark;return l.startContainer?(i=a.createRange(),i.setStart(l.startContainer,l.startOffset),i.setEnd(l.endContainer,l.endOffset)):i=l,i}if(e&&n.tridentSel)return n.tridentSel.getRangeAt(0);try{(r=n.getSel())&&(i=r.rangeCount>0?r.getRangeAt(0):r.createRange?r.createRange():a.createRange())}catch(c){}if(d&&i&&i.setStart&&a.selection){try{s=a.selection.createRange()}catch(c){}s&&s.item&&(o=s.item(0),i=a.createRange(),i.setStartBefore(o),i.setEndAfter(o))}return i||(i=a.createRange?a.createRange():a.body.createTextRange()),i.setStart&&9===i.startContainer.nodeType&&i.collapsed&&(o=n.dom.getRoot(),i.setStart(o,0),i.setEnd(o,0)),n.selectedRange&&n.explicitRange&&(0===t(i.START_TO_START,i,n.selectedRange)&&0===t(i.END_TO_END,i,n.selectedRange)?i=n.explicitRange:(n.selectedRange=null,n.explicitRange=null)),i},setRng:function(e,t){var n=this,r,i;if(e)if(e.select)try{e.select()}catch(o){}else if(n.tridentSel){if(e.cloneRange)try{return void n.tridentSel.addRange(e)}catch(o){}}else{if(r=n.getSel()){n.explicitRange=e;try{r.removeAllRanges(),r.addRange(e)}catch(o){}t===!1&&r.extend&&(r.collapse(e.endContainer,e.endOffset),r.extend(e.startContainer,e.startOffset)),n.selectedRange=r.rangeCount>0?r.getRangeAt(0):null}e.collapsed||e.startContainer!=e.endContainer||!r.setBaseAndExtent||a.ie||e.endOffset-e.startOffset<2&&e.startContainer.hasChildNodes()&&(i=e.startContainer.childNodes[e.startOffset],i&&"IMG"==i.tagName&&n.getSel().setBaseAndExtent(i,0,i,1))}},setNode:function(e){var t=this;return t.setContent(t.dom.getOuterHTML(e)),e},getNode:function(){function e(e,t){for(var n=e;e&&3===e.nodeType&&0===e.length;)e=t?e.nextSibling:e.previousSibling;return e||n}var t=this,n=t.getRng(),r,i=n.startContainer,o=n.endContainer,a=n.startOffset,s=n.endOffset,l=t.dom.getRoot();return n?n.setStart?(r=n.commonAncestorContainer,!n.collapsed&&(i==o&&2>s-a&&i.hasChildNodes()&&(r=i.childNodes[a]),3===i.nodeType&&3===o.nodeType&&(i=i.length===a?e(i.nextSibling,!0):i.parentNode,o=0===s?e(o.previousSibling,!1):o.parentNode,i&&i===o))?i:r&&3==r.nodeType?r.parentNode:r):(r=n.item?n.item(0):n.parentElement(),r.ownerDocument!==t.win.document&&(r=l),r):l},getSelectedBlocks:function(t,n){var r=this,i=r.dom,o,a,s=[];if(a=i.getRoot(),t=i.getParent(t||r.getStart(),i.isBlock),n=i.getParent(n||r.getEnd(),i.isBlock),t&&t!=a&&s.push(t),t&&n&&t!=n){o=t;for(var l=new e(t,a);(o=l.next())&&o!=n;)i.isBlock(o)&&s.push(o)}return n&&t!=n&&n!=a&&s.push(n),s},isForward:function(){var e=this.dom,t=this.getSel(),n,r;return t&&t.anchorNode&&t.focusNode?(n=e.createRng(),n.setStart(t.anchorNode,t.anchorOffset),n.collapse(!0),r=e.createRng(),r.setStart(t.focusNode,t.focusOffset),r.collapse(!0),n.compareBoundaryPoints(n.START_TO_START,r)<=0):!0},normalize:function(){var e=this,t=e.getRng();return a.range&&new i(e.dom).normalize(t)&&e.setRng(t,e.isForward()),t},selectorChanged:function(e,t){var n=this,r;return n.selectorChangedData||(n.selectorChangedData={},r={},n.editor.on("NodeChange",function(e){var t=e.element,i=n.dom,o=i.getParents(t,null,i.getRoot()),a={};c(n.selectorChangedData,function(e,t){c(o,function(n){return i.is(n,t)?(r[t]||(c(e,function(e){e(!0,{node:n,selector:t,parents:o})}),r[t]=e),a[t]=e,!1):void 0})}),c(r,function(e,n){a[n]||(delete r[n],c(e,function(e){e(!1,{node:t,selector:n,parents:o})}))})})),n.selectorChangedData[e]||(n.selectorChangedData[e]=[]),n.selectorChangedData[e].push(t),n},getScrollContainer:function(){for(var e,t=this.dom.getRoot();t&&"BODY"!=t.nodeName;){if(t.scrollHeight>t.clientHeight){e=t;break}t=t.parentNode}return e},scrollIntoView:function(e){function t(e){for(var t=0,n=0,r=e;r&&r.nodeType;)t+=r.offsetLeft||0,n+=r.offsetTop||0,r=r.offsetParent;return{x:t,y:n}}var n,r,i=this,o=i.dom,a=o.getRoot(),s,l;if("BODY"!=a.nodeName){var c=i.getScrollContainer();if(c)return n=t(e).y-t(c).y,l=c.clientHeight,s=c.scrollTop,void((s>n||n+25>s+l)&&(c.scrollTop=s>n?n:n-l+25))}r=o.getViewPort(i.editor.getWin()),n=o.getPos(e).y,s=r.y,l=r.h,(ns+l)&&i.editor.getWin().scrollTo(0,s>n?n:n-l+25)},placeCaretAt:function(e,t){var n=this.editor.getDoc(),r,i;if(n.caretPositionFromPoint)i=n.caretPositionFromPoint(e,t),r=n.createRange(),r.setStart(i.offsetNode,i.offset),r.collapse(!0);else if(n.caretRangeFromPoint)r=n.caretRangeFromPoint(e,t);else if(n.body.createTextRange){ -r=n.body.createTextRange();try{r.moveToPoint(e,t),r.collapse(!0)}catch(o){r.collapse(t=e;e++)a.addShortcut("access+"+e,"",["FormatBlock",!1,"h"+e]);a.addShortcut("access+7","",["FormatBlock",!1,"p"]),a.addShortcut("access+8","",["FormatBlock",!1,"div"]),a.addShortcut("access+9","",["FormatBlock",!1,"address"])}function p(e){return e?$[e]:$}function m(e,t){e&&("string"!=typeof e?le(e,function(e,t){m(t,e)}):(t=t.length?t:[t],le(t,function(e){e.deep===re&&(e.deep=!e.selector),e.split===re&&(e.split=!e.selector||e.inline),e.remove===re&&e.selector&&!e.inline&&(e.remove="none"),e.selector&&e.inline&&(e.mixed=!0,e.block_expand=!0),"string"==typeof e.classes&&(e.classes=e.classes.split(/\s+/))}),$[e]=t))}function g(e){return e&&$[e]&&delete $[e],$}function v(e){var t;return a.dom.getParent(e,function(e){return t=a.dom.getStyle(e,"text-decoration"),t&&"none"!==t}),t}function y(e){var t;1===e.nodeType&&e.parentNode&&1===e.parentNode.nodeType&&(t=v(e.parentNode),a.dom.getStyle(e,"color")&&t?a.dom.setStyle(e,"text-decoration",t):a.dom.getStyle(e,"text-decoration")===t&&a.dom.setStyle(e,"text-decoration",null))}function b(t,n,r){function i(e,t){if(t=t||u,e){if(t.onformat&&t.onformat(e,t,n,r),le(t.styles,function(t,r){q.setStyle(e,r,D(t,n))}),t.styles){var i=q.getAttrib(e,"style");i&&e.setAttribute("data-mce-style",i)}le(t.attributes,function(t,r){q.setAttrib(e,r,D(t,n))}),le(t.classes,function(t){t=D(t,n),q.hasClass(e,t)||q.addClass(e,t)})}}function o(){function t(t,n){var i=new e(n);for(r=i.current();r;r=i.prev())if(r.childNodes.length>1||r==t||"BR"==r.tagName)return r}var n=a.selection.getRng(),i=n.startContainer,o=n.endContainer;if(i!=o&&0===n.endOffset){var s=t(i,o),l=3==s.nodeType?s.length:s.childNodes.length;n.setEnd(s,l)}return n}function l(e,r,o){var a=[],l,f,h=!0;l=u.inline||u.block,f=q.create(l),i(f),K.walk(e,function(e){function r(e){var g,v,y,b,x;return x=h,g=e.nodeName.toLowerCase(),v=e.parentNode.nodeName.toLowerCase(),1===e.nodeType&&ie(e)&&(x=h,h="true"===ie(e),b=!0),R(g,"br")?(p=0,void(u.block&&q.remove(e))):u.wrapper&&w(e,t,n)?void(p=0):h&&!b&&u.block&&!u.wrapper&&s(g)&&Y(v,l)?(e=q.rename(e,l),i(e),a.push(e),void(p=0)):u.selector&&(le(c,function(t){"collapsed"in t&&t.collapsed!==m||q.is(e,t.selector)&&!d(e)&&(i(e,t),y=!0)}),!u.inline||y)?void(p=0):void(!h||b||!Y(l,g)||!Y(v,l)||!o&&3===e.nodeType&&1===e.nodeValue.length&&65279===e.nodeValue.charCodeAt(0)||d(e)||u.inline&&G(e)?(p=0,le(ce(e.childNodes),r),b&&(h=x),p=0):(p||(p=q.clone(f,ee),e.parentNode.insertBefore(p,e),a.push(p)),p.appendChild(e)))}var p;le(e,r)}),u.links===!0&&le(a,function(e){function t(e){"A"===e.nodeName&&i(e,u),le(ce(e.childNodes),t)}t(e)}),le(a,function(e){function r(e){var t=0;return le(e.childNodes,function(e){M(e)||se(e)||t++}),t}function o(e){var t,n;return le(e.childNodes,function(e){return 1!=e.nodeType||se(e)||d(e)?void 0:(t=e,ee)}),t&&!se(t)&&T(t,u)&&(n=q.clone(t,ee),i(n),q.replace(n,e,te),q.remove(t,1)),n||e}var s;if(s=r(e),(a.length>1||!G(e))&&0===s)return void q.remove(e,1);if(u.inline||u.wrapper){if(u.exact||1!==s||(e=o(e)),le(c,function(t){le(q.select(t.inline,e),function(e){se(e)||O(t,n,e,t.exact?e:null)})}),w(e.parentNode,t,n))return q.remove(e,1),e=0,te;u.merge_with_parents&&q.getParent(e.parentNode,function(r){return w(r,t,n)?(q.remove(e,1),e=0,te):void 0}),e&&u.merge_siblings!==!1&&(e=z(F(e),e),e=z(e,F(e,te)))}})}var c=p(t),u=c[0],f,h,m=!r&&j.isCollapsed();if(u)if(r)r.nodeType?(h=q.createRng(),h.setStartBefore(r),h.setEndAfter(r),l(H(h,c),null,!0)):l(r,null,!0);else if(m&&u.inline&&!q.select("td.mce-item-selected,th.mce-item-selected").length)V("apply",t,n);else{var g=a.selection.getNode();X||!c[0].defaultBlock||q.getParent(g,q.isBlock)||b(c[0].defaultBlock),a.selection.setRng(o()),f=j.getBookmark(),l(H(j.getRng(te),c),f),u.styles&&(u.styles.color||u.styles.textDecoration)&&(ue(g,y,"childNodes"),y(g)),j.moveToBookmark(f),U(j.getRng(te)),a.nodeChanged()}}function x(e,t,n,r){function i(e){var n,r,o,a,s;if(1===e.nodeType&&ie(e)&&(a=b,b="true"===ie(e),s=!0),n=ce(e.childNodes),b&&!s)for(r=0,o=h.length;o>r&&!O(h[r],t,e,e);r++);if(m.deep&&n.length){for(r=0,o=n.length;o>r;r++)i(n[r]);s&&(b=a)}}function o(n){var i;return le(u(n.parentNode).reverse(),function(n){var o;i||"_start"==n.id||"_end"==n.id||(o=w(n,e,t,r),o&&o.split!==!1&&(i=n))}),i}function s(e,n,r,i){var o,a,s,l,c,u;if(e){for(u=e.parentNode,o=n.parentNode;o&&o!=u;o=o.parentNode){for(a=q.clone(o,ee),c=0;c=0;o--){if(a=t[o].selector,!a||t[o].defaultBlock)return te;for(i=r.length-1;i>=0;i--)if(q.is(r[i],a))return te}return ee}function S(e,t,n){var r;return ne||(ne={},r={},a.on("NodeChange",function(e){var t=u(e.element),n={};t=i.grep(t,function(e){return 1==e.nodeType&&!e.getAttribute("data-mce-bogus")}),le(ne,function(e,i){le(t,function(o){return w(o,i,{},e.similar)?(r[i]||(le(e,function(e){e(!0,{node:o,format:i,parents:t})}),r[i]=e),n[i]=e,!1):void 0})}),le(r,function(i,o){n[o]||(delete r[o],le(i,function(n){n(!1,{node:e.element,format:o,parents:t})}))})})),le(e.split(","),function(e){ne[e]||(ne[e]=[],ne[e].similar=n),ne[e].push(t)}),this}function k(e){return o.getCssText(a,e)}function T(e,t){return R(e,t.inline)?te:R(e,t.block)?te:t.selector?1==e.nodeType&&q.is(e,t.selector):void 0}function R(e,t){return e=e||"",t=t||"",e=""+(e.nodeName||e),t=""+(t.nodeName||t),e.toLowerCase()==t.toLowerCase()}function A(e,t){return B(q.getStyle(e,t),t)}function B(e,t){return("color"==t||"backgroundColor"==t)&&(e=q.toHex(e)),"fontWeight"==t&&700==e&&(e="bold"),"fontFamily"==t&&(e=e.replace(/[\'\"]/g,"").replace(/,\s+/g,",")),""+e}function D(e,t){return"string"!=typeof e?e=e(t):t&&(e=e.replace(/%(\w+)/g,function(e,n){return t[n]||e})),e}function M(e){return e&&3===e.nodeType&&/^([\t \r\n]+|)$/.test(e.nodeValue)}function L(e,t,n){var r=q.create(t,n);return e.parentNode.insertBefore(r,e),r.appendChild(e),r}function H(t,n,r){function i(e){function t(e){return"BR"==e.nodeName&&e.getAttribute("data-mce-bogus")&&!e.nextSibling}var r,i,o,a,s;if(r=i=e?g:y,a=e?"previousSibling":"nextSibling",s=q.getRoot(),3==r.nodeType&&!M(r)&&(e?v>0:bo?n:o,-1===n||r||n++):(n=a.indexOf(" ",t),o=a.indexOf("\xa0",t),n=-1!==n&&(-1===o||o>n)?n:o),n}var s,l,c,u;if(3===t.nodeType){if(c=o(t,n),-1!==c)return{container:t,offset:c};u=t}for(s=new e(t,q.getParent(t,G)||a.getBody());l=s[i?"prev":"next"]();)if(3===l.nodeType){if(u=l,c=o(l),-1!==c)return{container:l,offset:c}}else if(G(l))break;return u?(n=i?0:u.length,{container:u,offset:n}):void 0}function d(e,r){var i,o,a,s;for(3==e.nodeType&&0===e.nodeValue.length&&e[r]&&(e=e[r]),i=u(e),o=0;oh?h:v],3==g.nodeType&&(v=0)),1==y.nodeType&&y.hasChildNodes()&&(h=y.childNodes.length-1,y=y.childNodes[b>h?h:b-1],3==y.nodeType&&(b=y.nodeValue.length)),g=l(g),y=l(y),(se(g.parentNode)||se(g))&&(g=se(g)?g:g.parentNode,g=g.nextSibling||g,3==g.nodeType&&(v=0)),(se(y.parentNode)||se(y))&&(y=se(y)?y:y.parentNode,y=y.previousSibling||y,3==y.nodeType&&(b=y.length)),n[0].inline&&(t.collapsed&&(m=c(g,v,!0),m&&(g=m.container,v=m.offset),m=c(y,b),m&&(y=m.container,b=m.offset)),p=o(y,b),p.node)){for(;p.node&&0===p.offset&&p.node.previousSibling;)p=o(p.node.previousSibling);p.node&&p.offset>0&&3===p.node.nodeType&&" "===p.node.nodeValue.charAt(p.offset-1)&&p.offset>1&&(y=p.node,y.splitText(p.offset-1))}return(n[0].inline||n[0].block_expand)&&(n[0].inline&&3==g.nodeType&&0!==v||(g=i(!0)),n[0].inline&&3==y.nodeType&&b!==y.nodeValue.length||(y=i())),n[0].selector&&n[0].expand!==ee&&!n[0].inline&&(g=d(g,"previousSibling"),y=d(y,"nextSibling")),(n[0].block||n[0].selector)&&(g=f(g,"previousSibling"),y=f(y,"nextSibling"),n[0].block&&(G(g)||(g=i(!0)),G(y)||(y=i()))),1==g.nodeType&&(v=J(g),g=g.parentNode),1==y.nodeType&&(b=J(y)+1,y=y.parentNode),{startContainer:g,startOffset:v,endContainer:y,endOffset:b}}function P(e,t){return t.links&&"A"==e.tagName}function O(e,t,n,r){var i,o,a;if(!T(n,e)&&!P(n,e))return ee;if("all"!=e.remove)for(le(e.styles,function(i,o){i=B(D(i,t),o),"number"==typeof o&&(o=i,r=0),(e.remove_similar||!r||R(A(r,o),i))&&q.setStyle(n,o,""),a=1}),a&&""===q.getAttrib(n,"style")&&(n.removeAttribute("style"),n.removeAttribute("data-mce-style")),le(e.attributes,function(e,i){var o;if(e=D(e,t),"number"==typeof i&&(i=e,r=0),!r||R(q.getAttrib(r,i),e)){if("class"==i&&(e=q.getAttrib(n,i),e&&(o="",le(e.split(/\s+/),function(e){/mce\-\w+/.test(e)&&(o+=(o?" ":"")+e)}),o)))return void q.setAttrib(n,i,o);"class"==i&&n.removeAttribute("className"),Z.test(i)&&n.removeAttribute("data-mce-"+i),n.removeAttribute(i)}}),le(e.classes,function(e){e=D(e,t),(!r||q.hasClass(r,e))&&q.removeClass(n,e)}),o=q.getAttribs(n),i=0;io?o:i]),3===r.nodeType&&n&&i>=r.nodeValue.length&&(r=new e(r,a.getBody()).next()||r),3!==r.nodeType||n||0!==i||(r=new e(r,a.getBody()).prev()||r),r}function V(t,n,r,i){function o(e){var t=q.create("span",{id:g,"data-mce-bogus":!0,style:v?"color:red":""});return e&&t.appendChild(a.getDoc().createTextNode(Q)),t}function l(e,t){for(;e;){if(3===e.nodeType&&e.nodeValue!==Q||e.childNodes.length>1)return!1;t&&1===e.nodeType&&t.push(e),e=e.firstChild}return!0}function c(e){for(;e;){if(e.id===g)return e;e=e.parentNode}}function u(t){var n;if(t)for(n=new e(t,t),t=n.current();t;t=n.next())if(3===t.nodeType)return t}function d(e,t){var n,r;if(e)r=j.getRng(!0),l(e)?(t!==!1&&(r.setStartBefore(e),r.setEndBefore(e)),q.remove(e)):(n=u(e),n.nodeValue.charAt(0)===Q&&(n.deleteData(0,1),r.startContainer==n&&r.startOffset>0&&r.setStart(n,r.startOffset-1),r.endContainer==n&&r.endOffset>0&&r.setEnd(n,r.endOffset-1)),q.remove(e,1)),j.setRng(r);else if(e=c(j.getStart()),!e)for(;e=q.get(g);)d(e,!1)}function f(){var e,t,i,a,s,l,d;e=j.getRng(!0),a=e.startOffset,l=e.startContainer,d=l.nodeValue,t=c(j.getStart()),t&&(i=u(t)),d&&a>0&&a=0;h--)u.appendChild(q.clone(f[h],!1)),u=u.firstChild;u.appendChild(q.doc.createTextNode(Q)),u=u.firstChild;var g=q.getParent(d,s);g&&q.isEmpty(g)?d.parentNode.replaceChild(m,d):q.insertAfter(m,d),j.setCursorLocation(u,1),q.isEmpty(d)&&q.remove(d)}}function m(){var e;e=c(j.getStart()),e&&!q.isEmpty(e)&&ue(e,function(e){1!=e.nodeType||e.id===g||q.isEmpty(e)||q.setAttrib(e,"data-mce-bogus",null)},"childNodes")}var g="_mce_caret",v=a.settings.caret_debug;a._hasCaretEvents||(ae=function(){var e=[],t;if(l(c(j.getStart()),e))for(t=e.length;t--;)q.setAttrib(e[t],"data-mce-bogus","1")},oe=function(e){var t=e.keyCode;d(),(8==t&&j.isCollapsed()||37==t||39==t)&&d(c(j.getStart())),m()},a.on("SetContent",function(e){e.selection&&m()}),a._hasCaretEvents=!0),"apply"==t?f():h()}function U(t){var n=t.startContainer,r=t.startOffset,i,o,a,s,l;if((t.startContainer!=t.endContainer||!c(t.startContainer.childNodes[t.startOffset]))&&(3==n.nodeType&&r>=n.nodeValue.length&&(r=J(n),n=n.parentNode,i=!0),1==n.nodeType))for(s=n.childNodes,n=s[Math.min(r,s.length-1)],o=new e(n,q.getParent(n,q.isBlock)),(r>s.length-1||i)&&o.next(),a=o.current();a;a=o.next())if(3==a.nodeType&&!M(a))return l=q.create("a",{"data-mce-bogus":"all"},Q),a.parentNode.insertBefore(l,a),t.setStart(a,0),j.setRng(t),void q.remove(l)}var $={},q=a.dom,j=a.selection,K=new t(q),Y=a.schema.isValidChild,G=q.isBlock,X=a.settings.forced_root_block,J=q.nodeIndex,Q="\ufeff",Z=/^(src|href|style)$/,ee=!1,te=!0,ne,re,ie=q.getContentEditable,oe,ae,se=n.isBookmarkNode,le=i.each,ce=i.grep,ue=i.walk,de=i.extend;de(this,{get:p,register:m,unregister:g,apply:b,remove:x,toggle:C,match:_,matchAll:E,matchNode:w,canApply:N,formatChanged:S,getCssText:k}),f(),h(),a.on("BeforeGetContent",function(e){ae&&"raw"!=e.format&&ae()}),a.on("mouseup keydown",function(e){oe&&oe(e)})}}),r(F,[D,u,f,S],function(e,t,n,r){var i=n.trim,o;return o=new RegExp(["]+data-mce-bogus[^>]+>[\u200b\ufeff]+<\\/span>",'\\s?data-mce-selected="[^"]+"'].join("|"),"gi"),function(e){function n(){var t=e.getContent({format:"raw",no_events:1}),n=/<(\w+) [^>]*data-mce-bogus="all"[^>]*>/g,a,s,l,c,u,d=e.schema;for(t=t.replace(o,""),u=d.getShortEndedElements();c=n.exec(t);)s=n.lastIndex,l=c[0].length,a=u[c[1]]?s:r.findEndTag(d,t,s),t=t.substring(0,s-l)+t.substring(a),n.lastIndex=s-l;return i(t)}function a(t){e.isNotDirty=!t}function s(e){l.typing=!1,l.add({},e)}var l=this,c=0,u=[],d,f,h=0;return e.on("init",function(){l.add()}),e.on("BeforeExecCommand",function(e){var t=e.command;"Undo"!=t&&"Redo"!=t&&"mceRepaint"!=t&&l.beforeChange()}),e.on("ExecCommand",function(e){var t=e.command;"Undo"!=t&&"Redo"!=t&&"mceRepaint"!=t&&s(e)}),e.on("ObjectResizeStart Cut",function(){l.beforeChange()}),e.on("SaveContent ObjectResized blur",s),e.on("DragEnd",s),e.on("KeyUp",function(r){var i=r.keyCode;r.isDefaultPrevented()||((i>=33&&36>=i||i>=37&&40>=i||45==i||13==i||r.ctrlKey)&&(s(),e.nodeChanged()),(46==i||8==i||t.mac&&(91==i||93==i))&&e.nodeChanged(),f&&l.typing&&(e.isDirty()||(a(u[0]&&n()!=u[0].content),e.isNotDirty||e.fire("change",{level:u[0],lastLevel:null})),e.fire("TypingUndo"),f=!1,e.nodeChanged()))}),e.on("KeyDown",function(e){var t=e.keyCode;if(!e.isDefaultPrevented()){if(t>=33&&36>=t||t>=37&&40>=t||45==t)return void(l.typing&&s(e));var n=e.ctrlKey&&!e.altKey||e.metaKey;!(16>t||t>20)||224==t||91==t||l.typing||n||(l.beforeChange(),l.typing=!0,l.add({},e),f=!0)}}),e.on("MouseDown",function(e){l.typing&&s(e)}),e.addShortcut("meta+z","","Undo"),e.addShortcut("meta+y,meta+shift+z","","Redo"),e.on("AddUndo Undo Redo ClearUndos",function(t){t.isDefaultPrevented()||e.nodeChanged()}),l={data:u,typing:!1,beforeChange:function(){h||(d=e.selection.getBookmark(2,!0))},add:function(t,r){var i,o=e.settings,s;if(t=t||{},t.content=n(),h||e.removed)return null;if(s=u[c],e.fire("BeforeAddUndo",{level:t,lastLevel:s,originalEvent:r}).isDefaultPrevented())return null;if(s&&s.content==t.content)return null;if(u[c]&&(u[c].beforeBookmark=d),o.custom_undo_redo_levels&&u.length>o.custom_undo_redo_levels){for(i=0;i0&&(a(!0),e.fire("change",l)),t},undo:function(){var t;return l.typing&&(l.add(),l.typing=!1),c>0&&(t=u[--c],0===c&&a(!1),e.setContent(t.content,{format:"raw"}),e.selection.moveToBookmark(t.beforeBookmark),e.fire("undo",{level:t})),t},redo:function(){var t;return c0||l.typing&&u[0]&&n()!=u[0].content},hasRedo:function(){return cL)&&(u=a.create("br"),t.parentNode.insertBefore(u,t)),l.setStartBefore(t),l.setEndBefore(t)):(l.setStartAfter(t),l.setEndAfter(t)):(l.setStart(t,0),l.setEnd(t,0));s.setRng(l),a.remove(u),s.scrollIntoView(t)}}function v(e){var t=l.forced_root_block;t&&t.toLowerCase()===e.tagName.toLowerCase()&&a.setAttribs(e,l.forced_root_block_attrs)}function y(e){e.innerHTML=r?"":'
    '}function b(e){var t=B,n,i,o,s=u.getTextInlineElements();if(e||"TABLE"==F?(n=a.create(e||W),v(n)):n=M.cloneNode(!1),o=n,l.keep_styles!==!1)do if(s[t.nodeName]){if("_mce_caret"==t.id)continue;i=t.cloneNode(!1),a.setAttrib(i,"id",""),n.hasChildNodes()?(i.appendChild(n.firstChild),n.appendChild(i)):(o=i,n.appendChild(i))}while(t=t.parentNode);return r||(o.innerHTML='
    '),n}function x(t){var n,r,i;if(3==B.nodeType&&(t?D>0:DB.childNodes.length-1,B=B.childNodes[Math.min(D,B.childNodes.length-1)]||B,D=V&&3==B.nodeType?B.nodeValue.length:0),A=N(B)){if(c.beforeChange(),!a.isBlock(A)&&A!=a.getRoot())return void((!W||H)&&_());if((W&&!H||!W&&H)&&(B=C(B,D)),M=a.getParent(B,a.isBlock),I=M?a.getParent(M.parentNode,a.isBlock):null,F=M?M.nodeName.toUpperCase():"",z=I?I.nodeName.toUpperCase():"","LI"!=z||o.ctrlKey||(M=I,F=z),/^(LI|DT|DD)$/.test(F)){if(!W&&H)return void _();if(a.isEmpty(M))return void w()}if("PRE"==F&&l.br_in_pre!==!1){if(!H)return void _()}else if(!W&&!H&&"LI"!=F||W&&H)return void _();W&&M===i.getBody()||(W=W||"P",x()?k():x(!0)?(P=M.parentNode.insertBefore(b(),M),p(P),g(M)):(R=T.cloneRange(),R.setEndAfter(M),O=R.extractContents(),E(O),P=O.firstChild,a.insertAfter(O,M),m(P),S(M),a.isEmpty(M)&&y(M),a.isEmpty(P)?(a.remove(P),k()):g(P)),a.setAttrib(P,"id",""),i.fire("NewBlock",{newBlock:P}),c.add())}}}var a=i.dom,s=i.selection,l=i.settings,c=i.undoManager,u=i.schema,d=u.getNonEmptyElements(),f=u.getMoveCaretBeforeOnEnterElements(); -i.on("keydown",function(e){13==e.keyCode&&o(e)!==!1&&e.preventDefault()})}}),r(W,[],function(){return function(e){function t(){var t=i.getStart(),s=e.getBody(),l,c,u,d,f,h,p,m=-16777215,g,v,y,b,x;if(x=n.forced_root_block,t&&1===t.nodeType&&x){for(;t&&t!=s;){if(a[t.nodeName])return;t=t.parentNode}if(l=i.getRng(),l.setStart){c=l.startContainer,u=l.startOffset,d=l.endContainer,f=l.endOffset;try{v=e.getDoc().activeElement===s}catch(C){}}else l.item&&(t=l.item(0),l=e.getDoc().body.createTextRange(),l.moveToElementText(t)),v=l.parentElement().ownerDocument===e.getDoc(),y=l.duplicate(),y.collapse(!0),u=-1*y.move("character",m),y.collapsed||(y=l.duplicate(),y.collapse(!1),f=-1*y.move("character",m)-u);for(t=s.firstChild,b=s.nodeName.toLowerCase();t;)if((3===t.nodeType||1==t.nodeType&&!a[t.nodeName])&&o.isValidChild(b,x.toLowerCase())){if(3===t.nodeType&&0===t.nodeValue.length){p=t,t=t.nextSibling,r.remove(p);continue}h||(h=r.create(x,e.settings.forced_root_block_attrs),t.parentNode.insertBefore(h,t),g=!0),p=t,t=t.nextSibling,h.appendChild(p)}else h=null,t=t.nextSibling;if(g&&v){if(l.setStart)l.setStart(c,u),l.setEnd(d,f),i.setRng(l);else try{l=e.getDoc().body.createTextRange(),l.moveToElementText(s),l.collapse(!0),l.moveStart("character",u),f>0&&l.moveEnd("character",f),l.select()}catch(C){}e.nodeChanged()}}}var n=e.settings,r=e.dom,i=e.selection,o=e.schema,a=o.getBlockElements();n.forced_root_block&&e.on("NodeChange",t)}}),r(V,[R,u,f,P,w,m],function(e,n,r,i,o,a){var s=r.each,l=r.extend,c=r.map,u=r.inArray,d=r.explode,f=n.gecko,h=n.ie,p=n.ie&&n.ie<11,m=!0,g=!1;return function(r){function v(e,t,n,i){var o,a,c=0;if(/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint)$/.test(e)||i&&i.skip_focus||r.focus(),i=l({},i),i=r.fire("BeforeExecCommand",{command:e,ui:t,value:n}),i.isDefaultPrevented())return!1;if(a=e.toLowerCase(),o=L.exec[a])return o(a,t,n),r.fire("ExecCommand",{command:e,ui:t,value:n}),!0;if(s(r.plugins,function(i){return i.execCommand&&i.execCommand(e,t,n)?(r.fire("ExecCommand",{command:e,ui:t,value:n}),c=!0,!1):void 0}),c)return c;if(r.theme&&r.theme.execCommand&&r.theme.execCommand(e,t,n))return r.fire("ExecCommand",{command:e,ui:t,value:n}),!0;try{c=r.getDoc().execCommand(e,t,n)}catch(u){}return c?(r.fire("ExecCommand",{command:e,ui:t,value:n}),!0):!1}function y(e){var t;if(!r._isHidden()){if(e=e.toLowerCase(),t=L.state[e])return t(e);try{return r.getDoc().queryCommandState(e)}catch(n){}return!1}}function b(e){var t;if(!r._isHidden()){if(e=e.toLowerCase(),t=L.value[e])return t(e);try{return r.getDoc().queryCommandValue(e)}catch(n){}}}function x(e,t){t=t||"exec",s(e,function(e,n){s(n.toLowerCase().split(","),function(n){L[t][n]=e})})}function C(e,t,n){e=e.toLowerCase(),L.exec[e]=function(e,i,o,a){return t.call(n||r,i,o,a)}}function w(e){if(e=e.toLowerCase(),L.exec[e])return!0;try{return r.getDoc().queryCommandSupported(e)}catch(t){}return!1}function _(e,t,n){e=e.toLowerCase(),L.state[e]=function(){return t.call(n||r)}}function E(e,t,n){e=e.toLowerCase(),L.value[e]=function(){return t.call(n||r)}}function N(e){return e=e.toLowerCase(),!!L.exec[e]}function S(e,n,i){return n===t&&(n=g),i===t&&(i=null),r.getDoc().execCommand(e,n,i)}function k(e){return M.match(e)}function T(e,n){M.toggle(e,n?{value:n}:t),r.nodeChanged()}function R(e){P=D.getBookmark(e)}function A(){D.moveToBookmark(P)}var B,D,M,L={state:{},exec:{},value:{}},H=r.settings,P;r.on("PreInit",function(){B=r.dom,D=r.selection,H=r.settings,M=r.formatter}),l(this,{execCommand:v,queryCommandState:y,queryCommandValue:b,queryCommandSupported:w,addCommands:x,addCommand:C,addQueryStateHandler:_,addQueryValueHandler:E,hasCustomCommand:N}),x({"mceResetDesignMode,mceBeginUndoLevel":function(){},"mceEndUndoLevel,mceAddUndoLevel":function(){r.undoManager.add()},"Cut,Copy,Paste":function(e){var t=r.getDoc(),i;try{S(e)}catch(o){i=m}if(i||!t.queryCommandSupported(e)){var a=r.translate("Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead.");n.mac&&(a=a.replace(/Ctrl\+/g,"\u2318+")),r.windowManager.alert(a)}},unlink:function(){if(D.isCollapsed()){var e=D.getNode();return void("A"==e.tagName&&r.dom.remove(e,!0))}M.remove("link")},"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull,JustifyNone":function(e){var t=e.substring(7);"full"==t&&(t="justify"),s("left,center,right,justify".split(","),function(e){t!=e&&M.remove("align"+e)}),"none"!=t&&(T("align"+t),v("mceRepaint"))},"InsertUnorderedList,InsertOrderedList":function(e){var t,n;S(e),t=B.getParent(D.getNode(),"ol,ul"),t&&(n=t.parentNode,/^(H[1-6]|P|ADDRESS|PRE)$/.test(n.nodeName)&&(R(),B.split(n,t),A()))},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(e){T(e)},"ForeColor,HiliteColor,FontName":function(e,t,n){T(e,n)},FontSize:function(e,t,n){var r,i;n>=1&&7>=n&&(i=d(H.font_size_style_values),r=d(H.font_size_classes),n=r?r[n-1]||n:i[n-1]||n),T(e,n)},RemoveFormat:function(e){M.remove(e)},mceBlockQuote:function(){T("blockquote")},FormatBlock:function(e,t,n){return T(n||"p")},mceCleanup:function(){var e=D.getBookmark();r.setContent(r.getContent({cleanup:m}),{cleanup:m}),D.moveToBookmark(e)},mceRemoveNode:function(e,t,n){var i=n||D.getNode();i!=r.getBody()&&(R(),r.dom.remove(i,m),A())},mceSelectNodeDepth:function(e,t,n){var i=0;B.getParent(D.getNode(),function(e){return 1==e.nodeType&&i++==n?(D.select(e),g):void 0},r.getBody())},mceSelectNode:function(e,t,n){D.select(n)},mceInsertContent:function(t,n,o){function a(e){function t(e){return r[e]&&3==r[e].nodeType}var n,r,i;return n=D.getRng(!0),r=n.startContainer,i=n.startOffset,3==r.nodeType&&(i>0?e=e.replace(/^ /," "):t("previousSibling")||(e=e.replace(/^ /," ")),i|)$/," "):t("nextSibling")||(e=e.replace(/( | )(
    |)$/," "))),e}function l(){var e,t,n;e=D.getRng(!0),t=e.startContainer,n=e.startOffset,3==t.nodeType&&e.collapsed&&("\xa0"===t.data[n]?(t.deleteData(n,1),/[\u00a0| ]$/.test(o)||(o+=" ")):"\xa0"===t.data[n-1]&&(t.deleteData(n-1,1),/[\u00a0| ]$/.test(o)||(o=" "+o)))}function c(e){if(_)for(x=e.firstChild;x;x=x.walk(!0))N[x.name]&&x.attr("data-mce-new","true")}function u(){if(_){var e=r.getBody(),t=new i(B);s(B.select("*[data-mce-new]"),function(n){n.removeAttribute("data-mce-new");for(var r=n.parentNode;r&&r!=e;r=r.parentNode)t.compare(r,n)&&B.remove(n,!0)})}}var d,f,p,m,g,v,y,b,x,C,w,_,E,N=r.schema.getTextInlineElements();"string"!=typeof o&&(_=o.merge,E=o.data,o=o.content),/^ | $/.test(o)&&(o=a(o)),d=r.parser,f=new e({},r.schema),w='​',v={content:o,format:"html",selection:!0},r.fire("BeforeSetContent",v),o=v.content,-1==o.indexOf("{$caret}")&&(o+="{$caret}"),o=o.replace(/\{\$caret\}/,w),b=D.getRng();var S=b.startContainer||(b.parentElement?b.parentElement():null),k=r.getBody();S===k&&D.isCollapsed()&&B.isBlock(k.firstChild)&&B.isEmpty(k.firstChild)&&(b=B.createRng(),b.setStart(k.firstChild,0),b.setEnd(k.firstChild,0),D.setRng(b)),D.isCollapsed()||(r.getDoc().execCommand("Delete",!1,null),l()),p=D.getNode();var T={context:p.nodeName.toLowerCase(),data:E};if(g=d.parse(o,T),c(g),x=g.lastChild,"mce_marker"==x.attr("id"))for(y=x,x=x.prev;x;x=x.walk(!0))if(3==x.type||!B.isBlock(x.name)){r.schema.isValidChild(x.parent.name,"span")&&x.parent.insert(y,x,"br"===x.name);break}if(T.invalid){for(D.setContent(w),p=D.getNode(),m=r.getBody(),9==p.nodeType?p=x=m:x=p;x!==m;)p=x,x=x.parentNode;o=p==m?m.innerHTML:B.getOuterHTML(p),o=f.serialize(d.parse(o.replace(//i,function(){return f.serialize(g)}))),p==m?B.setHTML(m,o):B.setOuterHTML(p,o)}else o=f.serialize(g),x=p.firstChild,C=p.lastChild,!x||x===C&&"BR"===x.nodeName?B.setHTML(p,o):D.setContent(o);u(),y=B.get("mce_marker"),D.scrollIntoView(y),b=B.createRng(),x=y.previousSibling,x&&3==x.nodeType?(b.setStart(x,x.nodeValue.length),h||(C=y.nextSibling,C&&3==C.nodeType&&(x.appendData(C.data),C.parentNode.removeChild(C)))):(b.setStartBefore(y),b.setEndBefore(y)),B.remove(y),D.setRng(b),r.fire("SetContent",v),r.addVisual()},mceInsertRawHTML:function(e,t,n){D.setContent("tiny_mce_marker"),r.setContent(r.getContent().replace(/tiny_mce_marker/g,function(){return n}))},mceToggleFormat:function(e,t,n){T(n)},mceSetContent:function(e,t,n){r.setContent(n)},"Indent,Outdent":function(e){var t,n,i;t=H.indentation,n=/[a-z%]+$/i.exec(t),t=parseInt(t,10),y("InsertUnorderedList")||y("InsertOrderedList")?S(e):(H.forced_root_block||B.getParent(D.getNode(),B.isBlock)||M.apply("div"),s(D.getSelectedBlocks(),function(o){if("LI"!=o.nodeName){var a=r.getParam("indent_use_margin",!1)?"margin":"padding";a+="rtl"==B.getStyle(o,"direction",!0)?"Right":"Left","outdent"==e?(i=Math.max(0,parseInt(o.style[a]||0,10)-t),B.setStyle(o,a,i?i+n:"")):(i=parseInt(o.style[a]||0,10)+t+n,B.setStyle(o,a,i))}}))},mceRepaint:function(){if(f)try{R(m),D.getSel()&&D.getSel().selectAllChildren(r.getBody()),D.collapse(m),A()}catch(e){}},InsertHorizontalRule:function(){r.execCommand("mceInsertContent",!1,"
    ")},mceToggleVisualAid:function(){r.hasVisual=!r.hasVisual,r.addVisual()},mceReplaceContent:function(e,t,n){r.execCommand("mceInsertContent",!1,n.replace(/\{\$selection\}/g,D.getContent({format:"text"})))},mceInsertLink:function(e,t,n){var r;"string"==typeof n&&(n={href:n}),r=B.getParent(D.getNode(),"a"),n.href=n.href.replace(" ","%20"),r&&n.href||M.remove("link"),n.href&&M.apply("link",n,r)},selectAll:function(){var e=B.getRoot(),t;D.getRng().setStart?(t=B.createRng(),t.setStart(e,0),t.setEnd(e,e.childNodes.length),D.setRng(t)):(t=D.getRng(),t.item||(t.moveToElementText(e),t.select()))},"delete":function(){S("Delete");var e=r.getBody();B.isEmpty(e)&&(r.setContent(""),e.firstChild&&B.isBlock(e.firstChild)?r.selection.setCursorLocation(e.firstChild,0):r.selection.setCursorLocation(e,0))},mceNewDocument:function(){r.setContent("")},InsertLineBreak:function(e,t,n){function i(){for(var e=new a(h,v),t,n=r.schema.getNonEmptyElements();t=e.next();)if(n[t.nodeName.toLowerCase()]||t.length>0)return!0}var s=n,l,c,u,d=D.getRng(!0);new o(B).normalize(d);var f=d.startOffset,h=d.startContainer;if(1==h.nodeType&&h.hasChildNodes()){var g=f>h.childNodes.length-1;h=h.childNodes[Math.min(f,h.childNodes.length-1)]||h,f=g&&3==h.nodeType?h.nodeValue.length:0}var v=B.getParent(h,B.isBlock),y=v?v.nodeName.toUpperCase():"",b=v?B.getParent(v.parentNode,B.isBlock):null,x=b?b.nodeName.toUpperCase():"",C=s&&s.ctrlKey;"LI"!=x||C||(v=b,y=x),h&&3==h.nodeType&&f>=h.nodeValue.length&&(p||i()||(l=B.create("br"),d.insertNode(l),d.setStartAfter(l),d.setEndAfter(l),c=!0)),l=B.create("br"),d.insertNode(l);var w=B.doc.documentMode;return p&&"PRE"==y&&(!w||8>w)&&l.parentNode.insertBefore(B.doc.createTextNode("\r"),l),u=B.create("span",{}," "),l.parentNode.insertBefore(u,l),D.scrollIntoView(u),B.remove(u),c?(d.setStartBefore(l),d.setEndBefore(l)):(d.setStartAfter(l),d.setEndAfter(l)),D.setRng(d),r.undoManager.add(),m}}),x({"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(e){var t="align"+e.substring(7),n=D.isCollapsed()?[B.getParent(D.getNode(),B.isBlock)]:D.getSelectedBlocks(),r=c(n,function(e){return!!M.matchNode(e,t)});return-1!==u(r,m)},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(e){return k(e)},mceBlockQuote:function(){return k("blockquote")},Outdent:function(){var e;if(H.inline_styles){if((e=B.getParent(D.getStart(),B.isBlock))&&parseInt(e.style.paddingLeft,10)>0)return m;if((e=B.getParent(D.getEnd(),B.isBlock))&&parseInt(e.style.paddingLeft,10)>0)return m}return y("InsertUnorderedList")||y("InsertOrderedList")||!H.inline_styles&&!!B.getParent(D.getNode(),"BLOCKQUOTE")},"InsertUnorderedList,InsertOrderedList":function(e){var t=B.getParent(D.getNode(),"ul,ol");return t&&("insertunorderedlist"===e&&"UL"===t.tagName||"insertorderedlist"===e&&"OL"===t.tagName)}},"state"),x({"FontSize,FontName":function(e){var t=0,n;return(n=B.getParent(D.getNode(),"span"))&&(t="fontsize"==e?n.style.fontSize:n.style.fontFamily.replace(/, /g,",").replace(/[\'\"]/g,"").toLowerCase()),t}},"value"),x({Undo:function(){r.undoManager.undo()},Redo:function(){r.undoManager.redo()}})}}),r(U,[f],function(e){function t(e,o){var a=this,s,l;if(e=r(e),o=a.settings=o||{},s=o.base_uri,/^([\w\-]+):([^\/]{2})/i.test(e)||/^\s*#/.test(e))return void(a.source=e);var c=0===e.indexOf("//");0!==e.indexOf("/")||c||(e=(s?s.protocol||"http":"http")+"://mce_host"+e),/^[\w\-]*:?\/\//.test(e)||(l=o.base_uri?o.base_uri.path:new t(location.href).directory,""===o.base_uri.protocol?e="//mce_host"+a.toAbsPath(l,e):(e=/([^#?]*)([#?]?.*)/.exec(e),e=(s&&s.protocol||"http")+"://mce_host"+a.toAbsPath(l,e[1])+e[2])),e=e.replace(/@@/g,"(mce_at)"),e=/^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@\/]*):?([^:@\/]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(e),n(i,function(t,n){var r=e[n];r&&(r=r.replace(/\(mce_at\)/g,"@@")),a[t]=r}),s&&(a.protocol||(a.protocol=s.protocol),a.userInfo||(a.userInfo=s.userInfo),a.port||"mce_host"!==a.host||(a.port=s.port),a.host&&"mce_host"!==a.host||(a.host=s.host),a.source=""),c&&(a.protocol="")}var n=e.each,r=e.trim,i="source protocol authority userInfo user password host port relative path directory file query anchor".split(" "),o={ftp:21,http:80,https:443,mailto:25};return t.prototype={setPath:function(e){var t=this;e=/^(.*?)\/?(\w+)?$/.exec(e),t.path=e[0],t.directory=e[1],t.file=e[2],t.source="",t.getURI()},toRelative:function(e){var n=this,r;if("./"===e)return e;if(e=new t(e,{base_uri:n}),"mce_host"!=e.host&&n.host!=e.host&&e.host||n.port!=e.port||n.protocol!=e.protocol&&""!==e.protocol)return e.getURI();var i=n.getURI(),o=e.getURI();return i==o||"/"==i.charAt(i.length-1)&&i.substr(0,i.length-1)==o?i:(r=n.toRelPath(n.path,e.path),e.query&&(r+="?"+e.query),e.anchor&&(r+="#"+e.anchor),r)},toAbsolute:function(e,n){return e=new t(e,{base_uri:this}),e.getURI(n&&this.isSameOrigin(e))},isSameOrigin:function(e){if(this.host==e.host&&this.protocol==e.protocol){if(this.port==e.port)return!0;var t=o[this.protocol];if(t&&(this.port||t)==(e.port||t))return!0}return!1},toRelPath:function(e,t){var n,r=0,i="",o,a;if(e=e.substring(0,e.lastIndexOf("/")),e=e.split("/"),n=t.split("/"),e.length>=n.length)for(o=0,a=e.length;a>o;o++)if(o>=n.length||e[o]!=n[o]){r=o+1;break}if(e.lengtho;o++)if(o>=e.length||e[o]!=n[o]){r=o+1;break}if(1===r)return t;for(o=0,a=e.length-(r-1);a>o;o++)i+="../";for(o=r-1,a=n.length;a>o;o++)i+=o!=r-1?"/"+n[o]:n[o];return i},toAbsPath:function(e,t){var r,i=0,o=[],a,s;for(a=/\/$/.test(t)?"/":"",e=e.split("/"),t=t.split("/"),n(e,function(e){e&&o.push(e)}),e=o,r=t.length-1,o=[];r>=0;r--)0!==t[r].length&&"."!==t[r]&&(".."!==t[r]?i>0?i--:o.push(t[r]):i++);return r=e.length-i,s=0>=r?o.reverse().join("/"):e.slice(0,r).join("/")+"/"+o.reverse().join("/"),0!==s.indexOf("/")&&(s="/"+s),a&&s.lastIndexOf("/")!==s.length-1&&(s+=a),s},getURI:function(e){var t,n=this;return(!n.source||e)&&(t="",e||(t+=n.protocol?n.protocol+"://":"//",n.userInfo&&(t+=n.userInfo+"@"),n.host&&(t+=n.host),n.port&&(t+=":"+n.port)),n.path&&(t+=n.path),n.query&&(t+="?"+n.query),n.anchor&&(t+="#"+n.anchor),n.source=t),n.source}},t.parseDataUri=function(e){var t,n;return e=decodeURIComponent(e).split(","),n=/data:([^;]+)/.exec(e[0]),n&&(t=n[1]),{type:t,data:e[1]}},t}),r($,[f],function(e){function t(){}var n=e.each,r=e.extend,i,o;return t.extend=i=function(e){function t(){var e,t,n,r=this;if(!o&&(r.init&&r.init.apply(r,arguments),t=r.Mixins))for(e=t.length;e--;)n=t[e],n.init&&n.init.apply(r,arguments)}function a(){return this}function s(e,t){return function(){var n=this,r=n._super,i;return n._super=c[e],i=t.apply(n,arguments),n._super=r,i}}var l=this,c=l.prototype,u,d,f;o=!0,u=new l,o=!1,e.Mixins&&(n(e.Mixins,function(t){t=t;for(var n in t)"init"!==n&&(e[n]=t[n])}),c.Mixins&&(e.Mixins=c.Mixins.concat(e.Mixins))),e.Methods&&n(e.Methods.split(","),function(t){e[t]=a}),e.Properties&&n(e.Properties.split(","),function(t){var n="_"+t;e[t]=function(e){var t=this,r;return e!==r?(t[n]=e,t):t[n]}}),e.Statics&&n(e.Statics,function(e,n){t[n]=e}),e.Defaults&&c.Defaults&&(e.Defaults=r({},c.Defaults,e.Defaults));for(d in e)f=e[d],"function"==typeof f&&c[d]?u[d]=s(d,f):u[d]=f;return t.prototype=u,t.constructor=t,t.extend=i,t},t}),r(q,[f],function(e){function t(t){function n(){return!1}function r(){return!0}function i(e,i){var o,s,l,c;if(e=e.toLowerCase(),i=i||{},i.type=e,i.target||(i.target=u),i.preventDefault||(i.preventDefault=function(){i.isDefaultPrevented=r},i.stopPropagation=function(){i.isPropagationStopped=r},i.stopImmediatePropagation=function(){i.isImmediatePropagationStopped=r},i.isDefaultPrevented=n,i.isPropagationStopped=n,i.isImmediatePropagationStopped=n),t.beforeFire&&t.beforeFire(i),o=d[e])for(s=0,l=o.length;l>s;s++){if(c=o[s],c.once&&a(e,c.func),i.isImmediatePropagationStopped())return i.stopPropagation(),i;if(c.func.call(u,i)===!1)return i.preventDefault(),i}return i}function o(t,r,i,o){var a,s,l;if(r===!1&&(r=n),r)for(r={func:r},o&&e.extend(r,o),s=t.toLowerCase().split(" "),l=s.length;l--;)t=s[l],a=d[t],a||(a=d[t]=[],f(t,!0)),i?a.unshift(r):a.push(r);return c}function a(e,t){var n,r,i,o,a;if(e)for(o=e.toLowerCase().split(" "),n=o.length;n--;){if(e=o[n],r=d[e],!e){for(i in d)f(i,!1),delete d[i];return c}if(r){if(t)for(a=r.length;a--;)r[a].func===t&&(r=r.slice(0,a).concat(r.slice(a+1)),d[e]=r);else r.length=0;r.length||(f(e,!1),delete d[e])}}else{for(e in d)f(e,!1);d={}}return c}function s(e,t,n){return o(e,t,n,{once:!0})}function l(e){return e=e.toLowerCase(),!(!d[e]||0===d[e].length)}var c=this,u,d={},f;t=t||{},u=t.scope||c,f=t.toggleEvent||n,c.fire=i,c.on=o,c.off=a,c.once=s,c.has=l}var n=e.makeMap("focus blur focusin focusout click dblclick mousedown mouseup mousemove mouseover beforepaste paste cut copy selectionchange mouseout mouseenter mouseleave wheel keydown keypress keyup input contextmenu dragstart dragend dragover draggesture dragdrop drop drag submit compositionstart compositionend compositionupdate touchstart touchend"," ");return t.isNative=function(e){return!!n[e.toLowerCase()]},t}),r(j,[],function(){function e(e){this.create=e.create}return e.create=function(t,n){return new e({create:function(e,r){function i(t){e.set(r,t.value)}function o(e){t.set(n,e.value)}var a;return e.on("change:"+r,o),t.on("change:"+n,i),a=e._bindings,a||(a=e._bindings=[],e.on("destroy",function(){for(var e=a.length;e--;)a[e]()})),a.push(function(){t.off("change:"+n,i)}),t.get(n)}})},e}),r(K,[q],function(e){function t(t){return t._eventDispatcher||(t._eventDispatcher=new e({scope:t,toggleEvent:function(n,r){e.isNative(n)&&t.toggleNativeEvent&&t.toggleNativeEvent(n,r)}})),t._eventDispatcher}return{fire:function(e,n,r){var i=this;if(i.removed&&"remove"!==e)return n;if(n=t(i).fire(e,n,r),r!==!1&&i.parent)for(var o=i.parent();o&&!n.isPropagationStopped();)o.fire(e,n,!1),o=o.parent();return n},on:function(e,n,r){return t(this).on(e,n,r)},off:function(e,n){return t(this).off(e,n)},once:function(e,n){return t(this).once(e,n)},hasEventListeners:function(e){return t(this).has(e)}}}),r(Y,[j,K,$,f],function(e,t,n,r){function i(e){return e.nodeType>0}function o(e,t){var n,a;if(e===t)return!0;if(null===e||null===t)return e===t;if("object"!=typeof e||"object"!=typeof t)return e===t;if(r.isArray(t)){if(e.length!==t.length)return!1;for(n=e.length;n--;)if(!o(e[n],t[n]))return!1}if(i(e)||i(t))return e===t;a={};for(n in t){if(!o(e[n],t[n]))return!1;a[n]=!0}for(n in e)if(!a[n]&&!o(e[n],t[n]))return!1;return!0}return n.extend({Mixins:[t],init:function(t){var n,r;t=t||{};for(n in t)r=t[n],r instanceof e&&(t[n]=r.create(this,n));this.data=t},set:function(t,n){var r,i,a=this.data[t];if(n instanceof e&&(n=n.create(this,t)),"object"==typeof t){for(r in t)this.set(r,t[r]);return this}return o(a,n)||(this.data[t]=n,i={target:this,name:t,value:n,oldValue:a},this.fire("change:"+t,i),this.fire("change",i)),this},get:function(e){return this.data[e]},has:function(e){return e in this.data},bind:function(t){return e.create(this,t)},destroy:function(){this.fire("destroy")}})}),r(G,[$],function(e){function t(e){for(var t=[],n=e.length,r;n--;)r=e[n],r.__checked||(t.push(r),r.__checked=1);for(n=t.length;n--;)delete t[n].__checked;return t}var n=/^([\w\\*]+)?(?:#([\w\\]+))?(?:\.([\w\\\.]+))?(?:\[\@?([\w\\]+)([\^\$\*!~]?=)([\w\\]+)\])?(?:\:(.+))?/i,r=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,i=/^\s*|\s*$/g,o,a=e.extend({init:function(e){function t(e){return e?(e=e.toLowerCase(),function(t){return"*"===e||t.type===e}):void 0}function o(e){return e?function(t){return t._name===e}:void 0}function a(e){return e?(e=e.split("."),function(t){for(var n=e.length;n--;)if(!t.classes.contains(e[n]))return!1;return!0}):void 0}function s(e,t,n){return e?function(r){var i=r[e]?r[e]():"";return t?"="===t?i===n:"*="===t?i.indexOf(n)>=0:"~="===t?(" "+i+" ").indexOf(" "+n+" ")>=0:"!="===t?i!=n:"^="===t?0===i.indexOf(n):"$="===t?i.substr(i.length-n.length)===n:!1:!!n}:void 0}function l(e){var t;return e?(e=/(?:not\((.+)\))|(.+)/i.exec(e),e[1]?(t=u(e[1],[]),function(e){return!d(e,t)}):(e=e[2],function(t,n,r){return"first"===e?0===n:"last"===e?n===r-1:"even"===e?n%2===0:"odd"===e?n%2===1:t[e]?t[e]():!1})):void 0}function c(e,r,c){function u(e){e&&r.push(e)}var d;return d=n.exec(e.replace(i,"")),u(t(d[1])),u(o(d[2])),u(a(d[3])),u(s(d[4],d[5],d[6])),u(l(d[7])),r.psuedo=!!d[7],r.direct=c,r}function u(e,t){var n=[],i,o,a;do if(r.exec(""),o=r.exec(e),o&&(e=o[3],n.push(o[1]),o[2])){i=o[3];break}while(o);for(i&&u(i,t),e=[],a=0;a"!=n[a]&&e.push(c(n[a],[],">"===n[a-1]));return t.push(e),t}var d=this.match;this._selectors=u(e,[])},match:function(e,t){var n,r,i,o,a,s,l,c,u,d,f,h,p;for(t=t||this._selectors,n=0,r=t.length;r>n;n++){for(a=t[n],o=a.length,p=e,h=0,i=o-1;i>=0;i--)for(c=a[i];p;){if(c.psuedo)for(f=p.parent().items(),u=d=f.length;u--&&f[u]!==p;);for(s=0,l=c.length;l>s;s++)if(!c[s](p,u,d)){s=l+1;break}if(s===l){h++;break}if(i===o-1)break;p=p.parent()}if(h===o)return!0}return!1},find:function(e){function n(e,t,i){var o,a,s,l,c,u=t[i];for(o=0,a=e.length;a>o;o++){for(c=e[o],s=0,l=u.length;l>s;s++)if(!u[s](c,o,a)){s=l+1;break}if(s===l)i==t.length-1?r.push(c):c.items&&n(c.items(),t,i+1);else if(u.direct)return;c.items&&n(c.items(),t,i)}}var r=[],i,s,l=this._selectors;if(e.items){for(i=0,s=l.length;s>i;i++)n(e.items(),l[i],0);s>1&&(r=t(r))}return o||(o=a.Collection),new o(r)}});return a}),r(X,[f,G,$],function(e,t,n){var r,i,o=Array.prototype.push,a=Array.prototype.slice;return i={length:0,init:function(e){e&&this.add(e)},add:function(t){var n=this;return e.isArray(t)?o.apply(n,t):t instanceof r?n.add(t.toArray()):o.call(n,t),n},set:function(e){var t=this,n=t.length,r;for(t.length=0,t.add(e),r=t.length;n>r;r++)delete t[r];return t},filter:function(e){var n=this,i,o,a=[],s,l;for("string"==typeof e?(e=new t(e),l=function(t){return e.match(t)}):l=e,i=0,o=n.length;o>i;i++)s=n[i],l(s)&&a.push(s);return new r(a)},slice:function(){return new r(a.apply(this,arguments))},eq:function(e){return-1===e?this.slice(e):this.slice(e,+e+1)},each:function(t){return e.each(this,t),this},toArray:function(){return e.toArray(this)},indexOf:function(e){for(var t=this,n=t.length;n--&&t[n]!==e;);return n},reverse:function(){return new r(e.toArray(this).reverse())},hasClass:function(e){return this[0]?this[0].classes.contains(e):!1},prop:function(e,t){var n=this,r,i;return t!==r?(n.each(function(n){n[e]&&n[e](t)}),n):(i=n[0],i&&i[e]?i[e]():void 0)},exec:function(t){var n=this,r=e.toArray(arguments).slice(1);return n.each(function(e){e[t]&&e[t].apply(e,r)}),n},remove:function(){for(var e=this.length;e--;)this[e].remove();return this},addClass:function(e){return this.each(function(t){t.classes.add(e)})},removeClass:function(e){return this.each(function(t){t.classes.remove(e)})}},e.each("fire on off show hide append prepend before after reflow".split(" "),function(t){i[t]=function(){var n=e.toArray(arguments);return this.each(function(e){t in e&&e[t].apply(e,n)}),this}}),e.each("text name disabled active selected checked visible parent value data".split(" "),function(e){i[e]=function(t){return this.prop(e,t)}}),r=n.extend(i),t.Collection=r,r}),r(J,[f,b],function(e,t){var n=0;return{id:function(){return"mceu_"+n++},createFragment:function(e){return t.DOM.createFragment(e)},getWindowSize:function(){return t.DOM.getViewPort()},getSize:function(e){var t,n;if(e.getBoundingClientRect){var r=e.getBoundingClientRect();t=Math.max(r.width||r.right-r.left,e.offsetWidth),n=Math.max(r.height||r.bottom-r.bottom,e.offsetHeight)}else t=e.offsetWidth,n=e.offsetHeight;return{width:t,height:n}},getPos:function(e,n){return t.DOM.getPos(e,n)},getViewPort:function(e){return t.DOM.getViewPort(e)},get:function(e){return document.getElementById(e)},addClass:function(e,n){return t.DOM.addClass(e,n)},removeClass:function(e,n){return t.DOM.removeClass(e,n)},hasClass:function(e,n){return t.DOM.hasClass(e,n)},toggleClass:function(e,n,r){return t.DOM.toggleClass(e,n,r)},css:function(e,n,r){return t.DOM.setStyle(e,n,r)},getRuntimeStyle:function(e,n){return t.DOM.getStyle(e,n,!0)},on:function(e,n,r,i){return t.DOM.bind(e,n,r,i)},off:function(e,n,r){return t.DOM.unbind(e,n,r)},fire:function(e,n,r){return t.DOM.fire(e,n,r)},innerHtml:function(e,n){t.DOM.setHTML(e,n)}}}),r(Q,[],function(){return{parseBox:function(e){var t,n=10;if(e)return"number"==typeof e?(e=e||0,{top:e,left:e,bottom:e,right:e}):(e=e.split(" "),t=e.length,1===t?e[1]=e[2]=e[3]=e[0]:2===t?(e[2]=e[0],e[3]=e[1]):3===t&&(e[3]=e[1]),{top:parseInt(e[0],n)||0,right:parseInt(e[1],n)||0,bottom:parseInt(e[2],n)||0,left:parseInt(e[3],n)||0})},measureBox:function(e,t){function n(t){var n=document.defaultView;return n?(t=t.replace(/[A-Z]/g,function(e){return"-"+e}),n.getComputedStyle(e,null).getPropertyValue(t)):e.currentStyle[t]}function r(e){var t=parseFloat(n(e),10);return isNaN(t)?0:t}return{top:r(t+"TopWidth"),right:r(t+"RightWidth"),bottom:r(t+"BottomWidth"),left:r(t+"LeftWidth")}}}}),r(Z,[f],function(e){function t(){}function n(e){this.cls=[],this.cls._map={},this.onchange=e||t,this.prefix=""}return e.extend(n.prototype,{add:function(e){return e&&!this.contains(e)&&(this.cls._map[e]=!0,this.cls.push(e),this._change()),this},remove:function(e){if(this.contains(e)){for(var t=0;t0&&(e+=" "),e+=this.prefix+this.cls[t];return e},n}),r(ee,[],function(){function e(e,t){function n(e){window.setTimeout(e,0)}var r,i=window.requestAnimationFrame,o=["ms","moz","webkit"];for(r=0;r=i;o--)r=s[o],r.fire("mouseleave",{target:r.getEl()})}for(o=i;oo;o++)c=l[o]._eventsRoot;for(c||(c=l[l.length-1]||e),e._eventsRoot=c,s=o,o=0;s>o;o++)l[o]._eventsRoot=c;var p=c._delegates;p||(p=c._delegates={});for(d in u){if(!u)return!1;"wheel"!==d||h?("mouseenter"===d||"mouseleave"===d?c._hasMouseEnter||(a(c.getEl()).on("mouseleave",n).on("mouseover",r),c._hasMouseEnter=1):p[d]||(a(c.getEl()).on(d,t),p[d]=!0),u[d]=!1):f?a(e.getEl()).on("mousewheel",i):a(e.getEl()).on("DOMMouseScroll",i)}}}var f="onmousewheel"in document,h=!1,p="mce-",m,g=0,v={Statics:{classPrefix:p},isRtl:function(){return m.rtl},classPrefix:p,init:function(e){function n(e){var t;for(e=e.split(" "),t=0;tn.maxW?n.maxW:i,n.w=i,n.innerW=i-o),i=e.h,i!==s&&(i=in.maxH?n.maxH:i,n.h=i,n.innerH=i-a),i=e.innerW,i!==s&&(i=in.maxW-o?n.maxW-o:i,n.innerW=i,n.w=i+o),i=e.innerH,i!==s&&(i=in.maxH-a?n.maxH-a:i,n.innerH=i,n.h=i+a),e.contentW!==s&&(n.contentW=e.contentW),e.contentH!==s&&(n.contentH=e.contentH),r=t._lastLayoutRect,(r.x!==n.x||r.y!==n.y||r.w!==n.w||r.h!==n.h)&&(l=m.repaintControls,l&&l.map&&!l.map[t._id]&&(l.push(t),l.map[t._id]=!0),r.x=n.x,r.y=n.y,r.w=n.w,r.h=n.h),t):n},repaint:function(){var e=this,t,n,r,i,o,a=0,s=0,l,c,u;c=document.createRange?function(e){return e}:Math.round,t=e.getEl().style,i=e._layoutRect,l=e._lastRepaintRect||{},o=e.borderBox,a=o.left+o.right,s=o.top+o.bottom,i.x!==l.x&&(t.left=c(i.x)+"px",l.x=i.x),i.y!==l.y&&(t.top=c(i.y)+"px",l.y=i.y), -i.w!==l.w&&(u=c(i.w-a),t.width=(u>=0?u:0)+"px",l.w=i.w),i.h!==l.h&&(u=c(i.h-s),t.height=(u>=0?u:0)+"px",l.h=i.h),e._hasBody&&i.innerW!==l.innerW&&(u=c(i.innerW),r=e.getEl("body"),r&&(n=r.style,n.width=(u>=0?u:0)+"px"),l.innerW=i.innerW),e._hasBody&&i.innerH!==l.innerH&&(u=c(i.innerH),r=r||e.getEl("body"),r&&(n=n||r.style,n.height=(u>=0?u:0)+"px"),l.innerH=i.innerH),e._lastRepaintRect=l,e.fire("repaint",{},!1)},on:function(e,t){function n(e){var t,n;return"string"!=typeof e?e:function(i){return t||r.parentsAndSelf().each(function(r){var i=r.settings.callbacks;return i&&(t=i[e])?(n=r,!1):void 0}),t?t.call(n,i):(i.action=e,void this.fire("execute",i))}}var r=this;return u(r).on(e,n(t)),r},off:function(e,t){return u(this).off(e,t),this},fire:function(e,t,n){var r=this;if(t=t||{},t.control||(t.control=r),t=u(r).fire(e,t),n!==!1&&r.parent)for(var i=r.parent();i&&!t.isPropagationStopped();)i.fire(e,t,!1),i=i.parent();return t},hasEventListeners:function(e){return u(this).has(e)},parents:function(e){var t=this,n,r=new i;for(n=t.parent();n;n=n.parent())r.add(n);return e&&(r=r.filter(e)),r},parentsAndSelf:function(e){return new i(this).add(this.parents(e))},next:function(){var e=this.parent().items();return e[e.indexOf(this)+1]},prev:function(){var e=this.parent().items();return e[e.indexOf(this)-1]},innerHtml:function(e){return this.$el.html(e),this},getEl:function(e){var t=e?this._id+"-"+e:this._id;return this._elmCache[t]||(this._elmCache[t]=a("#"+t)[0]),this._elmCache[t]},show:function(){return this.visible(!0)},hide:function(){return this.visible(!1)},focus:function(){try{this.getEl().focus()}catch(e){}return this},blur:function(){return this.getEl().blur(),this},aria:function(e,t){var n=this,r=n.getEl(n.ariaTarget);return"undefined"==typeof t?n._aria[e]:(n._aria[e]=t,n.state.get("rendered")&&r.setAttribute("role"==e?e:"aria-"+e,t),n)},encode:function(e,t){return t!==!1&&(e=this.translate(e)),(e||"").replace(/[&<>"]/g,function(e){return"&#"+e.charCodeAt(0)+";"})},translate:function(e){return m.translate?m.translate(e):e},before:function(e){var t=this,n=t.parent();return n&&n.insert(e,n.items().indexOf(t),!0),t},after:function(e){var t=this,n=t.parent();return n&&n.insert(e,n.items().indexOf(t)),t},remove:function(){var e=this,t=e.getEl(),n=e.parent(),r,i;if(e.items){var o=e.items().toArray();for(i=o.length;i--;)o[i].remove()}n&&n.items&&(r=[],n.items().each(function(t){t!==e&&r.push(t)}),n.items().set(r),n._lastRect=null),e._eventsRoot&&e._eventsRoot==e&&a(t).off();var s=e.getRoot().controlIdLookup;return s&&delete s[e._id],t&&t.parentNode&&t.parentNode.removeChild(t),e.state.set("rendered",!1),e.state.destroy(),e.fire("remove"),e},renderBefore:function(e){return a(e).before(this.renderHtml()),this.postRender(),this},renderTo:function(e){return a(e||this.getContainerElm()).append(this.renderHtml()),this.postRender(),this},preRender:function(){},render:function(){},renderHtml:function(){return'
    '},postRender:function(){var e=this,t=e.settings,n,r,i,o,s;e.$el=a(e.getEl()),e.state.set("rendered",!0);for(o in t)0===o.indexOf("on")&&e.on(o.substr(2),t[o]);if(e._eventsRoot){for(i=e.parent();!s&&i;i=i.parent())s=i._eventsRoot;if(s)for(o in s._nativeEvents)e._nativeEvents[o]=!0}d(e),t.style&&(n=e.getEl(),n&&(n.setAttribute("style",t.style),n.style.cssText=t.style)),e.settings.border&&(r=e.borderBox,e.$el.css({"border-top-width":r.top,"border-right-width":r.right,"border-bottom-width":r.bottom,"border-left-width":r.left}));var l=e.getRoot();l.controlIdLookup||(l.controlIdLookup={}),l.controlIdLookup[e._id]=e;for(var u in e._aria)e.aria(u,e._aria[u]);e.state.get("visible")===!1&&(e.getEl().style.display="none"),e.bindStates(),e.state.on("change:visible",function(t){var n=t.value,r;e.state.get("rendered")&&(e.getEl().style.display=n===!1?"none":"",e.getEl().getBoundingClientRect()),r=e.parent(),r&&(r._lastRect=null),e.fire(n?"show":"hide"),c.add(e)}),e.fire("postrender",{},!1)},bindStates:function(){},scrollIntoView:function(e){function t(e,t){var n,r,i=e;for(n=r=0;i&&i!=t&&i.nodeType;)n+=i.offsetLeft||0,r+=i.offsetTop||0,i=i.offsetParent;return{x:n,y:r}}var n=this.getEl(),r=n.parentNode,i,o,a,s,l,c,u=t(n,r);return i=u.x,o=u.y,a=n.offsetWidth,s=n.offsetHeight,l=r.clientWidth,c=r.clientHeight,"end"==e?(i-=l-a,o-=c-s):"center"==e&&(i-=l/2-a/2,o-=c/2-s/2),r.scrollLeft=i,r.scrollTop=o,this},getRoot:function(){for(var e=this,t,n=[];e;){if(e.rootControl){t=e.rootControl;break}n.push(e),t=e,e=e.parent()}t||(t=this);for(var r=n.length;r--;)n[r].rootControl=t;return t},reflow:function(){c.remove(this);var e=this.parent();return e._layout&&!e._layout.isNative()&&e.reflow(),this}};return t.each("text title visible disabled active value".split(" "),function(e){v[e]=function(t){return 0===arguments.length?this.state.get(e):("undefined"!=typeof t&&this.state.set(e,t),this)}}),m=e.extend(v)}),r(ne,[],function(){var e={},t;return{add:function(t,n){e[t.toLowerCase()]=n},has:function(t){return!!e[t.toLowerCase()]},create:function(n,r){var i,o,a;if(!t){a=tinymce.ui;for(o in a)e[o.toLowerCase()]=a[o];t=!0}if("string"==typeof n?(r=r||{},r.type=n):(r=n,n=r.type),n=n.toLowerCase(),i=e[n],!i)throw new Error("Could not find control by type: "+n);return i=new i(r),i.type=n,i}}}),r(re,[],function(){return function(e){function t(e){return e&&1===e.nodeType}function n(e){return e=e||x,t(e)?e.getAttribute("role"):null}function r(e){for(var t,r=e||x;r=r.parentNode;)if(t=n(r))return t}function i(e){var n=x;return t(n)?n.getAttribute("aria-"+e):void 0}function o(e){var t=e.tagName.toUpperCase();return"INPUT"==t||"TEXTAREA"==t}function a(e){return o(e)&&!e.hidden?!0:/^(button|menuitem|checkbox|tab|menuitemcheckbox|option|gridcell)$/.test(n(e))?!0:!1}function s(e){function t(e){if(1==e.nodeType&&"none"!=e.style.display){a(e)&&n.push(e);for(var r=0;re?e=t.length-1:e>=t.length&&(e=0),t[e]&&t[e].focus(),e}function d(e,t){var n=-1,r=l();t=t||s(r.getEl());for(var i=0;i=0&&(n=t.getEl(),n&&n.parentNode.removeChild(n),n=e.getEl(),n&&n.parentNode.removeChild(n)),t.parent(this)},create:function(t){var n=this,i,a=[];return o.isArray(t)||(t=[t]),o.each(t,function(t){t&&(t instanceof e||("string"==typeof t&&(t={type:t}),i=o.extend({},n.settings.defaults,t),t.type=i.type=i.type||t.type||n.settings.defaultType||(i.defaults?i.defaults.type:null),t=r.create(i)),a.push(t))}),a},renderNew:function(){var e=this;return e.items().each(function(t,n){var r;t.parent(e),t.state.get("rendered")||(r=e.getEl("body"),r.hasChildNodes()&&n<=r.childNodes.length-1?a(r.childNodes[n]).before(t.renderHtml()):a(r).append(t.renderHtml()),t.postRender(),l.add(t))}),e._layout.applyClasses(e.items().filter(":visible")),e._lastRect=null,e},append:function(e){return this.add(e).renderNew()},prepend:function(e){var t=this;return t.items().set(t.create(e).concat(t.items().toArray())),t.renderNew()},insert:function(e,t,n){var r=this,i,o,a;return e=r.create(e),i=r.items(),!n&&t=0&&t
    '+(e.settings.html||"")+t.renderHtml(e)+"
    "},postRender:function(){var e=this,t;return e.items().exec("postRender"),e._super(),e._layout.postRender(e),e.state.set("rendered",!0),e.settings.style&&e.$el.css(e.settings.style),e.settings.border&&(t=e.borderBox,e.$el.css({"border-top-width":t.top,"border-right-width":t.right,"border-bottom-width":t.bottom,"border-left-width":t.left})),e.parent()||(e.keyboardNav=new i({root:e})),e},initLayoutRect:function(){var e=this,t=e._super();return e._layout.recalc(e),t},recalc:function(){var e=this,t=e._layoutRect,n=e._lastRect;return n&&n.w==t.w&&n.h==t.h?void 0:(e._layout.recalc(e),t=e.layoutRect(),e._lastRect={x:t.x,y:t.y,w:t.w,h:t.h},!0)},reflow:function(){var t;if(l.remove(this),this.visible()){for(e.repaintControls=[],e.repaintControls.map={},this.recalc(),t=e.repaintControls.length;t--;)e.repaintControls[t].repaint();"flow"!==this.settings.layout&&"stack"!==this.settings.layout&&this.repaint(),e.repaintControls=[]}return this}})}),r(oe,[h],function(e){function t(e){var t,n,r,i,o,a,s,l,c=Math.max;return t=e.documentElement,n=e.body,r=c(t.scrollWidth,n.scrollWidth),i=c(t.clientWidth,n.clientWidth),o=c(t.offsetWidth,n.offsetWidth),a=c(t.scrollHeight,n.scrollHeight),s=c(t.clientHeight,n.clientHeight),l=c(t.offsetHeight,n.offsetHeight),{width:o>r?i:r,height:l>a?s:a}}function n(e){var t,n;if(e.changedTouches)for(t="screenX screenY pageX pageY clientX clientY".split(" "),n=0;n").css({position:"absolute",top:0,left:0,width:c.width,height:c.height,zIndex:2147483647,opacity:1e-4,cursor:m}).appendTo(s.body),e(s).on("mousemove touchmove",d).on("mouseup touchend",u),i.start(r)},d=function(e){return n(e),e.button!==l?u(e):(e.deltaX=e.screenX-f,e.deltaY=e.screenY-h,e.preventDefault(),void i.drag(e))},u=function(t){n(t),e(s).off("mousemove touchmove",d).off("mouseup touchend",u),a.remove(),i.stop&&i.stop(t)},this.destroy=function(){e(o()).off()},e(o()).on("mousedown touchstart",c)}}),r(ae,[h,oe],function(e,t){return{init:function(){var e=this;e.on("repaint",e.renderScroll)},renderScroll:function(){function n(){function t(t,a,s,l,c,u){var d,f,h,p,m,g,v,y,b;if(f=i.getEl("scroll"+t)){if(y=a.toLowerCase(),b=s.toLowerCase(),e(i.getEl("absend")).css(y,i.layoutRect()[l]-1),!c)return void e(f).css("display","none");e(f).css("display","block"),d=i.getEl("body"),h=i.getEl("scroll"+t+"t"),p=d["client"+s]-2*o,p-=n&&r?f["client"+u]:0,m=d["scroll"+s],g=p/m,v={},v[y]=d["offset"+a]+o,v[b]=p,e(f).css(v),v={},v[y]=d["scroll"+a]*g,v[b]=p*g,e(h).css(v)}}var n,r,a;a=i.getEl("body"),n=a.scrollWidth>a.clientWidth,r=a.scrollHeight>a.clientHeight,t("h","Left","Width","contentW",n,"Height"),t("v","Top","Height","contentH",r,"Width")}function r(){function n(n,r,a,s,l){var c,u=i._id+"-scroll"+n,d=i.classPrefix;e(i.getEl()).append('
    '),i.draghelper=new t(u+"t",{start:function(){c=i.getEl("body")["scroll"+r],e("#"+u).addClass(d+"active")},drag:function(e){var t,u,d,f,h=i.layoutRect();u=h.contentW>h.innerW,d=h.contentH>h.innerH,f=i.getEl("body")["client"+a]-2*o,f-=u&&d?i.getEl("scroll"+n)["client"+l]:0,t=f/i.getEl("body")["scroll"+a],i.getEl("body")["scroll"+r]=c+e["delta"+s]/t},stop:function(){e("#"+u).removeClass(d+"active")}})}i.classes.add("scroll"),n("v","Top","Height","Y","Width"),n("h","Left","Width","X","Height")}var i=this,o=2;i.settings.autoScroll&&(i._hasScroll||(i._hasScroll=!0,r(),i.on("wheel",function(e){var t=i.getEl("body");t.scrollLeft+=10*(e.deltaX||0),t.scrollTop+=10*e.deltaY,n()}),e(i.getEl("body")).on("scroll",n)),n())}}}),r(se,[ie,ae],function(e,t){return e.extend({Defaults:{layout:"fit",containerCls:"panel"},Mixins:[t],renderHtml:function(){var e=this,t=e._layout,n=e.settings.html;return e.preRender(),t.preRender(e),"undefined"==typeof n?n='
    '+t.renderHtml(e)+"
    ":("function"==typeof n&&(n=n.call(e)),e._hasBody=!1),'
    '+(e._preBodyHtml||"")+n+"
    "}})}),r(le,[J],function(e){function t(t,n,r){var i,o,a,s,l,c,u,d,f,h;return f=e.getViewPort(),o=e.getPos(n),a=o.x,s=o.y,t.state.get("fixed")&&"static"==e.getRuntimeStyle(document.body,"position")&&(a-=f.x,s-=f.y),i=t.getEl(),h=e.getSize(i),l=h.width,c=h.height,h=e.getSize(n),u=h.width,d=h.height,r=(r||"").split(""),"b"===r[0]&&(s+=d),"r"===r[1]&&(a+=u),"c"===r[0]&&(s+=Math.round(d/2)),"c"===r[1]&&(a+=Math.round(u/2)),"b"===r[3]&&(s-=c),"r"===r[4]&&(a-=l),"c"===r[3]&&(s-=Math.round(c/2)),"c"===r[4]&&(a-=Math.round(l/2)),{x:a,y:s,w:l,h:c}}return{testMoveRel:function(n,r){for(var i=e.getViewPort(),o=0;o0&&a.x+a.w0&&a.y+a.hi.x&&a.x+a.wi.y&&a.y+a.he?0:e+n>t?(e=t-n,0>e?0:e):e}var i=this;if(i.settings.constrainToViewport){var o=e.getViewPort(window),a=i.layoutRect();t=r(t,o.w+o.x,a.w),n=r(n,o.h+o.y,a.h)}return i.state.get("rendered")?i.layoutRect({x:t,y:n}).repaint():(i.settings.x=t,i.settings.y=n),i.fire("move",{x:t,y:n}),i}}}),r(ce,[J],function(e){return{resizeToContent:function(){this._layoutRect.autoResize=!0,this._lastRect=null,this.reflow()},resizeTo:function(t,n){if(1>=t||1>=n){var r=e.getWindowSize();t=1>=t?t*r.w:t,n=1>=n?n*r.h:n}return this._layoutRect.autoResize=!1,this.layoutRect({minW:t,minH:n,w:t,h:n}).reflow()},resizeBy:function(e,t){var n=this,r=n.layoutRect();return n.resizeTo(r.w+e,r.h+t)}}}),r(ue,[se,le,ce,J,h],function(e,t,n,r,i){function o(e,t){for(;e;){if(e==t)return!0;e=e.parent()}}function a(e){for(var t=g.length;t--;){var n=g[t],r=n.getParentCtrl(e.target);if(n.settings.autohide){if(r&&(o(r,n)||n.parent()===r))continue;e=n.fire("autohide",{target:e.target}),e.isDefaultPrevented()||n.hide()}}}function s(){h||(h=function(e){2!=e.button&&a(e)},i(document).on("click touchstart",h))}function l(){p||(p=function(){var e;for(e=g.length;e--;)u(g[e])},i(window).on("scroll",p))}function c(){if(!m){var e=document.documentElement,t=e.clientWidth,n=e.clientHeight;m=function(){document.all&&t==e.clientWidth&&n==e.clientHeight||(t=e.clientWidth,n=e.clientHeight,b.hideAll())},i(window).on("resize",m)}}function u(e){function t(t,n){for(var r,i=0;in&&(e.fixed(!1).layoutRect({y:e._autoFixY}).repaint(),t(!1,e._autoFixY-n)):(e._autoFixY=e.layoutRect().y,e._autoFixY
    ').appendTo(t.getContainerElm())),setTimeout(function(){n.addClass(r+"in"),i(t.getEl()).addClass(r+"in")},0),y=!0),d(!0,t)}}),t.on("show",function(){t.parents().each(function(e){return e.state.get("fixed")?(t.fixed(!0),!1):void 0})}),e.popover&&(t._preBodyHtml='
    ',t.classes.add("popover").add("bottom").add(t.isRtl()?"end":"start"))},fixed:function(e){var t=this;if(t.state.get("fixed")!=e){if(t.state.get("rendered")){var n=r.getViewPort();e?t.layoutRect().y-=n.y:t.layoutRect().y+=n.y}t.classes.toggle("fixed",e),t.state.set("fixed",e)}return t},show:function(){var e=this,t,n=e._super();for(t=g.length;t--&&g[t]!==e;);return-1===t&&g.push(e),n},hide:function(){return f(this),d(!1,this),this._super()},hideAll:function(){b.hideAll()},close:function(){var e=this;return e.fire("close").isDefaultPrevented()||(e.remove(),d(!1,e)),e},remove:function(){f(this),this._super()},postRender:function(){var e=this;return e.settings.bodyRole&&this.getEl("body").setAttribute("role",e.settings.bodyRole),e._super()}});return b.hideAll=function(){for(var e=g.length;e--;){var t=g[e];t&&t.settings.autohide&&(t.hide(),g.splice(e,1))}},b}),r(de,[ue,se,J,h,oe,Q,u],function(e,t,n,r,i,o,a){function s(e){var t="width=device-width,initial-scale=1.0,user-scalable=0,minimum-scale=1.0,maximum-scale=1.0",n=r("meta[name=viewport]")[0],i;a.overrideViewPort!==!1&&(n||(n=document.createElement("meta"),n.setAttribute("name","viewport"),document.getElementsByTagName("head")[0].appendChild(n)),i=n.getAttribute("content"),i&&"undefined"!=typeof d&&(d=i),n.setAttribute("content",e?t:d))}function l(e){for(var t=0;tr.w&&(o=r.x-Math.max(0,i/2),e.layoutRect({w:i,x:o}),a=!0)),t&&(t.layoutRect({w:e.layoutRect().innerW}).recalc(),i=t.layoutRect().minW+r.deltaW,i>r.w&&(o=r.x-Math.max(0,i-r.w),e.layoutRect({w:i,x:o}),a=!0)),a&&e.recalc()},initLayoutRect:function(){var e=this,t=e._super(),r=0,i;if(e.settings.title&&!e._fullscreen){i=e.getEl("head");var o=n.getSize(i);t.headerW=o.width,t.headerH=o.height,r+=t.headerH}e.statusbar&&(r+=e.statusbar.layoutRect().h),t.deltaH+=r,t.minH+=r,t.h+=r;var a=n.getWindowSize();return t.x=e.settings.x||Math.max(0,a.w/2-t.w/2),t.y=e.settings.y||Math.max(0,a.h/2-t.h/2),t},renderHtml:function(){var e=this,t=e._layout,n=e._id,r=e.classPrefix,i=e.settings,o="",a="",s=i.html;return e.preRender(),t.preRender(e),i.title&&(o='
    '+e.encode(i.title)+'
    '),i.url&&(s=''),"undefined"==typeof s&&(s=t.renderHtml(e)),e.statusbar&&(a=e.statusbar.renderHtml()),'
    '+o+'
    '+s+"
    "+a+"
    "},fullscreen:function(e){var t=this,i=document.documentElement,a,s=t.classPrefix,l;if(e!=t._fullscreen)if(r(window).on("resize",function(){var e;if(t._fullscreen)if(a)t._timer||(t._timer=setTimeout(function(){var e=n.getWindowSize();t.moveTo(0,0).resizeTo(e.w,e.h),t._timer=0},50));else{e=(new Date).getTime();var r=n.getWindowSize();t.moveTo(0,0).resizeTo(r.w,r.h),(new Date).getTime()-e>50&&(a=!0)}}),l=t.layoutRect(),t._fullscreen=e,e){t._initial={x:l.x,y:l.y,w:l.w,h:l.h},t.borderBox=o.parseBox("0"),t.getEl("head").style.display="none",l.deltaH-=l.headerH+2,r([i,document.body]).addClass(s+"fullscreen"),t.classes.add("fullscreen");var c=n.getWindowSize();t.moveTo(0,0).resizeTo(c.w,c.h)}else t.borderBox=o.parseBox(t.settings.border),t.getEl("head").style.display="",l.deltaH+=l.headerH,r([i,document.body]).removeClass(s+"fullscreen"),t.classes.remove("fullscreen"),t.moveTo(t._initial.x,t._initial.y).resizeTo(t._initial.w,t._initial.h);return t.reflow()},postRender:function(){var e=this,t;setTimeout(function(){e.classes.add("in")},0),e._super(),e.statusbar&&e.statusbar.postRender(),e.focus(),this.dragHelper=new i(e._id+"-dragh",{start:function(){t={x:e.layoutRect().x,y:e.layoutRect().y}},drag:function(n){e.moveTo(t.x+n.deltaX,t.y+n.deltaY)}}),e.on("submit",function(t){t.isDefaultPrevented()||e.close()}),u.push(e),s(!0)},submit:function(){return this.fire("submit",{data:this.toJSON()})},remove:function(){var e=this,t;for(e.dragHelper.destroy(),e._super(),e.statusbar&&this.statusbar.remove(),t=u.length;t--;)u[t]===e&&u.splice(t,1);s(u.length>0),l(e.classPrefix)},getContentWindow:function(){var e=this.getEl().getElementsByTagName("iframe")[0];return e?e.contentWindow:null}});return a.desktop||c(),f}),r(fe,[de],function(e){var t=e.extend({init:function(e){e={border:1,padding:20,layout:"flex",pack:"center",align:"center",containerCls:"panel",autoScroll:!0,buttons:{type:"button",text:"Ok",action:"ok"},items:{type:"label",multiline:!0,maxWidth:500,maxHeight:200}},this._super(e)},Statics:{OK:1,OK_CANCEL:2,YES_NO:3,YES_NO_CANCEL:4,msgBox:function(n){function r(e,t,n){return{type:"button",text:e,subtype:n?"primary":"",onClick:function(e){e.control.parents()[1].close(),o(t)}}}var i,o=n.callback||function(){};switch(n.buttons){case t.OK_CANCEL:i=[r("Ok",!0,!0),r("Cancel",!1)];break;case t.YES_NO:case t.YES_NO_CANCEL:i=[r("Yes",1,!0),r("No",0)],n.buttons==t.YES_NO_CANCEL&&i.push(r("Cancel",-1));break;default:i=[r("Ok",!0,!0)]}return new e({padding:20,x:n.x,y:n.y,minWidth:300,minHeight:100,layout:"flex",pack:"center",align:"center",buttons:i,title:n.title,role:"alertdialog",items:{type:"label",multiline:!0,maxWidth:500,maxHeight:200,text:n.text},onPostRender:function(){this.aria("describedby",this.items()[0]._id)},onClose:n.onClose,onCancel:function(){o(!1)}}).renderTo(document.body).reflow()},alert:function(e,n){return"string"==typeof e&&(e={text:e}),e.callback=n,t.msgBox(e)},confirm:function(e,n){return"string"==typeof e&&(e={text:e}),e.callback=n,e.buttons=t.OK_CANCEL,t.msgBox(e)}}});return t}),r(he,[de,fe],function(e,t){return function(n){function r(){return o.length?o[o.length-1]:void 0}var i=this,o=[];i.windows=o,n.on("remove",function(){for(var e=o.length;e--;)o[e].close()}),i.open=function(t,r){var i;return n.editorManager.setActive(n),t.title=t.title||" ",t.url=t.url||t.file,t.url&&(t.width=parseInt(t.width||320,10),t.height=parseInt(t.height||240,10)),t.body&&(t.items={defaults:t.defaults,type:t.bodyType||"form",items:t.body}),t.url||t.buttons||(t.buttons=[{text:"Ok",subtype:"primary",onclick:function(){i.find("form")[0].submit()}},{text:"Cancel",onclick:function(){i.close()}}]),i=new e(t),o.push(i),i.on("close",function(){for(var e=o.length;e--;)o[e]===i&&o.splice(e,1);o.length||n.focus()}),t.data&&i.on("postRender",function(){this.find("*").each(function(e){var n=e.name();n in t.data&&e.value(t.data[n])})}),i.features=t||{},i.params=r||{},1===o.length&&n.nodeChanged(),i.renderTo().reflow()},i.alert=function(e,r,i){t.alert(e,function(){r?r.call(i||this):n.focus()})},i.confirm=function(e,n,r){t.confirm(e,function(e){n.call(r||this,e)})},i.close=function(){r()&&r().close()},i.getParams=function(){return r()?r().params:null},i.setParams=function(e){r()&&(r().params=e)},i.getWindows=function(){return o}}}),r(pe,[D,w,m,E,v,u,f],function(e,t,n,r,i,o,a){return function(s){function l(e,t){try{s.getDoc().execCommand(e,!1,t)}catch(n){}}function c(){var e=s.getDoc().documentMode;return e?e:6}function u(e){return e.isDefaultPrevented()}function d(e){var t,n;e.dataTransfer&&(s.selection.isCollapsed()&&"IMG"==e.target.tagName&&X.select(e.target),t=s.selection.getContent(),t.length>0&&(n=re+escape(s.id)+","+escape(t),e.dataTransfer.setData(ie,n)))}function f(e){var t;return e.dataTransfer&&(t=e.dataTransfer.getData(ie),t&&t.indexOf(re)>=0)?(t=t.substr(re.length).split(","),{id:unescape(t[0]),html:unescape(t[1])}):null}function h(e){s.queryCommandSupported("mceInsertClipboardContent")?s.execCommand("mceInsertClipboardContent",!1,{content:e}):s.execCommand("mceInsertContent",!1,e)}function p(){function r(e){var t=v.schema.getBlockElements(),n=s.getBody();if("BR"!=e.nodeName)return!1;for(e=e;e!=n&&!t[e.nodeName];e=e.parentNode)if(e.nextSibling)return!1;return!0}function i(e,t){var n;for(n=e.nextSibling;n&&n!=t;n=n.nextSibling)if((3!=n.nodeType||0!==j.trim(n.data).length)&&n!==t)return!1;return n===t}function o(e,t,i){var o,a,s;for(s=v.schema.getNonEmptyElements(),o=new n(i||e,e);a=o[t?"next":"prev"]();){if(s[a.nodeName]&&!r(a))return a;if(3==a.nodeType&&a.data.length>0)return a}}function l(e){var n,r,i,a,l;if(!e.collapsed&&(n=v.getParent(t.getNode(e.startContainer,e.startOffset),v.isBlock),r=v.getParent(t.getNode(e.endContainer,e.endOffset),v.isBlock),l=s.schema.getTextBlockElements(),n!=r&&l[n.nodeName]&&l[r.nodeName]&&"false"!==v.getContentEditable(n)&&"false"!==v.getContentEditable(r)))return e.deleteContents(),i=o(n,!1),a=o(r,!0),v.isEmpty(r)||j(n).append(r.childNodes),j(r).remove(),i?1==i.nodeType?"BR"==i.nodeName?(e.setStartBefore(i),e.setEndBefore(i)):(e.setStartAfter(i),e.setEndAfter(i)):(e.setStart(i,i.data.length),e.setEnd(i,i.data.length)):a&&(1==a.nodeType?(e.setStartBefore(a),e.setEndBefore(a)):(e.setStart(a,0),e.setEnd(a,0))),y.setRng(e),!0}function c(e,n){var r,a,l,c,u,d;if(!e.collapsed)return e;if(u=e.startContainer,d=e.startOffset,3==u.nodeType)if(n){if(d0)return e;if(r=t.getNode(e.startContainer,e.startOffset),l=v.getParent(r,v.isBlock),a=o(s.getBody(),n,r),c=v.getParent(a,v.isBlock),!r||!a)return e;if(c&&l!=c)if(n){if(!i(l,c))return e;1==r.nodeType?"BR"==r.nodeName?e.setStartBefore(r):e.setStartAfter(r):e.setStart(r,r.data.length),1==a.nodeType?e.setEnd(a,0):e.setEndBefore(a)}else{if(!i(c,l))return e;1==a.nodeType?"BR"==a.nodeName?e.setStartBefore(a):e.setStartAfter(a):e.setStart(a,a.data.length),1==r.nodeType?e.setEnd(r,0):e.setEndBefore(r)}return e}function p(e){var t=y.getRng();return t=c(t,e),l(t)?!0:void 0}function m(e){var t,n,r;p(e)||(a.each(s.getBody().getElementsByTagName("*"),function(e){"SPAN"==e.tagName&&e.setAttribute("mce-data-marked",1),!e.hasAttribute("data-mce-style")&&e.hasAttribute("style")&&s.dom.setAttrib(e,"style",s.dom.getAttrib(e,"style"))}),t=new b(function(){}),t.observe(s.getDoc(),{childList:!0,attributes:!0,subtree:!0,attributeFilter:["style"]}),s.getDoc().execCommand(e?"ForwardDelete":"Delete",!1,null),n=s.selection.getRng(),r=n.startContainer.parentNode,a.each(t.takeRecords(),function(e){if(v.isChildOf(e.target,s.getBody())){if("style"==e.attributeName){var t=e.target.getAttribute("data-mce-style");t?e.target.setAttribute("style",t):e.target.removeAttribute("style")}a.each(e.addedNodes,function(e){if("SPAN"==e.nodeName&&!e.getAttribute("mce-data-marked")){var t,i;e==r&&(t=n.startOffset,i=e.firstChild),v.remove(e,!0),i&&(n.setStart(i,t),n.setEnd(i,t),s.selection.setRng(n))}})}}),t.disconnect(),a.each(s.dom.select("span[mce-data-marked]"),function(e){e.removeAttribute("mce-data-marked")}))}var g=s.getDoc(),v=s.dom,y=s.selection,b=window.MutationObserver,x,C;b||(x=!0,b=function(){function e(e){var t=e.relatedNode||e.target;n.push({target:t,addedNodes:[t]})}function t(e){var t=e.relatedNode||e.target;n.push({target:t,attributeName:e.attrName})}var n=[],r;this.observe=function(n){r=n,r.addEventListener("DOMSubtreeModified",e,!1),r.addEventListener("DOMNodeInsertedIntoDocument",e,!1),r.addEventListener("DOMNodeInserted",e,!1),r.addEventListener("DOMAttrModified",t,!1)},this.disconnect=function(){r.removeEventListener("DOMSubtreeModified",e,!1),r.removeEventListener("DOMNodeInsertedIntoDocument",e,!1),r.removeEventListener("DOMNodeInserted",e,!1),r.removeEventListener("DOMAttrModified",t,!1)},this.takeRecords=function(){return n}}),s.on("keydown",function(e){var t=e.keyCode==Y,n=e.ctrlKey||e.metaKey;if(!u(e)&&(t||e.keyCode==K)){var r=s.selection.getRng(),i=r.startContainer,o=r.startOffset;if(t&&e.shiftKey)return;if(!n&&r.collapsed&&3==i.nodeType&&(t?o0))return;e.preventDefault(),n&&s.selection.getSel().modify("extend",t?"forward":"backward",e.metaKey?"lineboundary":"word"),m(t)}}),s.on("keypress",function(t){if(!u(t)&&!y.isCollapsed()&&t.charCode&&!e.metaKeyPressed(t)){var n,r,i,o,a,l; -n=s.selection.getRng(),l=String.fromCharCode(t.charCode),t.preventDefault(),r=j(n.startContainer).parents().filter(function(e,t){return!!s.schema.getTextInlineElements()[t.nodeName]}),m(!0),r=r.filter(function(e,t){return!j.contains(s.getBody(),t)}),r.length?(i=v.createFragment(),r.each(function(e,t){t=t.cloneNode(!1),i.hasChildNodes()?(t.appendChild(i.firstChild),i.appendChild(t)):(a=t,i.appendChild(t)),i.appendChild(t)}),a.appendChild(s.getDoc().createTextNode(l)),o=v.getParent(n.startContainer,v.isBlock),v.isEmpty(o)?j(o).empty().append(i):n.insertNode(i),n.setStart(a.firstChild,1),n.setEnd(a.firstChild,1),s.selection.setRng(n)):s.selection.setContent(l)}}),s.addCommand("Delete",function(){m()}),s.addCommand("ForwardDelete",function(){m(!0)}),x||(s.on("dragstart",function(e){C=y.getRng(),d(e)}),s.on("drop",function(e){if(!u(e)){var n=f(e);n&&(e.preventDefault(),window.setTimeout(function(){var r=t.getCaretRangeFromPoint(e.x,e.y,g);C&&(y.setRng(C),C=null),m(),y.setRng(r),h(n.html)},0))}}),s.on("cut",function(e){u(e)||!e.clipboardData||s.selection.isCollapsed()||(e.preventDefault(),e.clipboardData.clearData(),e.clipboardData.setData("text/html",s.selection.getContent()),e.clipboardData.setData("text/plain",s.selection.getContent({format:"text"})),window.setTimeout(function(){m(!0)},0))}))}function m(){function e(e){var t=G.create("body"),n=e.cloneContents();return t.appendChild(n),X.serializer.serialize(t,{format:"html"})}function n(n){if(!n.setStart){if(n.item)return!1;var r=n.duplicate();return r.moveToElementText(s.getBody()),t.compareRanges(n,r)}var i=e(n),o=G.createRng();o.selectNode(s.getBody());var a=e(o);return i===a}s.on("keydown",function(e){var t=e.keyCode,r,i;if(!u(e)&&(t==Y||t==K)){if(r=s.selection.isCollapsed(),i=s.getBody(),r&&!G.isEmpty(i))return;if(!r&&!n(s.selection.getRng()))return;e.preventDefault(),s.setContent(""),i.firstChild&&G.isBlock(i.firstChild)?s.selection.setCursorLocation(i.firstChild,0):s.selection.setCursorLocation(i,0),s.nodeChanged()}})}function g(){s.shortcuts.add("meta+a",null,"SelectAll")}function v(){s.settings.content_editable||(G.bind(s.getDoc(),"focusin",function(){X.setRng(X.getRng())}),G.bind(s.getDoc(),"mousedown mouseup",function(e){e.target==s.getDoc().documentElement&&(s.getBody().focus(),"mousedown"==e.type?X.placeCaretAt(e.clientX,e.clientY):X.setRng(X.getRng()))}))}function y(){s.on("keydown",function(e){if(!u(e)&&e.keyCode===K){if(!s.getBody().getElementsByTagName("hr").length)return;if(X.isCollapsed()&&0===X.getRng(!0).startOffset){var t=X.getNode(),n=t.previousSibling;if("HR"==t.nodeName)return G.remove(t),void e.preventDefault();n&&n.nodeName&&"hr"===n.nodeName.toLowerCase()&&(G.remove(n),e.preventDefault())}}})}function b(){window.Range.prototype.getClientRects||s.on("mousedown",function(e){if(!u(e)&&"HTML"===e.target.nodeName){var t=s.getBody();t.blur(),setTimeout(function(){t.focus()},0)}})}function x(){s.on("click",function(e){var t=e.target;/^(IMG|HR)$/.test(t.nodeName)&&(e.preventDefault(),X.getSel().setBaseAndExtent(t,0,t,1),s.nodeChanged()),"A"==t.nodeName&&G.hasClass(t,"mce-item-anchor")&&(e.preventDefault(),X.select(t))})}function C(){function e(){var e=G.getAttribs(X.getStart().cloneNode(!1));return function(){var t=X.getStart();t!==s.getBody()&&(G.setAttrib(t,"style",null),q(e,function(e){t.setAttributeNode(e.cloneNode(!0))}))}}function t(){return!X.isCollapsed()&&G.getParent(X.getStart(),G.isBlock)!=G.getParent(X.getEnd(),G.isBlock)}s.on("keypress",function(n){var r;return u(n)||8!=n.keyCode&&46!=n.keyCode||!t()?void 0:(r=e(),s.getDoc().execCommand("delete",!1,null),r(),n.preventDefault(),!1)}),G.bind(s.getDoc(),"cut",function(n){var r;!u(n)&&t()&&(r=e(),setTimeout(function(){r()},0))})}function w(){document.body.setAttribute("role","application")}function _(){s.on("keydown",function(e){if(!u(e)&&e.keyCode===K&&X.isCollapsed()&&0===X.getRng(!0).startOffset){var t=X.getNode().previousSibling;if(t&&t.nodeName&&"table"===t.nodeName.toLowerCase())return e.preventDefault(),!1}})}function E(){c()>7||(l("RespectVisibilityInDesign",!0),s.contentStyles.push(".mceHideBrInPre pre br {display: none}"),G.addClass(s.getBody(),"mceHideBrInPre"),Q.addNodeFilter("pre",function(e){for(var t=e.length,n,i,o,a;t--;)for(n=e[t].getAll("br"),i=n.length;i--;)o=n[i],a=o.prev,a&&3===a.type&&"\n"!=a.value.charAt(a.value-1)?a.value+="\n":o.parent.insert(new r("#text",3),o,!0).value="\n"}),Z.addNodeFilter("pre",function(e){for(var t=e.length,n,r,i,o;t--;)for(n=e[t].getAll("br"),r=n.length;r--;)i=n[r],o=i.prev,o&&3==o.type&&(o.value=o.value.replace(/\r?\n$/,""))}))}function N(){G.bind(s.getBody(),"mouseup",function(){var e,t=X.getNode();"IMG"==t.nodeName&&((e=G.getStyle(t,"width"))&&(G.setAttrib(t,"width",e.replace(/[^0-9%]+/g,"")),G.setStyle(t,"width","")),(e=G.getStyle(t,"height"))&&(G.setAttrib(t,"height",e.replace(/[^0-9%]+/g,"")),G.setStyle(t,"height","")))})}function S(){s.on("keydown",function(t){var n,r,i,o,a;if(!u(t)&&t.keyCode==e.BACKSPACE&&(n=X.getRng(),r=n.startContainer,i=n.startOffset,o=G.getRoot(),a=r,n.collapsed&&0===i)){for(;a&&a.parentNode&&a.parentNode.firstChild==a&&a.parentNode!=o;)a=a.parentNode;"BLOCKQUOTE"===a.tagName&&(s.formatter.toggle("blockquote",null,a),n=G.createRng(),n.setStart(r,0),n.setEnd(r,0),X.setRng(n))}})}function k(){function e(){s._refreshContentEditable(),l("StyleWithCSS",!1),l("enableInlineTableEditing",!1),J.object_resizing||l("enableObjectResizing",!1)}J.readonly||s.on("BeforeExecCommand MouseDown",e)}function T(){function e(){q(G.select("a"),function(e){var t=e.parentNode,n=G.getRoot();if(t.lastChild===e){for(;t&&!G.isBlock(t);){if(t.parentNode.lastChild!==t||t===n)return;t=t.parentNode}G.add(t,"br",{"data-mce-bogus":1})}})}s.on("SetContent ExecCommand",function(t){("setcontent"==t.type||"mceInsertLink"===t.command)&&e()})}function R(){J.forced_root_block&&s.on("init",function(){l("DefaultParagraphSeparator",J.forced_root_block)})}function A(){s.on("Undo Redo SetContent",function(e){e.initial||s.execCommand("mceRepaint")})}function B(){s.on("keydown",function(e){var t;u(e)||e.keyCode!=K||(t=s.getDoc().selection.createRange(),t&&t.item&&(e.preventDefault(),s.undoManager.beforeChange(),G.remove(t.item(0)),s.undoManager.add()))})}function D(){var e;c()>=10&&(e="",q("p div h1 h2 h3 h4 h5 h6".split(" "),function(t,n){e+=(n>0?",":"")+t+":empty"}),s.contentStyles.push(e+"{padding-right: 1px !important}"))}function M(){c()<9&&(Q.addNodeFilter("noscript",function(e){for(var t=e.length,n,r;t--;)n=e[t],r=n.firstChild,r&&n.attr("data-mce-innertext",r.value)}),Z.addNodeFilter("noscript",function(e){for(var t=e.length,n,o,a;t--;)n=e[t],o=e[t].firstChild,o?o.value=i.decode(o.value):(a=n.attributes.map["data-mce-innertext"],a&&(n.attr("data-mce-innertext",null),o=new r("#text",3),o.value=a,o.raw=!0,n.append(o)))}))}function L(){function e(e,t){var n=i.createTextRange();try{n.moveToPoint(e,t)}catch(r){n=null}return n}function t(t){var r;t.button?(r=e(t.x,t.y),r&&(r.compareEndPoints("StartToStart",a)>0?r.setEndPoint("StartToStart",a):r.setEndPoint("EndToEnd",a),r.select())):n()}function n(){var e=r.selection.createRange();a&&!e.item&&0===e.compareEndPoints("StartToEnd",e)&&a.select(),G.unbind(r,"mouseup",n),G.unbind(r,"mousemove",t),a=o=0}var r=G.doc,i=r.body,o,a,s;r.documentElement.unselectable=!0,G.bind(r,"mousedown contextmenu",function(i){if("HTML"===i.target.nodeName){if(o&&n(),s=r.documentElement,s.scrollHeight>s.clientHeight)return;o=1,a=e(i.x,i.y),a&&(G.bind(r,"mouseup",n),G.bind(r,"mousemove",t),G.getRoot().focus(),a.select())}})}function H(){s.on("keyup focusin mouseup",function(t){65==t.keyCode&&e.metaKeyPressed(t)||X.normalize()},!0)}function P(){s.contentStyles.push("img:-moz-broken {-moz-force-broken-image-icon:1;min-width:24px;min-height:24px}")}function O(){s.inline||s.on("keydown",function(){document.activeElement==document.body&&s.getWin().focus()})}function I(){s.inline||(s.contentStyles.push("body {min-height: 150px}"),s.on("click",function(e){var t;if("HTML"==e.target.nodeName){if(o.ie>11)return void s.getBody().focus();t=s.selection.getRng(),s.getBody().focus(),s.selection.setRng(t),s.selection.normalize(),s.nodeChanged()}}))}function F(){o.mac&&s.on("keydown",function(t){!e.metaKeyPressed(t)||t.shiftKey||37!=t.keyCode&&39!=t.keyCode||(t.preventDefault(),s.selection.getSel().modify("move",37==t.keyCode?"backward":"forward","lineboundary"))})}function z(){l("AutoUrlDetect",!1)}function W(){s.on("click",function(e){var t=e.target;do if("A"===t.tagName)return void e.preventDefault();while(t=t.parentNode)}),s.contentStyles.push(".mce-content-body {-webkit-touch-callout: none}")}function V(){s.on("init",function(){s.dom.bind(s.getBody(),"submit",function(e){e.preventDefault()})})}function U(){Q.addNodeFilter("br",function(e){for(var t=e.length;t--;)"Apple-interchange-newline"==e[t].attr("class")&&e[t].remove()})}function $(){s.on("dragstart",function(e){d(e)}),s.on("drop",function(e){if(!u(e)){var n=f(e);if(n&&n.id!=s.id){e.preventDefault();var r=t.getCaretRangeFromPoint(e.x,e.y,s.getDoc());X.setRng(r),h(n.html)}}})}var q=a.each,j=s.$,K=e.BACKSPACE,Y=e.DELETE,G=s.dom,X=s.selection,J=s.settings,Q=s.parser,Z=s.serializer,ee=o.gecko,te=o.ie,ne=o.webkit,re="data:text/mce-internal,",ie=te?"Text":"URL";S(),m(),H(),ne&&(p(),v(),x(),R(),V(),_(),U(),o.iOS?(O(),I(),W()):g()),te&&o.ie<11&&(y(),w(),E(),N(),B(),D(),M(),L()),o.ie>=11&&(I(),_()),o.ie&&(g(),z(),$()),ee&&(y(),b(),C(),k(),T(),A(),P(),F(),_())}}),r(me,[K,b,f],function(e,t,n){function r(e,t){return"selectionchange"==t?e.getDoc():!e.inline&&/^mouse|click|contextmenu|drop|dragover|dragend/.test(t)?e.getDoc().documentElement:e.settings.event_root?(e.eventRoot||(e.eventRoot=o.select(e.settings.event_root)[0]),e.eventRoot):e.getBody()}function i(e,t){var n=r(e,t),i;if(e.delegates||(e.delegates={}),!e.delegates[t])if(e.settings.event_root){if(a||(a={},e.editorManager.on("removeEditor",function(){var t;if(!e.editorManager.activeEditor&&a){for(t in a)e.dom.unbind(r(e,t));a=null}})),a[t])return;i=function(n){for(var r=n.target,i=e.editorManager.editors,a=i.length;a--;){var s=i[a].getBody();(s===r||o.isChildOf(r,s))&&(i[a].hidden||i[a].fire(t,n))}},a[t]=i,o.bind(n,t,i)}else i=function(n){e.hidden||e.fire(t,n)},o.bind(n,t,i),e.delegates[t]=i}var o=t.DOM,a,s={bindPendingEventDelegates:function(){var e=this;n.each(e._pendingNativeEvents,function(t){i(e,t)})},toggleNativeEvent:function(e,t){var n=this;n.settings.readonly||"focus"!=e&&"blur"!=e&&(t?n.initialized?i(n,e):n._pendingNativeEvents?n._pendingNativeEvents.push(e):n._pendingNativeEvents=[e]:n.initialized&&(n.dom.unbind(r(n,e),e,n.delegates[e]),delete n.delegates[e]))},unbindAllNativeEvents:function(){var e=this,t;if(e.delegates){for(t in e.delegates)e.dom.unbind(r(e,t),t,e.delegates[t]);delete e.delegates}e.inline||(e.getBody().onload=null,e.dom.unbind(e.getWin()),e.dom.unbind(e.getDoc())),e.dom.unbind(e.getBody()),e.dom.unbind(e.getContainer())}};return s=n.extend({},e,s)}),r(ge,[f,u],function(e,t){var n=e.each,r=e.explode,i={f9:120,f10:121,f11:122},o=e.makeMap("alt,ctrl,shift,meta,access");return function(a){function s(e,s,l,c){var u,d,f;f={func:l,scope:c||a,desc:a.translate(s)},n(r(e,"+"),function(e){e in o?f[e]=!0:/^[0-9]{2,}$/.test(e)?f.keyCode=parseInt(e,10):(f.charCode=e.charCodeAt(0),f.keyCode=i[e]||e.toUpperCase().charCodeAt(0))}),u=[f.keyCode];for(d in o)f[d]?u.push(d):f[d]=!1;return f.id=u.join(","),f.access&&(f.alt=!0,t.mac?f.ctrl=!0:f.shift=!0),f.meta&&(t.mac?f.meta=!0:(f.ctrl=!0,f.meta=!1)),f}var l=this,c={};a.on("keyup keypress keydown",function(e){(e.altKey||e.ctrlKey||e.metaKey)&&!e.isDefaultPrevented()&&n(c,function(t){return t.ctrl==e.ctrlKey&&t.meta==e.metaKey&&t.alt==e.altKey&&t.shift==e.shiftKey&&(e.keyCode==t.keyCode||e.charCode&&e.charCode==t.charCode)?(e.preventDefault(),"keydown"==e.type&&t.func.call(t.scope),!0):void 0})}),l.add=function(t,i,o,l){var u;return u=o,"string"==typeof o?o=function(){a.execCommand(u,!1,null)}:e.isArray(u)&&(o=function(){a.execCommand(u[0],u[1],u[2])}),n(r(t.toLowerCase()),function(e){var t=s(e,i,o,l);c[t.id]=t}),!0},l.remove=function(e){var t=s(e);return c[t.id]?(delete c[t.id],!0):!1}}}),r(ve,[],function(){function e(e,t){return function(){e.apply(t,arguments)}}function t(t){if("object"!=typeof this)throw new TypeError("Promises must be constructed via new");if("function"!=typeof t)throw new TypeError("not a function");this._state=null,this._value=null,this._deferreds=[],s(t,e(r,this),e(i,this))}function n(e){var t=this;return null===this._state?void this._deferreds.push(e):void l(function(){var n=t._state?e.onFulfilled:e.onRejected;if(null===n)return void(t._state?e.resolve:e.reject)(t._value);var r;try{r=n(t._value)}catch(i){return void e.reject(i)}e.resolve(r)})}function r(t){try{if(t===this)throw new TypeError("A promise cannot be resolved with itself.");if(t&&("object"==typeof t||"function"==typeof t)){var n=t.then;if("function"==typeof n)return void s(e(n,t),e(r,this),e(i,this))}this._state=!0,this._value=t,o.call(this)}catch(a){i.call(this,a)}}function i(e){this._state=!1,this._value=e,o.call(this)}function o(){for(var e=0,t=this._deferreds.length;t>e;e++)n.call(this,this._deferreds[e]);this._deferreds=null}function a(e,t,n,r){this.onFulfilled="function"==typeof e?e:null,this.onRejected="function"==typeof t?t:null,this.resolve=n,this.reject=r}function s(e,t,n){var r=!1;try{e(function(e){r||(r=!0,t(e))},function(e){r||(r=!0,n(e))})}catch(i){if(r)return;r=!0,n(i)}}if(window.Promise)return window.Promise;var l=t.immediateFn||"function"==typeof setImmediate&&setImmediate||function(e){setTimeout(e,1)},c=Array.isArray||function(e){return"[object Array]"===Object.prototype.toString.call(e)};return t.prototype["catch"]=function(e){return this.then(null,e)},t.prototype.then=function(e,r){var i=this;return new t(function(t,o){n.call(i,new a(e,r,t,o))})},t.all=function(){var e=Array.prototype.slice.call(1===arguments.length&&c(arguments[0])?arguments[0]:arguments);return new t(function(t,n){function r(o,a){try{if(a&&("object"==typeof a||"function"==typeof a)){var s=a.then;if("function"==typeof s)return void s.call(a,function(e){r(o,e)},n)}e[o]=a,0===--i&&t(e)}catch(l){n(l)}}if(0===e.length)return t([]);for(var i=e.length,o=0;or;r++)e[r].then(t,n)})},t}),r(ye,[],function(){function e(e){return function(){return e}}return{constant:e}}),r(be,[ve,f,ye],function(e,t,n){return function(r){function i(e){var t,n;return n={"image/jpeg":"jpg","image/jpg":"jpg","image/gif":"gif","image/png":"png"},t=n[e.blob().type.toLowerCase()]||"dat",e.id()+"."+t}function o(e,t){return e?e.replace(/\/$/,"")+"/"+t.replace(/^\//,""):t}function a(e){return{id:e.id,blob:e.blob,base64:e.base64,filename:n.constant(i(e))}}function s(e,t,n){var a,s;a=new XMLHttpRequest,a.open("POST",r.url),a.withCredentials=r.credentials,a.onload=function(){var e;return 200!=a.status?void n("HTTP Error: "+a.status):(e=JSON.parse(a.responseText),e&&"string"==typeof e.location?void t(o(r.basePath,e.location)):void n("Invalid JSON: "+a.responseText))},s=new FormData,s.append("file",e.blob(),i(e)),a.send(s)}function l(n){function i(t){return new e(function(e){var n=r.handler;n(a(t),function(n){e({url:n,blobInfo:t,status:!0})},function(n){e({url:"",blobInfo:t,status:!1,error:n})})})}var o;return r.url||r.handler!==s?(o=t.map(n,function(e){var t,n=e.id();return c[n]?c[n]:(t=i(e).then(function(e){return delete c[n],e})["catch"](function(e){return delete c[n],e}),c[n]=t,t)}),e.all(o)):new e(function(e){e([])})}var c={};return r=t.extend({credentials:!1,handler:s},r),{upload:l}}}),r(xe,[ve],function(e){function t(t){return new e(function(e){var n=new XMLHttpRequest;n.open("GET",t,!0),n.responseType="blob",n.onload=function(){200==this.status&&e(this.response)},n.send()})}function n(e){var t,n;return e=decodeURIComponent(e).split(","),n=/data:([^;]+)/.exec(e[0]),n&&(t=n[1]),{type:t,data:e[1]}}function r(t){return new e(function(e){var r,i,o;t=n(t);try{r=atob(t.data)}catch(a){return void e(new Blob([]))}for(i=new Uint8Array(r.length),o=0;o",visual:!0,font_size_style_values:"xx-small,x-small,small,medium,large,x-large,xx-large",font_size_legacy_values:"xx-small,small,medium,large,x-large,xx-large,300%",forced_root_block:"p",hidden_input:!0,padd_empty_editor:!0,render_ui:!0,indentation:"30px",inline_styles:!0,convert_fonts_to_spans:!0,indent:"simple",indent_before:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,th,ul,ol,li,dl,dt,dd,area,table,thead,tfoot,tbody,tr,section,article,hgroup,aside,figure,option,optgroup,datalist",indent_after:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,th,ul,ol,li,dl,dt,dd,area,table,thead,tfoot,tbody,tr,section,article,hgroup,aside,figure,option,optgroup,datalist",validate:!0,entity_encoding:"named",url_converter:o.convertURL,url_converter_scope:o,ie7_compat:!0},t),r.language=t.language||"en",r.languageLoad=t.language_load,r.baseURL=i.baseURL,o.id=t.id=e,o.isNotDirty=!0,o.plugins={},o.documentBaseURI=new p(t.document_base_url||a,{base_uri:s}),o.baseURI=s,o.contentCSS=[],o.contentStyles=[],o.shortcuts=new E(o),o.loadedCSS={},o.editorCommands=new h(o),t.target&&(o.targetElm=t.target),o.suffix=i.suffix,o.editorManager=i,o.inline=t.inline,t.cache_suffix&&(C.cacheSuffix=t.cache_suffix.replace(/^[\?\&]+/,"")),t.override_viewport===!1&&(C.overrideViewPort=!1),i.fire("SetupEditor",o),o.execCallback("setup",o),o.$=n.overrideDefaults(function(){return{context:o.inline?o.getBody():o.getDoc(),element:o.getBody()}})}var k=e.DOM,T=r.ThemeManager,R=r.PluginManager,A=w.extend,B=w.each,D=w.explode,M=w.inArray,L=w.trim,H=w.resolve,P=g.Event,O=C.gecko,I=C.ie;return S.prototype={render:function(){function e(){k.unbind(window,"ready",e),n.render()}function t(){var e=m.ScriptLoader;if(r.language&&"en"!=r.language&&!r.language_url&&(r.language_url=n.editorManager.baseURL+"/langs/"+r.language+".js"),r.language_url&&e.add(r.language_url),r.theme&&"function"!=typeof r.theme&&"-"!=r.theme.charAt(0)&&!T.urls[r.theme]){var t=r.theme_url;t=t?n.documentBaseURI.toAbsolute(t):"themes/"+r.theme+"/theme"+o+".js",T.load(r.theme,t)}w.isArray(r.plugins)&&(r.plugins=r.plugins.join(" ")),B(r.external_plugins,function(e,t){R.load(t,e),r.plugins+=" "+t}),B(r.plugins.split(/[ ,]/),function(e){if(e=L(e),e&&!R.urls[e])if("-"==e.charAt(0)){e=e.substr(1,e.length);var t=R.dependencies(e);B(t,function(e){var t={prefix:"plugins/",resource:e,suffix:"/plugin"+o+".js"};e=R.createUrl(t,e),R.load(e.resource,e)})}else R.load(e,{prefix:"plugins/",resource:e,suffix:"/plugin"+o+".js"})}),e.loadQueue(function(){n.removed||n.init()})}var n=this,r=n.settings,i=n.id,o=n.suffix;if(!P.domLoaded)return void k.bind(window,"ready",e);if(n.getElement()&&C.contentEditable){r.inline?n.inline=!0:(n.orgVisibility=n.getElement().style.visibility,n.getElement().style.visibility="hidden");var a=n.getElement().form||k.getParent(i,"form");a&&(n.formElement=a,r.hidden_input&&!/TEXTAREA|INPUT/i.test(n.getElement().nodeName)&&(k.insertAfter(k.create("input",{type:"hidden",name:i}),i),n.hasHiddenInput=!0),n.formEventDelegate=function(e){n.fire(e.type,e)},k.bind(a,"submit reset",n.formEventDelegate),n.on("reset",function(){n.setContent(n.startContent,{format:"raw"})}),!r.submit_patch||a.submit.nodeType||a.submit.length||a._mceOldSubmit||(a._mceOldSubmit=a.submit,a.submit=function(){return n.editorManager.triggerSave(),n.isNotDirty=!0,a._mceOldSubmit(a)})),n.windowManager=new v(n),"xml"==r.encoding&&n.on("GetContent",function(e){e.save&&(e.content=k.encode(e.content))}),r.add_form_submit_trigger&&n.on("submit",function(){n.initialized&&n.save()}),r.add_unload_trigger&&(n._beforeUnload=function(){!n.initialized||n.destroyed||n.isHidden()||n.save({format:"raw",no_events:!0,set_dirty:!1})},n.editorManager.on("BeforeUnload",n._beforeUnload)),t()}},init:function(){function e(n){var r=R.get(n),i,o;i=R.urls[n]||t.documentBaseUrl.replace(/\/$/,""),n=L(n),r&&-1===M(m,n)&&(B(R.dependencies(n),function(t){e(t)}),o=new r(t,i,t.$),t.plugins[n]=o,o.init&&(o.init(t,i),m.push(n)))}var t=this,n=t.settings,r=t.getElement(),i,o,a,s,l,c,u,d,f,h,p,m=[];if(this.editorManager.i18n.setCode(n.language),t.rtl=n.rtl_ui||this.editorManager.i18n.rtl,t.editorManager.add(t),n.aria_label=n.aria_label||k.getAttrib(r,"aria-label",t.getLang("aria.rich_text_area")),n.theme&&("function"!=typeof n.theme?(n.theme=n.theme.replace(/-/,""),c=T.get(n.theme),t.theme=new c(t,T.urls[n.theme]),t.theme.init&&t.theme.init(t,T.urls[n.theme]||t.documentBaseUrl.replace(/\/$/,""),t.$)):t.theme=n.theme),B(n.plugins.replace(/\-/g,"").split(/[ ,]/),e),n.render_ui&&t.theme&&(t.orgDisplay=r.style.display,"function"!=typeof n.theme?(i=n.width||r.style.width||r.offsetWidth,o=n.height||r.style.height||r.offsetHeight,a=n.min_height||100,h=/^[0-9\.]+(|px)$/i,h.test(""+i)&&(i=Math.max(parseInt(i,10),100)),h.test(""+o)&&(o=Math.max(parseInt(o,10),a)),l=t.theme.renderUI({targetNode:r,width:i,height:o,deltaWidth:n.delta_width,deltaHeight:n.delta_height}),n.content_editable||(o=(l.iframeHeight||o)+("number"==typeof o?l.deltaHeight||0:""),a>o&&(o=a))):(l=n.theme(t,r),l.editorContainer.nodeType&&(l.editorContainer=l.editorContainer.id=l.editorContainer.id||t.id+"_parent"),l.iframeContainer.nodeType&&(l.iframeContainer=l.iframeContainer.id=l.iframeContainer.id||t.id+"_iframecontainer"),o=l.iframeHeight||r.offsetHeight),t.editorContainer=l.editorContainer),n.content_css&&B(D(n.content_css),function(e){t.contentCSS.push(t.documentBaseURI.toAbsolute(e))}),n.content_style&&t.contentStyles.push(n.content_style),n.content_editable)return r=s=l=null,t.initContentBody();for(t.iframeHTML=n.doctype+"",n.document_base_url!=t.documentBaseUrl&&(t.iframeHTML+=''),!C.caretAfter&&n.ie7_compat&&(t.iframeHTML+=''),t.iframeHTML+='',p=0;p',t.loadedCSS[g]=!0}d=n.body_id||"tinymce",-1!=d.indexOf("=")&&(d=t.getParam("body_id","","hash"),d=d[t.id]||d),f=n.body_class||"",-1!=f.indexOf("=")&&(f=t.getParam("body_class","","hash"),f=f[t.id]||""),n.content_security_policy&&(t.iframeHTML+=''),t.iframeHTML+='
    ';var v='javascript:(function(){document.open();document.domain="'+document.domain+'";var ed = window.parent.tinymce.get("'+t.id+'");document.write(ed.iframeHTML);document.close();ed.initContentBody(true);})()';document.domain!=location.hostname&&C.ie&&C.ie<12&&(u=v);var y=k.create("iframe",{id:t.id+"_ifr",frameBorder:"0",allowTransparency:"true",title:t.editorManager.translate("Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help"),style:{width:"100%",height:o,display:"block"}});if(y.onload=function(){y.onload=null,t.fire("load")},k.setAttrib(y,"src",u||'javascript:""'),t.contentAreaContainer=l.iframeContainer,t.iframeElement=y,s=k.add(l.iframeContainer,y),I)try{t.getDoc()}catch(b){s.src=u=v}l.editorContainer&&(k.get(l.editorContainer).style.display=t.orgDisplay,t.hidden=k.isHidden(l.editorContainer)),t.getElement().style.display="none",k.setAttrib(t.id,"aria-hidden",!0),u||t.initContentBody(),r=s=l=null},initContentBody:function(t){var n=this,r=n.settings,s=n.getElement(),h=n.getDoc(),p,m;r.inline||(n.getElement().style.visibility=n.orgVisibility),t||r.content_editable||(h.open(),h.write(n.iframeHTML),h.close()),r.content_editable&&(n.on("remove",function(){var e=this.getBody();k.removeClass(e,"mce-content-body"),k.removeClass(e,"mce-edit-focus"),k.setAttrib(e,"contentEditable",null)}),k.addClass(s,"mce-content-body"),n.contentDocument=h=r.content_document||document,n.contentWindow=r.content_window||window,n.bodyElement=s,r.content_document=r.content_window=null,r.root_name=s.nodeName.toLowerCase()),p=n.getBody(),p.disabled=!0,r.readonly||(n.inline&&"static"==k.getStyle(p,"position",!0)&&(p.style.position="relative"),p.contentEditable=n.getParam("content_editable_state",!0)),p.disabled=!1,n.editorUpload=new N(n),n.schema=new y(r),n.dom=new e(h,{keep_values:!0,url_converter:n.convertURL,url_converter_scope:n,hex_colors:r.force_hex_style_colors,class_filter:r.class_filter,update_styles:!0,root_element:n.inline?n.getBody():null,collect:r.content_editable,schema:n.schema,onSetAttrib:function(e){n.fire("SetAttrib",e)}}),n.parser=new b(r,n.schema),n.parser.addAttributeFilter("src,href,style,tabindex",function(e,t){for(var r=e.length,i,o=n.dom,a,s;r--;)if(i=e[r],a=i.attr(t),s="data-mce-"+t,!i.attributes.map[s]){if(0===a.indexOf("data:")||0===a.indexOf("blob:"))continue;"style"===t?(a=o.serializeStyle(o.parseStyle(a),i.name),a.length||(a=null),i.attr(s,a),i.attr(t,a)):"tabindex"===t?(i.attr(s,a),i.attr(t,null)):i.attr(s,n.convertURL(a,t,i.name))}}),n.parser.addNodeFilter("script",function(e){for(var t=e.length,n;t--;)n=e[t],n.attr("type","mce-"+(n.attr("type")||"no/type"))}),n.parser.addNodeFilter("#cdata",function(e){for(var t=e.length,n;t--;)n=e[t],n.type=8,n.name="#comment",n.value="[CDATA["+n.value+"]]"}),n.parser.addNodeFilter("p,h1,h2,h3,h4,h5,h6,div",function(e){for(var t=e.length,r,i=n.schema.getNonEmptyElements();t--;)r=e[t],r.isEmpty(i)&&(r.append(new o("br",1)).shortEnded=!0)}),n.serializer=new a(r,n),n.selection=new l(n.dom,n.getWin(),n.serializer,n),n.formatter=new c(n),n.undoManager=new u(n),n.forceBlocks=new f(n),n.enterKey=new d(n),n._nodeChangeDispatcher=new i(n),n.fire("PreInit"),r.browser_spellcheck||r.gecko_spellcheck||(h.body.spellcheck=!1,k.setAttrib(p,"spellcheck","false")),n.fire("PostRender"),n.quirks=new x(n),r.directionality&&(p.dir=r.directionality),r.nowrap&&(p.style.whiteSpace="nowrap"),r.protect&&n.on("BeforeSetContent",function(e){B(r.protect,function(t){e.content=e.content.replace(t,function(e){return""})})}),n.on("SetContent",function(){n.addVisual(n.getBody())}),r.padd_empty_editor&&n.on("PostProcess",function(e){e.content=e.content.replace(/^(]*>( | |\s|\u00a0|)<\/p>[\r\n]*|
    [\r\n]*)$/,"")}),n.load({initial:!0,format:"html"}),n.startContent=n.getContent({format:"raw"}),n.initialized=!0,n.bindPendingEventDelegates(),n.fire("init"),n.focus(!0),n.nodeChanged({initial:!0}),n.execCallback("init_instance_callback",n),n.contentStyles.length>0&&(m="",B(n.contentStyles,function(e){m+=e+"\r\n"}),n.dom.addStyle(m)),B(n.contentCSS,function(e){n.loadedCSS[e]||(n.dom.loadCSS(e),n.loadedCSS[e]=!0)}),r.auto_focus&&setTimeout(function(){var e;e=r.auto_focus===!0?n:n.editorManager.get(r.auto_focus),e.destroyed||e.focus()},100),s=h=p=null},focus:function(e){var t=this,n=t.selection,r=t.settings.content_editable,i,o,a=t.getDoc(),s;if(!e){if(i=n.getRng(),i.item&&(o=i.item(0)),t._refreshContentEditable(),r||(C.opera||t.getBody().focus(),t.getWin().focus()),O||r){if(s=t.getBody(),s.setActive)try{s.setActive()}catch(l){s.focus()}else s.focus();r&&n.normalize()}o&&o.ownerDocument==a&&(i=a.body.createControlRange(),i.addElement(o),i.select())}t.editorManager.setActive(t)},execCallback:function(e){var t=this,n=t.settings[e],r;if(n)return t.callbackLookup&&(r=t.callbackLookup[e])&&(n=r.func,r=r.scope),"string"==typeof n&&(r=n.replace(/\.\w+$/,""),r=r?H(r):0,n=H(n),t.callbackLookup=t.callbackLookup||{},t.callbackLookup[e]={func:n,scope:r}),n.apply(r||t,Array.prototype.slice.call(arguments,1))},translate:function(e){var t=this.settings.language||"en",n=this.editorManager.i18n;return e?n.data[t+"."+e]||e.replace(/\{\#([^\}]+)\}/g,function(e,r){ -return n.data[t+"."+r]||"{#"+r+"}"}):""},getLang:function(e,n){return this.editorManager.i18n.data[(this.settings.language||"en")+"."+e]||(n!==t?n:"{#"+e+"}")},getParam:function(e,t,n){var r=e in this.settings?this.settings[e]:t,i;return"hash"===n?(i={},"string"==typeof r?B(r.indexOf("=")>0?r.split(/[;,](?![^=;,]*(?:[;,]|$))/):r.split(","),function(e){e=e.split("="),e.length>1?i[L(e[0])]=L(e[1]):i[L(e[0])]=L(e)}):i=r,i):r},nodeChanged:function(e){this._nodeChangeDispatcher.nodeChanged(e)},addButton:function(e,t){var n=this;t.cmd&&(t.onclick=function(){n.execCommand(t.cmd)}),t.text||t.icon||(t.icon=e),n.buttons=n.buttons||{},t.tooltip=t.tooltip||t.title,n.buttons[e]=t},addMenuItem:function(e,t){var n=this;t.cmd&&(t.onclick=function(){n.execCommand(t.cmd)}),n.menuItems=n.menuItems||{},n.menuItems[e]=t},addContextToolbar:function(e,t){var n=this,r;n.contextToolbars=n.contextToolbars||[],"string"==typeof e&&(r=e,e=function(e){return n.dom.is(e,r)}),n.contextToolbars.push({predicate:e,items:t})},addCommand:function(e,t,n){this.editorCommands.addCommand(e,t,n)},addQueryStateHandler:function(e,t,n){this.editorCommands.addQueryStateHandler(e,t,n)},addQueryValueHandler:function(e,t,n){this.editorCommands.addQueryValueHandler(e,t,n)},addShortcut:function(e,t,n,r){this.shortcuts.add(e,t,n,r)},execCommand:function(e,t,n,r){return this.editorCommands.execCommand(e,t,n,r)},queryCommandState:function(e){return this.editorCommands.queryCommandState(e)},queryCommandValue:function(e){return this.editorCommands.queryCommandValue(e)},queryCommandSupported:function(e){return this.editorCommands.queryCommandSupported(e)},show:function(){var e=this;e.hidden&&(e.hidden=!1,e.inline?e.getBody().contentEditable=!0:(k.show(e.getContainer()),k.hide(e.id)),e.load(),e.fire("show"))},hide:function(){var e=this,t=e.getDoc();e.hidden||(I&&t&&!e.inline&&t.execCommand("SelectAll"),e.save(),e.inline?(e.getBody().contentEditable=!1,e==e.editorManager.focusedEditor&&(e.editorManager.focusedEditor=null)):(k.hide(e.getContainer()),k.setStyle(e.id,"display",e.orgDisplay)),e.hidden=!0,e.fire("hide"))},isHidden:function(){return!!this.hidden},setProgressState:function(e,t){this.fire("ProgressState",{state:e,time:t})},load:function(e){var n=this,r=n.getElement(),i;return r?(e=e||{},e.load=!0,i=n.setContent(r.value!==t?r.value:r.innerHTML,e),e.element=r,e.no_events||n.fire("LoadContent",e),e.element=r=null,i):void 0},save:function(e){var t=this,n=t.getElement(),r,i;if(n&&t.initialized)return e=e||{},e.save=!0,e.element=n,r=e.content=t.getContent(e),e.no_events||t.fire("SaveContent",e),"raw"==e.format&&t.fire("RawSaveContent",e),r=e.content,/TEXTAREA|INPUT/i.test(n.nodeName)?n.value=r:(t.inline||(n.innerHTML=r),(i=k.getParent(t.id,"form"))&&B(i.elements,function(e){return e.name==t.id?(e.value=r,!1):void 0})),e.element=n=null,e.set_dirty!==!1&&(t.isNotDirty=!0),r},setContent:function(e,t){var n=this,r=n.getBody(),i;return t=t||{},t.format=t.format||"html",t.set=!0,t.content=e,t.no_events||n.fire("BeforeSetContent",t),e=t.content,0===e.length||/^\s+$/.test(e)?(i=n.settings.forced_root_block,i&&n.schema.isValidChild(r.nodeName.toLowerCase(),i.toLowerCase())?(e=I&&11>I?"":'
    ',e=n.dom.createHTML(i,n.settings.forced_root_block_attrs,e)):I||(e='
    '),n.dom.setHTML(r,e),n.fire("SetContent",t)):("raw"!==t.format&&(e=new s({},n.schema).serialize(n.parser.parse(e,{isRootContent:!0}))),t.content=L(e),n.dom.setHTML(r,t.content),t.no_events||n.fire("SetContent",t)),t.content},getContent:function(e){var t=this,n,r=t.getBody();return e=e||{},e.format=e.format||"html",e.get=!0,e.getInner=!0,e.no_events||t.fire("BeforeGetContent",e),n="raw"==e.format?r.innerHTML:"text"==e.format?r.innerText||r.textContent:t.serializer.serialize(r,e),"text"!=e.format?e.content=L(n):e.content=n,e.no_events||t.fire("GetContent",e),e.content},insertContent:function(e,t){t&&(e=A({content:e},t)),this.execCommand("mceInsertContent",!1,e)},isDirty:function(){return!this.isNotDirty},getContainer:function(){var e=this;return e.container||(e.container=k.get(e.editorContainer||e.id+"_parent")),e.container},getContentAreaContainer:function(){return this.contentAreaContainer},getElement:function(){return this.targetElm||(this.targetElm=k.get(this.id)),this.targetElm},getWin:function(){var e=this,t;return e.contentWindow||(t=e.iframeElement,t&&(e.contentWindow=t.contentWindow)),e.contentWindow},getDoc:function(){var e=this,t;return e.contentDocument||(t=e.getWin(),t&&(e.contentDocument=t.document)),e.contentDocument},getBody:function(){return this.bodyElement||this.getDoc().body},convertURL:function(e,t,n){var r=this,i=r.settings;return i.urlconverter_callback?r.execCallback("urlconverter_callback",e,n,!0,t):!i.convert_urls||n&&"LINK"==n.nodeName||0===e.indexOf("file:")||0===e.length?e:i.relative_urls?r.documentBaseURI.toRelative(e):e=r.documentBaseURI.toAbsolute(e,i.remove_script_host)},addVisual:function(e){var n=this,r=n.settings,i=n.dom,o;e=e||n.getBody(),n.hasVisual===t&&(n.hasVisual=r.visual),B(i.select("table,a",e),function(e){var t;switch(e.nodeName){case"TABLE":return o=r.visual_table_class||"mce-item-table",t=i.getAttrib(e,"border"),void(t&&"0"!=t||!n.hasVisual?i.removeClass(e,o):i.addClass(e,o));case"A":return void(i.getAttrib(e,"href",!1)||(t=i.getAttrib(e,"name")||e.id,o=r.visual_anchor_class||"mce-item-anchor",t&&n.hasVisual?i.addClass(e,o):i.removeClass(e,o)))}}),n.fire("VisualAid",{element:e,hasVisual:n.hasVisual})},remove:function(){var e=this;e.removed||(e.save(),e.removed=1,e.unbindAllNativeEvents(),e.hasHiddenInput&&k.remove(e.getElement().nextSibling),e.inline||(I&&10>I&&e.getDoc().execCommand("SelectAll",!1,null),k.setStyle(e.id,"display",e.orgDisplay),e.getBody().onload=null),e.fire("remove"),e.editorManager.remove(e),k.remove(e.getContainer()),e.editorUpload.destroy(),e.destroy())},destroy:function(e){var t=this,n;if(!t.destroyed){if(!e&&!t.removed)return void t.remove();e||(t.editorManager.off("beforeunload",t._beforeUnload),t.theme&&t.theme.destroy&&t.theme.destroy(),t.selection.destroy(),t.dom.destroy()),n=t.formElement,n&&(n._mceOldSubmit&&(n.submit=n._mceOldSubmit,n._mceOldSubmit=null),k.unbind(n,"submit reset",t.formEventDelegate)),t.contentAreaContainer=t.formElement=t.container=t.editorContainer=null,t.bodyElement=t.contentDocument=t.contentWindow=null,t.iframeElement=t.targetElm=null,t.selection&&(t.selection=t.selection.win=t.selection.dom=t.selection.dom.doc=null),t.destroyed=1}},uploadImages:function(e){return this.editorUpload.uploadImages(e)},_scanForImages:function(){return this.editorUpload.scanForImages()},_refreshContentEditable:function(){var e=this,t,n;e._isHidden()&&(t=e.getBody(),n=t.parentNode,n.removeChild(t),n.appendChild(t),t.focus())},_isHidden:function(){var e;return O?(e=this.selection.getSel(),!e||!e.rangeCount||0===e.rangeCount):0}},A(S.prototype,_),S}),r(Ne,[],function(){var e={},t="en";return{setCode:function(e){e&&(t=e,this.rtl=this.data[e]?"rtl"===this.data[e]._dir:!1)},getCode:function(){return t},rtl:!1,add:function(t,n){var r=e[t];r||(e[t]=r={});for(var i in n)r[i]=n[i];this.setCode(t)},translate:function(n){var r;if(r=e[t],r||(r={}),"undefined"==typeof n)return n;if("string"!=typeof n&&n.raw)return n.raw;if(n.push){var i=n.slice(1);n=(r[n[0]]||n[0]).replace(/\{([0-9]+)\}/g,function(e,t){return i[t]})}return(r[n]||n).replace(/{context:\w+}$/,"")},data:e}}),r(Se,[b,u],function(e,t){function n(e){function s(){try{return document.activeElement}catch(e){return document.body}}function l(e,t){if(t&&t.startContainer){if(!e.isChildOf(t.startContainer,e.getRoot())||!e.isChildOf(t.endContainer,e.getRoot()))return;return{startContainer:t.startContainer,startOffset:t.startOffset,endContainer:t.endContainer,endOffset:t.endOffset}}return t}function c(e,t){var n;return t.startContainer?(n=e.getDoc().createRange(),n.setStart(t.startContainer,t.startOffset),n.setEnd(t.endContainer,t.endOffset)):n=t,n}function u(e){return!!a.getParent(e,n.isEditorUIElement)}function d(n){var d=n.editor;d.on("init",function(){(d.inline||t.ie)&&("onbeforedeactivate"in document&&t.ie<9?d.dom.bind(d.getBody(),"beforedeactivate",function(e){if(e.target==d.getBody())try{d.lastRng=d.selection.getRng()}catch(t){}}):d.on("nodechange mouseup keyup",function(e){var t=s();"nodechange"==e.type&&e.selectionChange||(t&&t.id==d.id+"_ifr"&&(t=d.getBody()),d.dom.isChildOf(t,d.getBody())&&(d.lastRng=d.selection.getRng()))}),t.webkit&&!r&&(r=function(){var t=e.activeEditor;if(t&&t.selection){var n=t.selection.getRng();n&&!n.collapsed&&(d.lastRng=n)}},a.bind(document,"selectionchange",r)))}),d.on("setcontent",function(){d.lastRng=null}),d.on("mousedown",function(){d.selection.lastFocusBookmark=null}),d.on("focusin",function(){var t=e.focusedEditor;d.selection.lastFocusBookmark&&(d.selection.setRng(c(d,d.selection.lastFocusBookmark)),d.selection.lastFocusBookmark=null),t!=d&&(t&&t.fire("blur",{focusedEditor:d}),e.setActive(d),e.focusedEditor=d,d.fire("focus",{blurredEditor:t}),d.focus(!0)),d.lastRng=null}),d.on("focusout",function(){window.setTimeout(function(){var t=e.focusedEditor;u(s())||t!=d||(d.fire("blur",{focusedEditor:null}),e.focusedEditor=null,d.selection&&(d.selection.lastFocusBookmark=null))},0)}),i||(i=function(t){var n=e.activeEditor;n&&t.target.ownerDocument==document&&(n.selection&&t.target!=n.getBody()&&(n.selection.lastFocusBookmark=l(n.dom,n.lastRng)),t.target==document.body||u(t.target)||e.focusedEditor!=n||(n.fire("blur",{focusedEditor:null}),e.focusedEditor=null))},a.bind(document,"focusin",i)),d.inline&&!o&&(o=function(t){var n=e.activeEditor;if(n.inline&&!n.dom.isChildOf(t.target,n.getBody())){var r=n.selection.getRng();r.collapsed||(n.lastRng=r)}},a.bind(document,"mouseup",o))}function f(t){e.focusedEditor==t.editor&&(e.focusedEditor=null),e.activeEditor||(a.unbind(document,"selectionchange",r),a.unbind(document,"focusin",i),a.unbind(document,"mouseup",o),r=i=o=null)}e.on("AddEditor",d),e.on("RemoveEditor",f)}var r,i,o,a=e.DOM;return n.isEditorUIElement=function(e){return-1!==e.className.toString().indexOf("mce-")},n}),r(ke,[Ee,h,b,U,u,f,K,Ne,Se],function(e,t,n,r,i,o,a,s,l){function c(e){m(b.editors,function(t){t.fire("ResizeWindow",e)})}function u(e,n){n!==x&&(n?t(window).on("resize",c):t(window).off("resize",c),x=n)}function d(e){var t=b.editors,n;delete t[e.id];for(var r=0;r0&&m(p(e),function(e){var n;(n=h.get(e))?r(e,t,n):m(document.forms,function(n){m(n.elements,function(n){n.name===e&&(e="mce_editor_"+v++,h.setAttrib(n,"id",e),r(e,t,n))})})});break;case"textareas":case"specific_textareas":m(h.select("textarea"),function(e){t.editor_deselector&&o(e,t.editor_deselector)||(!t.editor_selector||o(e,t.editor_selector))&&r(n(e),t,e)})}t.oninit&&(e=s=0,m(l,function(t){s++,t.initialized?e++:t.on("init",function(){e++,e==s&&i("oninit")}),e==s&&i("oninit")}))}var s=this,l=[];s.settings=t,h.bind(window,"ready",a)},get:function(e){return arguments.length?e in this.editors?this.editors[e]:null:this.editors},add:function(e){var t=this,n=t.editors;return n[e.id]=e,n.push(e),u(n,!0),t.activeEditor=e,t.fire("AddEditor",{editor:e}),y||(y=function(){t.fire("BeforeUnload")},h.bind(window,"beforeunload",y)),e},createEditor:function(t,n){return this.add(new e(t,n,this))},remove:function(e){var t=this,n,r=t.editors,i;{if(e)return"string"==typeof e?(e=e.selector||e,void m(h.select(e),function(e){i=r[e.id],i&&t.remove(i)})):(i=e,r[i.id]?(d(i)&&t.fire("RemoveEditor",{editor:i}),r.length||h.unbind(window,"beforeunload",y),i.remove(),u(r,r.length>0),i):null);for(n=r.length-1;n>=0;n--)t.remove(r[n])}},execCommand:function(t,n,r){var i=this,o=i.get(r);switch(t){case"mceAddEditor":return i.get(r)||new e(r,i.settings,i).render(),!0;case"mceRemoveEditor":return o&&o.remove(),!0;case"mceToggleEditor":return o?(o.isHidden()?o.show():o.hide(),!0):(i.execCommand("mceAddEditor",0,r),!0)}return i.activeEditor?i.activeEditor.execCommand(t,n,r):!1},triggerSave:function(){m(this.editors,function(e){e.save()})},addI18n:function(e,t){s.add(e,t)},translate:function(e){return s.translate(e)},setActive:function(e){var t=this.activeEditor;this.activeEditor!=e&&(t&&t.fire("deactivate",{relatedTarget:e}),e.fire("activate",{relatedTarget:t})),this.activeEditor=e}},g(b,a),b.setup(),window.tinymce=window.tinyMCE=b,b}),r(Te,[ke,f],function(e,t){var n=t.each,r=t.explode;e.on("AddEditor",function(e){var t=e.editor;t.on("preInit",function(){function e(e,t){n(t,function(t,n){t&&s.setStyle(e,n,t)}),s.rename(e,"span")}function i(e){s=t.dom,l.convert_fonts_to_spans&&n(s.select("font,u,strike",e.node),function(e){o[e.nodeName.toLowerCase()](s,e)})}var o,a,s,l=t.settings;l.inline_styles&&(a=r(l.font_size_legacy_values),o={font:function(t,n){e(n,{backgroundColor:n.style.backgroundColor,color:n.color,fontFamily:n.face,fontSize:a[parseInt(n.size,10)-1]})},u:function(n,r){"html4"===t.settings.schema&&e(r,{textDecoration:"underline"})},strike:function(t,n){e(n,{textDecoration:"line-through"})}},t.on("PreProcess SetContent",i))})})}),r(Re,[K,f],function(e,t){var n={send:function(e){function r(){!e.async||4==i.readyState||o++>1e4?(e.success&&1e4>o&&200==i.status?e.success.call(e.success_scope,""+i.responseText,i,e):e.error&&e.error.call(e.error_scope,o>1e4?"TIMED_OUT":"GENERAL",i,e),i=null):setTimeout(r,10)}var i,o=0;if(e.scope=e.scope||this,e.success_scope=e.success_scope||e.scope,e.error_scope=e.error_scope||e.scope,e.async=e.async===!1?!1:!0,e.data=e.data||"",i=new XMLHttpRequest){if(i.overrideMimeType&&i.overrideMimeType(e.content_type),i.open(e.type||(e.data?"POST":"GET"),e.url,e.async),e.crossDomain&&(i.withCredentials=!0),e.content_type&&i.setRequestHeader("Content-Type",e.content_type),e.requestheaders&&t.each(e.requestheaders,function(e){i.setRequestHeader(e.key,e.value)}),i.setRequestHeader("X-Requested-With","XMLHttpRequest"),i=n.fire("beforeSend",{xhr:i,settings:e}).xhr,i.send(e.data),!e.async)return r();setTimeout(r,10)}}};return t.extend(n,e),n}),r(Ae,[],function(){function e(t,n){var r,i,o,a;if(n=n||'"',null===t)return"null";if(o=typeof t,"string"==o)return i="\bb t\nn\ff\rr\"\"''\\\\",n+t.replace(/([\u0080-\uFFFF\x00-\x1f\"\'\\])/g,function(e,t){return'"'===n&&"'"===e?e:(r=i.indexOf(t),r+1?"\\"+i.charAt(r+1):(e=t.charCodeAt().toString(16),"\\u"+"0000".substring(e.length)+e))})+n;if("object"==o){if(t.hasOwnProperty&&"[object Array]"===Object.prototype.toString.call(t)){for(r=0,i="[";r0?",":"")+e(t[r],n);return i+"]"}i="{";for(a in t)t.hasOwnProperty(a)&&(i+="function"!=typeof t[a]?(i.length>1?","+n:n)+a+n+":"+e(t[a],n):"");return i+"}"}return""+t}return{serialize:e,parse:function(e){try{return window[String.fromCharCode(101)+"val"]("("+e+")")}catch(t){}}}}),r(Be,[Ae,Re,f],function(e,t,n){function r(e){this.settings=i({},e),this.count=0}var i=n.extend;return r.sendRPC=function(e){return(new r).send(e)},r.prototype={send:function(n){var r=n.error,o=n.success;n=i(this.settings,n),n.success=function(t,i){t=e.parse(t),"undefined"==typeof t&&(t={error:"JSON Parse error."}),t.error?r.call(n.error_scope||n.scope,t.error,i):o.call(n.success_scope||n.scope,t.result)},n.error=function(e,t){r&&r.call(n.error_scope||n.scope,e,t)},n.data=e.serialize({id:n.id||"c"+this.count++,method:n.method,params:n.params}),n.content_type="application/json",t.send(n)}},r}),r(De,[b],function(e){return{callbacks:{},count:0,send:function(n){var r=this,i=e.DOM,o=n.count!==t?n.count:r.count,a="tinymce_jsonp_"+o;r.callbacks[o]=function(e){i.remove(a),delete r.callbacks[o],n.callback(e)},i.add(i.doc.body,"script",{id:a,src:n.url,type:"text/javascript"}),r.count++}}}),r(Me,[],function(){function e(){s=[];for(var e in a)s.push(e);i.length=s.length}function n(){function n(e){var n,r;return r=e!==t?u+e:i.indexOf(",",u),-1===r||r>i.length?null:(n=i.substring(u,r),u=r+1,n)}var r,i,s,u=0;if(a={},c){o.load(l),i=o.getAttribute(l)||"";do{var d=n();if(null===d)break;if(r=n(parseInt(d,32)||0),null!==r){if(d=n(),null===d)break;s=n(parseInt(d,32)||0),r&&(a[r]=s)}}while(null!==r);e()}}function r(){var t,n="";if(c){for(var r in a)t=a[r],n+=(n?",":"")+r.length.toString(32)+","+r+","+t.length.toString(32)+","+t;o.setAttribute(l,n);try{o.save(l)}catch(i){}e()}}var i,o,a,s,l,c;try{if(window.localStorage)return localStorage}catch(u){}return l="tinymce",o=document.documentElement,c=!!o.addBehavior,c&&o.addBehavior("#default#userData"),i={key:function(e){return s[e]},getItem:function(e){return e in a?a[e]:null},setItem:function(e,t){a[e]=""+t,r()},removeItem:function(e){delete a[e],r()},clear:function(){a={},r()}},n(),i}),r(Le,[b,l,x,C,f,u],function(e,t,n,r,i,o){var a=window.tinymce;return a.DOM=e.DOM,a.ScriptLoader=n.ScriptLoader,a.PluginManager=r.PluginManager,a.ThemeManager=r.ThemeManager,a.dom=a.dom||{},a.dom.Event=t.Event,i.each(i,function(e,t){a[t]=e}),i.each("isOpera isWebKit isIE isGecko isMac".split(" "),function(e){a[e]=o[e.substr(2).toLowerCase()]}),{}}),r(He,[$,f],function(e,t){return e.extend({Defaults:{firstControlClass:"first",lastControlClass:"last"},init:function(e){this.settings=t.extend({},this.Defaults,e)},preRender:function(e){e.bodyClasses.add(this.settings.containerClass)},applyClasses:function(e){var t=this,n=t.settings,r,i,o,a;r=n.firstControlClass,i=n.lastControlClass,e.each(function(e){e.classes.remove(r).remove(i).add(n.controlClass),e.visible()&&(o||(o=e),a=e)}),o&&o.classes.add(r),a&&a.classes.add(i)},renderHtml:function(e){var t=this,n="";return t.applyClasses(e.items()),e.items().each(function(e){n+=e.renderHtml()}),n},recalc:function(){},postRender:function(){},isNative:function(){return!1}})}),r(Pe,[He],function(e){return e.extend({Defaults:{containerClass:"abs-layout",controlClass:"abs-layout-item"},recalc:function(e){e.items().filter(":visible").each(function(e){var t=e.settings;e.layoutRect({x:t.x,y:t.y,w:t.w,h:t.h}),e.recalc&&e.recalc()})},renderHtml:function(e){return'
    '+this._super(e)}})}),r(Oe,[te,le],function(e,t){return e.extend({Mixins:[t],Defaults:{classes:"widget tooltip tooltip-n"},renderHtml:function(){var e=this,t=e.classPrefix;return'"},bindStates:function(){var e=this;return e.state.on("change:text",function(t){e.getEl().lastChild.innerHTML=e.encode(t.value)}),e._super()},repaint:function(){var e=this,t,n;t=e.getEl().style,n=e._layoutRect,t.left=n.x+"px",t.top=n.y+"px",t.zIndex=131070}})}),r(Ie,[te,Oe],function(e,t){var n,r=e.extend({init:function(e){var t=this;t._super(e),e=t.settings,t.canFocus=!0,e.tooltip&&r.tooltips!==!1&&(t.on("mouseenter",function(n){var r=t.tooltip().moveTo(-65535);if(n.control==t){var i=r.text(e.tooltip).show().testMoveRel(t.getEl(),["bc-tc","bc-tl","bc-tr"]);r.classes.toggle("tooltip-n","bc-tc"==i),r.classes.toggle("tooltip-nw","bc-tl"==i),r.classes.toggle("tooltip-ne","bc-tr"==i),r.moveRel(t.getEl(),i)}else r.hide()}),t.on("mouseleave mousedown click",function(){t.tooltip().hide()})),t.aria("label",e.ariaLabel||e.tooltip)},tooltip:function(){return n||(n=new t({type:"tooltip"}),n.renderTo()),n},postRender:function(){var e=this,t=e.settings;e._super(),e.parent()||!t.width&&!t.height||(e.initLayoutRect(),e.repaint()),t.autofocus&&e.focus()},bindStates:function(){function e(e){n.aria("disabled",e),n.classes.toggle("disabled",e)}function t(e){n.aria("pressed",e),n.classes.toggle("active",e)}var n=this;return n.state.on("change:disabled",function(t){e(t.value)}),n.state.on("change:active",function(e){t(e.value)}),n.state.get("disabled")&&e(!0),n.state.get("active")&&t(!0),n._super()},remove:function(){this._super(),n&&(n.remove(),n=null)}});return r}),r(Fe,[Ie],function(e){return e.extend({Defaults:{classes:"widget btn",role:"button"},init:function(e){var t=this,n;t._super(e),e=t.settings,n=t.settings.size,t.on("click mousedown",function(e){e.preventDefault()}),t.on("touchstart",function(e){t.fire("click",e),e.preventDefault()}),e.subtype&&t.classes.add(e.subtype),n&&t.classes.add("btn-"+n),e.icon&&t.icon(e.icon)},icon:function(e){return arguments.length?(this.state.set("icon",e),this):this.state.get("icon")},repaint:function(){var e=this.getEl().firstChild,t;e&&(t=e.style,t.width=t.height="100%"),this._super()},renderHtml:function(){var e=this,t=e._id,n=e.classPrefix,r=e.state.get("icon"),i,o=e.state.get("text");return i=e.settings.image,i?(r="none","string"!=typeof i&&(i=window.getSelection?i[0]:i[1]),i=" style=\"background-image: url('"+i+"')\""):i="",o&&e.classes.add("btn-has-text"),r=e.settings.icon?n+"ico "+n+"i-"+r:"",'
    "},bindStates:function(){function e(e){for(var n=t.getEl().firstChild.firstChild;n;n=n.nextSibling)3==n.nodeType&&(n.data=t.translate(e));t.classes.toggle("btn-has-text",!!e)}var t=this;return t.state.on("change:text",function(t){e(t.value)}),t.state.on("change:icon",function(n){var r=n.value,i=t.classPrefix;t.settings.icon=r,r=r?i+"ico "+i+"i-"+t.settings.icon:"";var o=t.getEl().firstChild,a=o.getElementsByTagName("i")[0];r?(a&&a==o.firstChild||(a=document.createElement("i"),o.insertBefore(a,o.firstChild)),a.className=r):a&&o.removeChild(a),e(t.state.get("text"))}),t._super()}})}),r(ze,[ie],function(e){return e.extend({Defaults:{defaultType:"button",role:"group"},renderHtml:function(){var e=this,t=e._layout;return e.classes.add("btn-group"),e.preRender(),t.preRender(e),'
    '+(e.settings.html||"")+t.renderHtml(e)+"
    "}})}),r(We,[Ie],function(e){return e.extend({Defaults:{classes:"checkbox",role:"checkbox",checked:!1},init:function(e){var t=this;t._super(e),t.on("click mousedown",function(e){e.preventDefault()}),t.on("click",function(e){e.preventDefault(),t.disabled()||t.checked(!t.checked())}),t.checked(t.settings.checked)},checked:function(e){return arguments.length?(this.state.set("checked",e),this):this.state.get("checked")},value:function(e){return arguments.length?this.checked(e):this.checked()},renderHtml:function(){var e=this,t=e._id,n=e.classPrefix;return'
    '+e.encode(e.state.get("text"))+"
    "},bindStates:function(){function e(e){t.classes.toggle("checked",e),t.aria("checked",e)}var t=this;return t.state.on("change:text",function(e){t.getEl("al").firstChild.data=t.translate(e.value)}),t.state.on("change:checked change:value",function(n){t.fire("change"),e(n.value)}),t.state.on("change:icon",function(e){var n=e.value,r=t.classPrefix;if("undefined"==typeof n)return t.settings.icon;t.settings.icon=n,n=n?r+"ico "+r+"i-"+t.settings.icon:"";var i=t.getEl().firstChild,o=i.getElementsByTagName("i")[0];n?(o&&o==i.firstChild||(o=document.createElement("i"),i.insertBefore(o,i.firstChild)),o.className=n):o&&i.removeChild(o)}),t.state.get("checked")&&e(!0),t._super()}})}),r(Ve,[Ie,ne,J,h],function(e,t,n,r){return e.extend({init:function(e){var t=this;t._super(e),e=t.settings,t.classes.add("combobox"),t.subinput=!0,t.ariaTarget="inp",e.menu=e.menu||e.values,e.menu&&(e.icon="caret"),t.on("click",function(n){var i=n.target,o=t.getEl();if(r.contains(o,i)||i==o)for(;i&&i!=o;)i.id&&-1!=i.id.indexOf("-open")&&(t.fire("action"),e.menu&&(t.showMenu(),n.aria&&t.menu.items()[0].focus())),i=i.parentNode}),t.on("keydown",function(e){"INPUT"==e.target.nodeName&&13==e.keyCode&&t.parents().reverse().each(function(n){var r=t.state.get("value"),i=t.getEl("inp").value;return e.preventDefault(),t.state.set("value",i),r!=i&&t.fire("change"),n.hasEventListeners("submit")&&n.toJSON?(n.fire("submit",{data:n.toJSON()}),!1):void 0})}),t.on("keyup",function(e){"INPUT"==e.target.nodeName&&t.state.set("value",e.target.value)})},showMenu:function(){var e=this,n=e.settings,r;e.menu||(r=n.menu||[],r.length?r={type:"menu",items:r}:r.type=r.type||"menu",e.menu=t.create(r).parent(e).renderTo(e.getContainerElm()),e.fire("createmenu"),e.menu.reflow(),e.menu.on("cancel",function(t){t.control===e.menu&&e.focus()}),e.menu.on("show hide",function(t){t.control.items().each(function(t){t.active(t.value()==e.value())})}).fire("show"),e.menu.on("select",function(t){e.value(t.control.value())}),e.on("focusin",function(t){"INPUT"==t.target.tagName.toUpperCase()&&e.menu.hide()}),e.aria("expanded",!0)),e.menu.show(),e.menu.layoutRect({w:e.layoutRect().w}),e.menu.moveRel(e.getEl(),e.isRtl()?["br-tr","tr-br"]:["bl-tl","tl-bl"])},focus:function(){this.getEl("inp").focus()},repaint:function(){var e=this,t=e.getEl(),i=e.getEl("open"),o=e.layoutRect(),a,s;a=i?o.w-n.getSize(i).width-10:o.w-10;var l=document;return l.all&&(!l.documentMode||l.documentMode<=8)&&(s=e.layoutRect().h-2+"px"),r(t.firstChild).css({width:a,lineHeight:s}),e._super(),e},postRender:function(){var e=this;return r(this.getEl("inp")).on("change",function(t){e.state.set("value",t.target.value),e.fire("change",t)}),e._super()},renderHtml:function(){var e=this,t=e._id,n=e.settings,r=e.classPrefix,i=e.state.get("value")||"",o,a,s="",l="";return"spellcheck"in n&&(l+=' spellcheck="'+n.spellcheck+'"'),n.maxLength&&(l+=' maxlength="'+n.maxLength+'"'),n.size&&(l+=' size="'+n.size+'"'),n.subtype&&(l+=' type="'+n.subtype+'"'),e.disabled()&&(l+=' disabled="disabled"'),o=n.icon,o&&"caret"!=o&&(o=r+"ico "+r+"i-"+n.icon),a=e.state.get("text"),(o||a)&&(s='
    ",e.classes.add("has-open")),'
    '+s+"
    "},value:function(e){return arguments.length?(this.state.set("value",e),this):(this.state.get("rendered")&&this.state.set("value",this.getEl("inp").value),this.state.get("value"))},bindStates:function(){var e=this;return e.state.on("change:value",function(t){e.getEl("inp").value!=t.value&&(e.getEl("inp").value=t.value)}),e.state.on("change:disabled",function(t){e.getEl("inp").disabled=t.value}),e._super()},remove:function(){r(this.getEl("inp")).off(),this._super()}})}),r(Ue,[Ve],function(e){return e.extend({init:function(e){var t=this;e.spellcheck=!1,e.onaction&&(e.icon="none"),t._super(e),t.classes.add("colorbox"),t.on("change keyup postrender",function(){t.repaintColor(t.value())})},repaintColor:function(e){var t=this.getEl().getElementsByTagName("i")[0];if(t)try{t.style.background=e}catch(n){}},bindStates:function(){var e=this;return e.state.on("change:value",function(t){e._rendered&&e.repaintColor(t.value)}),e._super()}})}),r($e,[Fe,ue],function(e,t){return e.extend({showPanel:function(){var e=this,n=e.settings;if(e.active(!0),e.panel)e.panel.show();else{var r=n.panel;r.type&&(r={layout:"grid",items:r}),r.role=r.role||"dialog",r.popover=!0,r.autohide=!0,r.ariaRoot=!0,e.panel=new t(r).on("hide",function(){e.active(!1)}).on("cancel",function(t){t.stopPropagation(),e.focus(),e.hidePanel()}).parent(e).renderTo(e.getContainerElm()),e.panel.fire("show"),e.panel.reflow()}e.panel.moveRel(e.getEl(),n.popoverAlign||(e.isRtl()?["bc-tr","bc-tc"]:["bc-tl","bc-tc"]))},hidePanel:function(){var e=this;e.panel&&e.panel.hide()},postRender:function(){var e=this;return e.aria("haspopup",!0),e.on("click",function(t){t.control===e&&(e.panel&&e.panel.visible()?e.hidePanel():(e.showPanel(),e.panel.focus(!!t.aria)))}),e._super()},remove:function(){return this.panel&&(this.panel.remove(),this.panel=null),this._super()}})}),r(qe,[$e,b],function(e,t){var n=t.DOM;return e.extend({init:function(e){this._super(e),this.classes.add("colorbutton")},color:function(e){return e?(this._color=e,this.getEl("preview").style.backgroundColor=e,this):this._color},resetColor:function(){return this._color=null,this.getEl("preview").style.backgroundColor=null,this},renderHtml:function(){var e=this,t=e._id,n=e.classPrefix,r=e.state.get("text"),i=e.settings.icon?n+"ico "+n+"i-"+e.settings.icon:"",o=e.settings.image?" style=\"background-image: url('"+e.settings.image+"')\"":"";return'
    '},postRender:function(){var e=this,t=e.settings.onclick;return e.on("click",function(r){r.aria&&"down"==r.aria.key||r.control!=e||n.getParent(r.target,"."+e.classPrefix+"open")||(r.stopImmediatePropagation(),t.call(e,r))}),delete e.settings.onclick,e._super()}})}),r(je,[],function(){function e(e){function i(e,i,o){var a,s,l,c,u,d;return a=0,s=0,l=0,e/=255,i/=255,o/=255,u=t(e,t(i,o)),d=n(e,n(i,o)),u==d?(l=u,{h:0,s:0,v:100*l}):(c=e==u?i-o:o==u?e-i:o-e,a=e==u?3:o==u?1:5,a=60*(a-c/(d-u)),s=(d-u)/d,l=d,{h:r(a),s:r(100*s),v:r(100*l)})}function o(e,i,o){var a,s,l,c;if(e=(parseInt(e,10)||0)%360,i=parseInt(i,10)/100,o=parseInt(o,10)/100,i=n(0,t(i,1)),o=n(0,t(o,1)),0===i)return void(d=f=h=r(255*o));switch(a=e/60,s=o*i,l=s*(1-Math.abs(a%2-1)),c=o-s,Math.floor(a)){case 0:d=s,f=l,h=0;break;case 1:d=l,f=s,h=0;break;case 2:d=0,f=s,h=l;break;case 3:d=0,f=l,h=s;break;case 4:d=l,f=0,h=s;break;case 5:d=s,f=0,h=l;break;default:d=f=h=0}d=r(255*(d+c)),f=r(255*(f+c)),h=r(255*(h+c))}function a(){function e(e){return e=parseInt(e,10).toString(16),e.length>1?e:"0"+e}return"#"+e(d)+e(f)+e(h)}function s(){return{r:d,g:f,b:h}}function l(){return i(d,f,h)}function c(e){var t;return"object"==typeof e?"r"in e?(d=e.r,f=e.g,h=e.b):"v"in e&&o(e.h,e.s,e.v):(t=/rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)[^\)]*\)/gi.exec(e))?(d=parseInt(t[1],10), -f=parseInt(t[2],10),h=parseInt(t[3],10)):(t=/#([0-F]{2})([0-F]{2})([0-F]{2})/gi.exec(e))?(d=parseInt(t[1],16),f=parseInt(t[2],16),h=parseInt(t[3],16)):(t=/#([0-F])([0-F])([0-F])/gi.exec(e))&&(d=parseInt(t[1]+t[1],16),f=parseInt(t[2]+t[2],16),h=parseInt(t[3]+t[3],16)),d=0>d?0:d>255?255:d,f=0>f?0:f>255?255:f,h=0>h?0:h>255?255:h,u}var u=this,d=0,f=0,h=0;e&&c(e),u.toRgb=s,u.toHsv=l,u.toHex=a,u.parse=c}var t=Math.min,n=Math.max,r=Math.round;return e}),r(Ke,[Ie,oe,J,je],function(e,t,n,r){return e.extend({Defaults:{classes:"widget colorpicker"},init:function(e){this._super(e)},postRender:function(){function e(e,t){var r=n.getPos(e),i,o;return i=t.pageX-r.x,o=t.pageY-r.y,i=Math.max(0,Math.min(i/e.clientWidth,1)),o=Math.max(0,Math.min(o/e.clientHeight,1)),{x:i,y:o}}function i(e,t){var i=(360-e.h)/360;n.css(d,{top:100*i+"%"}),t||n.css(h,{left:e.s+"%",top:100-e.v+"%"}),f.style.background=new r({s:100,v:100,h:e.h}).toHex(),s.color().parse({s:e.s,v:e.v,h:e.h})}function o(t){var n;n=e(f,t),c.s=100*n.x,c.v=100*(1-n.y),i(c),s.fire("change")}function a(t){var n;n=e(u,t),c=l.toHsv(),c.h=360*(1-n.y),i(c,!0),s.fire("change")}var s=this,l=s.color(),c,u,d,f,h;u=s.getEl("h"),d=s.getEl("hp"),f=s.getEl("sv"),h=s.getEl("svp"),s._repaint=function(){c=l.toHsv(),i(c)},s._super(),s._svdraghelper=new t(s._id+"-sv",{start:o,drag:o}),s._hdraghelper=new t(s._id+"-h",{start:a,drag:a}),s._repaint()},rgb:function(){return this.color().toRgb()},value:function(e){var t=this;return arguments.length?(t.color().parse(e),void(t._rendered&&t._repaint())):t.color().toHex()},color:function(){return this._color||(this._color=new r),this._color},renderHtml:function(){function e(){var e,t,n="",i,a;for(i="filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=",a=o.split(","),e=0,t=a.length-1;t>e;e++)n+='
    ';return n}var t=this,n=t._id,r=t.classPrefix,i,o="#ff0000,#ff0080,#ff00ff,#8000ff,#0000ff,#0080ff,#00ffff,#00ff80,#00ff00,#80ff00,#ffff00,#ff8000,#ff0000",a="background: -ms-linear-gradient(top,"+o+");background: linear-gradient(to bottom,"+o+");";return i='
    '+e()+'
    ','
    '+i+"
    "}})}),r(Ye,[Ie],function(e){return e.extend({init:function(e){var t=this;e.delimiter||(e.delimiter="\xbb"),t._super(e),t.classes.add("path"),t.canFocus=!0,t.on("click",function(e){var n,r=e.target;(n=r.getAttribute("data-index"))&&t.fire("select",{value:t.row()[n],index:n})}),t.row(t.settings.row)},focus:function(){var e=this;return e.getEl().firstChild.focus(),e},row:function(e){return arguments.length?(this.state.set("row",e),this):this.state.get("row")},renderHtml:function(){var e=this;return'
    '+e._getDataPathHtml(e.state.get("row"))+"
    "},bindStates:function(){var e=this;return e.state.on("change:row",function(t){e.innerHtml(e._getDataPathHtml(t.value))}),e._super()},_getDataPathHtml:function(e){var t=this,n=e||[],r,i,o="",a=t.classPrefix;for(r=0,i=n.length;i>r;r++)o+=(r>0?'":"")+'
    '+n[r].name+"
    ";return o||(o='
    \xa0
    '),o}})}),r(Ge,[Ye,ke],function(e,t){return e.extend({postRender:function(){function e(e){if(1===e.nodeType){if("BR"==e.nodeName||e.getAttribute("data-mce-bogus"))return!0;if("bookmark"===e.getAttribute("data-mce-type"))return!0}return!1}var n=this,r=t.activeEditor;return r.settings.elementpath!==!1&&(n.on("select",function(e){r.focus(),r.selection.select(this.row()[e.index].element),r.nodeChanged()}),r.on("nodeChange",function(t){for(var i=[],o=t.parents,a=o.length;a--;)if(1==o[a].nodeType&&!e(o[a])){var s=r.fire("ResolveName",{name:o[a].nodeName.toLowerCase(),target:o[a]});if(s.isDefaultPrevented()||i.push({name:s.name,element:o[a]}),s.isPropagationStopped())break}n.row(i)})),n._super()}})}),r(Xe,[ie],function(e){return e.extend({Defaults:{layout:"flex",align:"center",defaults:{flex:1}},renderHtml:function(){var e=this,t=e._layout,n=e.classPrefix;return e.classes.add("formitem"),t.preRender(e),'
    '+(e.settings.title?'
    '+e.settings.title+"
    ":"")+'
    '+(e.settings.html||"")+t.renderHtml(e)+"
    "}})}),r(Je,[ie,Xe,f],function(e,t,n){return e.extend({Defaults:{containerCls:"form",layout:"flex",direction:"column",align:"stretch",flex:1,padding:20,labelGap:30,spacing:10,callbacks:{submit:function(){this.submit()}}},preRender:function(){var e=this,r=e.items();e.settings.formItemDefaults||(e.settings.formItemDefaults={layout:"flex",autoResize:"overflow",defaults:{flex:1}}),r.each(function(r){var i,o=r.settings.label;o&&(i=new t(n.extend({items:{type:"label",id:r._id+"-l",text:o,flex:0,forId:r._id,disabled:r.disabled()}},e.settings.formItemDefaults)),i.type="formitem",r.aria("labelledby",r._id+"-l"),"undefined"==typeof r.settings.flex&&(r.settings.flex=1),e.replace(r,i),i.add(r))})},submit:function(){return this.fire("submit",{data:this.toJSON()})},postRender:function(){var e=this;e._super(),e.fromJSON(e.settings.data)},bindStates:function(){function e(){var e=0,n=[],r,i,o;if(t.settings.labelGapCalc!==!1)for(o="children"==t.settings.labelGapCalc?t.find("formitem"):t.items(),o.filter("formitem").each(function(t){var r=t.items()[0],i=r.getEl().clientWidth;e=i>e?i:e,n.push(r)}),i=t.settings.labelGap||0,r=n.length;r--;)n[r].settings.minWidth=e+i}var t=this;t._super(),t.on("show",e),e()}})}),r(Qe,[Je],function(e){return e.extend({Defaults:{containerCls:"fieldset",layout:"flex",direction:"column",align:"stretch",flex:1,padding:"25 15 5 15",labelGap:30,spacing:10,border:1},renderHtml:function(){var e=this,t=e._layout,n=e.classPrefix;return e.preRender(),t.preRender(e),'
    '+(e.settings.title?''+e.settings.title+"":"")+'
    '+(e.settings.html||"")+t.renderHtml(e)+"
    "}})}),r(Ze,[Ve,f],function(e,t){return e.extend({init:function(e){var n=this,r=tinymce.activeEditor,i=r.settings,o,a,s;e.spellcheck=!1,s=i.file_picker_types||i.file_browser_callback_types,s&&(s=t.makeMap(s,/[, ]/)),(!s||s[e.filetype])&&(a=i.file_picker_callback,!a||s&&!s[e.filetype]?(a=i.file_browser_callback,!a||s&&!s[e.filetype]||(o=function(){a(n.getEl("inp").id,n.value(),e.filetype,window)})):o=function(){var i=n.fire("beforecall").meta;i=t.extend({filetype:e.filetype},i),a.call(r,function(e,t){n.value(e).fire("change",{meta:t})},n.value(),i)}),o&&(e.icon="browse",e.onaction=o),n._super(e)}})}),r(et,[Pe],function(e){return e.extend({recalc:function(e){var t=e.layoutRect(),n=e.paddingBox;e.items().filter(":visible").each(function(e){e.layoutRect({x:n.left,y:n.top,w:t.innerW-n.right-n.left,h:t.innerH-n.top-n.bottom}),e.recalc&&e.recalc()})}})}),r(tt,[Pe],function(e){return e.extend({recalc:function(e){var t,n,r,i,o,a,s,l,c,u,d,f,h,p,m,g,v=[],y,b,x,C,w,_,E,N,S,k,T,R,A,B,D,M,L,H,P,O,I,F,z=Math.max,W=Math.min;for(r=e.items().filter(":visible"),i=e.layoutRect(),o=e.paddingBox,a=e.settings,f=e.isRtl()?a.direction||"row-reversed":a.direction,s=a.align,l=e.isRtl()?a.pack||"end":a.pack,c=a.spacing||0,("row-reversed"==f||"column-reverse"==f)&&(r=r.set(r.toArray().reverse()),f=f.split("-")[0]),"column"==f?(S="y",E="h",N="minH",k="maxH",R="innerH",T="top",A="deltaH",B="contentH",P="left",L="w",D="x",M="innerW",H="minW",O="right",I="deltaW",F="contentW"):(S="x",E="w",N="minW",k="maxW",R="innerW",T="left",A="deltaW",B="contentW",P="top",L="h",D="y",M="innerH",H="minH",O="bottom",I="deltaH",F="contentH"),d=i[R]-o[T]-o[T],_=u=0,t=0,n=r.length;n>t;t++)h=r[t],p=h.layoutRect(),m=h.settings,g=m.flex,d-=n-1>t?c:0,g>0&&(u+=g,p[k]&&v.push(h),p.flex=g),d-=p[N],y=o[P]+p[H]+o[O],y>_&&(_=y);if(C={},0>d?C[N]=i[N]-d+i[A]:C[N]=i[R]-d+i[A],C[H]=_+i[I],C[B]=i[R]-d,C[F]=_,C.minW=W(C.minW,i.maxW),C.minH=W(C.minH,i.maxH),C.minW=z(C.minW,i.startMinWidth),C.minH=z(C.minH,i.startMinHeight),!i.autoResize||C.minW==i.minW&&C.minH==i.minH){for(x=d/u,t=0,n=v.length;n>t;t++)h=v[t],p=h.layoutRect(),b=p[k],y=p[N]+p.flex*x,y>b?(d-=p[k]-p[N],u-=p.flex,p.flex=0,p.maxFlexSize=b):p.maxFlexSize=0;for(x=d/u,w=o[T],C={},0===u&&("end"==l?w=d+o[T]:"center"==l?(w=Math.round(i[R]/2-(i[R]-d)/2)+o[T],0>w&&(w=o[T])):"justify"==l&&(w=o[T],c=Math.floor(d/(r.length-1)))),C[D]=o[P],t=0,n=r.length;n>t;t++)h=r[t],p=h.layoutRect(),y=p.maxFlexSize||p[N],"center"===s?C[D]=Math.round(i[M]/2-p[L]/2):"stretch"===s?(C[L]=z(p[H]||0,i[M]-o[P]-o[O]),C[D]=o[P]):"end"===s&&(C[D]=i[M]-p[L]-o.top),p.flex>0&&(y+=p.flex*x),C[E]=y,C[S]=w,h.layoutRect(C),h.recalc&&h.recalc(),w+=y+c}else if(C.w=C.minW,C.h=C.minH,e.layoutRect(C),this.recalc(e),null===e._lastRect){var V=e.parent();V&&(V._lastRect=null,V.recalc())}}})}),r(nt,[He],function(e){return e.extend({Defaults:{containerClass:"flow-layout",controlClass:"flow-layout-item",endClass:"break"},recalc:function(e){e.items().filter(":visible").each(function(e){e.recalc&&e.recalc()})},isNative:function(){return!0}})}),r(rt,[te,Ie,ue,f,ke,u],function(e,t,n,r,i,o){function a(e){function t(t,n){return function(){var r=this;e.on("nodeChange",function(i){var o=e.formatter,a=null;s(i.parents,function(e){return s(t,function(t){return n?o.matchNode(e,n,{value:t.value})&&(a=t.value):o.matchNode(e,t.value)&&(a=t.value),a?!1:void 0}),a?!1:void 0}),r.value(a)})}}function r(e){e=e.replace(/;$/,"").split(";");for(var t=e.length;t--;)e[t]=e[t].split("=");return e}function i(){function t(e){var n=[];if(e)return s(e,function(e){var o={text:e.title,icon:e.icon};if(e.items)o.menu=t(e.items);else{var a=e.format||"custom"+r++;e.format||(e.name=a,i.push(e)),o.format=a,o.cmd=e.cmd}n.push(o)}),n}function n(){var n;return n=t(e.settings.style_formats_merge?e.settings.style_formats?o.concat(e.settings.style_formats):o:e.settings.style_formats||o)}var r=0,i=[],o=[{title:"Headings",items:[{title:"Heading 1",format:"h1"},{title:"Heading 2",format:"h2"},{title:"Heading 3",format:"h3"},{title:"Heading 4",format:"h4"},{title:"Heading 5",format:"h5"},{title:"Heading 6",format:"h6"}]},{title:"Inline",items:[{title:"Bold",icon:"bold",format:"bold"},{title:"Italic",icon:"italic",format:"italic"},{title:"Underline",icon:"underline",format:"underline"},{title:"Strikethrough",icon:"strikethrough",format:"strikethrough"},{title:"Superscript",icon:"superscript",format:"superscript"},{title:"Subscript",icon:"subscript",format:"subscript"},{title:"Code",icon:"code",format:"code"}]},{title:"Blocks",items:[{title:"Paragraph",format:"p"},{title:"Blockquote",format:"blockquote"},{title:"Div",format:"div"},{title:"Pre",format:"pre"}]},{title:"Alignment",items:[{title:"Left",icon:"alignleft",format:"alignleft"},{title:"Center",icon:"aligncenter",format:"aligncenter"},{title:"Right",icon:"alignright",format:"alignright"},{title:"Justify",icon:"alignjustify",format:"alignjustify"}]}];return e.on("init",function(){s(i,function(t){e.formatter.register(t.name,t)})}),{type:"menu",items:n(),onPostRender:function(t){e.fire("renderFormatsMenu",{control:t.control})},itemDefaults:{preview:!0,textStyle:function(){return this.settings.format?e.formatter.getCssText(this.settings.format):void 0},onPostRender:function(){var t=this;t.parent().on("show",function(){var n,r;n=t.settings.format,n&&(t.disabled(!e.formatter.canApply(n)),t.active(e.formatter.match(n))),r=t.settings.cmd,r&&t.active(e.queryCommandState(r))})},onclick:function(){this.settings.format&&l(this.settings.format),this.settings.cmd&&e.execCommand(this.settings.cmd)}}}}function o(t){return function(){function n(){return e.undoManager?e.undoManager[t]():!1}var r=this;t="redo"==t?"hasRedo":"hasUndo",r.disabled(!n()),e.on("Undo Redo AddUndo TypingUndo ClearUndos",function(){r.disabled(!n())})}}function a(){var t=this;e.on("VisualAid",function(e){t.active(e.hasVisual)}),t.active(e.hasVisual)}function l(t){t.control&&(t=t.control.value()),t&&e.execCommand("mceToggleFormat",!1,t)}var c;c=i(),s({bold:"Bold",italic:"Italic",underline:"Underline",strikethrough:"Strikethrough",subscript:"Subscript",superscript:"Superscript"},function(t,n){e.addButton(n,{tooltip:t,onPostRender:function(){var t=this;e.formatter?e.formatter.formatChanged(n,function(e){t.active(e)}):e.on("init",function(){e.formatter.formatChanged(n,function(e){t.active(e)})})},onclick:function(){l(n)}})}),s({outdent:["Decrease indent","Outdent"],indent:["Increase indent","Indent"],cut:["Cut","Cut"],copy:["Copy","Copy"],paste:["Paste","Paste"],help:["Help","mceHelp"],selectall:["Select all","SelectAll"],removeformat:["Clear formatting","RemoveFormat"],visualaid:["Visual aids","mceToggleVisualAid"],newdocument:["New document","mceNewDocument"]},function(t,n){e.addButton(n,{tooltip:t[0],cmd:t[1]})}),s({blockquote:["Blockquote","mceBlockQuote"],numlist:["Numbered list","InsertOrderedList"],bullist:["Bullet list","InsertUnorderedList"],subscript:["Subscript","Subscript"],superscript:["Superscript","Superscript"],alignleft:["Align left","JustifyLeft"],aligncenter:["Align center","JustifyCenter"],alignright:["Align right","JustifyRight"],alignjustify:["Justify","JustifyFull"],alignnone:["No alignment","JustifyNone"]},function(t,n){e.addButton(n,{tooltip:t[0],cmd:t[1],onPostRender:function(){var t=this;e.formatter?e.formatter.formatChanged(n,function(e){t.active(e)}):e.on("init",function(){e.formatter.formatChanged(n,function(e){t.active(e)})})}})}),e.addButton("undo",{tooltip:"Undo",onPostRender:o("undo"),cmd:"undo"}),e.addButton("redo",{tooltip:"Redo",onPostRender:o("redo"),cmd:"redo"}),e.addMenuItem("newdocument",{text:"New document",icon:"newdocument",cmd:"mceNewDocument"}),e.addMenuItem("undo",{text:"Undo",icon:"undo",shortcut:"Meta+Z",onPostRender:o("undo"),cmd:"undo"}),e.addMenuItem("redo",{text:"Redo",icon:"redo",shortcut:"Meta+Y",onPostRender:o("redo"),cmd:"redo"}),e.addMenuItem("visualaid",{text:"Visual aids",selectable:!0,onPostRender:a,cmd:"mceToggleVisualAid"}),e.addButton("remove",{tooltip:"Remove",icon:"remove",cmd:"Delete"}),s({cut:["Cut","Cut","Meta+X"],copy:["Copy","Copy","Meta+C"],paste:["Paste","Paste","Meta+V"],selectall:["Select all","SelectAll","Meta+A"],bold:["Bold","Bold","Meta+B"],italic:["Italic","Italic","Meta+I"],underline:["Underline","Underline"],strikethrough:["Strikethrough","Strikethrough"],subscript:["Subscript","Subscript"],superscript:["Superscript","Superscript"],removeformat:["Clear formatting","RemoveFormat"]},function(t,n){e.addMenuItem(n,{text:t[0],icon:n,shortcut:t[2],cmd:t[1]})}),e.on("mousedown",function(){n.hideAll()}),e.addButton("styleselect",{type:"menubutton",text:"Formats",menu:c}),e.addButton("formatselect",function(){var n=[],i=r(e.settings.block_formats||"Paragraph=p;Heading 1=h1;Heading 2=h2;Heading 3=h3;Heading 4=h4;Heading 5=h5;Heading 6=h6;Preformatted=pre");return s(i,function(t){n.push({text:t[0],value:t[1],textStyle:function(){return e.formatter.getCssText(t[1])}})}),{type:"listbox",text:i[0][0],values:n,fixedWidth:!0,onselect:l,onPostRender:t(n)}}),e.addButton("fontselect",function(){var n="Andale Mono=andale mono,monospace;Arial=arial,helvetica,sans-serif;Arial Black=arial black,sans-serif;Book Antiqua=book antiqua,palatino,serif;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,palatino,serif;Helvetica=helvetica,arial,sans-serif;Impact=impact,sans-serif;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco,monospace;Times New Roman=times new roman,times,serif;Trebuchet MS=trebuchet ms,geneva,sans-serif;Verdana=verdana,geneva,sans-serif;Webdings=webdings;Wingdings=wingdings,zapf dingbats",i=[],o=r(e.settings.font_formats||n);return s(o,function(e){i.push({text:{raw:e[0]},value:e[1],textStyle:-1==e[1].indexOf("dings")?"font-family:"+e[1]:""})}),{type:"listbox",text:"Font Family",tooltip:"Font Family",values:i,fixedWidth:!0,onPostRender:t(i,"fontname"),onselect:function(t){t.control.settings.value&&e.execCommand("FontName",!1,t.control.settings.value)}}}),e.addButton("fontsizeselect",function(){var n=[],r="8pt 10pt 12pt 14pt 18pt 24pt 36pt",i=e.settings.fontsize_formats||r;return s(i.split(" "),function(e){var t=e,r=e,i=e.split("=");i.length>1&&(t=i[0],r=i[1]),n.push({text:t,value:r})}),{type:"listbox",text:"Font Sizes",tooltip:"Font Sizes",values:n,fixedWidth:!0,onPostRender:t(n,"fontsize"),onclick:function(t){t.control.settings.value&&e.execCommand("FontSize",!1,t.control.settings.value)}}}),e.addMenuItem("formats",{text:"Formats",menu:c})}var s=r.each;i.on("AddEditor",function(t){t.editor.rtl&&(e.rtl=!0),a(t.editor)}),e.translate=function(e){return i.translate(e)},t.tooltips=!o.iOS}),r(it,[Pe],function(e){return e.extend({recalc:function(e){var t=e.settings,n,r,i,o,a,s,l,c,u,d,f,h,p,m,g,v,y,b,x,C,w,_,E=[],N=[],S,k,T,R,A,B;t=e.settings,i=e.items().filter(":visible"),o=e.layoutRect(),r=t.columns||Math.ceil(Math.sqrt(i.length)),n=Math.ceil(i.length/r),y=t.spacingH||t.spacing||0,b=t.spacingV||t.spacing||0,x=t.alignH||t.align,C=t.alignV||t.align,g=e.paddingBox,A="reverseRows"in t?t.reverseRows:e.isRtl(),x&&"string"==typeof x&&(x=[x]),C&&"string"==typeof C&&(C=[C]);for(d=0;r>d;d++)E.push(0);for(f=0;n>f;f++)N.push(0);for(f=0;n>f;f++)for(d=0;r>d&&(u=i[f*r+d],u);d++)c=u.layoutRect(),S=c.minW,k=c.minH,E[d]=S>E[d]?S:E[d],N[f]=k>N[f]?k:N[f];for(T=o.innerW-g.left-g.right,w=0,d=0;r>d;d++)w+=E[d]+(d>0?y:0),T-=(d>0?y:0)+E[d];for(R=o.innerH-g.top-g.bottom,_=0,f=0;n>f;f++)_+=N[f]+(f>0?b:0),R-=(f>0?b:0)+N[f];if(w+=g.left+g.right,_+=g.top+g.bottom,l={},l.minW=w+(o.w-o.innerW),l.minH=_+(o.h-o.innerH),l.contentW=l.minW-o.deltaW,l.contentH=l.minH-o.deltaH,l.minW=Math.min(l.minW,o.maxW),l.minH=Math.min(l.minH,o.maxH),l.minW=Math.max(l.minW,o.startMinWidth),l.minH=Math.max(l.minH,o.startMinHeight),!o.autoResize||l.minW==o.minW&&l.minH==o.minH){o.autoResize&&(l=e.layoutRect(l),l.contentW=l.minW-o.deltaW,l.contentH=l.minH-o.deltaH);var D;D="start"==t.packV?0:R>0?Math.floor(R/n):0;var M=0,L=t.flexWidths;if(L)for(d=0;dd;d++)E[d]+=L?L[d]*H:H;for(p=g.top,f=0;n>f;f++){for(h=g.left,s=N[f]+D,d=0;r>d&&(B=A?f*r+r-1-d:f*r+d,u=i[B],u);d++)m=u.settings,c=u.layoutRect(),a=Math.max(E[d],c.startMinWidth),c.x=h,c.y=p,v=m.alignH||(x?x[d]||x[0]:null),"center"==v?c.x=h+a/2-c.w/2:"right"==v?c.x=h+a-c.w:"stretch"==v&&(c.w=a),v=m.alignV||(C?C[d]||C[0]:null),"center"==v?c.y=p+s/2-c.h/2:"bottom"==v?c.y=p+s-c.h:"stretch"==v&&(c.h=s),u.layoutRect(c),h+=a+y,u.recalc&&u.recalc();p+=s+b}}else if(l.w=l.minW,l.h=l.minH,e.layoutRect(l),this.recalc(e),null===e._lastRect){var P=e.parent();P&&(P._lastRect=null,P.recalc())}}})}),r(ot,[Ie],function(e){return e.extend({renderHtml:function(){var e=this;return e.classes.add("iframe"),e.canFocus=!1,''},src:function(e){this.getEl().src=e},html:function(e,t){var n=this,r=this.getEl().contentWindow.document.body;return r?(r.innerHTML=e,t&&t()):setTimeout(function(){n.html(e)},0),this}})}),r(at,[Ie,J],function(e,t){return e.extend({init:function(e){var t=this;t._super(e),t.classes.add("widget").add("label"),t.canFocus=!1,e.multiline&&t.classes.add("autoscroll"),e.strong&&t.classes.add("strong")},initLayoutRect:function(){var e=this,n=e._super();if(e.settings.multiline){var r=t.getSize(e.getEl());r.width>n.maxW&&(n.minW=n.maxW,e.classes.add("multiline")),e.getEl().style.width=n.minW+"px",n.startMinH=n.h=n.minH=Math.min(n.maxH,t.getSize(e.getEl()).height)}return n},repaint:function(){var e=this;return e.settings.multiline||(e.getEl().style.lineHeight=e.layoutRect().h+"px"),e._super()},renderHtml:function(){var e=this,t=e.settings.forId;return'"},bindStates:function(){var e=this;return e.state.on("change:text",function(t){e.innerHtml(e.encode(t.value))}),e._super()}})}),r(st,[ie],function(e){return e.extend({Defaults:{role:"toolbar",layout:"flow"},init:function(e){var t=this;t._super(e),t.classes.add("toolbar")},postRender:function(){var e=this;return e.items().each(function(e){e.classes.add("toolbar-item")}),e._super()}})}),r(lt,[st],function(e){return e.extend({Defaults:{role:"menubar",containerCls:"menubar",ariaRoot:!0,defaults:{type:"menubutton"}}})}),r(ct,[Fe,ne,lt],function(e,t,n){function r(e,t){for(;e;){if(t===e)return!0;e=e.parentNode}return!1}var i=e.extend({init:function(e){var t=this;t._renderOpen=!0,t._super(e),e=t.settings,t.classes.add("menubtn"),e.fixedWidth&&t.classes.add("fixed-width"),t.aria("haspopup",!0),t.state.set("menu",e.menu||t.render())},showMenu:function(){var e=this,n;return e.menu&&e.menu.visible()?e.hideMenu():(e.menu||(n=e.state.get("menu")||[],n.length?n={type:"menu",items:n}:n.type=n.type||"menu",n.renderTo?e.menu=n.parent(e).show().renderTo():e.menu=t.create(n).parent(e).renderTo(),e.fire("createmenu"),e.menu.reflow(),e.menu.on("cancel",function(t){t.control.parent()===e.menu&&(t.stopPropagation(),e.focus(),e.hideMenu())}),e.menu.on("select",function(){e.focus()}),e.menu.on("show hide",function(t){t.control==e.menu&&e.activeMenu("show"==t.type),e.aria("expanded","show"==t.type)}).fire("show")),e.menu.show(),e.menu.layoutRect({w:e.layoutRect().w}),void e.menu.moveRel(e.getEl(),e.isRtl()?["br-tr","tr-br"]:["bl-tl","tl-bl"]))},hideMenu:function(){var e=this;e.menu&&(e.menu.items().each(function(e){e.hideMenu&&e.hideMenu()}),e.menu.hide())},activeMenu:function(e){this.classes.toggle("active",e)},renderHtml:function(){var e=this,t=e._id,r=e.classPrefix,i=e.settings.icon,o,a=e.state.get("text");return o=e.settings.image,o?(i="none","string"!=typeof o&&(o=window.getSelection?o[0]:o[1]),o=" style=\"background-image: url('"+o+"')\""):o="",i=e.settings.icon?r+"ico "+r+"i-"+i:"",e.aria("role",e.parent()instanceof n?"menuitem":"button"),'
    '},postRender:function(){var e=this;return e.on("click",function(t){t.control===e&&r(t.target,e.getEl())&&(e.showMenu(),t.aria&&e.menu.items()[0].focus())}),e.on("mouseenter",function(t){var n=t.control,r=e.parent(),o;n&&r&&n instanceof i&&n.parent()==r&&(r.items().filter("MenuButton").each(function(e){e.hideMenu&&e!=n&&(e.menu&&e.menu.visible()&&(o=!0),e.hideMenu())}),o&&(n.focus(),n.showMenu()))}),e._super()},bindStates:function(){var e=this;return e.state.on("change:menu",function(){e.menu&&e.menu.remove(),e.menu=null}),e._super()},remove:function(){this._super(),this.menu&&this.menu.remove()}});return i}),r(ut,[Ie,ne,u],function(e,t,n){return e.extend({Defaults:{border:0,role:"menuitem"},init:function(e){var t=this,n;t._super(e),e=t.settings,t.classes.add("menu-item"),e.menu&&t.classes.add("menu-item-expand"),e.preview&&t.classes.add("menu-item-preview"),n=t.state.get("text"),("-"===n||"|"===n)&&(t.classes.add("menu-item-sep"),t.aria("role","separator"),t.state.set("text","-")),e.selectable&&(t.aria("role","menuitemcheckbox"),t.classes.add("menu-item-checkbox"),e.icon="selected"),e.preview||e.selectable||t.classes.add("menu-item-normal"),t.on("mousedown",function(e){e.preventDefault()}),e.menu&&!e.ariaHideMenu&&t.aria("haspopup",!0)},hasMenus:function(){return!!this.settings.menu},showMenu:function(){var e=this,n=e.settings,r,i=e.parent();if(i.items().each(function(t){t!==e&&t.hideMenu()}),n.menu){r=e.menu,r?r.show():(r=n.menu,r.length?r={type:"menu",items:r}:r.type=r.type||"menu",i.settings.itemDefaults&&(r.itemDefaults=i.settings.itemDefaults),r=e.menu=t.create(r).parent(e).renderTo(),r.reflow(),r.on("cancel",function(t){t.stopPropagation(),e.focus(),r.hide()}),r.on("show hide",function(e){e.control.items().each(function(e){e.active(e.settings.selected)})}).fire("show"),r.on("hide",function(t){t.control===r&&e.classes.remove("selected")}),r.submenu=!0),r._parentMenu=i,r.classes.add("menu-sub");var o=r.testMoveRel(e.getEl(),e.isRtl()?["tl-tr","bl-br","tr-tl","br-bl"]:["tr-tl","br-bl","tl-tr","bl-br"]);r.moveRel(e.getEl(),o),r.rel=o,o="menu-sub-"+o,r.classes.remove(r._lastRel).add(o),r._lastRel=o,e.classes.add("selected"),e.aria("expanded",!0)}},hideMenu:function(){var e=this;return e.menu&&(e.menu.items().each(function(e){e.hideMenu&&e.hideMenu()}),e.menu.hide(),e.aria("expanded",!1)),e},renderHtml:function(){function e(e){var t,r,i={};for(i=n.mac?{alt:"⌥",ctrl:"⌘",shift:"⇧",meta:"⌘"}:{meta:"Ctrl"},e=e.split("+"),t=0;t'+("-"!==a?'\xa0":"")+("-"!==a?''+a+"":"")+(c?'
    '+c+"
    ":"")+(i.menu?'
    ':"")+"
    "},postRender:function(){var e=this,t=e.settings,n=t.textStyle;if("function"==typeof n&&(n=n.call(this)),n){var r=e.getEl("text");r&&r.setAttribute("style",n)}return e.on("mouseenter click",function(n){n.control===e&&(t.menu||"click"!==n.type?(e.showMenu(),n.aria&&e.menu.focus(!0)):(e.fire("select"),e.parent().hideAll()))}),e._super(),e},active:function(e){return"undefined"!=typeof e&&this.aria("checked",e),this._super(e)},remove:function(){this._super(),this.menu&&this.menu.remove()}})}),r(dt,[ue,ut,f],function(e,t,n){var r=e.extend({Defaults:{defaultType:"menuitem",border:1,layout:"stack",role:"application",bodyRole:"menu",ariaRoot:!0},init:function(e){var t=this;if(e.autohide=!0,e.constrainToViewport=!0,e.itemDefaults)for(var r=e.items,i=r.length;i--;)r[i]=n.extend({},e.itemDefaults,r[i]);t._super(e),t.classes.add("menu")},repaint:function(){return this.classes.toggle("menu-align",!0),this._super(),this.getEl().style.height="",this.getEl("body").style.height="",this},cancel:function(){var e=this;e.hideAll(),e.fire("select")},hideAll:function(){var e=this;return this.find("menuitem").exec("hideMenu"),e._super()},preRender:function(){var e=this;return e.items().each(function(t){var n=t.settings;return n.icon||n.image||n.selectable?(e._hasIcons=!0,!1):void 0}),e._super()}});return r}),r(ft,[ct,dt],function(e,t){return e.extend({init:function(e){function t(r){for(var a=0;a0&&(o=r[0].text,n.state.set("value",r[0].value)),n.state.set("menu",r)),n.state.set("text",e.text||o||r[0].text),n.classes.add("listbox"),n.on("select",function(t){var r=t.control;a&&(t.lastControl=a),e.multiple?r.active(!r.active()):n.value(t.control.value()),a=r})},bindStates:function(){function e(e,n){e instanceof t&&e.items().each(function(e){e.hasMenus()||e.active(e.value()===n)})}function n(e,t){var r;if(e)for(var i=0;i=r.x&&o.x+o.w<=r.w+r.x&&o.y>=r.y&&o.y+o.h<=r.h+r.y)return i[a]}function n(e,t,n){return{x:e.x-t,y:e.y-n,w:e.w+2*t,h:e.h+2*n}}function r(e,t){var n,r,i,s;return n=a(e.x,t.x),r=a(e.y,t.y),i=o(e.x+e.w,t.x+t.w),s=o(e.y+e.h,t.y+t.h),0>i-n||0>s-r?null:{x:n,y:r,w:i-n,h:s-r}}function i(e,t,n){var r,i,o,s,l,c,u,d,f,h;return l=e.x,c=e.y,u=e.x+e.w,d=e.y+e.h,f=t.x+t.w,h=t.y+t.h,r=a(0,t.x-l),i=a(0,t.y-c),o=a(0,u-f),s=a(0,d-h),l+=r,c+=i,n&&(u+=r,d+=i,l-=o,c-=s),u-=o,d-=s,{x:l,y:c,w:u-l,h:d-c}}var o=Math.min,a=Math.max,s=Math.round;return{inflate:n,relativePosition:e,findBestRelativePosition:t,intersect:r,clamp:i}}),r(mt,[Ie,oe],function(e,t){return e.extend({renderHtml:function(){var e=this,t=e.classPrefix;return e.classes.add("resizehandle"),"both"==e.settings.direction&&e.classes.add("resizehandle-both"),e.canFocus=!1,'
    '},postRender:function(){var e=this;e._super(),e.resizeDragHelper=new t(this._id,{start:function(){e.fire("ResizeStart")},drag:function(t){"both"!=e.settings.direction&&(t.deltaX=0),e.fire("Resize",t)},stop:function(){e.fire("ResizeEnd")}})},remove:function(){return this.resizeDragHelper&&this.resizeDragHelper.destroy(),this._super()}})}),r(gt,[Ie,oe,J],function(e,t,n){function r(e,t,n){return t>e&&(e=t),e>n&&(e=n),e}function i(e,t){var r,i,o,a,s;"v"==e.settings.orientation?(a="top",o="height",i="h"):(a="left",o="width",i="w"),r=(e.layoutRect()[i]||100)-n.getSize(e.getEl("handle"))[o],s=r*((t-e._minValue)/(e._maxValue-e._minValue))+"px",e.getEl("handle").style[a]=s,e.getEl("handle").style.height=e.layoutRect().h+"px"}return e.extend({init:function(e){var t=this;e.previewFilter||(e.previewFilter=function(e){return Math.round(100*e)/100}),t._super(e),t.classes.add("slider"),"v"==e.orientation&&t.classes.add("vertical"),t._minValue=e.minValue||0,t._maxValue=e.maxValue||100,t._initValue=t.state.get("value")},renderHtml:function(){var e=this,t=e._id,n=e.classPrefix;return'
    '},reset:function(){this.value(this._initValue).repaint()},postRender:function(){var e=this,i,o,a=0,s,l,c,u,d,f,h,p;l=e._minValue,c=e._maxValue,s=e.value(),"v"==e.settings.orientation?(d="screenY",f="top",h="height",p="h"):(d="screenX",f="left",h="width",p="w"),e._super(),e._dragHelper=new t(e._id,{handle:e._id+"-handle",start:function(t){i=t[d],o=parseInt(e.getEl("handle").style[f],10),u=(e.layoutRect()[p]||100)-n.getSize(e.getEl("handle"))[h],e.fire("dragstart",{value:s})},drag:function(t){var n=t[d]-i,h=e.getEl("handle");a=r(o+n,0,u),h.style[f]=a+"px",s=l+a/u*(c-l),e.value(s),e.tooltip().text(""+e.settings.previewFilter(s)).show().moveRel(h,"bc tc"),e.fire("drag",{value:s})},stop:function(){e.tooltip().hide(),e.fire("dragend",{value:s})}})},repaint:function(){this._super(),i(this,this.value())},bindStates:function(){var e=this;return e.state.on("change:value",function(t){i(e,t.value)}),e._super()}})}),r(vt,[Ie],function(e){return e.extend({renderHtml:function(){var e=this;return e.classes.add("spacer"),e.canFocus=!1, -'
    '}})}),r(yt,[ct,J,h],function(e,t,n){return e.extend({Defaults:{classes:"widget btn splitbtn",role:"button"},repaint:function(){var e=this,r=e.getEl(),i=e.layoutRect(),o,a;return e._super(),o=r.firstChild,a=r.lastChild,n(o).css({width:i.w-t.getSize(a).width,height:i.h-2}),n(a).css({height:i.h-2}),e},activeMenu:function(e){var t=this;n(t.getEl().lastChild).toggleClass(t.classPrefix+"active",e)},renderHtml:function(){var e=this,t=e._id,n=e.classPrefix,r,i=e.state.get("icon"),o=e.state.get("text");return r=e.settings.image,r?(i="none","string"!=typeof r&&(r=window.getSelection?r[0]:r[1]),r=" style=\"background-image: url('"+r+"')\""):r="",i=e.settings.icon?n+"ico "+n+"i-"+i:"",'
    '},postRender:function(){var e=this,t=e.settings.onclick;return e.on("click",function(e){var n=e.target;if(e.control==this)for(;n;){if(e.aria&&"down"!=e.aria.key||"BUTTON"==n.nodeName&&-1==n.className.indexOf("open"))return e.stopImmediatePropagation(),void(t&&t.call(this,e));n=n.parentNode}}),delete e.settings.onclick,e._super()}})}),r(bt,[nt],function(e){return e.extend({Defaults:{containerClass:"stack-layout",controlClass:"stack-layout-item",endClass:"break"},isNative:function(){return!0}})}),r(xt,[se,h,J],function(e,t,n){return e.extend({Defaults:{layout:"absolute",defaults:{type:"panel"}},activateTab:function(e){var n;this.activeTabId&&(n=this.getEl(this.activeTabId),t(n).removeClass(this.classPrefix+"active"),n.setAttribute("aria-selected","false")),this.activeTabId="t"+e,n=this.getEl("t"+e),n.setAttribute("aria-selected","true"),t(n).addClass(this.classPrefix+"active"),this.items()[e].show().fire("showtab"),this.reflow(),this.items().each(function(t,n){e!=n&&t.hide()})},renderHtml:function(){var e=this,t=e._layout,n="",r=e.classPrefix;return e.preRender(),t.preRender(e),e.items().each(function(t,i){var o=e._id+"-t"+i;t.aria("role","tabpanel"),t.aria("labelledby",o),n+='"}),'
    '+n+'
    '+t.renderHtml(e)+"
    "},postRender:function(){var e=this;e._super(),e.settings.activeTab=e.settings.activeTab||0,e.activateTab(e.settings.activeTab),this.on("click",function(t){var n=t.target.parentNode;if(t.target.parentNode.id==e._id+"-head")for(var r=n.childNodes.length;r--;)n.childNodes[r]==t.target&&e.activateTab(r)})},initLayoutRect:function(){var e=this,t,r,i;r=n.getSize(e.getEl("head")).width,r=0>r?0:r,i=0,e.items().each(function(e){r=Math.max(r,e.layoutRect().minW),i=Math.max(i,e.layoutRect().minH)}),e.items().each(function(e){e.settings.x=0,e.settings.y=0,e.settings.w=r,e.settings.h=i,e.layoutRect({x:0,y:0,w:r,h:i})});var o=n.getSize(e.getEl("head")).height;return e.settings.minWidth=r,e.settings.minHeight=i+o,t=e._super(),t.deltaH+=o,t.innerH=t.h-t.deltaH,t}})}),r(Ct,[Ie],function(e){return e.extend({init:function(e){var t=this;t._super(e),t.classes.add("textbox"),e.multiline?t.classes.add("multiline"):(t.on("keydown",function(e){var n;13==e.keyCode&&(e.preventDefault(),t.parents().reverse().each(function(e){return e.toJSON?(n=e,!1):void 0}),t.fire("submit",{data:n.toJSON()}))}),t.on("keyup",function(e){t.state.set("value",e.target.value)}))},repaint:function(){var e=this,t,n,r,i=0,o=0,a;t=e.getEl().style,n=e._layoutRect,a=e._lastRepaintRect||{};var s=document;return!e.settings.multiline&&s.all&&(!s.documentMode||s.documentMode<=8)&&(t.lineHeight=n.h-o+"px"),r=e.borderBox,i=r.left+r.right+8,o=r.top+r.bottom+(e.settings.multiline?8:0),n.x!==a.x&&(t.left=n.x+"px",a.x=n.x),n.y!==a.y&&(t.top=n.y+"px",a.y=n.y),n.w!==a.w&&(t.width=n.w-i+"px",a.w=n.w),n.h!==a.h&&(t.height=n.h-o+"px",a.h=n.h),e._lastRepaintRect=a,e.fire("repaint",{},!1),e},renderHtml:function(){var e=this,t=e._id,n=e.settings,r=e.encode(e.state.get("value"),!1),i="";return"spellcheck"in n&&(i+=' spellcheck="'+n.spellcheck+'"'),n.maxLength&&(i+=' maxlength="'+n.maxLength+'"'),n.size&&(i+=' size="'+n.size+'"'),n.subtype&&(i+=' type="'+n.subtype+'"'),e.disabled()&&(i+=' disabled="disabled"'),n.multiline?'":'"},value:function(e){return arguments.length?(this.state.set("value",e),this):(this.state.get("rendered")&&this.state.set("value",this.getEl().value),this.state.get("value"))},postRender:function(){var e=this;e._super(),e.$el.on("change",function(t){e.state.set("value",t.target.value),e.fire("change",t)})},bindStates:function(){var e=this;return e.state.on("change:value",function(t){e.getEl().value!=t.value&&(e.getEl().value=t.value)}),e.state.on("change:disabled",function(t){e.getEl().disabled=t.value}),e._super()},remove:function(){this.$el.off(),this._super()}})}),r(wt,[h,te],function(e,t){return function(n,r){var i=this,o,a=t.classPrefix;i.show=function(t,s){return i.hide(),o=!0,window.setTimeout(function(){o&&(e(n).append('
    '),s&&s())},t||0),i},i.hide=function(){var e=n.lastChild;return e&&-1!=e.className.indexOf("throbber")&&e.parentNode.removeChild(e),o=!1,i}}}),a([l,c,u,f,h,p,m,v,b,x,C,w,E,N,S,k,T,R,A,D,M,L,H,I,F,V,U,$,q,K,G,X,ee,te,ne,re,ie,oe,ae,se,le,ce,ue,de,fe,he,me,ge,ve,Ee,Ne,Se,ke,Re,Ae,Be,De,Me,Le,He,Pe,Oe,Ie,Fe,ze,We,Ve,Ue,$e,qe,je,Ke,Ye,Ge,Xe,Je,Qe,Ze,et,tt,nt,rt,it,ot,at,st,lt,ct,ut,dt,ft,ht,pt,mt,gt,vt,yt,bt,xt,Ct,wt])}(this); \ No newline at end of file +// 4.3.3 (2016-01-14) +!function(e,t){"use strict";function n(e,t){for(var n,r=[],i=0;i=r.x&&o.x+o.w<=r.w+r.x&&o.y>=r.y&&o.y+o.h<=r.h+r.y)return i[a];return null}function n(e,t,n){return o(e.x-t,e.y-n,e.w+2*t,e.h+2*n)}function r(e,t){var n,r,i,a;return n=l(e.x,t.x),r=l(e.y,t.y),i=s(e.x+e.w,t.x+t.w),a=s(e.y+e.h,t.y+t.h),0>i-n||0>a-r?null:o(n,r,i-n,a-r)}function i(e,t,n){var r,i,a,s,c,u,d,f,h,p;return c=e.x,u=e.y,d=e.x+e.w,f=e.y+e.h,h=t.x+t.w,p=t.y+t.h,r=l(0,t.x-c),i=l(0,t.y-u),a=l(0,d-h),s=l(0,f-p),c+=r,u+=i,n&&(d+=r,f+=i,c-=a,u-=s),d-=a,f-=s,o(c,u,d-c,f-u)}function o(e,t,n,r){return{x:e,y:t,w:n,h:r}}function a(e){return o(e.left,e.top,e.width,e.height)}var s=Math.min,l=Math.max,c=Math.round;return{inflate:n,relativePosition:e,findBestRelativePosition:t,intersect:r,clamp:i,create:o,fromClientRect:a}}),r(c,[],function(){function e(e,t){return function(){e.apply(t,arguments)}}function t(t){if("object"!=typeof this)throw new TypeError("Promises must be constructed via new");if("function"!=typeof t)throw new TypeError("not a function");this._state=null,this._value=null,this._deferreds=[],s(t,e(r,this),e(i,this))}function n(e){var t=this;return null===this._state?void this._deferreds.push(e):void l(function(){var n=t._state?e.onFulfilled:e.onRejected;if(null===n)return void(t._state?e.resolve:e.reject)(t._value);var r;try{r=n(t._value)}catch(i){return void e.reject(i)}e.resolve(r)})}function r(t){try{if(t===this)throw new TypeError("A promise cannot be resolved with itself.");if(t&&("object"==typeof t||"function"==typeof t)){var n=t.then;if("function"==typeof n)return void s(e(n,t),e(r,this),e(i,this))}this._state=!0,this._value=t,o.call(this)}catch(a){i.call(this,a)}}function i(e){this._state=!1,this._value=e,o.call(this)}function o(){for(var e=0,t=this._deferreds.length;t>e;e++)n.call(this,this._deferreds[e]);this._deferreds=null}function a(e,t,n,r){this.onFulfilled="function"==typeof e?e:null,this.onRejected="function"==typeof t?t:null,this.resolve=n,this.reject=r}function s(e,t,n){var r=!1;try{e(function(e){r||(r=!0,t(e))},function(e){r||(r=!0,n(e))})}catch(i){if(r)return;r=!0,n(i)}}if(window.Promise)return window.Promise;var l=t.immediateFn||"function"==typeof setImmediate&&setImmediate||function(e){setTimeout(e,1)},c=Array.isArray||function(e){return"[object Array]"===Object.prototype.toString.call(e)};return t.prototype["catch"]=function(e){return this.then(null,e)},t.prototype.then=function(e,r){var i=this;return new t(function(t,o){n.call(i,new a(e,r,t,o))})},t.all=function(){var e=Array.prototype.slice.call(1===arguments.length&&c(arguments[0])?arguments[0]:arguments);return new t(function(t,n){function r(o,a){try{if(a&&("object"==typeof a||"function"==typeof a)){var s=a.then;if("function"==typeof s)return void s.call(a,function(e){r(o,e)},n)}e[o]=a,0===--i&&t(e)}catch(l){n(l)}}if(0===e.length)return t([]);for(var i=e.length,o=0;or;r++)e[r].then(t,n)})},t}),r(u,[c],function(e){function t(e,t){function n(e){window.setTimeout(e,0)}var r,i=window.requestAnimationFrame,o=["ms","moz","webkit"];for(r=0;rr;r++)if(o=n[r],o&&o.func.call(o.scope,e)===!1&&e.preventDefault(),e.isImmediatePropagationStopped())return}var o=this,s={},l,c,u,d,f;c=a+(+new Date).toString(32),d="onmouseenter"in document.documentElement,u="onfocusin"in document.documentElement,f={mouseenter:"mouseover",mouseleave:"mouseout"},l=1,o.domLoaded=!1,o.events=s,o.bind=function(n,a,h,p){function m(t){e(r(t||E.event),g)}var g,v,y,b,C,x,w,E=window;if(n&&3!==n.nodeType&&8!==n.nodeType){for(n[c]?g=n[c]:(g=l++,n[c]=g,s[g]={}),p=p||n,a=a.split(" "),y=a.length;y--;)b=a[y],x=m,C=w=!1,"DOMContentLoaded"===b&&(b="ready"),o.domLoaded&&"ready"===b&&"complete"==n.readyState?h.call(p,r({type:b})):(d||(C=f[b],C&&(x=function(t){var n,i;if(n=t.currentTarget,i=t.relatedTarget,i&&n.contains)i=n.contains(i);else for(;i&&i!==n;)i=i.parentNode;i||(t=r(t||E.event),t.type="mouseout"===t.type?"mouseleave":"mouseenter",t.target=n,e(t,g))})),u||"focusin"!==b&&"focusout"!==b||(w=!0,C="focusin"===b?"focus":"blur",x=function(t){t=r(t||E.event),t.type="focus"===t.type?"focusin":"focusout",e(t,g)}),v=s[g][b],v?"ready"===b&&o.domLoaded?h({type:b}):v.push({func:h,scope:p}):(s[g][b]=v=[{func:h,scope:p}],v.fakeName=C,v.capture=w,v.nativeHandler=x,"ready"===b?i(n,x,o):t(n,C||b,x,w)));return n=v=0,h}},o.unbind=function(e,t,r){var i,a,l,u,d,f;if(!e||3===e.nodeType||8===e.nodeType)return o;if(i=e[c]){if(f=s[i],t){for(t=t.split(" "),l=t.length;l--;)if(d=t[l],a=f[d]){if(r)for(u=a.length;u--;)if(a[u].func===r){var h=a.nativeHandler,p=a.fakeName,m=a.capture;a=a.slice(0,u).concat(a.slice(u+1)),a.nativeHandler=h,a.fakeName=p,a.capture=m,f[d]=a}r&&0!==a.length||(delete f[d],n(e,a.fakeName||d,a.nativeHandler,a.capture))}}else{for(d in f)a=f[d],n(e,a.fakeName||d,a.nativeHandler,a.capture);f={}}for(d in f)return o;delete s[i];try{delete e[c]}catch(g){e[c]=null}}return o},o.fire=function(t,n,i){var a;if(!t||3===t.nodeType||8===t.nodeType)return o;i=r(null,i),i.type=n,i.target=t;do a=t[c],a&&e(i,a),t=t.parentNode||t.ownerDocument||t.defaultView||t.parentWindow;while(t&&!i.isPropagationStopped());return o},o.clean=function(e){var t,n,r=o.unbind;if(!e||3===e.nodeType||8===e.nodeType)return o;if(e[c]&&r(e),e.getElementsByTagName||(e=e.document),e&&e.getElementsByTagName)for(r(e),n=e.getElementsByTagName("*"),t=n.length;t--;)e=n[t],e[c]&&r(e);return o},o.destroy=function(){s={}},o.cancel=function(e){return e&&(e.preventDefault(),e.stopImmediatePropagation()),!1}}var a="mce-data-",s=/^(?:mouse|contextmenu)|click/,l={keyLocation:1,layerX:1,layerY:1,returnValue:1,webkitMovementX:1,webkitMovementY:1};return o.Event=new o,o.Event.bind(window,"ready",function(){}),o}),r(f,[],function(){function e(e,t,n,r){var i,o,a,s,l,c,d,h,p,m;if((t?t.ownerDocument||t:z)!==D&&B(t),t=t||D,n=n||[],!e||"string"!=typeof e)return n;if(1!==(s=t.nodeType)&&9!==s)return[];if(L&&!r){if(i=ve.exec(e))if(a=i[1]){if(9===s){if(o=t.getElementById(a),!o||!o.parentNode)return n;if(o.id===a)return n.push(o),n}else if(t.ownerDocument&&(o=t.ownerDocument.getElementById(a))&&I(t,o)&&o.id===a)return n.push(o),n}else{if(i[2])return Z.apply(n,t.getElementsByTagName(e)),n;if((a=i[3])&&x.getElementsByClassName)return Z.apply(n,t.getElementsByClassName(a)),n}if(x.qsa&&(!P||!P.test(e))){if(h=d=F,p=t,m=9===s&&e,1===s&&"object"!==t.nodeName.toLowerCase()){for(c=_(e),(d=t.getAttribute("id"))?h=d.replace(be,"\\$&"):t.setAttribute("id",h),h="[id='"+h+"'] ",l=c.length;l--;)c[l]=h+f(c[l]);p=ye.test(e)&&u(t.parentNode)||t,m=c.join(",")}if(m)try{return Z.apply(n,p.querySelectorAll(m)),n}catch(g){}finally{d||t.removeAttribute("id")}}}return k(e.replace(se,"$1"),t,n,r)}function n(){function e(n,r){return t.push(n+" ")>w.cacheLength&&delete e[t.shift()],e[n+" "]=r}var t=[];return e}function r(e){return e[F]=!0,e}function i(e){var t=D.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function o(e,t){for(var n=e.split("|"),r=e.length;r--;)w.attrHandle[n[r]]=t}function a(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||X)-(~e.sourceIndex||X);if(r)return r;if(n)for(;n=n.nextSibling;)if(n===t)return-1;return e?1:-1}function s(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function l(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function c(e){return r(function(t){return t=+t,r(function(n,r){for(var i,o=e([],n.length,t),a=o.length;a--;)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function u(e){return e&&typeof e.getElementsByTagName!==Y&&e}function d(){}function f(e){for(var t=0,n=e.length,r="";n>t;t++)r+=e[t].value;return r}function h(e,t,n){var r=t.dir,i=n&&"parentNode"===r,o=V++;return t.first?function(t,n,o){for(;t=t[r];)if(1===t.nodeType||i)return e(t,n,o)}:function(t,n,a){var s,l,c=[W,o];if(a){for(;t=t[r];)if((1===t.nodeType||i)&&e(t,n,a))return!0}else for(;t=t[r];)if(1===t.nodeType||i){if(l=t[F]||(t[F]={}),(s=l[r])&&s[0]===W&&s[1]===o)return c[2]=s[2];if(l[r]=c,c[2]=e(t,n,a))return!0}}}function p(e){return e.length>1?function(t,n,r){for(var i=e.length;i--;)if(!e[i](t,n,r))return!1;return!0}:e[0]}function m(t,n,r){for(var i=0,o=n.length;o>i;i++)e(t,n[i],r);return r}function g(e,t,n,r,i){for(var o,a=[],s=0,l=e.length,c=null!=t;l>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),c&&t.push(s));return a}function v(e,t,n,i,o,a){return i&&!i[F]&&(i=v(i)),o&&!o[F]&&(o=v(o,a)),r(function(r,a,s,l){var c,u,d,f=[],h=[],p=a.length,v=r||m(t||"*",s.nodeType?[s]:s,[]),y=!e||!r&&t?v:g(v,f,e,s,l),b=n?o||(r?e:p||i)?[]:a:y;if(n&&n(y,b,s,l),i)for(c=g(b,h),i(c,[],s,l),u=c.length;u--;)(d=c[u])&&(b[h[u]]=!(y[h[u]]=d));if(r){if(o||e){if(o){for(c=[],u=b.length;u--;)(d=b[u])&&c.push(y[u]=d);o(null,b=[],c,l)}for(u=b.length;u--;)(d=b[u])&&(c=o?te.call(r,d):f[u])>-1&&(r[c]=!(a[c]=d))}}else b=g(b===a?b.splice(p,b.length):b),o?o(null,a,b,l):Z.apply(a,b)})}function y(e){for(var t,n,r,i=e.length,o=w.relative[e[0].type],a=o||w.relative[" "],s=o?1:0,l=h(function(e){return e===t},a,!0),c=h(function(e){return te.call(t,e)>-1},a,!0),u=[function(e,n,r){return!o&&(r||n!==T)||((t=n).nodeType?l(e,n,r):c(e,n,r))}];i>s;s++)if(n=w.relative[e[s].type])u=[h(p(u),n)];else{if(n=w.filter[e[s].type].apply(null,e[s].matches),n[F]){for(r=++s;i>r&&!w.relative[e[r].type];r++);return v(s>1&&p(u),s>1&&f(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace(se,"$1"),n,r>s&&y(e.slice(s,r)),i>r&&y(e=e.slice(r)),i>r&&f(e))}u.push(n)}return p(u)}function b(t,n){var i=n.length>0,o=t.length>0,a=function(r,a,s,l,c){var u,d,f,h=0,p="0",m=r&&[],v=[],y=T,b=r||o&&w.find.TAG("*",c),C=W+=null==y?1:Math.random()||.1,x=b.length;for(c&&(T=a!==D&&a);p!==x&&null!=(u=b[p]);p++){if(o&&u){for(d=0;f=t[d++];)if(f(u,a,s)){l.push(u);break}c&&(W=C)}i&&((u=!f&&u)&&h--,r&&m.push(u))}if(h+=p,i&&p!==h){for(d=0;f=n[d++];)f(m,v,a,s);if(r){if(h>0)for(;p--;)m[p]||v[p]||(v[p]=J.call(l));v=g(v)}Z.apply(l,v),c&&!r&&v.length>0&&h+n.length>1&&e.uniqueSort(l)}return c&&(W=C,T=y),m};return i?r(a):a}var C,x,w,E,N,_,S,k,T,R,A,B,D,M,L,P,H,O,I,F="sizzle"+-new Date,z=window.document,W=0,V=0,U=n(),$=n(),q=n(),j=function(e,t){return e===t&&(A=!0),0},Y=typeof t,X=1<<31,K={}.hasOwnProperty,G=[],J=G.pop,Q=G.push,Z=G.push,ee=G.slice,te=G.indexOf||function(e){for(var t=0,n=this.length;n>t;t++)if(this[t]===e)return t;return-1},ne="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",re="[\\x20\\t\\r\\n\\f]",ie="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",oe="\\["+re+"*("+ie+")(?:"+re+"*([*^$|!~]?=)"+re+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+ie+"))|)"+re+"*\\]",ae=":("+ie+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+oe+")*)|.*)\\)|)",se=new RegExp("^"+re+"+|((?:^|[^\\\\])(?:\\\\.)*)"+re+"+$","g"),le=new RegExp("^"+re+"*,"+re+"*"),ce=new RegExp("^"+re+"*([>+~]|"+re+")"+re+"*"),ue=new RegExp("="+re+"*([^\\]'\"]*?)"+re+"*\\]","g"),de=new RegExp(ae),fe=new RegExp("^"+ie+"$"),he={ID:new RegExp("^#("+ie+")"),CLASS:new RegExp("^\\.("+ie+")"),TAG:new RegExp("^("+ie+"|[*])"),ATTR:new RegExp("^"+oe),PSEUDO:new RegExp("^"+ae),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+re+"*(even|odd|(([+-]|)(\\d*)n|)"+re+"*(?:([+-]|)"+re+"*(\\d+)|))"+re+"*\\)|)","i"),bool:new RegExp("^(?:"+ne+")$","i"),needsContext:new RegExp("^"+re+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+re+"*((?:-\\d)?\\d*)"+re+"*\\)|)(?=[^-]|$)","i")},pe=/^(?:input|select|textarea|button)$/i,me=/^h\d$/i,ge=/^[^{]+\{\s*\[native \w/,ve=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ye=/[+~]/,be=/'|\\/g,Ce=new RegExp("\\\\([\\da-f]{1,6}"+re+"?|("+re+")|.)","ig"),xe=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:0>r?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)};try{Z.apply(G=ee.call(z.childNodes),z.childNodes),G[z.childNodes.length].nodeType}catch(we){Z={apply:G.length?function(e,t){Q.apply(e,ee.call(t))}:function(e,t){for(var n=e.length,r=0;e[n++]=t[r++];);e.length=n-1}}}x=e.support={},N=e.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},B=e.setDocument=function(e){var t,n=e?e.ownerDocument||e:z,r=n.defaultView;return n!==D&&9===n.nodeType&&n.documentElement?(D=n,M=n.documentElement,L=!N(n),r&&r!==r.top&&(r.addEventListener?r.addEventListener("unload",function(){B()},!1):r.attachEvent&&r.attachEvent("onunload",function(){B()})),x.attributes=i(function(e){return e.className="i",!e.getAttribute("className")}),x.getElementsByTagName=i(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),x.getElementsByClassName=ge.test(n.getElementsByClassName),x.getById=i(function(e){return M.appendChild(e).id=F,!n.getElementsByName||!n.getElementsByName(F).length}),x.getById?(w.find.ID=function(e,t){if(typeof t.getElementById!==Y&&L){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},w.filter.ID=function(e){var t=e.replace(Ce,xe);return function(e){return e.getAttribute("id")===t}}):(delete w.find.ID,w.filter.ID=function(e){var t=e.replace(Ce,xe);return function(e){var n=typeof e.getAttributeNode!==Y&&e.getAttributeNode("id");return n&&n.value===t}}),w.find.TAG=x.getElementsByTagName?function(e,t){return typeof t.getElementsByTagName!==Y?t.getElementsByTagName(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){for(;n=o[i++];)1===n.nodeType&&r.push(n);return r}return o},w.find.CLASS=x.getElementsByClassName&&function(e,t){return L?t.getElementsByClassName(e):void 0},H=[],P=[],(x.qsa=ge.test(n.querySelectorAll))&&(i(function(e){e.innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&P.push("[*^$]="+re+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||P.push("\\["+re+"*(?:value|"+ne+")"),e.querySelectorAll(":checked").length||P.push(":checked")}),i(function(e){var t=n.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&P.push("name"+re+"*[*^$|!~]?="),e.querySelectorAll(":enabled").length||P.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),P.push(",.*:")})),(x.matchesSelector=ge.test(O=M.matches||M.webkitMatchesSelector||M.mozMatchesSelector||M.oMatchesSelector||M.msMatchesSelector))&&i(function(e){x.disconnectedMatch=O.call(e,"div"),O.call(e,"[s!='']:x"),H.push("!=",ae)}),P=P.length&&new RegExp(P.join("|")),H=H.length&&new RegExp(H.join("|")),t=ge.test(M.compareDocumentPosition),I=t||ge.test(M.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)for(;t=t.parentNode;)if(t===e)return!0;return!1},j=t?function(e,t){if(e===t)return A=!0,0;var r=!e.compareDocumentPosition-!t.compareDocumentPosition;return r?r:(r=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1,1&r||!x.sortDetached&&t.compareDocumentPosition(e)===r?e===n||e.ownerDocument===z&&I(z,e)?-1:t===n||t.ownerDocument===z&&I(z,t)?1:R?te.call(R,e)-te.call(R,t):0:4&r?-1:1)}:function(e,t){if(e===t)return A=!0,0;var r,i=0,o=e.parentNode,s=t.parentNode,l=[e],c=[t];if(!o||!s)return e===n?-1:t===n?1:o?-1:s?1:R?te.call(R,e)-te.call(R,t):0;if(o===s)return a(e,t);for(r=e;r=r.parentNode;)l.unshift(r);for(r=t;r=r.parentNode;)c.unshift(r);for(;l[i]===c[i];)i++;return i?a(l[i],c[i]):l[i]===z?-1:c[i]===z?1:0},n):D},e.matches=function(t,n){return e(t,null,null,n)},e.matchesSelector=function(t,n){if((t.ownerDocument||t)!==D&&B(t),n=n.replace(ue,"='$1']"),x.matchesSelector&&L&&(!H||!H.test(n))&&(!P||!P.test(n)))try{var r=O.call(t,n);if(r||x.disconnectedMatch||t.document&&11!==t.document.nodeType)return r}catch(i){}return e(n,D,null,[t]).length>0},e.contains=function(e,t){return(e.ownerDocument||e)!==D&&B(e),I(e,t)},e.attr=function(e,n){(e.ownerDocument||e)!==D&&B(e);var r=w.attrHandle[n.toLowerCase()],i=r&&K.call(w.attrHandle,n.toLowerCase())?r(e,n,!L):t;return i!==t?i:x.attributes||!L?e.getAttribute(n):(i=e.getAttributeNode(n))&&i.specified?i.value:null},e.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},e.uniqueSort=function(e){var t,n=[],r=0,i=0;if(A=!x.detectDuplicates,R=!x.sortStable&&e.slice(0),e.sort(j),A){for(;t=e[i++];)t===e[i]&&(r=n.push(i));for(;r--;)e.splice(n[r],1)}return R=null,e},E=e.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=E(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r++];)n+=E(t);return n},w=e.selectors={cacheLength:50,createPseudo:r,match:he,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(Ce,xe),e[3]=(e[3]||e[4]||e[5]||"").replace(Ce,xe),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(t){return t[1]=t[1].toLowerCase(),"nth"===t[1].slice(0,3)?(t[3]||e.error(t[0]),t[4]=+(t[4]?t[5]+(t[6]||1):2*("even"===t[3]||"odd"===t[3])),t[5]=+(t[7]+t[8]||"odd"===t[3])):t[3]&&e.error(t[0]),t},PSEUDO:function(e){var t,n=!e[6]&&e[2];return he.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&de.test(n)&&(t=_(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(Ce,xe).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=U[e+" "];return t||(t=new RegExp("(^|"+re+")"+e+"("+re+"|$)"))&&U(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==Y&&e.getAttribute("class")||"")})},ATTR:function(t,n,r){return function(i){var o=e.attr(i,t);return null==o?"!="===n:n?(o+="","="===n?o===r:"!="===n?o!==r:"^="===n?r&&0===o.indexOf(r):"*="===n?r&&o.indexOf(r)>-1:"$="===n?r&&o.slice(-r.length)===r:"~="===n?(" "+o+" ").indexOf(r)>-1:"|="===n?o===r||o.slice(0,r.length+1)===r+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,l){var c,u,d,f,h,p,m=o!==a?"nextSibling":"previousSibling",g=t.parentNode,v=s&&t.nodeName.toLowerCase(),y=!l&&!s;if(g){if(o){for(;m;){for(d=t;d=d[m];)if(s?d.nodeName.toLowerCase()===v:1===d.nodeType)return!1;p=m="only"===e&&!p&&"nextSibling"}return!0}if(p=[a?g.firstChild:g.lastChild],a&&y){for(u=g[F]||(g[F]={}),c=u[e]||[],h=c[0]===W&&c[1],f=c[0]===W&&c[2],d=h&&g.childNodes[h];d=++h&&d&&d[m]||(f=h=0)||p.pop();)if(1===d.nodeType&&++f&&d===t){u[e]=[W,h,f];break}}else if(y&&(c=(t[F]||(t[F]={}))[e])&&c[0]===W)f=c[1];else for(;(d=++h&&d&&d[m]||(f=h=0)||p.pop())&&((s?d.nodeName.toLowerCase()!==v:1!==d.nodeType)||!++f||(y&&((d[F]||(d[F]={}))[e]=[W,f]),d!==t)););return f-=i,f===r||f%r===0&&f/r>=0}}},PSEUDO:function(t,n){var i,o=w.pseudos[t]||w.setFilters[t.toLowerCase()]||e.error("unsupported pseudo: "+t);return o[F]?o(n):o.length>1?(i=[t,t,"",n],w.setFilters.hasOwnProperty(t.toLowerCase())?r(function(e,t){for(var r,i=o(e,n),a=i.length;a--;)r=te.call(e,i[a]),e[r]=!(t[r]=i[a])}):function(e){return o(e,0,i)}):o}},pseudos:{not:r(function(e){var t=[],n=[],i=S(e.replace(se,"$1"));return i[F]?r(function(e,t,n,r){for(var o,a=i(e,null,r,[]),s=e.length;s--;)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,r,o){return t[0]=e,i(t,null,o,n),!n.pop()}}),has:r(function(t){return function(n){return e(t,n).length>0}}),contains:r(function(e){return e=e.replace(Ce,xe),function(t){return(t.textContent||t.innerText||E(t)).indexOf(e)>-1}}),lang:r(function(t){return fe.test(t||"")||e.error("unsupported lang: "+t),t=t.replace(Ce,xe).toLowerCase(),function(e){var n;do if(n=L?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return n=n.toLowerCase(),n===t||0===n.indexOf(t+"-");while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=window.location&&window.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===M},focus:function(e){return e===D.activeElement&&(!D.hasFocus||D.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!w.pseudos.empty(e)},header:function(e){return me.test(e.nodeName)},input:function(e){return pe.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:c(function(){return[0]}),last:c(function(e,t){return[t-1]}),eq:c(function(e,t,n){return[0>n?n+t:n]}),even:c(function(e,t){for(var n=0;t>n;n+=2)e.push(n);return e}),odd:c(function(e,t){for(var n=1;t>n;n+=2)e.push(n);return e}),lt:c(function(e,t,n){for(var r=0>n?n+t:n;--r>=0;)e.push(r);return e}),gt:c(function(e,t,n){for(var r=0>n?n+t:n;++r2&&"ID"===(a=o[0]).type&&x.getById&&9===t.nodeType&&L&&w.relative[o[1].type]){if(t=(w.find.ID(a.matches[0].replace(Ce,xe),t)||[])[0],!t)return n;c&&(t=t.parentNode),e=e.slice(o.shift().value.length)}for(i=he.needsContext.test(e)?0:o.length;i--&&(a=o[i],!w.relative[s=a.type]);)if((l=w.find[s])&&(r=l(a.matches[0].replace(Ce,xe),ye.test(o[0].type)&&u(t.parentNode)||t))){if(o.splice(i,1),e=r.length&&f(o),!e)return Z.apply(n,r),n;break}}return(c||S(e,d))(r,t,!L,n,ye.test(e)&&u(t.parentNode)||t),n},x.sortStable=F.split("").sort(j).join("")===F,x.detectDuplicates=!!A,B(),x.sortDetached=i(function(e){return 1&e.compareDocumentPosition(D.createElement("div"))}),i(function(e){return e.innerHTML="","#"===e.firstChild.getAttribute("href")})||o("type|href|height|width",function(e,t,n){return n?void 0:e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),x.attributes&&i(function(e){return e.innerHTML="",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||o("value",function(e,t,n){return n||"input"!==e.nodeName.toLowerCase()?void 0:e.defaultValue}),i(function(e){return null==e.getAttribute("disabled")})||o(ne,function(e,t,n){var r;return n?void 0:e[t]===!0?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),e}),r(h,[],function(){function e(e){return"matchMedia"in window?matchMedia(e).matches:!1}var t=navigator,n=t.userAgent,r,i,o,a,s,l,c,u,d,f,h,p;r=window.opera&&window.opera.buildNumber,d=/Android/.test(n),i=/WebKit/.test(n),o=!i&&!r&&/MSIE/gi.test(n)&&/Explorer/gi.test(t.appName),o=o&&/MSIE (\w+)\./.exec(n)[1],a=-1==n.indexOf("Trident/")||-1==n.indexOf("rv:")&&-1==t.appName.indexOf("Netscape")?!1:11,s=-1==n.indexOf("Edge/")||o||a?!1:12,o=o||a||s,l=!i&&!a&&/Gecko/.test(n),c=-1!=n.indexOf("Mac"), +u=/(iPad|iPhone)/.test(n),f="FormData"in window&&"FileReader"in window&&"URL"in window&&!!URL.createObjectURL,h=e("only screen and (max-device-width: 480px)")&&(d||u),p=e("only screen and (min-width: 800px)")&&(d||u),s&&(i=!1);var m=!u||f||n.match(/AppleWebKit\/(\d*)/)[1]>=534;return{opera:r,webkit:i,ie:o,gecko:l,mac:c,iOS:u,android:d,contentEditable:m,transparentSrc:"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7",caretAfter:8!=o,range:window.getSelection&&"Range"in window,documentMode:o&&!s?document.documentMode||7:10,fileApi:f,ceFalse:o===!1||o>8,desktop:!h&&!p}}),r(p,[],function(){function e(e){var t=e,n,r;if(!u(e))for(t=[],n=0,r=e.length;r>n;n++)t[n]=e[n];return t}function n(e,n,r){var i,o;if(!e)return 0;if(r=r||e,e.length!==t){for(i=0,o=e.length;o>i;i++)if(n.call(r,e[i],i,e)===!1)return 0}else for(i in e)if(e.hasOwnProperty(i)&&n.call(r,e[i],i,e)===!1)return 0;return 1}function r(e,t){var r=[];return n(e,function(n,i){r.push(t(n,i,e))}),r}function i(e,t){var r=[];return n(e,function(n,i){(!t||t(n,i,e))&&r.push(n)}),r}function o(e,t){var n,r;if(e)for(n=0,r=e.length;r>n;n++)if(e[n]===t)return n;return-1}function a(e,t,n,r){var i=0;for(arguments.length<3&&(n=e[0]);ir;r++)if(t.call(n,e[r],r,e))return r;return-1}function l(e,n,r){var i=s(e,n,r);return-1!==i?e[i]:t}function c(e){return e[e.length-1]}var u=Array.isArray||function(e){return"[object Array]"===Object.prototype.toString.call(e)};return{isArray:u,toArray:e,each:n,map:r,filter:i,indexOf:o,reduce:a,findIndex:s,find:l,last:c}}),r(m,[h,p],function(e,n){function r(e){return null===e||e===t?"":(""+e).replace(h,"")}function i(e,r){return r?"array"==r&&n.isArray(e)?!0:typeof e==r:e!==t}function o(e,t,n){var r;for(e=e||[],t=t||",","string"==typeof e&&(e=e.split(t)),n=n||{},r=e.length;r--;)n[e[r]]={};return n}function a(e,t,n){var r=this,i,o,a,s,l,c=0;if(e=/^((static) )?([\w.]+)(:([\w.]+))?/.exec(e),a=e[3].match(/(^|\.)(\w+)$/i)[2],o=r.createNS(e[3].replace(/\.\w+$/,""),n),!o[a]){if("static"==e[2])return o[a]=t,void(this.onCreate&&this.onCreate(e[2],e[3],o[a]));t[a]||(t[a]=function(){},c=1),o[a]=t[a],r.extend(o[a].prototype,t),e[5]&&(i=r.resolve(e[5]).prototype,s=e[5].match(/\.(\w+)$/i)[1],l=o[a],c?o[a]=function(){return i[s].apply(this,arguments)}:o[a]=function(){return this.parent=i[s],l.apply(this,arguments)},o[a].prototype[a]=o[a],r.each(i,function(e,t){o[a].prototype[t]=i[t]}),r.each(t,function(e,t){i[t]?o[a].prototype[t]=function(){return this.parent=i[t],e.apply(this,arguments)}:t!=a&&(o[a].prototype[t]=e)})),r.each(t["static"],function(e,t){o[a][t]=e})}}function s(e,n){var r,i,o,a=arguments,s;for(r=1,i=a.length;i>r;r++){n=a[r];for(o in n)n.hasOwnProperty(o)&&(s=n[o],s!==t&&(e[o]=s))}return e}function l(e,t,r,i){i=i||this,e&&(r&&(e=e[r]),n.each(e,function(e,n){return t.call(i,e,n,r)===!1?!1:void l(e,t,r,i)}))}function c(e,t){var n,r;for(t=t||window,e=e.split("."),n=0;nn&&(t=t[e[n]],t);n++);return t}function d(e,t){return!e||i(e,"array")?e:n.map(e.split(t||","),r)}function f(t){var n=e.cacheSuffix;return n&&(t+=(-1===t.indexOf("?")?"?":"&")+n),t}var h=/^\s*|\s*$/g;return{trim:r,isArray:n.isArray,is:i,toArray:n.toArray,makeMap:o,each:n.each,map:n.map,grep:n.filter,inArray:n.indexOf,extend:s,create:a,walk:l,createNS:c,resolve:u,explode:d,_addCacheSuffix:f}}),r(g,[d,f,m,h],function(e,n,r,i){function o(e){return"undefined"!=typeof e}function a(e){return"string"==typeof e}function s(e){return e&&e==e.window}function l(e,t){var n,r,i;for(t=t||w,i=t.createElement("div"),n=t.createDocumentFragment(),i.innerHTML=e;r=i.firstChild;)n.appendChild(r);return n}function c(e,t,n,r){var i;if(a(t))t=l(t,v(e[0]));else if(t.length&&!t.nodeType){if(t=f.makeArray(t),r)for(i=t.length-1;i>=0;i--)c(e,t[i],n,r);else for(i=0;ii&&(a=e[i],t.call(a,i,a)!==!1);i++);return e}function g(e,t){var n=[];return m(e,function(e,r){t(r,e)&&n.push(r)}),n}function v(e){return e?9==e.nodeType?e:e.ownerDocument:w}function y(e,n,r){var i=[],o=e[n];for("string"!=typeof r&&r instanceof f&&(r=r[0]);o&&9!==o.nodeType;){if(r!==t){if(o===r)break;if("string"==typeof r&&f(o).is(r))break}1===o.nodeType&&i.push(o),o=o[n]}return i}function b(e,n,r,i){var o=[];for(i instanceof f&&(i=i[0]);e;e=e[n])if(!r||e.nodeType===r){if(i!==t){if(e===i)break;if("string"==typeof i&&f(e).is(i))break}o.push(e)}return o}function C(e,t,n){for(e=e[t];e;e=e[t])if(e.nodeType==n)return e;return null}function x(e,t,n){m(n,function(n,r){e[n]=e[n]||{},e[n][t]=r})}var w=document,E=Array.prototype.push,N=Array.prototype.slice,_=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,S=e.Event,k,T=r.makeMap("children,contents,next,prev"),R=r.makeMap("fillOpacity fontWeight lineHeight opacity orphans widows zIndex zoom"," "),A=r.makeMap("checked compact declare defer disabled ismap multiple nohref noshade nowrap readonly selected"," "),B={"for":"htmlFor","class":"className",readonly:"readOnly"},D={"float":"cssFloat"},M={},L={},P=/^\s*|\s*$/g;return f.fn=f.prototype={constructor:f,selector:"",context:null,length:0,init:function(e,t){var n=this,r,i;if(!e)return n;if(e.nodeType)return n.context=n[0]=e,n.length=1,n;if(t&&t.nodeType)n.context=t;else{if(t)return f(e).attr(t);n.context=t=document}if(a(e)){if(n.selector=e,r="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:_.exec(e),!r)return f(t).find(e);if(r[1])for(i=l(e,v(t)).firstChild;i;)E.call(n,i),i=i.nextSibling;else{if(i=v(t).getElementById(r[2]),!i)return n;if(i.id!==r[2])return n.find(e);n.length=1,n[0]=i}}else this.add(e,!1);return n},toArray:function(){return r.toArray(this)},add:function(e,t){var n=this,r,i;if(a(e))return n.add(f(e));if(t!==!1)for(r=f.unique(n.toArray().concat(f.makeArray(e))),n.length=r.length,i=0;it;t++)f.find(e,this[t],r);return f(r)},filter:function(e){return f("function"==typeof e?g(this.toArray(),function(t,n){return e(n,t)}):f.filter(e,this.toArray()))},closest:function(e){var t=[];return e instanceof f&&(e=e[0]),this.each(function(n,r){for(;r;){if("string"==typeof e&&f(r).is(e)){t.push(r);break}if(r==e){t.push(r);break}r=r.parentNode}}),f(t)},offset:function(e){var t,n,r,i=0,o=0,a;return e?this.css(e):(t=this[0],t&&(n=t.ownerDocument,r=n.documentElement,t.getBoundingClientRect&&(a=t.getBoundingClientRect(),i=a.left+(r.scrollLeft||n.body.scrollLeft)-r.clientLeft,o=a.top+(r.scrollTop||n.body.scrollTop)-r.clientTop)),{left:i,top:o})},push:E,sort:[].sort,splice:[].splice},r.extend(f,{extend:r.extend,makeArray:function(e){return s(e)||e.nodeType?[e]:r.toArray(e)},inArray:h,isArray:r.isArray,each:m,trim:p,grep:g,find:n,expr:n.selectors,unique:n.uniqueSort,text:n.getText,contains:n.contains,filter:function(e,t,n){var r=t.length;for(n&&(e=":not("+e+")");r--;)1!=t[r].nodeType&&t.splice(r,1);return t=1===t.length?f.find.matchesSelector(t[0],e)?[t[0]]:[]:f.find.matches(e,t)}}),m({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return y(e,"parentNode")},next:function(e){return C(e,"nextSibling",1)},prev:function(e){return C(e,"previousSibling",1)},children:function(e){return b(e.firstChild,"nextSibling",1)},contents:function(e){return r.toArray(("iframe"===e.nodeName?e.contentDocument||e.contentWindow.document:e).childNodes)}},function(e,t){f.fn[e]=function(n){var r=this,i=[];return r.each(function(){var e=t.call(i,this,n,i);e&&(f.isArray(e)?i.push.apply(i,e):i.push(e))}),this.length>1&&(T[e]||(i=f.unique(i)),0===e.indexOf("parents")&&(i=i.reverse())),i=f(i),n?i.filter(n):i}}),m({parentsUntil:function(e,t){return y(e,"parentNode",t)},nextUntil:function(e,t){return b(e,"nextSibling",1,t).slice(1)},prevUntil:function(e,t){return b(e,"previousSibling",1,t).slice(1)}},function(e,t){f.fn[e]=function(n,r){var i=this,o=[];return i.each(function(){var e=t.call(o,this,n,o);e&&(f.isArray(e)?o.push.apply(o,e):o.push(e))}),this.length>1&&(o=f.unique(o),(0===e.indexOf("parents")||"prevUntil"===e)&&(o=o.reverse())),o=f(o),r?o.filter(r):o}}),f.fn.is=function(e){return!!e&&this.filter(e).length>0},f.fn.init.prototype=f.fn,f.overrideDefaults=function(e){function t(r,i){return n=n||e(),0===arguments.length&&(r=n.element),i||(i=n.context),new t.fn.init(r,i)}var n;return f.extend(t,this),t},i.ie&&i.ie<8&&(x(M,"get",{maxlength:function(e){var t=e.maxLength;return 2147483647===t?k:t},size:function(e){var t=e.size;return 20===t?k:t},"class":function(e){return e.className},style:function(e){var t=e.style.cssText;return 0===t.length?k:t}}),x(M,"set",{"class":function(e,t){e.className=t},style:function(e,t){e.style.cssText=t}})),i.ie&&i.ie<9&&(D["float"]="styleFloat",x(L,"set",{opacity:function(e,t){var n=e.style;null===t||""===t?n.removeAttribute("filter"):(n.zoom=1,n.filter="alpha(opacity="+100*t+")")}})),f.attrHooks=M,f.cssHooks=L,f}),r(v,[],function(){return function(e,t){function n(e,t,n,r){function i(e){return e=parseInt(e,10).toString(16),e.length>1?e:"0"+e}return"#"+i(t)+i(n)+i(r)}var r=/rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*\)/gi,i=/(?:url(?:(?:\(\s*\"([^\"]+)\"\s*\))|(?:\(\s*\'([^\']+)\'\s*\))|(?:\(\s*([^)\s]+)\s*\))))|(?:\'([^\']+)\')|(?:\"([^\"]+)\")/gi,o=/\s*([^:]+):\s*([^;]+);?/g,a=/\s+$/,s,l,c={},u,d,f,h="\ufeff";for(e=e||{},t&&(d=t.getValidStyles(),f=t.getInvalidStyles()),u=("\\\" \\' \\; \\: ; : "+h).split(" "),l=0;l-1&&n||(m[e+t]=-1==l?s[0]:s.join(" "),delete m[e+"-top"+t],delete m[e+"-right"+t],delete m[e+"-bottom"+t],delete m[e+"-left"+t])}}function u(e){var t=m[e],n;if(t){for(t=t.split(" "),n=t.length;n--;)if(t[n]!==t[0])return!1;return m[e]=t[0],!0}}function d(e,t,n,r){u(t)&&u(n)&&u(r)&&(m[e]=m[t]+" "+m[n]+" "+m[r],delete m[t],delete m[n],delete m[r])}function f(e){return b=!0,c[e]}function h(e,t){return b&&(e=e.replace(/\uFEFF[0-9]/g,function(e){return c[e]})),t||(e=e.replace(/\\([\'\";:])/g,"$1")),e}function p(t,n,r,i,o,a){if(o=o||a)return o=h(o),"'"+o.replace(/\'/g,"\\'")+"'";if(n=h(n||r||i),!e.allow_script_urls){var s=n.replace(/[\s\r\n]+/,"");if(/(java|vb)script:/i.test(s))return"";if(!e.allow_svg_data_urls&&/^data:image\/svg/i.test(s))return""}return C&&(n=C.call(x,n,"style")),"url('"+n.replace(/\'/g,"\\'")+"')"}var m={},g,v,y,b,C=e.url_converter,x=e.url_converter_scope||this;if(t){for(t=t.replace(/[\u0000-\u001F]/g,""),t=t.replace(/\\[\"\';:\uFEFF]/g,f).replace(/\"[^\"]+\"|\'[^\']+\'/g,function(e){return e.replace(/[;:]/g,f)});g=o.exec(t);){if(v=g[1].replace(a,"").toLowerCase(),y=g[2].replace(a,""),y=y.replace(/\\[0-9a-f]+/g,function(e){return String.fromCharCode(parseInt(e.substr(1),16))}),v&&y.length>0){if(!e.allow_script_urls&&("behavior"==v||/expression\s*\(|\/\*|\*\//.test(y)))continue;"font-weight"===v&&"700"===y?y="bold":("color"===v||"background-color"===v)&&(y=y.toLowerCase()),y=y.replace(r,n),y=y.replace(i,p),m[v]=b?h(y,!0):y}o.lastIndex=g.index+g[0].length}s("border","",!0),s("border","-width"),s("border","-color"),s("border","-style"),s("padding",""),s("margin",""),d("border","border-width","border-style","border-color"),"medium none"===m.border&&delete m.border,"none"===m["border-image"]&&delete m["border-image"]}return m},serialize:function(e,t){function n(t){var n,r,o,a;if(n=d[t])for(r=0,o=n.length;o>r;r++)t=n[r],a=e[t],a!==s&&a.length>0&&(i+=(i.length>0?" ":"")+t+": "+a+";")}function r(e,t){var n;return n=f["*"],n&&n[e]?!1:(n=f[t],n&&n[e]?!1:!0)}var i="",o,a;if(t&&d)n("*"),n(t);else for(o in e)a=e[o],a!==s&&a.length>0&&(!f||r(o,t))&&(i+=(i.length>0?" ":"")+o+": "+a+";");return i}}}}),r(y,[],function(){return function(e,t){function n(e,n,r,i){var o,a;if(e){if(!i&&e[n])return e[n];if(e!=t){if(o=e[r])return o;for(a=e.parentNode;a&&a!=t;a=a.parentNode)if(o=a[r])return o}}}var r=e;this.current=function(){return r},this.next=function(e){return r=n(r,"firstChild","nextSibling",e)},this.prev=function(e){return r=n(r,"lastChild","previousSibling",e)}}}),r(b,[m],function(e){function t(n){function r(){return P.createDocumentFragment()}function i(e,t){E(F,e,t)}function o(e,t){E(z,e,t)}function a(e){i(e.parentNode,j(e))}function s(e){i(e.parentNode,j(e)+1)}function l(e){o(e.parentNode,j(e))}function c(e){o(e.parentNode,j(e)+1)}function u(e){e?(L[U]=L[V],L[$]=L[W]):(L[V]=L[U],L[W]=L[$]),L.collapsed=F}function d(e){a(e),c(e)}function f(e){i(e,0),o(e,1===e.nodeType?e.childNodes.length:e.nodeValue.length)}function h(e,t){var n=L[V],r=L[W],i=L[U],o=L[$],a=t.startContainer,s=t.startOffset,l=t.endContainer,c=t.endOffset;return 0===e?w(n,r,a,s):1===e?w(i,o,a,s):2===e?w(i,o,l,c):3===e?w(n,r,l,c):void 0}function p(){N(I)}function m(){return N(H)}function g(){return N(O)}function v(e){var t=this[V],r=this[W],i,o;3!==t.nodeType&&4!==t.nodeType||!t.nodeValue?(t.childNodes.length>0&&(o=t.childNodes[r]),o?t.insertBefore(e,o):3==t.nodeType?n.insertAfter(e,t):t.appendChild(e)):r?r>=t.nodeValue.length?n.insertAfter(e,t):(i=t.splitText(r),t.parentNode.insertBefore(e,i)):t.parentNode.insertBefore(e,t)}function y(e){var t=L.extractContents();L.insertNode(e),e.appendChild(t),L.selectNode(e)}function b(){return q(new t(n),{startContainer:L[V],startOffset:L[W],endContainer:L[U],endOffset:L[$],collapsed:L.collapsed,commonAncestorContainer:L.commonAncestorContainer})}function C(e,t){var n;if(3==e.nodeType)return e;if(0>t)return e;for(n=e.firstChild;n&&t>0;)--t,n=n.nextSibling;return n?n:e}function x(){return L[V]==L[U]&&L[W]==L[$]}function w(e,t,r,i){var o,a,s,l,c,u;if(e==r)return t==i?0:i>t?-1:1;for(o=r;o&&o.parentNode!=e;)o=o.parentNode;if(o){for(a=0,s=e.firstChild;s!=o&&t>a;)a++,s=s.nextSibling;return a>=t?-1:1}for(o=e;o&&o.parentNode!=r;)o=o.parentNode;if(o){for(a=0,s=r.firstChild;s!=o&&i>a;)a++,s=s.nextSibling;return i>a?-1:1}for(l=n.findCommonAncestor(e,r),c=e;c&&c.parentNode!=l;)c=c.parentNode;for(c||(c=l),u=r;u&&u.parentNode!=l;)u=u.parentNode;if(u||(u=l),c==u)return 0;for(s=l.firstChild;s;){if(s==c)return-1;if(s==u)return 1;s=s.nextSibling}}function E(e,t,r){var i,o;for(e?(L[V]=t,L[W]=r):(L[U]=t,L[$]=r),i=L[U];i.parentNode;)i=i.parentNode;for(o=L[V];o.parentNode;)o=o.parentNode;o==i?w(L[V],L[W],L[U],L[$])>0&&L.collapse(e):L.collapse(e),L.collapsed=x(),L.commonAncestorContainer=n.findCommonAncestor(L[V],L[U])}function N(e){var t,n=0,r=0,i,o,a,s,l,c;if(L[V]==L[U])return _(e);for(t=L[U],i=t.parentNode;i;t=i,i=i.parentNode){if(i==L[V])return S(t,e);++n}for(t=L[V],i=t.parentNode;i;t=i,i=i.parentNode){if(i==L[U])return k(t,e);++r}for(o=r-n,a=L[V];o>0;)a=a.parentNode,o--;for(s=L[U];0>o;)s=s.parentNode,o++;for(l=a.parentNode,c=s.parentNode;l!=c;l=l.parentNode,c=c.parentNode)a=l,s=c;return T(a,s,e)}function _(e){var t,n,i,o,a,s,l,c,u;if(e!=I&&(t=r()),L[W]==L[$])return t;if(3==L[V].nodeType){if(n=L[V].nodeValue,i=n.substring(L[W],L[$]),e!=O&&(o=L[V],c=L[W],u=L[$]-L[W],0===c&&u>=o.nodeValue.length-1?o.parentNode.removeChild(o):o.deleteData(c,u),L.collapse(F)),e==I)return;return i.length>0&&t.appendChild(P.createTextNode(i)),t}for(o=C(L[V],L[W]),a=L[$]-L[W];o&&a>0;)s=o.nextSibling,l=D(o,e),t&&t.appendChild(l),--a,o=s;return e!=O&&L.collapse(F),t}function S(e,t){var n,i,o,a,s,l;if(t!=I&&(n=r()),i=R(e,t),n&&n.appendChild(i),o=j(e),a=o-L[W],0>=a)return t!=O&&(L.setEndBefore(e),L.collapse(z)),n;for(i=e.previousSibling;a>0;)s=i.previousSibling,l=D(i,t),n&&n.insertBefore(l,n.firstChild),--a,i=s;return t!=O&&(L.setEndBefore(e),L.collapse(z)),n}function k(e,t){var n,i,o,a,s,l;for(t!=I&&(n=r()),o=A(e,t),n&&n.appendChild(o),i=j(e),++i,a=L[$]-i,o=e.nextSibling;o&&a>0;)s=o.nextSibling,l=D(o,t),n&&n.appendChild(l),--a,o=s;return t!=O&&(L.setStartAfter(e),L.collapse(F)),n}function T(e,t,n){var i,o,a,s,l,c,u;for(n!=I&&(o=r()),i=A(e,n),o&&o.appendChild(i),a=j(e),s=j(t),++a,l=s-a,c=e.nextSibling;l>0;)u=c.nextSibling,i=D(c,n),o&&o.appendChild(i),c=u,--l;return i=R(t,n),o&&o.appendChild(i),n!=O&&(L.setStartAfter(e),L.collapse(F)),o}function R(e,t){var n=C(L[U],L[$]-1),r,i,o,a,s,l=n!=L[U];if(n==e)return B(n,l,z,t);for(r=n.parentNode,i=B(r,z,z,t);r;){for(;n;)o=n.previousSibling,a=B(n,l,z,t),t!=I&&i.insertBefore(a,i.firstChild),l=F,n=o;if(r==e)return i;n=r.previousSibling,r=r.parentNode,s=B(r,z,z,t),t!=I&&s.appendChild(i),i=s}}function A(e,t){var n=C(L[V],L[W]),r=n!=L[V],i,o,a,s,l;if(n==e)return B(n,r,F,t);for(i=n.parentNode,o=B(i,z,F,t);i;){for(;n;)a=n.nextSibling,s=B(n,r,F,t),t!=I&&o.appendChild(s),r=F,n=a;if(i==e)return o;n=i.nextSibling,i=i.parentNode,l=B(i,z,F,t),t!=I&&l.appendChild(o),o=l}}function B(e,t,r,i){var o,a,s,l,c;if(t)return D(e,i);if(3==e.nodeType){if(o=e.nodeValue,r?(l=L[W],a=o.substring(l),s=o.substring(0,l)):(l=L[$],a=o.substring(0,l),s=o.substring(l)),i!=O&&(e.nodeValue=s),i==I)return;return c=n.clone(e,z),c.nodeValue=a,c}if(i!=I)return n.clone(e,z)}function D(e,t){return t!=I?t==O?n.clone(e,F):e:void e.parentNode.removeChild(e)}function M(){return n.create("body",null,g()).outerText}var L=this,P=n.doc,H=0,O=1,I=2,F=!0,z=!1,W="startOffset",V="startContainer",U="endContainer",$="endOffset",q=e.extend,j=n.nodeIndex;return q(L,{startContainer:P,startOffset:0,endContainer:P,endOffset:0,collapsed:F,commonAncestorContainer:P,START_TO_START:0,START_TO_END:1,END_TO_END:2,END_TO_START:3,setStart:i,setEnd:o,setStartBefore:a,setStartAfter:s,setEndBefore:l,setEndAfter:c,collapse:u,selectNode:d,selectNodeContents:f,compareBoundaryPoints:h,deleteContents:p,extractContents:m,cloneContents:g,insertNode:v,surroundContents:y,cloneRange:b,toStringIE:M}),L}return t.prototype.toString=function(){return this.toStringIE()},t}),r(C,[m],function(e){function t(e){var t;return t=document.createElement("div"),t.innerHTML=e,t.textContent||t.innerText||e}function n(e,t){var n,r,i,a={};if(e){for(e=e.split(","),t=t||10,n=0;n\"\u0060\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,l=/[<>&\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,c=/[<>&\"\']/g,u=/&#([a-z0-9]+);?|&([a-z0-9]+);/gi,d={128:"\u20ac",130:"\u201a",131:"\u0192",132:"\u201e",133:"\u2026",134:"\u2020",135:"\u2021",136:"\u02c6",137:"\u2030",138:"\u0160",139:"\u2039",140:"\u0152",142:"\u017d",145:"\u2018",146:"\u2019",147:"\u201c",148:"\u201d",149:"\u2022",150:"\u2013",151:"\u2014",152:"\u02dc",153:"\u2122",154:"\u0161",155:"\u203a",156:"\u0153",158:"\u017e",159:"\u0178"};o={'"':""","'":"'","<":"<",">":">","&":"&","`":"`"},a={"<":"<",">":">","&":"&",""":'"',"'":"'"},i=n("50,nbsp,51,iexcl,52,cent,53,pound,54,curren,55,yen,56,brvbar,57,sect,58,uml,59,copy,5a,ordf,5b,laquo,5c,not,5d,shy,5e,reg,5f,macr,5g,deg,5h,plusmn,5i,sup2,5j,sup3,5k,acute,5l,micro,5m,para,5n,middot,5o,cedil,5p,sup1,5q,ordm,5r,raquo,5s,frac14,5t,frac12,5u,frac34,5v,iquest,60,Agrave,61,Aacute,62,Acirc,63,Atilde,64,Auml,65,Aring,66,AElig,67,Ccedil,68,Egrave,69,Eacute,6a,Ecirc,6b,Euml,6c,Igrave,6d,Iacute,6e,Icirc,6f,Iuml,6g,ETH,6h,Ntilde,6i,Ograve,6j,Oacute,6k,Ocirc,6l,Otilde,6m,Ouml,6n,times,6o,Oslash,6p,Ugrave,6q,Uacute,6r,Ucirc,6s,Uuml,6t,Yacute,6u,THORN,6v,szlig,70,agrave,71,aacute,72,acirc,73,atilde,74,auml,75,aring,76,aelig,77,ccedil,78,egrave,79,eacute,7a,ecirc,7b,euml,7c,igrave,7d,iacute,7e,icirc,7f,iuml,7g,eth,7h,ntilde,7i,ograve,7j,oacute,7k,ocirc,7l,otilde,7m,ouml,7n,divide,7o,oslash,7p,ugrave,7q,uacute,7r,ucirc,7s,uuml,7t,yacute,7u,thorn,7v,yuml,ci,fnof,sh,Alpha,si,Beta,sj,Gamma,sk,Delta,sl,Epsilon,sm,Zeta,sn,Eta,so,Theta,sp,Iota,sq,Kappa,sr,Lambda,ss,Mu,st,Nu,su,Xi,sv,Omicron,t0,Pi,t1,Rho,t3,Sigma,t4,Tau,t5,Upsilon,t6,Phi,t7,Chi,t8,Psi,t9,Omega,th,alpha,ti,beta,tj,gamma,tk,delta,tl,epsilon,tm,zeta,tn,eta,to,theta,tp,iota,tq,kappa,tr,lambda,ts,mu,tt,nu,tu,xi,tv,omicron,u0,pi,u1,rho,u2,sigmaf,u3,sigma,u4,tau,u5,upsilon,u6,phi,u7,chi,u8,psi,u9,omega,uh,thetasym,ui,upsih,um,piv,812,bull,816,hellip,81i,prime,81j,Prime,81u,oline,824,frasl,88o,weierp,88h,image,88s,real,892,trade,89l,alefsym,8cg,larr,8ch,uarr,8ci,rarr,8cj,darr,8ck,harr,8dl,crarr,8eg,lArr,8eh,uArr,8ei,rArr,8ej,dArr,8ek,hArr,8g0,forall,8g2,part,8g3,exist,8g5,empty,8g7,nabla,8g8,isin,8g9,notin,8gb,ni,8gf,prod,8gh,sum,8gi,minus,8gn,lowast,8gq,radic,8gt,prop,8gu,infin,8h0,ang,8h7,and,8h8,or,8h9,cap,8ha,cup,8hb,int,8hk,there4,8hs,sim,8i5,cong,8i8,asymp,8j0,ne,8j1,equiv,8j4,le,8j5,ge,8k2,sub,8k3,sup,8k4,nsub,8k6,sube,8k7,supe,8kl,oplus,8kn,otimes,8l5,perp,8m5,sdot,8o8,lceil,8o9,rceil,8oa,lfloor,8ob,rfloor,8p9,lang,8pa,rang,9ea,loz,9j0,spades,9j3,clubs,9j5,hearts,9j6,diams,ai,OElig,aj,oelig,b0,Scaron,b1,scaron,bo,Yuml,m6,circ,ms,tilde,802,ensp,803,emsp,809,thinsp,80c,zwnj,80d,zwj,80e,lrm,80f,rlm,80j,ndash,80k,mdash,80o,lsquo,80p,rsquo,80q,sbquo,80s,ldquo,80t,rdquo,80u,bdquo,810,dagger,811,Dagger,81g,permil,81p,lsaquo,81q,rsaquo,85c,euro",32);var f={encodeRaw:function(e,t){return e.replace(t?s:l,function(e){return o[e]||e})},encodeAllRaw:function(e){return(""+e).replace(c,function(e){return o[e]||e})},encodeNumeric:function(e,t){return e.replace(t?s:l,function(e){return e.length>1?"&#"+(1024*(e.charCodeAt(0)-55296)+(e.charCodeAt(1)-56320)+65536)+";":o[e]||"&#"+e.charCodeAt(0)+";"})},encodeNamed:function(e,t,n){return n=n||i,e.replace(t?s:l,function(e){return o[e]||n[e]||e})},getEncodeFunc:function(e,t){function a(e,n){return e.replace(n?s:l,function(e){return o[e]||t[e]||"&#"+e.charCodeAt(0)+";"||e})}function c(e,n){return f.encodeNamed(e,n,t)}return t=n(t)||i,e=r(e.replace(/\+/g,",")),e.named&&e.numeric?a:e.named?t?c:f.encodeNamed:e.numeric?f.encodeNumeric:f.encodeRaw},decode:function(e){return e.replace(u,function(e,n){return n?(n="x"===n.charAt(0).toLowerCase()?parseInt(n.substr(1),16):parseInt(n,10),n>65535?(n-=65536,String.fromCharCode(55296+(n>>10),56320+(1023&n))):d[n]||String.fromCharCode(n)):a[e]||i[e]||t(e)})}};return f}),r(x,[m,u],function(e,t){return function(n,r){function i(e){n.getElementsByTagName("head")[0].appendChild(e)}function o(r,o,c){function u(){for(var e=b.passed,t=e.length;t--;)e[t]();b.status=2,b.passed=[],b.failed=[]}function d(){for(var e=b.failed,t=e.length;t--;)e[t]();b.status=3,b.passed=[],b.failed=[]}function f(){var e=navigator.userAgent.match(/WebKit\/(\d*)/);return!!(e&&e[1]<536)}function h(e,n){e()||((new Date).getTime()-y0)return v=n.createElement("style"),v.textContent='@import "'+r+'"',m(),void i(v);p()}i(g),g.href=r}}var a=0,s={},l;r=r||{},l=r.maxLoadTime||5e3,this.load=o}}),r(w,[f,g,v,d,y,b,C,h,m,x],function(e,n,r,i,o,a,s,l,c,u){function d(e,t){var n={},r=t.keep_values,i;return i={set:function(n,r,i){t.url_converter&&(r=t.url_converter.call(t.url_converter_scope||e,r,i,n[0])),n.attr("data-mce-"+i,r).attr(i,r)},get:function(e,t){return e.attr("data-mce-"+t)||e.attr(t)}},n={style:{set:function(e,t){return null!==t&&"object"==typeof t?void e.css(t):(r&&e.attr("data-mce-style",t),void e.attr("style",t))},get:function(t){var n=t.attr("data-mce-style")||t.attr("style");return n=e.serializeStyle(e.parseStyle(n),t[0].nodeName)}}},r&&(n.href=n.src=i),n}function f(e,t){var n=t.attr("style");n=e.serializeStyle(e.parseStyle(n),t[0].nodeName),n||(n=null),t.attr("data-mce-style",n)}function h(e,t){var n=0,r,i;if(e)for(r=e.nodeType,e=e.previousSibling;e;e=e.previousSibling)i=e.nodeType,(!t||3!=i||i!=r&&e.nodeValue.length)&&(n++,r=i);return n}function p(e,t){var o=this,a;o.doc=e,o.win=window,o.files={},o.counter=0,o.stdMode=!b||e.documentMode>=8,o.boxModel=!b||"CSS1Compat"==e.compatMode||o.stdMode,o.styleSheetLoader=new u(e),o.boundEvents=[],o.settings=t=t||{},o.schema=t.schema,o.styles=new r({url_converter:t.url_converter,url_converter_scope:t.url_converter_scope},t.schema),o.fixDoc(e),o.events=t.ownEvents?new i(t.proxy):i.Event,o.attrHooks=d(o,t),a=t.schema?t.schema.getBlockElements():{},o.$=n.overrideDefaults(function(){return{context:e,element:o.getRoot()}}),o.isBlock=function(e){if(!e)return!1;var t=e.nodeType;return t?!(1!==t||!a[e.nodeName]):!!a[e]}}var m=c.each,g=c.is,v=c.grep,y=c.trim,b=l.ie,C=/^([a-z0-9],?)+$/i,x=/^[ \t\r\n]*$/;return p.prototype={$$:function(e){return"string"==typeof e&&(e=this.get(e)),this.$(e)},root:null,fixDoc:function(e){var t=this.settings,n;if(b&&t.schema){"abbr article aside audio canvas details figcaption figure footer header hgroup mark menu meter nav output progress section summary time video".replace(/\w+/g,function(t){e.createElement(t)});for(n in t.schema.getCustomElements())e.createElement(n)}},clone:function(e,t){var n=this,r,i;return!b||1!==e.nodeType||t?e.cloneNode(t):(i=n.doc,t?r.firstChild:(r=i.createElement(e.nodeName),m(n.getAttribs(e),function(t){n.setAttrib(r,t.nodeName,n.getAttrib(e,t.nodeName))}),r))},getRoot:function(){var e=this;return e.settings.root_element||e.doc.body},getViewPort:function(e){var t,n;return e=e?e:this.win,t=e.document,n=this.boxModel?t.documentElement:t.body,{x:e.pageXOffset||n.scrollLeft,y:e.pageYOffset||n.scrollTop,w:e.innerWidth||n.clientWidth,h:e.innerHeight||n.clientHeight}},getRect:function(e){var t=this,n,r;return e=t.get(e),n=t.getPos(e),r=t.getSize(e),{x:n.x,y:n.y,w:r.w,h:r.h}},getSize:function(e){var t=this,n,r;return e=t.get(e),n=t.getStyle(e,"width"),r=t.getStyle(e,"height"),-1===n.indexOf("px")&&(n=0),-1===r.indexOf("px")&&(r=0),{w:parseInt(n,10)||e.offsetWidth||e.clientWidth,h:parseInt(r,10)||e.offsetHeight||e.clientHeight}},getParent:function(e,t,n){return this.getParents(e,t,n,!1)},getParents:function(e,n,r,i){var o=this,a,s=[];for(e=o.get(e),i=i===t,r=r||("BODY"!=o.getRoot().nodeName?o.getRoot().parentNode:null),g(n,"string")&&(a=n,n="*"===n?function(e){return 1==e.nodeType}:function(e){return o.is(e,a)});e&&e!=r&&e.nodeType&&9!==e.nodeType;){if(!n||n(e)){if(!i)return e;s.push(e)}e=e.parentNode}return i?s:null},get:function(e){var t;return e&&this.doc&&"string"==typeof e&&(t=e,e=this.doc.getElementById(e),e&&e.id!==t)?this.doc.getElementsByName(t)[1]:e},getNext:function(e,t){return this._findSib(e,t,"nextSibling")},getPrev:function(e,t){return this._findSib(e,t,"previousSibling")},select:function(t,n){var r=this;return e(t,r.get(n)||r.settings.root_element||r.doc,[])},is:function(n,r){var i;if(n.length===t){if("*"===r)return 1==n.nodeType;if(C.test(r)){for(r=r.toLowerCase().split(/,/),n=n.nodeName.toLowerCase(),i=r.length-1;i>=0;i--)if(r[i]==n)return!0;return!1}}if(n.nodeType&&1!=n.nodeType)return!1;var o=n.nodeType?[n]:n;return e(r,o[0].ownerDocument||o[0],null,o).length>0; +},add:function(e,t,n,r,i){var o=this;return this.run(e,function(e){var a;return a=g(t,"string")?o.doc.createElement(t):t,o.setAttribs(a,n),r&&(r.nodeType?a.appendChild(r):o.setHTML(a,r)),i?a:e.appendChild(a)})},create:function(e,t,n){return this.add(this.doc.createElement(e),e,t,n,1)},createHTML:function(e,t,n){var r="",i;r+="<"+e;for(i in t)t.hasOwnProperty(i)&&null!==t[i]&&"undefined"!=typeof t[i]&&(r+=" "+i+'="'+this.encode(t[i])+'"');return"undefined"!=typeof n?r+">"+n+"":r+" />"},createFragment:function(e){var t,n,r=this.doc,i;for(i=r.createElement("div"),t=r.createDocumentFragment(),e&&(i.innerHTML=e);n=i.firstChild;)t.appendChild(n);return t},remove:function(e,t){return e=this.$$(e),t?e.each(function(){for(var e;e=this.firstChild;)3==e.nodeType&&0===e.data.length?this.removeChild(e):this.parentNode.insertBefore(e,this)}).remove():e.remove(),e.length>1?e.toArray():e[0]},setStyle:function(e,t,n){e=this.$$(e).css(t,n),this.settings.update_styles&&f(this,e)},getStyle:function(e,n,r){return e=this.$$(e),r?e.css(n):(n=n.replace(/-(\D)/g,function(e,t){return t.toUpperCase()}),"float"==n&&(n=l.ie&&l.ie<12?"styleFloat":"cssFloat"),e[0]&&e[0].style?e[0].style[n]:t)},setStyles:function(e,t){e=this.$$(e).css(t),this.settings.update_styles&&f(this,e)},removeAllAttribs:function(e){return this.run(e,function(e){var t,n=e.attributes;for(t=n.length-1;t>=0;t--)e.removeAttributeNode(n.item(t))})},setAttrib:function(e,t,n){var r=this,i,o,a=r.settings;""===n&&(n=null),e=r.$$(e),i=e.attr(t),e.length&&(o=r.attrHooks[t],o&&o.set?o.set(e,n,t):e.attr(t,n),i!=n&&a.onSetAttrib&&a.onSetAttrib({attrElm:e,attrName:t,attrValue:n}))},setAttribs:function(e,t){var n=this;n.$$(e).each(function(e,r){m(t,function(e,t){n.setAttrib(r,t,e)})})},getAttrib:function(e,t,n){var r=this,i,o;return e=r.$$(e),e.length&&(i=r.attrHooks[t],o=i&&i.get?i.get(e,t):e.attr(t)),"undefined"==typeof o&&(o=n||""),o},getPos:function(e,t){var r=this,i=0,o=0,a,s=r.doc,l=s.body,c;if(e=r.get(e),t=t||l,e){if(t===l&&e.getBoundingClientRect&&"static"===n(l).css("position"))return c=e.getBoundingClientRect(),t=r.boxModel?s.documentElement:l,i=c.left+(s.documentElement.scrollLeft||l.scrollLeft)-t.clientLeft,o=c.top+(s.documentElement.scrollTop||l.scrollTop)-t.clientTop,{x:i,y:o};for(a=e;a&&a!=t&&a.nodeType;)i+=a.offsetLeft||0,o+=a.offsetTop||0,a=a.offsetParent;for(a=e.parentNode;a&&a!=t&&a.nodeType;)i-=a.scrollLeft||0,o-=a.scrollTop||0,a=a.parentNode}return{x:i,y:o}},parseStyle:function(e){return this.styles.parse(e)},serializeStyle:function(e,t){return this.styles.serialize(e,t)},addStyle:function(e){var t=this,n=t.doc,r,i;if(t!==p.DOM&&n===document){var o=p.DOM.addedStyles;if(o=o||[],o[e])return;o[e]=!0,p.DOM.addedStyles=o}i=n.getElementById("mceDefaultStyles"),i||(i=n.createElement("style"),i.id="mceDefaultStyles",i.type="text/css",r=n.getElementsByTagName("head")[0],r.firstChild?r.insertBefore(i,r.firstChild):r.appendChild(i)),i.styleSheet?i.styleSheet.cssText+=e:i.appendChild(n.createTextNode(e))},loadCSS:function(e){var t=this,n=t.doc,r;return t!==p.DOM&&n===document?void p.DOM.loadCSS(e):(e||(e=""),r=n.getElementsByTagName("head")[0],void m(e.split(","),function(e){var i;e=c._addCacheSuffix(e),t.files[e]||(t.files[e]=!0,i=t.create("link",{rel:"stylesheet",href:e}),b&&n.documentMode&&n.recalc&&(i.onload=function(){n.recalc&&n.recalc(),i.onload=null}),r.appendChild(i))}))},addClass:function(e,t){this.$$(e).addClass(t)},removeClass:function(e,t){this.toggleClass(e,t,!1)},hasClass:function(e,t){return this.$$(e).hasClass(t)},toggleClass:function(e,t,r){this.$$(e).toggleClass(t,r).each(function(){""===this.className&&n(this).attr("class",null)})},show:function(e){this.$$(e).show()},hide:function(e){this.$$(e).hide()},isHidden:function(e){return"none"==this.$$(e).css("display")},uniqueId:function(e){return(e?e:"mce_")+this.counter++},setHTML:function(e,t){e=this.$$(e),b?e.each(function(e,r){if(r.canHaveHTML!==!1){for(;r.firstChild;)r.removeChild(r.firstChild);try{r.innerHTML="
    "+t,r.removeChild(r.firstChild)}catch(i){n("
    ").html("
    "+t).contents().slice(1).appendTo(r)}return t}}):e.html(t)},getOuterHTML:function(e){return e=this.get(e),1==e.nodeType&&"outerHTML"in e?e.outerHTML:n("
    ").append(n(e).clone()).html()},setOuterHTML:function(e,t){var r=this;r.$$(e).each(function(){try{if("outerHTML"in this)return void(this.outerHTML=t)}catch(e){}r.remove(n(this).html(t),!0)})},decode:s.decode,encode:s.encodeAllRaw,insertAfter:function(e,t){return t=this.get(t),this.run(e,function(e){var n,r;return n=t.parentNode,r=t.nextSibling,r?n.insertBefore(e,r):n.appendChild(e),e})},replace:function(e,t,n){var r=this;return r.run(t,function(t){return g(t,"array")&&(e=e.cloneNode(!0)),n&&m(v(t.childNodes),function(t){e.appendChild(t)}),t.parentNode.replaceChild(e,t)})},rename:function(e,t){var n=this,r;return e.nodeName!=t.toUpperCase()&&(r=n.create(t),m(n.getAttribs(e),function(t){n.setAttrib(r,t.nodeName,n.getAttrib(e,t.nodeName))}),n.replace(r,e,1)),r||e},findCommonAncestor:function(e,t){for(var n=e,r;n;){for(r=t;r&&n!=r;)r=r.parentNode;if(n==r)break;n=n.parentNode}return!n&&e.ownerDocument?e.ownerDocument.documentElement:n},toHex:function(e){return this.styles.toHex(c.trim(e))},run:function(e,t,n){var r=this,i;return"string"==typeof e&&(e=r.get(e)),e?(n=n||this,e.nodeType||!e.length&&0!==e.length?t.call(n,e):(i=[],m(e,function(e,o){e&&("string"==typeof e&&(e=r.get(e)),i.push(t.call(n,e,o)))}),i)):!1},getAttribs:function(e){var t;if(e=this.get(e),!e)return[];if(b){if(t=[],"OBJECT"==e.nodeName)return e.attributes;"OPTION"===e.nodeName&&this.getAttrib(e,"selected")&&t.push({specified:1,nodeName:"selected"});var n=/<\/?[\w:\-]+ ?|=[\"][^\"]+\"|=\'[^\']+\'|=[\w\-]+|>/gi;return e.cloneNode(!1).outerHTML.replace(n,"").replace(/[\w:\-]+/gi,function(e){t.push({specified:1,nodeName:e})}),t}return e.attributes},isEmpty:function(e,t){var n=this,r,i,a,s,l,c=0;if(e=e.firstChild){s=new o(e,e.parentNode),t=t||(n.schema?n.schema.getNonEmptyElements():null);do{if(a=e.nodeType,1===a){if(e.getAttribute("data-mce-bogus"))continue;if(l=e.nodeName.toLowerCase(),t&&t[l]){if("br"===l){c++;continue}return!1}for(i=n.getAttribs(e),r=i.length;r--;)if(l=i[r].nodeName,"name"===l||"data-mce-bookmark"===l)return!1}if(8==a)return!1;if(3===a&&!x.test(e.nodeValue))return!1}while(e=s.next())}return 1>=c},createRng:function(){var e=this.doc;return e.createRange?e.createRange():new a(this)},nodeIndex:h,split:function(e,t,n){function r(e){function t(e){var t=e.previousSibling&&"SPAN"==e.previousSibling.nodeName,n=e.nextSibling&&"SPAN"==e.nextSibling.nodeName;return t&&n}var n,o=e.childNodes,a=e.nodeType;if(1!=a||"bookmark"!=e.getAttribute("data-mce-type")){for(n=o.length-1;n>=0;n--)r(o[n]);if(9!=a){if(3==a&&e.nodeValue.length>0){var s=y(e.nodeValue).length;if(!i.isBlock(e.parentNode)||s>0||0===s&&t(e))return}else if(1==a&&(o=e.childNodes,1==o.length&&o[0]&&1==o[0].nodeType&&"bookmark"==o[0].getAttribute("data-mce-type")&&e.parentNode.insertBefore(o[0],e),o.length||/^(br|hr|input|img)$/i.test(e.nodeName)))return;i.remove(e)}return e}}var i=this,o=i.createRng(),a,s,l;return e&&t?(o.setStart(e.parentNode,i.nodeIndex(e)),o.setEnd(t.parentNode,i.nodeIndex(t)),a=o.extractContents(),o=i.createRng(),o.setStart(t.parentNode,i.nodeIndex(t)+1),o.setEnd(e.parentNode,i.nodeIndex(e)+1),s=o.extractContents(),l=e.parentNode,l.insertBefore(r(a),e),n?l.insertBefore(n,e):l.insertBefore(t,e),l.insertBefore(r(s),e),i.remove(e),n||t):void 0},bind:function(e,t,n,r){var i=this;if(c.isArray(e)){for(var o=e.length;o--;)e[o]=i.bind(e[o],t,n,r);return e}return!i.settings.collect||e!==i.doc&&e!==i.win||i.boundEvents.push([e,t,n,r]),i.events.bind(e,t,n,r||i)},unbind:function(e,t,n){var r=this,i;if(c.isArray(e)){for(i=e.length;i--;)e[i]=r.unbind(e[i],t,n);return e}if(r.boundEvents&&(e===r.doc||e===r.win))for(i=r.boundEvents.length;i--;){var o=r.boundEvents[i];e!=o[0]||t&&t!=o[1]||n&&n!=o[2]||this.events.unbind(o[0],o[1],o[2])}return this.events.unbind(e,t,n)},fire:function(e,t,n){return this.events.fire(e,t,n)},getContentEditable:function(e){var t;return e&&1==e.nodeType?(t=e.getAttribute("data-mce-contenteditable"),t&&"inherit"!==t?t:"inherit"!==e.contentEditable?e.contentEditable:null):null},getContentEditableParent:function(e){for(var t=this.getRoot(),n=null;e&&e!==t&&(n=this.getContentEditable(e),null===n);e=e.parentNode);return n},destroy:function(){var t=this;if(t.boundEvents){for(var n=t.boundEvents.length;n--;){var r=t.boundEvents[n];this.events.unbind(r[0],r[1],r[2])}t.boundEvents=null}e.setDocument&&e.setDocument(),t.win=t.doc=t.root=t.events=t.frag=null},isChildOf:function(e,t){for(;e;){if(t===e)return!0;e=e.parentNode}return!1},dumpRng:function(e){return"startContainer: "+e.startContainer.nodeName+", startOffset: "+e.startOffset+", endContainer: "+e.endContainer.nodeName+", endOffset: "+e.endOffset},_findSib:function(e,t,n){var r=this,i=t;if(e)for("string"==typeof i&&(i=function(e){return r.is(e,t)}),e=e[n];e;e=e[n])if(i(e))return e;return null}},p.DOM=new p(document),p.nodeIndex=h,p}),r(E,[w,m],function(e,t){function n(){function e(e,n){function i(){a.remove(l),s&&(s.onreadystatechange=s.onload=s=null),n()}function o(){"undefined"!=typeof console&&console.log&&console.log("Failed to load: "+e)}var a=r,s,l;l=a.uniqueId(),s=document.createElement("script"),s.id=l,s.type="text/javascript",s.src=t._addCacheSuffix(e),"onreadystatechange"in s?s.onreadystatechange=function(){/loaded|complete/.test(s.readyState)&&i()}:s.onload=i,s.onerror=o,(document.getElementsByTagName("head")[0]||document.body).appendChild(s)}var n=0,a=1,s=2,l={},c=[],u={},d=[],f=0,h;this.isDone=function(e){return l[e]==s},this.markDone=function(e){l[e]=s},this.add=this.load=function(e,t,r){var i=l[e];i==h&&(c.push(e),l[e]=n),t&&(u[e]||(u[e]=[]),u[e].push({func:t,scope:r||this}))},this.loadQueue=function(e,t){this.loadScripts(c,e,t)},this.loadScripts=function(t,n,r){function c(e){i(u[e],function(e){e.func.call(e.scope)}),u[e]=h}var p;d.push({func:n,scope:r||this}),(p=function(){var n=o(t);t.length=0,i(n,function(t){return l[t]==s?void c(t):void(l[t]!=a&&(l[t]=a,f++,e(t,function(){l[t]=s,f--,c(t),p()})))}),f||(i(d,function(e){e.func.call(e.scope)}),d.length=0)})()}}var r=e.DOM,i=t.each,o=t.grep;return n.ScriptLoader=new n,n}),r(N,[E,m],function(e,n){function r(){var e=this;e.items=[],e.urls={},e.lookup={}}var i=n.each;return r.prototype={get:function(e){return this.lookup[e]?this.lookup[e].instance:t},dependencies:function(e){var t;return this.lookup[e]&&(t=this.lookup[e].dependencies),t||[]},requireLangPack:function(t,n){var i=r.language;if(i&&r.languageLoad!==!1){if(n)if(n=","+n+",",-1!=n.indexOf(","+i.substr(0,2)+","))i=i.substr(0,2);else if(-1==n.indexOf(","+i+","))return;e.ScriptLoader.add(this.urls[t]+"/langs/"+i+".js")}},add:function(e,t,n){return this.items.push(t),this.lookup[e]={instance:t,dependencies:n},t},createUrl:function(e,t){return"object"==typeof t?t:{prefix:e.prefix,resource:t,suffix:e.suffix}},addComponents:function(t,n){var r=this.urls[t];i(n,function(t){e.ScriptLoader.add(r+"/"+t)})},load:function(n,o,a,s){function l(){var r=c.dependencies(n);i(r,function(e){var n=c.createUrl(o,e);c.load(n.resource,n,t,t)}),a&&(s?a.call(s):a.call(e))}var c=this,u=o;c.urls[n]||("object"==typeof o&&(u=o.prefix+o.resource+o.suffix),0!==u.indexOf("/")&&-1==u.indexOf("://")&&(u=r.baseURL+"/"+u),c.urls[n]=u.substring(0,u.lastIndexOf("/")),c.lookup[n]?l():e.ScriptLoader.add(u,l,s))}},r.PluginManager=new r,r.ThemeManager=new r,r}),r(_,[],function(){function e(e){return function(t){return!!t&&t.nodeType==e}}function t(e){return e=e.toLowerCase().split(" "),function(t){var n,r;if(t&&t.nodeType)for(r=t.nodeName.toLowerCase(),n=0;nn.length-1?t=n.length-1:0>t&&(t=0),n[t]||e}function o(e){this.walk=function(t,n){function r(e){var t;return t=e[0],3===t.nodeType&&t===c&&u>=t.nodeValue.length&&e.splice(0,1),t=e[e.length-1],0===f&&e.length>0&&t===d&&3===t.nodeType&&e.splice(e.length-1,1),e}function o(e,t,n){for(var r=[];e&&e!=n;e=e[t])r.push(e);return r}function a(e,t){do{if(e.parentNode==t)return e;e=e.parentNode}while(e)}function l(e,t,i){var a=i?"nextSibling":"previousSibling";for(g=e,v=g.parentNode;g&&g!=t;g=v)v=g.parentNode,y=o(g==e?g:g[a],a),y.length&&(i||y.reverse(),n(r(y)))}var c=t.startContainer,u=t.startOffset,d=t.endContainer,f=t.endOffset,h,p,m,g,v,y,b;if(b=e.select("td.mce-item-selected,th.mce-item-selected"),b.length>0)return void s(b,function(e){n([e])});if(1==c.nodeType&&c.hasChildNodes()&&(c=c.childNodes[u]),1==d.nodeType&&d.hasChildNodes()&&(d=i(d,f)),c==d)return n(r([c]));for(h=e.findCommonAncestor(c,d),g=c;g;g=g.parentNode){if(g===d)return l(c,h,!0);if(g===h)break}for(g=d;g;g=g.parentNode){if(g===c)return l(d,h);if(g===h)break}p=a(c,h)||c,m=a(d,h)||d,l(c,p,!0),y=o(p==c?p:p.nextSibling,"nextSibling",m==d?m.nextSibling:m),y.length&&n(r(y)),l(d,m)},this.split=function(e){function t(e,t){return e.splitText(t)}var n=e.startContainer,r=e.startOffset,i=e.endContainer,o=e.endOffset;return n==i&&3==n.nodeType?r>0&&rr?(o-=r,n=i=t(i,o).previousSibling,o=i.nodeValue.length,r=0):o=0):(3==n.nodeType&&r>0&&r0&&o0)return h=v,p=n?v.nodeValue.length:0,void(i=!0);if(e.isBlock(v)||y[v.nodeName.toLowerCase()])return;s=v}o&&s&&(h=s,i=!0,p=0)}var h,p,m,g=e.getRoot(),v,y,b,C;if(h=n[(r?"start":"end")+"Container"],p=n[(r?"start":"end")+"Offset"],C=1==h.nodeType&&p===h.childNodes.length,y=e.schema.getNonEmptyElements(),b=r,!c(h)){if(1==h.nodeType&&p>h.childNodes.length-1&&(b=!1),9===h.nodeType&&(h=e.getRoot(),p=0),h===g){if(b&&(v=h.childNodes[p>0?p-1:0])){if(c(v))return;if(y[v.nodeName]||"TABLE"==v.nodeName)return}if(h.hasChildNodes()){if(p=Math.min(!b&&p>0?p-1:p,h.childNodes.length-1),h=h.childNodes[p],p=0,u(h)||c(h))return;if(h.hasChildNodes()&&!/TABLE/.test(h.nodeName)){v=h,m=new t(h,g);do{if(l(v)||c(v)){i=!1;break}if(3===v.nodeType&&v.nodeValue.length>0){p=b?0:v.nodeValue.length,h=v,i=!0;break}if(y[v.nodeName.toLowerCase()]&&!a(v)){p=e.nodeIndex(v),h=v.parentNode,"IMG"!=v.nodeName||b||p++,i=!0;break}}while(v=b?m.next():m.prev())}}}o&&(3===h.nodeType&&0===p&&f(!0),1===h.nodeType&&(v=h.childNodes[p],v||(v=h.childNodes[p-1]),!v||"BR"!==v.nodeName||d(v,"A")||s(v)||s(v,!0)||f(!0,v))),b&&!o&&3===h.nodeType&&p===h.nodeValue.length&&f(!1),i&&n["set"+(r?"Start":"End")](h,p)}}var i,o;return o=n.collapsed,r(!0),o||r(),i&&o&&n.collapse(!0),i}}function a(t,n,r){var i,o,a;if(i=r.elementFromPoint(t,n),o=r.body.createTextRange(),"HTML"==i.tagName&&(i=r.body),o.moveToElementText(i),a=e.toArray(o.getClientRects()),a=a.sort(function(e,t){return e=Math.abs(Math.max(e.top-n,e.bottom-n)),t=Math.abs(Math.max(t.top-n,t.bottom-n)),e-t}),a.length>0){n=(a[0].bottom+a[0].top)/2;try{return o.moveToPoint(t,n),o.collapse(!0),o}catch(s){}}return null}var s=e.each,l=n.isContentEditableFalse,c=r.isCaretContainer;return o.compareRanges=function(e,t){if(e&&t){if(!e.item&&!e.duplicate)return e.startContainer==t.startContainer&&e.startOffset==t.startOffset;if(e.item&&t.item&&e.item(0)===t.item(0))return!0;if(e.isEqual&&t.isEqual&&t.isEqual(e))return!0}return!1},o.getCaretRangeFromPoint=function(e,t,n){var r,i;if(n.caretPositionFromPoint)i=n.caretPositionFromPoint(e,t),r=n.createRange(),r.setStart(i.offsetNode,i.offset),r.collapse(!0);else if(n.caretRangeFromPoint)r=n.caretRangeFromPoint(e,t);else if(n.body.createTextRange){r=n.body.createTextRange();try{r.moveToPoint(e,t),r.collapse(!0)}catch(o){r=a(e,t,n)}}return r},o.getSelectedNode=function(e){var t=e.startContainer,n=e.startOffset;return t.hasChildNodes()&&e.endOffset==n+1?t.childNodes[n]:null},o.getNode=function(e,t){return 1==e.nodeType&&e.hasChildNodes()&&(t>=e.childNodes.length&&(t=e.childNodes.length-1),e=e.childNodes[t]),e},o}),r(R,[T,h,u],function(e,t,n){return function(r){function i(e){var t,n;if(n=r.$(e).parentsUntil(r.getBody()).add(e),n.length===a.length){for(t=n.length;t>=0&&n[t]===a[t];t--);if(-1===t)return a=n,!0}return a=n,!1}var o,a=[];"onselectionchange"in r.getDoc()||r.on("NodeChange Click MouseUp KeyUp Focus",function(t){var n,i;n=r.selection.getRng(),i={startContainer:n.startContainer,startOffset:n.startOffset,endContainer:n.endContainer,endOffset:n.endOffset},"nodechange"!=t.type&&e.compareRanges(i,o)||r.fire("SelectionChange"),o=i}),r.on("contextmenu",function(){r.fire("SelectionChange")}),r.on("SelectionChange",function(){var e=r.selection.getStart(!0);(t.range||!r.selection.isCollapsed())&&!i(e)&&r.dom.isChildOf(e,r.getBody())&&r.nodeChanged({selectionChange:!0})}),r.on("MouseUp",function(e){e.isDefaultPrevented()||("IMG"==r.selection.getNode().nodeName?n.setEditorTimeout(r,function(){r.nodeChanged()}):r.nodeChanged())}),this.nodeChanged=function(e){var t=r.selection,n,i,o;r.initialized&&t&&!r.settings.disable_nodechange&&!r.readonly&&(o=r.getBody(),n=t.getStart()||o,n=n.ownerDocument!=r.getDoc()?r.getBody():n,"IMG"==n.nodeName&&t.isCollapsed()&&(n=n.parentNode),i=[],r.dom.getParent(n,function(e){return e===o?!0:void i.push(e)}),e=e||{},e.element=n,e.parents=i,r.fire("NodeChange",e))}}}),r(A,[],function(){function e(e,t,n){var r,i,o=n?"lastChild":"firstChild",a=n?"prev":"next";if(e[o])return e[o];if(e!==t){if(r=e[a])return r;for(i=e.parent;i&&i!==t;i=i.parent)if(r=i[a])return r}}function t(e,t){this.name=e,this.type=t,1===t&&(this.attributes=[],this.attributes.map={})}var n=/^[ \t\r\n]*$/,r={"#text":3,"#comment":8,"#cdata":4,"#pi":7,"#doctype":10,"#document-fragment":11};return t.prototype={replace:function(e){var t=this;return e.parent&&e.remove(),t.insert(e,t),t.remove(),t},attr:function(e,t){var n=this,r,i,o;if("string"!=typeof e){for(i in e)n.attr(i,e[i]);return n}if(r=n.attributes){if(t!==o){if(null===t){if(e in r.map)for(delete r.map[e],i=r.length;i--;)if(r[i].name===e)return r=r.splice(i,1),n;return n}if(e in r.map){for(i=r.length;i--;)if(r[i].name===e){r[i].value=t;break}}else r.push({name:e,value:t});return r.map[e]=t,n}return r.map[e]}},clone:function(){var e=this,n=new t(e.name,e.type),r,i,o,a,s;if(o=e.attributes){for(s=[],s.map={},r=0,i=o.length;i>r;r++)a=o[r],"id"!==a.name&&(s[s.length]={name:a.name,value:a.value},s.map[a.name]=a.value);n.attributes=s}return n.value=e.value,n.shortEnded=e.shortEnded,n},wrap:function(e){var t=this;return t.parent.insert(e,t),e.append(t),t},unwrap:function(){var e=this,t,n;for(t=e.firstChild;t;)n=t.next,e.insert(t,e,!0),t=n;e.remove()},remove:function(){var e=this,t=e.parent,n=e.next,r=e.prev;return t&&(t.firstChild===e?(t.firstChild=n,n&&(n.prev=null)):r.next=n,t.lastChild===e?(t.lastChild=r,r&&(r.next=null)):n.prev=r,e.parent=e.next=e.prev=null),e},append:function(e){var t=this,n;return e.parent&&e.remove(),n=t.lastChild,n?(n.next=e,e.prev=n,t.lastChild=e):t.lastChild=t.firstChild=e,e.parent=t,e},insert:function(e,t,n){var r;return e.parent&&e.remove(),r=t.parent||this,n?(t===r.firstChild?r.firstChild=e:t.prev.next=e,e.prev=t.prev,e.next=t,t.prev=e):(t===r.lastChild?r.lastChild=e:t.next.prev=e,e.next=t.next,e.prev=t,t.next=e),e.parent=r,e},getAll:function(t){var n=this,r,i=[];for(r=n.firstChild;r;r=e(r,n))r.name===t&&i.push(r);return i},empty:function(){var t=this,n,r,i;if(t.firstChild){for(n=[],i=t.firstChild;i;i=e(i,t))n.push(i);for(r=n.length;r--;)i=n[r],i.parent=i.firstChild=i.lastChild=i.next=i.prev=null}return t.firstChild=t.lastChild=null,t},isEmpty:function(t){var r=this,i=r.firstChild,o,a;if(i)do{if(1===i.type){if(i.attributes.map["data-mce-bogus"])continue;if(t[i.name])return!1;for(o=i.attributes.length;o--;)if(a=i.attributes[o].name,"name"===a||0===a.indexOf("data-mce-bookmark"))return!1}if(8===i.type)return!1;if(3===i.type&&!n.test(i.value))return!1}while(i=e(i,r));return!0},walk:function(t){return e(this,null,t)}},t.create=function(e,n){var i,o;if(i=new t(e,r[e]||1),n)for(o in n)i.attr(o,n[o]);return i},t}),r(B,[m],function(e){function t(e,t){return e?e.split(t||" "):[]}function n(e){function n(e,n,r){function i(e,t){var n={},r,i;for(r=0,i=e.length;i>r;r++)n[e[r]]=t||{};return n}var s,c,u,d=arguments;for(r=r||[],n=n||"","string"==typeof r&&(r=t(r)),c=3;co;o++)i.attributes[n[o]]={},i.attributesOrder.push(n[o])}var a={},l,c,u,d,f,h;return i[e]?i[e]:(l=t("id accesskey class dir lang style tabindex title"),c=t("address blockquote div dl fieldset form h1 h2 h3 h4 h5 h6 hr menu ol p pre table ul"),u=t("a abbr b bdo br button cite code del dfn em embed i iframe img input ins kbd label map noscript object q s samp script select small span strong sub sup textarea u var #text #comment"),"html4"!=e&&(l.push.apply(l,t("contenteditable contextmenu draggable dropzone hidden spellcheck translate")),c.push.apply(c,t("article aside details dialog figure header footer hgroup section nav")),u.push.apply(u,t("audio canvas command datalist mark meter output picture progress time wbr video ruby bdi keygen"))),"html5-strict"!=e&&(l.push("xml:lang"),h=t("acronym applet basefont big font strike tt"),u.push.apply(u,h),s(h,function(e){n(e,"",u)}),f=t("center dir isindex noframes"),c.push.apply(c,f),d=[].concat(c,u),s(f,function(e){n(e,"",d)})),d=d||[].concat(c,u),n("html","manifest","head body"),n("head","","base command link meta noscript script style title"),n("title hr noscript br"),n("base","href target"),n("link","href rel media hreflang type sizes hreflang"),n("meta","name http-equiv content charset"),n("style","media type scoped"),n("script","src async defer type charset"),n("body","onafterprint onbeforeprint onbeforeunload onblur onerror onfocus onhashchange onload onmessage onoffline ononline onpagehide onpageshow onpopstate onresize onscroll onstorage onunload",d),n("address dt dd div caption","",d),n("h1 h2 h3 h4 h5 h6 pre p abbr code var samp kbd sub sup i b u bdo span legend em strong small s cite dfn","",u),n("blockquote","cite",d),n("ol","reversed start type","li"),n("ul","","li"),n("li","value",d),n("dl","","dt dd"),n("a","href target rel media hreflang type",u),n("q","cite",u),n("ins del","cite datetime",d),n("img","src sizes srcset alt usemap ismap width height"),n("iframe","src name width height",d),n("embed","src type width height"),n("object","data type typemustmatch name usemap form width height",d,"param"),n("param","name value"),n("map","name",d,"area"),n("area","alt coords shape href target rel media hreflang type"),n("table","border","caption colgroup thead tfoot tbody tr"+("html4"==e?" col":"")),n("colgroup","span","col"),n("col","span"),n("tbody thead tfoot","","tr"),n("tr","","td th"),n("td","colspan rowspan headers",d),n("th","colspan rowspan headers scope abbr",d),n("form","accept-charset action autocomplete enctype method name novalidate target",d),n("fieldset","disabled form name",d,"legend"),n("label","form for",u),n("input","accept alt autocomplete checked dirname disabled form formaction formenctype formmethod formnovalidate formtarget height list max maxlength min multiple name pattern readonly required size src step type value width"),n("button","disabled form formaction formenctype formmethod formnovalidate formtarget name type value","html4"==e?d:u),n("select","disabled form multiple name required size","option optgroup"),n("optgroup","disabled label","option"),n("option","disabled label selected value"),n("textarea","cols dirname disabled form maxlength name readonly required rows wrap"),n("menu","type label",d,"li"),n("noscript","",d),"html4"!=e&&(n("wbr"),n("ruby","",u,"rt rp"),n("figcaption","",d),n("mark rt rp summary bdi","",u),n("canvas","width height",d),n("video","src crossorigin poster preload autoplay mediagroup loop muted controls width height buffered",d,"track source"),n("audio","src crossorigin preload autoplay mediagroup loop muted controls buffered volume",d,"track source"),n("picture","","img source"),n("source","src srcset type media sizes"),n("track","kind src srclang label default"),n("datalist","",u,"option"),n("article section nav aside header footer","",d),n("hgroup","","h1 h2 h3 h4 h5 h6"),n("figure","",d,"figcaption"),n("time","datetime",u),n("dialog","open",d),n("command","type label icon disabled checked radiogroup command"),n("output","for form name",u),n("progress","value max",u),n("meter","value min max low high optimum",u),n("details","open",d,"summary"),n("keygen","autofocus challenge disabled form keytype name")),"html5-strict"!=e&&(r("script","language xml:space"),r("style","xml:space"),r("object","declare classid code codebase codetype archive standby align border hspace vspace"),r("embed","align name hspace vspace"),r("param","valuetype type"),r("a","charset name rev shape coords"),r("br","clear"),r("applet","codebase archive code object alt name width height align hspace vspace"),r("img","name longdesc align border hspace vspace"),r("iframe","longdesc frameborder marginwidth marginheight scrolling align"),r("font basefont","size color face"),r("input","usemap align"),r("select","onchange"),r("textarea"),r("h1 h2 h3 h4 h5 h6 div p legend caption","align"),r("ul","type compact"),r("li","type"),r("ol dl menu dir","compact"),r("pre","width xml:space"),r("hr","align noshade size width"),r("isindex","prompt"),r("table","summary width frame rules cellspacing cellpadding align bgcolor"),r("col","width align char charoff valign"),r("colgroup","width align char charoff valign"),r("thead","align char charoff valign"),r("tr","align char charoff valign bgcolor"),r("th","axis align char charoff valign nowrap bgcolor width height"),r("form","accept"),r("td","abbr axis scope align char charoff valign nowrap bgcolor width height"),r("tfoot","align char charoff valign"),r("tbody","align char charoff valign"),r("area","nohref"),r("body","background bgcolor text link vlink alink")),"html4"!=e&&(r("input button select textarea","autofocus"),r("input textarea","placeholder"),r("a","download"),r("link script img","crossorigin"),r("iframe","sandbox seamless allowfullscreen")),s(t("a form meter progress dfn"),function(e){a[e]&&delete a[e].children[e]}),delete a.caption.children.table,delete a.script,i[e]=a,a)}function r(e,t){var n;return e&&(n={},"string"==typeof e&&(e={"*":e}),s(e,function(e,r){n[r]=n[r.toUpperCase()]="map"==t?a(e,/[, ]/):c(e,/[, ]/)})),n}var i={},o={},a=e.makeMap,s=e.each,l=e.extend,c=e.explode,u=e.inArray;return function(e){function o(t,n,r){var o=e[t];return o?o=a(o,/[, ]/,a(o.toUpperCase(),/[, ]/)):(o=i[t],o||(o=a(n," ",a(n.toUpperCase()," ")),o=l(o,r),i[t]=o)),o}function d(e){return new RegExp("^"+e.replace(/([?+*])/g,".$1")+"$")}function f(e){var n,r,i,o,s,l,c,f,h,p,m,g,v,b,x,w,E,N,_,S=/^([#+\-])?([^\[!\/]+)(?:\/([^\[!]+))?(?:(!?)\[([^\]]+)\])?$/,k=/^([!\-])?(\w+::\w+|[^=:<]+)?(?:([=:<])(.*))?$/,T=/[*?+]/;if(e)for(e=t(e,","),y["@"]&&(w=y["@"].attributes,E=y["@"].attributesOrder),n=0,r=e.length;r>n;n++)if(s=S.exec(e[n])){if(b=s[1],h=s[2],x=s[3],f=s[5],g={},v=[],l={attributes:g,attributesOrder:v},"#"===b&&(l.paddEmpty=!0),"-"===b&&(l.removeEmpty=!0),"!"===s[4]&&(l.removeEmptyAttrs=!0),w){for(N in w)g[N]=w[N];v.push.apply(v,E)}if(f)for(f=t(f,"|"),i=0,o=f.length;o>i;i++)if(s=k.exec(f[i])){if(c={},m=s[1],p=s[2].replace(/::/g,":"),b=s[3],_=s[4],"!"===m&&(l.attributesRequired=l.attributesRequired||[],l.attributesRequired.push(p),c.required=!0),"-"===m){delete g[p],v.splice(u(v,p),1);continue}b&&("="===b&&(l.attributesDefault=l.attributesDefault||[],l.attributesDefault.push({name:p,value:_}),c.defaultValue=_),":"===b&&(l.attributesForced=l.attributesForced||[],l.attributesForced.push({name:p,value:_}),c.forcedValue=_),"<"===b&&(c.validValues=a(_,"?"))),T.test(p)?(l.attributePatterns=l.attributePatterns||[],c.pattern=d(p),l.attributePatterns.push(c)):(g[p]||v.push(p),g[p]=c)}w||"@"!=h||(w=g,E=v),x&&(l.outputName=h,y[x]=l),T.test(h)?(l.pattern=d(h),C.push(l)):y[h]=l}}function h(e){y={},C=[],f(e),s(E,function(e,t){b[t]=e.children})}function p(e){var n=/^(~)?(.+)$/;e&&(i.text_block_elements=i.block_elements=null,s(t(e,","),function(e){var t=n.exec(e),r="~"===t[1],i=r?"span":"div",o=t[2];if(b[o]=b[i],L[o]=i,r||(R[o.toUpperCase()]={},R[o]={}),!y[o]){var a=y[i];a=l({},a),delete a.removeEmptyAttrs,delete a.removeEmpty,y[o]=a}s(b,function(e,t){e[i]&&(b[t]=e=l({},b[t]),e[o]=e[i])})}))}function m(n){var r=/^([+\-]?)(\w+)\[([^\]]+)\]$/;i[e.schema]=null,n&&s(t(n,","),function(e){var n=r.exec(e),i,o;n&&(o=n[1],i=o?b[n[2]]:b[n[2]]={"#comment":{}},i=b[n[2]],s(t(n[3],"|"),function(e){"-"===o?delete i[e]:i[e]={}}))})}function g(e){var t=y[e],n;if(t)return t;for(n=C.length;n--;)if(t=C[n],t.pattern.test(e))return t}var v=this,y={},b={},C=[],x,w,E,N,_,S,k,T,R,A,B,D,M,L={},P={};e=e||{},E=n(e.schema),e.verify_html===!1&&(e.valid_elements="*[*]"), +x=r(e.valid_styles),w=r(e.invalid_styles,"map"),T=r(e.valid_classes,"map"),N=o("whitespace_elements","pre script noscript style textarea video audio iframe object"),_=o("self_closing_elements","colgroup dd dt li option p td tfoot th thead tr"),S=o("short_ended_elements","area base basefont br col frame hr img input isindex link meta param embed source wbr track"),k=o("boolean_attributes","checked compact declare defer disabled ismap multiple nohref noresize noshade nowrap readonly selected autoplay loop controls"),A=o("non_empty_elements","td th iframe video audio object script",S),B=o("move_caret_before_on_enter_elements","table",A),D=o("text_block_elements","h1 h2 h3 h4 h5 h6 p div address pre form blockquote center dir fieldset header footer article section hgroup aside nav figure"),R=o("block_elements","hr table tbody thead tfoot th tr td li ol ul caption dl dt dd noscript menu isindex option datalist select optgroup figcaption",D),M=o("text_inline_elements","span strong b em i font strike u var cite dfn code mark q sup sub samp"),s((e.special||"script noscript style textarea").split(" "),function(e){P[e]=new RegExp("]*>","gi")}),e.valid_elements?h(e.valid_elements):(s(E,function(e,t){y[t]={attributes:e.attributes,attributesOrder:e.attributesOrder},b[t]=e.children}),"html5"!=e.schema&&s(t("strong/b em/i"),function(e){e=t(e,"/"),y[e[1]].outputName=e[0]}),y.img.attributesDefault=[{name:"alt",value:""}],s(t("ol ul sub sup blockquote span font a table tbody tr strong em b i"),function(e){y[e]&&(y[e].removeEmpty=!0)}),s(t("p h1 h2 h3 h4 h5 h6 th td pre div address caption"),function(e){y[e].paddEmpty=!0}),s(t("span"),function(e){y[e].removeEmptyAttrs=!0})),p(e.custom_elements),m(e.valid_children),f(e.extended_valid_elements),m("+ol[ul|ol],+ul[ul|ol]"),e.invalid_elements&&s(c(e.invalid_elements),function(e){y[e]&&delete y[e]}),g("span")||f("span[!data-mce-type|*]"),v.children=b,v.getValidStyles=function(){return x},v.getInvalidStyles=function(){return w},v.getValidClasses=function(){return T},v.getBoolAttrs=function(){return k},v.getBlockElements=function(){return R},v.getTextBlockElements=function(){return D},v.getTextInlineElements=function(){return M},v.getShortEndedElements=function(){return S},v.getSelfClosingElements=function(){return _},v.getNonEmptyElements=function(){return A},v.getMoveCaretBeforeOnEnterElements=function(){return B},v.getWhiteSpaceElements=function(){return N},v.getSpecialElements=function(){return P},v.isValidChild=function(e,t){var n=b[e];return!(!n||!n[t])},v.isValid=function(e,t){var n,r,i=g(e);if(i){if(!t)return!0;if(i.attributes[t])return!0;if(n=i.attributePatterns)for(r=n.length;r--;)if(n[r].pattern.test(e))return!0}return!1},v.getElementRule=g,v.getCustomElements=function(){return L},v.addValidElements=f,v.setValidElements=h,v.addCustomElements=p,v.addValidChildren=m,v.elements=y}}),r(D,[B,C,m],function(e,t,n){function r(e,t,n){var r=1,i,o,a,s;for(s=e.getShortEndedElements(),a=/<([!?\/])?([A-Za-z0-9\-_\:\.]+)((?:\s+[^"\'>]+(?:(?:"[^"]*")|(?:\'[^\']*\')|[^>]*))*|\/|\s+)>/g,a.lastIndex=i=n;o=a.exec(t);){if(i=a.lastIndex,"/"===o[1])r--;else if(!o[1]){if(o[2]in s)continue;r++}if(0===r)break}return i}function i(i,a){function s(){}var l=this;i=i||{},l.schema=a=a||new e,i.fix_self_closing!==!1&&(i.fix_self_closing=!0),o("comment cdata text start end pi doctype".split(" "),function(e){e&&(l[e]=i[e]||s)}),l.parse=function(e){function o(e){var t,n;for(t=h.length;t--&&h[t].name!==e;);if(t>=0){for(n=h.length-1;n>=t;n--)e=h[n],e.valid&&l.end(e.name);h.length=t}}function s(e,t,n,r,o){var a,s,l=/[\s\u0000-\u001F]+/g;if(t=t.toLowerCase(),n=t in x?t:z(n||r||o||""),E&&!y&&0!==t.indexOf("data-")){if(a=T[t],!a&&R){for(s=R.length;s--&&(a=R[s],!a.pattern.test(t)););-1===s&&(a=null)}if(!a)return;if(a.validValues&&!(n in a.validValues))return}if(V[t]&&!i.allow_script_urls){var c=n.replace(l,"");try{c=decodeURIComponent(c)}catch(u){c=unescape(c)}if(U.test(c))return;if(!i.allow_html_data_urls&&$.test(c)&&!/^data:image\//i.test(c))return}p.map[t]=n,p.push({name:t,value:n})}var l=this,c,u=0,d,f,h=[],p,m,g,v,y,b,C,x,w,E,N,_,S,k,T,R,A,B,D,M,L,P,H,O,I,F=0,z=t.decode,W,V=n.makeMap("src,href,data,background,formaction,poster"),U=/((java|vb)script|mhtml):/i,$=/^data:/i;for(P=new RegExp("<(?:(?:!--([\\w\\W]*?)-->)|(?:!\\[CDATA\\[([\\w\\W]*?)\\]\\]>)|(?:!DOCTYPE([\\w\\W]*?)>)|(?:\\?([^\\s\\/<>]+) ?([\\w\\W]*?)[?/]>)|(?:\\/([^>]+)>)|(?:([A-Za-z0-9\\-_\\:\\.]+)((?:\\s+[^\"'>]+(?:(?:\"[^\"]*\")|(?:'[^']*')|[^>]*))*|\\/|\\s+)>))","g"),H=/([\w:\-]+)(?:\s*=\s*(?:(?:\"((?:[^\"])*)\")|(?:\'((?:[^\'])*)\')|([^>\s]+)))?/g,C=a.getShortEndedElements(),L=i.self_closing_elements||a.getSelfClosingElements(),x=a.getBoolAttrs(),E=i.validate,b=i.remove_internals,W=i.fix_self_closing,O=a.getSpecialElements();c=P.exec(e);){if(u0&&h[h.length-1].name===d&&o(d),!E||(N=a.getElementRule(d))){if(_=!0,E&&(T=N.attributes,R=N.attributePatterns),(k=c[8])?(y=-1!==k.indexOf("data-mce-type"),y&&b&&(_=!1),p=[],p.map={},k.replace(H,s)):(p=[],p.map={}),E&&!y){if(A=N.attributesRequired,B=N.attributesDefault,D=N.attributesForced,M=N.removeEmptyAttrs,M&&!p.length&&(_=!1),D)for(m=D.length;m--;)S=D[m],v=S.name,I=S.value,"{$uid}"===I&&(I="mce_"+F++),p.map[v]=I,p.push({name:v,value:I});if(B)for(m=B.length;m--;)S=B[m],v=S.name,v in p.map||(I=S.value,"{$uid}"===I&&(I="mce_"+F++),p.map[v]=I,p.push({name:v,value:I}));if(A){for(m=A.length;m--&&!(A[m]in p.map););-1===m&&(_=!1)}if(S=p.map["data-mce-bogus"]){if("all"===S){u=r(a,e,P.lastIndex),P.lastIndex=u;continue}_=!1}}_&&l.start(d,p,w)}else _=!1;if(f=O[d]){f.lastIndex=u=c.index+c[0].length,(c=f.exec(e))?(_&&(g=e.substr(u,c.index-u)),u=c.index+c[0].length):(g=e.substr(u),u=e.length),_&&(g.length>0&&l.text(g,!0),l.end(d)),P.lastIndex=u;continue}w||(k&&k.indexOf("/")==k.length-1?_&&l.end(d):h.push({name:d,valid:_}))}else(d=c[1])?(">"===d.charAt(0)&&(d=" "+d),i.allow_conditional_comments||"[if"!==d.substr(0,3)||(d=" "+d),l.comment(d)):(d=c[2])?l.cdata(d):(d=c[3])?l.doctype(d):(d=c[4])&&l.pi(d,c[5]);u=c.index+c[0].length}for(u=0;m--)d=h[m],d.valid&&l.end(d.name)}}var o=n.each;return i.findEndTag=r,i}),r(M,[A,B,D,m],function(e,t,n,r){var i=r.makeMap,o=r.each,a=r.explode,s=r.extend;return function(r,l){function c(t){var n,r,o,a,s,c,d,f,h,p,m,g,v,y,b;for(m=i("tr,td,th,tbody,thead,tfoot,table"),p=l.getNonEmptyElements(),g=l.getTextBlockElements(),v=l.getSpecialElements(),n=0;n1){for(a.reverse(),s=c=u.filterNode(a[0].clone()),h=0;h0)return void(t.value=r);if(n=t.next){if(3==n.type&&n.value.length){t=t.prev;continue}if(!o[n.name]&&"script"!=n.name&&"style"!=n.name){t=t.prev;continue}}i=t.prev,t.remove(),t=i}}function g(e){var t,n={};for(t in e)"li"!==t&&"p"!=t&&(n[t]=e[t]);return n}var v,y,b,C,x,w,E,N,_,S,k,T,R,A=[],B,D,M,L,P,H,O,I;if(o=o||{},h={},p={},T=s(i("script,style,head,html,body,title,meta,param"),l.getBlockElements()),O=l.getNonEmptyElements(),H=l.children,k=r.validate,I="forced_root_block"in o?o.forced_root_block:r.forced_root_block,P=l.getWhiteSpaceElements(),R=/^[ \t\r\n]+/,D=/[ \t\r\n]+$/,M=/[ \t\r\n]+/g,L=/^[ \t\r\n]+$/,v=new n({validate:k,allow_script_urls:r.allow_script_urls,allow_conditional_comments:r.allow_conditional_comments,self_closing_elements:g(l.getSelfClosingElements()),cdata:function(e){b.append(u("#cdata",4)).value=e},text:function(e,t){var n;B||(e=e.replace(M," "),b.lastChild&&T[b.lastChild.name]&&(e=e.replace(R,""))),0!==e.length&&(n=u("#text",3),n.raw=!!t,b.append(n).value=e)},comment:function(e){b.append(u("#comment",8)).value=e},pi:function(e,t){b.append(u(e,7)).value=t,m(b)},doctype:function(e){var t;t=b.append(u("#doctype",10)),t.value=e,m(b)},start:function(e,t,n){var r,i,o,a,s;if(o=k?l.getElementRule(e):{}){for(r=u(o.outputName||e,1),r.attributes=t,r.shortEnded=n,b.append(r),s=H[b.name],s&&H[r.name]&&!s[r.name]&&A.push(r),i=f.length;i--;)a=f[i].name,a in t.map&&(_=p[a],_?_.push(r):p[a]=[r]);T[e]&&m(r),n||(b=r),!B&&P[e]&&(B=!0)}},end:function(t){var n,r,i,o,a;if(r=k?l.getElementRule(t):{}){if(T[t]&&!B){if(n=b.firstChild,n&&3===n.type)if(i=n.value.replace(R,""),i.length>0)n.value=i,n=n.next;else for(o=n.next,n.remove(),n=o;n&&3===n.type;)i=n.value,o=n.next,(0===i.length||L.test(i))&&(n.remove(),n=o),n=o;if(n=b.lastChild,n&&3===n.type)if(i=n.value.replace(D,""),i.length>0)n.value=i,n=n.prev;else for(o=n.prev,n.remove(),n=o;n&&3===n.type;)i=n.value,o=n.prev,(0===i.length||L.test(i))&&(n.remove(),n=o),n=o}if(B&&P[t]&&(B=!1),(r.removeEmpty||r.paddEmpty)&&b.isEmpty(O))if(r.paddEmpty)b.empty().append(new e("#text","3")).value="\xa0";else if(!b.attributes.map.name&&!b.attributes.map.id)return a=b.parent,T[b.name]?b.empty().remove():b.unwrap(),void(b=a);b=b.parent}}},l),y=b=new e(o.context||r.root_name,11),v.parse(t),k&&A.length&&(o.context?o.invalid=!0:c(A)),I&&("body"==y.name||o.isRootContent)&&a(),!o.invalid){for(S in h){for(_=d[S],C=h[S],E=C.length;E--;)C[E].parent||C.splice(E,1);for(x=0,w=_.length;w>x;x++)_[x](C,S,o)}for(x=0,w=f.length;w>x;x++)if(_=f[x],_.name in p){for(C=p[_.name],E=C.length;E--;)C[E].parent||C.splice(E,1);for(E=0,N=_.callbacks.length;N>E;E++)_.callbacks[E](C,_.name,o)}}return y},r.remove_trailing_brs&&u.addNodeFilter("br",function(t){var n,r=t.length,i,o=s({},l.getBlockElements()),a=l.getNonEmptyElements(),c,u,d,f,h,p;for(o.body=1,n=0;r>n;n++)if(i=t[n],c=i.parent,o[i.parent.name]&&i===c.lastChild){for(d=i.prev;d;){if(f=d.name,"span"!==f||"bookmark"!==d.attr("data-mce-type")){if("br"!==f)break;if("br"===f){i=null;break}}d=d.prev}i&&(i.remove(),c.isEmpty(a)&&(h=l.getElementRule(c.name),h&&(h.removeEmpty?c.remove():h.paddEmpty&&(c.empty().append(new e("#text",3)).value="\xa0"))))}else{for(u=i;c&&c.firstChild===u&&c.lastChild===u&&(u=c,!o[c.name]);)c=c.parent;u===c&&(p=new e("#text",3),p.value="\xa0",i.replace(p))}}),r.allow_html_in_named_anchor||u.addAttributeFilter("id,name",function(e){for(var t=e.length,n,r,i,o;t--;)if(o=e[t],"a"===o.name&&o.firstChild&&!o.attr("href")){i=o.parent,n=o.lastChild;do r=n.prev,i.insert(n,o),n=r;while(n)}}),r.validate&&l.getValidClasses()&&u.addAttributeFilter("class",function(e){for(var t=e.length,n,r,i,o,a,s=l.getValidClasses(),c,u;t--;){for(n=e[t],r=n.attr("class").split(" "),a="",i=0;i0&&(f=r[r.length-1],f.length>0&&"\n"!==f&&r.push("\n")),r.push("<",e),t)for(c=0,u=t.length;u>c;c++)d=t[c],r.push(" ",d.name,'="',s(d.value,!0),'"');!n||l?r[r.length]=">":r[r.length]=" />",n&&i&&a[e]&&r.length>0&&(f=r[r.length-1],f.length>0&&"\n"!==f&&r.push("\n"))},end:function(e){var t;r.push(""),i&&a[e]&&r.length>0&&(t=r[r.length-1],t.length>0&&"\n"!==t&&r.push("\n"))},text:function(e,t){e.length>0&&(r[r.length]=t?e:s(e))},cdata:function(e){r.push("")},comment:function(e){r.push("")},pi:function(e,t){t?r.push(""):r.push(""),i&&r.push("\n")},doctype:function(e){r.push("",i?"\n":"")},reset:function(){r.length=0},getContent:function(){return r.join("").replace(/\n$/,"")}}}}),r(P,[L,B],function(e,t){return function(n,r){var i=this,o=new e(n);n=n||{},n.validate="validate"in n?n.validate:!0,i.schema=r=r||new t,i.writer=o,i.serialize=function(e){function t(e){var n=i[e.type],s,l,c,u,d,f,h,p,m;if(n)n(e);else{if(s=e.name,l=e.shortEnded,c=e.attributes,a&&c&&c.length>1&&(f=[],f.map={},m=r.getElementRule(e.name))){for(h=0,p=m.attributesOrder.length;p>h;h++)u=m.attributesOrder[h],u in c.map&&(d=c.map[u],f.map[u]=d,f.push({name:u,value:d}));for(h=0,p=c.length;p>h;h++)u=c[h].name,u in f.map||(d=c.map[u],f.map[u]=d,f.push({name:u,value:d}));c=f}if(o.start(e.name,c,l),!l){if(e=e.firstChild)do t(e);while(e=e.next);o.end(s)}}}var i,a;return a=n.validate,i={3:function(e){o.text(e.value,e.raw)},8:function(e){o.comment(e.value)},7:function(e){o.pi(e.name,e.value)},10:function(e){o.doctype(e.value)},4:function(e){o.cdata(e.value)},11:function(e){if(e=e.firstChild)do t(e);while(e=e.next)}},o.reset(),1!=e.type||n.inner?i[11](e):t(e),o.getContent()}}}),r(H,[w,M,D,C,P,A,B,h,m,S],function(e,t,n,r,i,o,a,s,l,c){function u(e){function t(e){return e&&"br"===e.name}var n,r;n=e.lastChild,t(n)&&(r=n.prev,t(r)&&(n.remove(),r.remove()))}var d=l.each,f=l.trim,h=e.DOM,p=new RegExp(["]+data-mce-bogus[^>]+>[\u200b\ufeff]+<\\/span>",'\\s?data-mce-selected="[^"]+"'].join("|"),"gi");return function(e,o){function l(){var e=o.getBody().innerHTML,t=/<(\w+) [^>]*data-mce-bogus="all"[^>]*>/g,r,i,a,s,l,u=o.schema;for(e=c.trim(e.replace(p,"")),l=u.getShortEndedElements();s=t.exec(e);)i=t.lastIndex,a=s[0].length,r=l[s[1]]?i:n.findEndTag(u,e,i),e=e.substring(0,i-a)+e.substring(r),t.lastIndex=i-a;return f(e)}var m,g,v;return o&&(m=o.dom,g=o.schema),m=m||h,g=g||new a(e),e.entity_encoding=e.entity_encoding||"named",e.remove_trailing_brs="remove_trailing_brs"in e?e.remove_trailing_brs:!0,v=new t(e,g),v.addAttributeFilter("data-mce-tabindex",function(e,t){for(var n=e.length,r;n--;)r=e[n],r.attr("tabindex",r.attributes.map["data-mce-tabindex"]),r.attr(t,null)}),v.addAttributeFilter("src,href,style",function(t,n){for(var r=t.length,i,o,a="data-mce-"+n,s=e.url_converter,l=e.url_converter_scope,c;r--;)i=t[r],o=i.attributes.map[a],o!==c?(i.attr(n,o.length>0?o:null),i.attr(a,null)):(o=i.attributes.map[n],"style"===n?o=m.serializeStyle(m.parseStyle(o),i.name):s&&(o=s.call(l,o,n,i.name)),i.attr(n,o.length>0?o:null))}),v.addAttributeFilter("class",function(e){for(var t=e.length,n,r;t--;)n=e[t],r=n.attr("class"),r&&(r=n.attr("class").replace(/(?:^|\s)mce-item-\w+(?!\S)/g,""),n.attr("class",r.length>0?r:null))}),v.addAttributeFilter("data-mce-type",function(e,t,n){for(var r=e.length,i;r--;)i=e[r],"bookmark"!==i.attributes.map["data-mce-type"]||n.cleanup||i.remove()}),v.addNodeFilter("noscript",function(e){for(var t=e.length,n;t--;)n=e[t].firstChild,n&&(n.value=r.decode(n.value))}),v.addNodeFilter("script,style",function(e,t){function n(e){return e.replace(/()/g,"\n").replace(/^[\r\n]*|[\r\n]*$/g,"").replace(/^\s*(()?|\s*\/\/\s*\]\]>(-->)?|\/\/\s*(-->)?|\]\]>|\/\*\s*-->\s*\*\/|\s*-->\s*)\s*$/g,"")}for(var r=e.length,i,o,a;r--;)i=e[r],o=i.firstChild?i.firstChild.value:"","script"===t?(a=i.attr("type"),a&&i.attr("type","mce-no/type"==a?null:a.replace(/^mce\-/,"")),o.length>0&&(i.firstChild.value="// ")):o.length>0&&(i.firstChild.value="")}),v.addNodeFilter("#comment",function(e){for(var t=e.length,n;t--;)n=e[t],0===n.value.indexOf("[CDATA[")?(n.name="#cdata",n.type=4,n.value=n.value.replace(/^\[CDATA\[|\]\]$/g,"")):0===n.value.indexOf("mce:protected ")&&(n.name="#text",n.type=3,n.raw=!0,n.value=unescape(n.value).substr(14))}),v.addNodeFilter("xml:namespace,input",function(e,t){for(var n=e.length,r;n--;)r=e[n],7===r.type?r.remove():1===r.type&&("input"!==t||"type"in r.attributes.map||r.attr("type","text"))}),e.fix_list_elements&&v.addNodeFilter("ul,ol",function(e){for(var t=e.length,n,r;t--;)n=e[t],r=n.parent,("ul"===r.name||"ol"===r.name)&&n.prev&&"li"===n.prev.name&&n.prev.append(n)}),v.addAttributeFilter("data-mce-src,data-mce-href,data-mce-style,data-mce-selected,data-mce-expando,data-mce-type,data-mce-resize",function(e,t){for(var n=e.length;n--;)e[n].attr(t,null)}),{schema:g,addNodeFilter:v.addNodeFilter,addAttributeFilter:v.addAttributeFilter,serialize:function(t,n){var r=this,o,a,l,h,p,y;return s.ie&&m.select("script,style,select,map").length>0?(p=t.innerHTML,t=t.cloneNode(!1),m.setHTML(t,p)):t=t.cloneNode(!0),o=t.ownerDocument.implementation,o.createHTMLDocument&&(a=o.createHTMLDocument(""),d("BODY"==t.nodeName?t.childNodes:[t],function(e){a.body.appendChild(a.importNode(e,!0))}),t="BODY"!=t.nodeName?a.body.firstChild:a.body,l=m.doc,m.doc=a),n=n||{},n.format=n.format||"html",n.selection&&(n.forced_root_block=""),n.no_events||(n.node=t,r.onPreProcess(n)),y=v.parse(f(n.getInner?t.innerHTML:m.getOuterHTML(t)),n),u(y),h=new i(e,g),n.content=h.serialize(y),n.cleanup||(n.content=c.trim(n.content),n.content=n.content.replace(/\uFEFF/g,"")),n.no_events||r.onPostProcess(n),l&&(m.doc=l),n.node=null,n.content},addRules:function(e){g.addValidElements(e)},setRules:function(e){g.setValidElements(e)},onPreProcess:function(e){o&&o.fire("PreProcess",e)},onPostProcess:function(e){o&&o.fire("PostProcess",e)},getTrimmedContent:l}}}),r(O,[],function(){function e(e){function t(t,n){var r,i=0,o,a,s,l,c,u,d=-1,f;if(r=t.duplicate(),r.collapse(n),f=r.parentElement(),f.ownerDocument===e.dom.doc){for(;"false"===f.contentEditable;)f=f.parentNode;if(!f.hasChildNodes())return{node:f,inside:1};for(s=f.children,o=s.length-1;o>=i;)if(u=Math.floor((i+o)/2),l=s[u],r.moveToElementText(l),d=r.compareEndPoints(n?"StartToStart":"EndToEnd",t),d>0)o=u-1;else{if(!(0>d))return{node:l};i=u+1}if(0>d)for(l?r.collapse(!1):(r.moveToElementText(f),r.collapse(!0),l=f,a=!0),c=0;0!==r.compareEndPoints(n?"StartToStart":"StartToEnd",t)&&0!==r.move("character",1)&&f==r.parentElement();)c++;else for(r.collapse(!0),c=0;0!==r.compareEndPoints(n?"StartToStart":"StartToEnd",t)&&0!==r.move("character",-1)&&f==r.parentElement();)c++;return{node:l,position:d,offset:c,inside:a}}}function n(){function n(e){var n=t(o,e),r,i,s=0,l,c,u;if(r=n.node,i=n.offset,n.inside&&!r.hasChildNodes())return void a[e?"setStart":"setEnd"](r,0);if(i===c)return void a[e?"setStartBefore":"setEndAfter"](r);if(n.position<0){if(l=n.inside?r.firstChild:r.nextSibling,!l)return void a[e?"setStartAfter":"setEndAfter"](r);if(!i)return void(3==l.nodeType?a[e?"setStart":"setEnd"](l,0):a[e?"setStartBefore":"setEndBefore"](l));for(;l;){if(3==l.nodeType&&(u=l.nodeValue,s+=u.length,s>=i)){r=l,s-=i,s=u.length-s;break}l=l.nextSibling}}else{if(l=r.previousSibling,!l)return a[e?"setStartBefore":"setEndBefore"](r);if(!i)return void(3==r.nodeType?a[e?"setStart":"setEnd"](l,r.nodeValue.length):a[e?"setStartAfter":"setEndAfter"](l));for(;l;){if(3==l.nodeType&&(s+=l.nodeValue.length,s>=i)){r=l,s-=i;break}l=l.previousSibling}}a[e?"setStart":"setEnd"](r,s)}var o=e.getRng(),a=i.createRng(),s,l,c,u,d;if(s=o.item?o.item(0):o.parentElement(),s.ownerDocument!=i.doc)return a;if(l=e.isCollapsed(),o.item)return a.setStart(s.parentNode,i.nodeIndex(s)),a.setEnd(a.startContainer,a.startOffset+1),a;try{n(!0),l||n()}catch(f){if(-2147024809!=f.number)throw f;d=r.getBookmark(2),c=o.duplicate(),c.collapse(!0),s=c.parentElement(),l||(c=o.duplicate(),c.collapse(!1),u=c.parentElement(),u.innerHTML=u.innerHTML),s.innerHTML=s.innerHTML,r.moveToBookmark(d),o=e.getRng(),n(!0),l||n()}return a}var r=this,i=e.dom,o=!1;this.getBookmark=function(n){function r(e){var t,n,r,o,a=[];for(t=e.parentNode,n=i.getRoot().parentNode;t!=n&&9!==t.nodeType;){for(r=t.children,o=r.length;o--;)if(e===r[o]){a.push(o);break}e=t,t=t.parentNode}return a}function o(e){var n;return n=t(a,e),n?{position:n.position,offset:n.offset,indexes:r(n.node),inside:n.inside}:void 0}var a=e.getRng(),s={};return 2===n&&(a.item?s.start={ctrl:!0,indexes:r(a.item(0))}:(s.start=o(!0),e.isCollapsed()||(s.end=o()))),s},this.moveToBookmark=function(e){function t(e){var t,n,r,o;for(t=i.getRoot(),n=e.length-1;n>=0;n--)o=t.children,r=e[n],r<=o.length-1&&(t=o[r]);return t}function n(n){var i=e[n?"start":"end"],a,s,l,c;i&&(a=i.position>0,s=o.createTextRange(),s.moveToElementText(t(i.indexes)),c=i.offset,c!==l?(s.collapse(i.inside||a),s.moveStart("character",a?-c:c)):s.collapse(n),r.setEndPoint(n?"StartToStart":"EndToStart",s),n&&r.collapse(!0))}var r,o=i.doc.body;e.start&&(e.start.ctrl?(r=o.createControlRange(),r.addElement(t(e.start.indexes)),r.select()):(r=o.createTextRange(),n(!0),n(),r.select()))},this.addRange=function(t){function n(e){var t,n,a,d,p;a=i.create("a"),t=e?s:c,n=e?l:u,d=r.duplicate(),(t==f||t==f.documentElement)&&(t=h,n=0),3==t.nodeType?(t.parentNode.insertBefore(a,t),d.moveToElementText(a),d.moveStart("character",n),i.remove(a),r.setEndPoint(e?"StartToStart":"EndToEnd",d)):(p=t.childNodes,p.length?(n>=p.length?i.insertAfter(a,p[p.length-1]):t.insertBefore(a,p[n]),d.moveToElementText(a)):t.canHaveHTML&&(t.innerHTML="",a=t.firstChild,d.moveToElementText(a),d.collapse(o)),r.setEndPoint(e?"StartToStart":"EndToEnd",d),i.remove(a))}var r,a,s,l,c,u,d,f=e.dom.doc,h=f.body,p,m;if(s=t.startContainer,l=t.startOffset,c=t.endContainer,u=t.endOffset,r=h.createTextRange(),s==c&&1==s.nodeType){if(l==u&&!s.hasChildNodes()){if(s.canHaveHTML)return d=s.previousSibling,d&&!d.hasChildNodes()&&i.isBlock(d)?d.innerHTML="":d=null,s.innerHTML="",r.moveToElementText(s.lastChild),r.select(),i.doc.selection.clear(),s.innerHTML="",void(d&&(d.innerHTML=""));l=i.nodeIndex(s),s=s.parentNode}if(l==u-1)try{if(m=s.childNodes[l],a=h.createControlRange(),a.addElement(m),a.select(),p=e.getRng(),p.item&&m===p.item(0))return}catch(g){}}n(!0),n(),r.select()},this.getRangeAt=n}return e}),r(I,[h],function(e){return{BACKSPACE:8,DELETE:46,DOWN:40,ENTER:13,LEFT:37,RIGHT:39,SPACEBAR:32,TAB:9,UP:38,modifierPressed:function(e){return e.shiftKey||e.ctrlKey||e.altKey||this.metaKeyPressed(e)},metaKeyPressed:function(t){return e.mac?t.metaKey:t.ctrlKey&&!t.altKey}}}),r(F,[I,m,u,h,_],function(e,t,n,r,i){var o=i.isContentEditableFalse;return function(i,a){function s(e){var t=a.settings.object_resizing;return t===!1||r.iOS?!1:("string"!=typeof t&&(t="table,img,div"),"false"===e.getAttribute("data-mce-resize")?!1:e==a.getBody()?!1:a.dom.is(e,t))}function l(t){var n,r,i,o,s;n=t.screenX-B,r=t.screenY-D,F=n*R[2]+P,z=r*R[3]+H,F=5>F?5:F,z=5>z?5:z,i="IMG"==_.nodeName&&a.settings.resize_img_proportional!==!1?!e.modifierPressed(t):e.modifierPressed(t)||"IMG"==_.nodeName&&R[2]*R[3]!==0,i&&($(n)>$(r)?(z=q(F*O),F=q(z/O)):(F=q(z/O),z=q(F*O))),E.setStyles(S,{width:F,height:z}),o=R.startPos.x+n,s=R.startPos.y+r,o=o>0?o:0,s=s>0?s:0,E.setStyles(k,{left:o,top:s,display:"block"}),k.innerHTML=F+" × "+z,R[2]<0&&S.clientWidth<=F&&E.setStyle(S,"left",M+(P-F)),R[3]<0&&S.clientHeight<=z&&E.setStyle(S,"top",L+(H-z)),n=j.scrollWidth-Y,r=j.scrollHeight-X,n+r!==0&&E.setStyles(k,{left:o-n,top:s-r}),I||(a.fire("ObjectResizeStart",{target:_,width:P,height:H}),I=!0)}function c(){function e(e,t){t&&(_.style[e]||!a.schema.isValid(_.nodeName.toLowerCase(),e)?E.setStyle(_,e,t):E.setAttrib(_,e,t))}I=!1,e("width",F),e("height",z),E.unbind(W,"mousemove",l),E.unbind(W,"mouseup",c),V!=W&&(E.unbind(V,"mousemove",l),E.unbind(V,"mouseup",c)),E.remove(S),E.remove(k),U&&"TABLE"!=_.nodeName||u(_),a.fire("ObjectResized",{target:_,width:F,height:z}),E.setAttrib(_,"style",E.getAttrib(_,"style")),a.nodeChanged()}function u(e,t,n){var i,o,u,f,h;d(),b(),i=E.getPos(e,j),M=i.x,L=i.y,h=e.getBoundingClientRect(),o=h.width||h.right-h.left,u=h.height||h.bottom-h.top,_!=e&&(y(),_=e,F=z=0),f=a.fire("ObjectSelected",{target:e}),s(e)&&!f.isDefaultPrevented()?N(T,function(e,i){function a(t){B=t.screenX,D=t.screenY,P=_.clientWidth,H=_.clientHeight,O=H/P,R=e,e.startPos={x:o*e[0]+M,y:u*e[1]+L},Y=j.scrollWidth,X=j.scrollHeight,S=_.cloneNode(!0),E.addClass(S,"mce-clonedresizable"),E.setAttrib(S,"data-mce-bogus","all"),S.contentEditable=!1,S.unSelectabe=!0,E.setStyles(S,{left:M,top:L,margin:0}),S.removeAttribute("data-mce-selected"),j.appendChild(S),E.bind(W,"mousemove",l),E.bind(W,"mouseup",c),V!=W&&(E.bind(V,"mousemove",l),E.bind(V,"mouseup",c)),k=E.add(j,"div",{"class":"mce-resize-helper","data-mce-bogus":"all"},P+" × "+H)}var s;return t?void(i==t&&a(n)):(s=E.get("mceResizeHandle"+i),s&&E.remove(s),s=E.add(j,"div",{id:"mceResizeHandle"+i,"data-mce-bogus":"all","class":"mce-resizehandle",unselectable:!0,style:"cursor:"+i+"-resize; margin:0; padding:0"}),r.ie&&(s.contentEditable=!1),E.bind(s,"mousedown",function(e){e.stopImmediatePropagation(),e.preventDefault(),a(e)}),e.elm=s,void E.setStyles(s,{left:o*e[0]+M-s.offsetWidth/2,top:u*e[1]+L-s.offsetHeight/2}))}):d(),_.setAttribute("data-mce-selected","1")}function d(){var e,t;b(),_&&_.removeAttribute("data-mce-selected");for(e in T)t=E.get("mceResizeHandle"+e),t&&(E.unbind(t),E.remove(t))}function f(e){function t(e,t){if(e)do if(e===t)return!0;while(e=e.parentNode)}var n,r;if(!I&&!a.removed)return N(E.select("img[data-mce-selected],hr[data-mce-selected]"),function(e){e.removeAttribute("data-mce-selected")}),r="mousedown"==e.type?e.target:i.getNode(),r=E.$(r).closest(U?"table":"table,img,hr")[0],t(r,j)&&(C(),n=i.getStart(!0),t(n,r)&&t(i.getEnd(!0),r)&&(!U||r!=n&&"IMG"!==n.nodeName))?void u(r):void d()}function h(e,t,n){e&&e.attachEvent&&e.attachEvent("on"+t,n)}function p(e,t,n){e&&e.detachEvent&&e.detachEvent("on"+t,n)}function m(e){var t=e.srcElement,n,r,i,o,s,l,c;n=t.getBoundingClientRect(),l=A.clientX-n.left,c=A.clientY-n.top;for(r in T)if(i=T[r],o=t.offsetWidth*i[0],s=t.offsetHeight*i[1],$(o-l)<8&&$(s-c)<8){R=i;break}I=!0,a.fire("ObjectResizeStart",{target:_,width:_.clientWidth,height:_.clientHeight}),a.getDoc().selection.empty(),u(t,r,A)}function g(e){e.preventDefault?e.preventDefault():e.returnValue=!1}function v(e){var t=e.srcElement;if(o(t))return void g(e);if(t!=_){if(a.fire("ObjectSelected",{target:t}),y(),0===t.id.indexOf("mceResizeHandle"))return void(e.returnValue=!1);("IMG"==t.nodeName||"TABLE"==t.nodeName)&&(d(),_=t,h(t,"resizestart",m))}}function y(){p(_,"resizestart",m)}function b(){for(var e in T){var t=T[e];t.elm&&(E.unbind(t.elm),delete t.elm)}}function C(){try{a.getDoc().execCommand("enableObjectResizing",!1,!1)}catch(e){}}function x(e){var t;if(U){t=W.body.createControlRange();try{return t.addElement(e),t.select(),!0}catch(n){}}}function w(){_=S=null,U&&(y(),p(j,"controlselect",v))}var E=a.dom,N=t.each,_,S,k,T,R,A,B,D,M,L,P,H,O,I,F,z,W=a.getDoc(),V=document,U=r.ie&&r.ie<11,$=Math.abs,q=Math.round,j=a.getBody(),Y,X;T={nw:[0,0,-1,-1],ne:[1,0,1,-1],se:[1,1,1,1],sw:[0,1,-1,1]};var K=".mce-content-body";return a.contentStyles.push(K+" div.mce-resizehandle {position: absolute;border: 1px solid black;background: #FFF;width: 7px;height: 7px;z-index: 10000}"+K+" .mce-resizehandle:hover {background: #000}"+K+" *[data-mce-selected] {outline: 1px solid black;resize: none}"+K+" .mce-clonedresizable {position: absolute;"+(r.gecko?"":"outline: 1px dashed black;")+"opacity: .5;filter: alpha(opacity=50);z-index: 10000}"+K+" .mce-resize-helper {background: #555;background: rgba(0,0,0,0.75);border-radius: 3px;border: 1px;color: white;display: none;font-family: sans-serif;font-size: 12px;white-space: nowrap;line-height: 14px;margin: 5px 10px;padding: 5px;position: absolute;z-index: 10001}"),a.on("init",function(){U?(a.on("ObjectResized",function(e){"TABLE"!=e.target.nodeName&&(d(),x(e.target))}),h(j,"controlselect",v),a.on("mousedown",function(e){A=e})):(C(),r.ie>=11&&(a.on("mousedown click",function(e){var t=e.target.nodeName;!I&&/^(TABLE|IMG|HR)$/.test(t)&&(a.selection.select(e.target,"TABLE"==t),"mousedown"==e.type&&a.nodeChanged())}),a.dom.bind(j,"mscontrolselect",function(e){function t(e){n.setEditorTimeout(a,function(){a.selection.select(e)})}return o(e.target)?(e.preventDefault(),void t(e.target)):void(/^(TABLE|IMG|HR)$/.test(e.target.nodeName)&&(e.preventDefault(),"IMG"==e.target.tagName&&t(e.target)))})));var e=n.throttle(f);a.on("nodechange ResizeEditor ResizeWindow drop",e),a.on("keydown keyup",function(t){_&&"TABLE"==_.nodeName&&e(t)}),a.on("hide blur",d)}),a.on("remove",b),{isResizable:s,showResizeRect:u,hideResizeRect:d,updateResizeRect:f,controlSelect:x,destroy:w}}}),r(z,[],function(){function e(e){return function(){return e}}function t(e){return function(t){return!e(t)}}function n(e,t){return function(n){return e(t(n))}}function r(){var e=a.call(arguments);return function(t){for(var n=0;n=e.length?e.apply(this,t.slice(1)):function(){var e=t.concat([].slice.call(arguments));return o.apply(this,e)}}var a=[].slice;return{constant:e,negate:t,and:i,or:r,curry:o,compose:n}}),r(W,[_,p,k],function(e,t,n){function r(e){return m(e)?!1:d(e)?f(e.parentNode)?!1:!0:h(e)||u(e)||p(e)||c(e)}function i(e,t){for(e=e.parentNode;e&&e!=t;e=e.parentNode){if(c(e))return!1;if(l(e))return!0}return!0}function o(e){return c(e)?t.reduce(e.getElementsByTagName("*"),function(e,t){return e||l(t)},!1)!==!0:!1}function a(e){return h(e)||o(e)}function s(e,t){return r(e)&&i(e,t)}var l=e.isContentEditableTrue,c=e.isContentEditableFalse,u=e.isBr,d=e.isText,f=e.matchNodeNames("script style textarea"),h=e.matchNodeNames("img input textarea hr iframe video audio object"),p=e.matchNodeNames("table"),m=n.isCaretContainer;return{isCaretCandidate:r,isInEditable:i,isAtomic:a,isEditableCaretCandidate:s}}),r(V,[],function(){function e(e){return e?{left:c(e.left),top:c(e.top),bottom:c(e.bottom),right:c(e.right),width:c(e.width),height:c(e.height)}:{left:0,top:0,bottom:0,right:0,width:0,height:0}}function t(t,n){return t=e(t),n?t.right=t.left:(t.left=t.left+t.width,t.right=t.left),t.width=0,t}function n(e,t){return e.left===t.left&&e.top===t.top&&e.bottom===t.bottom&&e.right===t.right}function r(e,t,n){return e>=0&&e<=Math.min(t.height,n.height)/2; +}function i(e,t){return e.bottomt.bottom?!1:r(t.top-e.bottom,e,t)}function o(e,t){return e.top>t.bottom?!0:e.bottomt.right}function l(e,t){return i(e,t)?-1:o(e,t)?1:a(e,t)?-1:s(e,t)?1:0}var c=Math.round;return{clone:e,collapse:t,isEqual:n,isAbove:i,isBelow:o,isLeft:a,isRight:s,compare:l}}),r(U,[],function(){function e(e){return"string"==typeof e&&e.charCodeAt(0)>=768&&t.test(e)}var t=new RegExp("[\u0300-\u036f\u0483-\u0487\u0488-\u0489\u0591-\u05bd\u05bf\u05c1-\u05c2\u05c4-\u05c5\u05c7\u0610-\u061a\u064b-\u065f\u0670\u06d6-\u06dc\u06df-\u06e4\u06e7-\u06e8\u06ea-\u06ed\u0711\u0730-\u074a\u07a6-\u07b0\u07eb-\u07f3\u0816-\u0819\u081b-\u0823\u0825-\u0827\u0829-\u082d\u0859-\u085b\u08e3-\u0902\u093a\u093c\u0941-\u0948\u094d\u0951-\u0957\u0962-\u0963\u0981\u09bc\u09be\u09c1-\u09c4\u09cd\u09d7\u09e2-\u09e3\u0a01-\u0a02\u0a3c\u0a41-\u0a42\u0a47-\u0a48\u0a4b-\u0a4d\u0a51\u0a70-\u0a71\u0a75\u0a81-\u0a82\u0abc\u0ac1-\u0ac5\u0ac7-\u0ac8\u0acd\u0ae2-\u0ae3\u0b01\u0b3c\u0b3e\u0b3f\u0b41-\u0b44\u0b4d\u0b56\u0b57\u0b62-\u0b63\u0b82\u0bbe\u0bc0\u0bcd\u0bd7\u0c00\u0c3e-\u0c40\u0c46-\u0c48\u0c4a-\u0c4d\u0c55-\u0c56\u0c62-\u0c63\u0c81\u0cbc\u0cbf\u0cc2\u0cc6\u0ccc-\u0ccd\u0cd5-\u0cd6\u0ce2-\u0ce3\u0d01\u0d3e\u0d41-\u0d44\u0d4d\u0d57\u0d62-\u0d63\u0dca\u0dcf\u0dd2-\u0dd4\u0dd6\u0ddf\u0e31\u0e34-\u0e3a\u0e47-\u0e4e\u0eb1\u0eb4-\u0eb9\u0ebb-\u0ebc\u0ec8-\u0ecd\u0f18-\u0f19\u0f35\u0f37\u0f39\u0f71-\u0f7e\u0f80-\u0f84\u0f86-\u0f87\u0f8d-\u0f97\u0f99-\u0fbc\u0fc6\u102d-\u1030\u1032-\u1037\u1039-\u103a\u103d-\u103e\u1058-\u1059\u105e-\u1060\u1071-\u1074\u1082\u1085-\u1086\u108d\u109d\u135d-\u135f\u1712-\u1714\u1732-\u1734\u1752-\u1753\u1772-\u1773\u17b4-\u17b5\u17b7-\u17bd\u17c6\u17c9-\u17d3\u17dd\u180b-\u180d\u18a9\u1920-\u1922\u1927-\u1928\u1932\u1939-\u193b\u1a17-\u1a18\u1a1b\u1a56\u1a58-\u1a5e\u1a60\u1a62\u1a65-\u1a6c\u1a73-\u1a7c\u1a7f\u1ab0-\u1abd\u1abe\u1b00-\u1b03\u1b34\u1b36-\u1b3a\u1b3c\u1b42\u1b6b-\u1b73\u1b80-\u1b81\u1ba2-\u1ba5\u1ba8-\u1ba9\u1bab-\u1bad\u1be6\u1be8-\u1be9\u1bed\u1bef-\u1bf1\u1c2c-\u1c33\u1c36-\u1c37\u1cd0-\u1cd2\u1cd4-\u1ce0\u1ce2-\u1ce8\u1ced\u1cf4\u1cf8-\u1cf9\u1dc0-\u1df5\u1dfc-\u1dff\u200c-\u200d\u20d0-\u20dc\u20dd-\u20e0\u20e1\u20e2-\u20e4\u20e5-\u20f0\u2cef-\u2cf1\u2d7f\u2de0-\u2dff\u302a-\u302d\u302e-\u302f\u3099-\u309a\ua66f\ua670-\ua672\ua674-\ua67d\ua69e-\ua69f\ua6f0-\ua6f1\ua802\ua806\ua80b\ua825-\ua826\ua8c4\ua8e0-\ua8f1\ua926-\ua92d\ua947-\ua951\ua980-\ua982\ua9b3\ua9b6-\ua9b9\ua9bc\ua9e5\uaa29-\uaa2e\uaa31-\uaa32\uaa35-\uaa36\uaa43\uaa4c\uaa7c\uaab0\uaab2-\uaab4\uaab7-\uaab8\uaabe-\uaabf\uaac1\uaaec-\uaaed\uaaf6\uabe5\uabe8\uabed\ufb1e\ufe00-\ufe0f\ufe20-\ufe2f\uff9e-\uff9f]");return{isExtendingChar:e}}),r($,[z,_,w,T,W,V,U],function(e,t,n,r,i,o,a){function s(e){return e&&/[\r\n\t ]/.test(e)}function l(e){var t=e.startContainer,n=e.startOffset,r;return s(e.toString())&&g(t.parentNode)&&(r=t.data,s(r[n-1])||s(r[n+1]))?!0:!1}function c(e){function t(e){var t=e.ownerDocument,n=t.createRange(),r=t.createTextNode("\xa0"),i=e.parentNode,a;return i.insertBefore(r,e),n.setStart(r,0),n.setEnd(r,1),a=o.clone(n.getBoundingClientRect()),i.removeChild(r),a}function n(e){var n,r;return r=e.getClientRects(),n=r.length>0?o.clone(r[0]):o.clone(e.getBoundingClientRect()),y(e)&&0===n.left?t(e):n}function r(e,t){return e=o.collapse(e,t),e.width=1,e.right=e.left+1,e}function i(e){0!==e.height&&(c.length>0&&o.isEqual(e,c[c.length-1])||c.push(e))}function s(e,t){var o=e.ownerDocument.createRange();return t0&&(o.setStart(e,t-1),o.setEnd(e,t),l(o)||i(r(n(o),!1))),void(t=t.data.length:n>=t.childNodes.length}function a(){var e;return e=t.ownerDocument.createRange(),e.setStart(t,n),e.setEnd(t,n),e}function s(){return r||(r=c(new u(t,n))),r}function l(){return s().length>0}function d(e){return e&&t===e.container()&&n===e.offset()}function f(e){return C(t,e?n-1:n)}return{container:e.constant(t),offset:e.constant(n),toRange:a,getClientRects:s,isVisible:l,isAtStart:i,isAtEnd:o,isEqual:d,getNode:f}}var d=t.isElement,f=i.isCaretCandidate,h=t.matchStyleValues("display","block table"),p=t.matchStyleValues("float","left right"),m=e.and(d,f,e.negate(p)),g=e.negate(t.matchStyleValues("white-space","pre pre-line pre-wrap")),v=t.isText,y=t.isBr,b=n.nodeIndex,C=r.getNode;return u.fromRangeStart=function(e){return new u(e.startContainer,e.startOffset)},u.fromRangeEnd=function(e){return new u(e.endContainer,e.endOffset)},u.after=function(e){return new u(e.parentNode,b(e)+1)},u.before=function(e){return new u(e.parentNode,b(e))},u}),r(q,[_,w,z,p,$],function(e,t,n,r,i){function o(e){var t=e.parentNode;return v(t)?o(t):t}function a(e){return e?r.reduce(e.childNodes,function(e,t){return v(t)&&"BR"!=t.nodeName?e=e.concat(a(t)):e.push(t),e},[]):[]}function s(e,t){for(;(e=e.previousSibling)&&g(e);)t+=e.data.length;return t}function l(e){return function(t){return e===t}}function c(t){var n,i,s;return n=a(o(t)),i=r.findIndex(n,l(t),t),n=n.slice(0,i+1),s=r.reduce(n,function(e,t,r){return g(t)&&g(n[r-1])&&e++,e},0),n=r.filter(n,e.matchNodeNames(t.nodeName)),i=r.findIndex(n,l(t),t),i-s}function u(e){var t;return t=g(e)?"text()":e.nodeName.toLowerCase(),t+"["+c(e)+"]"}function d(e,t,n){var r=[];for(t=t.parentNode;t!=e&&(!n||!n(t));t=t.parentNode)r.push(t);return r}function f(t,i){var o,a,l=[],c,f,h;return o=i.container(),a=i.offset(),g(o)?c=s(o,a):(f=o.childNodes,a>=f.length?(c="after",a=f.length-1):c="before",o=f[a]),l.push(u(o)),h=d(t,o),h=r.filter(h,n.negate(e.isBogus)),l=l.concat(r.map(h,function(e){return u(e)})),l.reverse().join("/")+","+c}function h(t,n,i){var o=a(t);return o=r.filter(o,function(e,t){return!g(e)||!g(o[t-1])}),o=r.filter(o,e.matchNodeNames(n)),o[i]}function p(e,t){for(var n=e,r=0,o;g(n);){if(o=n.data.length,t>=r&&r+o>=t){e=n,t-=r;break}if(!g(n.nextSibling)){e=n,t=o;break}r+=o,n=n.nextSibling}return t>e.data.length&&(t=e.data.length),new i(e,t)}function m(e,t){var n,o,a;return t?(n=t.split(","),t=n[0].split("/"),a=n.length>1?n[1]:"before",o=r.reduce(t,function(e,t){return(t=/([\w\-\(\)]+)\[([0-9]+)\]/.exec(t))?("text()"===t[1]&&(t[1]="#text"),h(e,t[1],parseInt(t[2],10))):null},e),o?g(o)?p(o,parseInt(a,10)):(a="after"===a?y(o)+1:y(o),new i(o.parentNode,a)):null):null}var g=e.isText,v=e.isBogus,y=t.nodeIndex;return{create:f,resolve:m}}),r(j,[h,m,k,q,$,_],function(e,t,n,r,i,o){function a(a){var l=a.dom;this.getBookmark=function(e,c){function u(e,n){var r=0;return t.each(l.select(e),function(e){return"all"!==e.getAttribute("data-mce-bogus")?e==n?!1:void r++:void 0}),r}function d(e){function t(t){var n,r,i,o=t?"start":"end";n=e[o+"Container"],r=e[o+"Offset"],1==n.nodeType&&"TR"==n.nodeName&&(i=n.childNodes,n=i[Math.min(t?r:r-1,i.length-1)],n&&(r=t?0:n.childNodes.length,e["set"+(t?"Start":"End")](n,r)))}return t(!0),t(),e}function f(e){function t(e,t){var r=e[t?"startContainer":"endContainer"],i=e[t?"startOffset":"endOffset"],o=[],a,s,u=0;if(3==r.nodeType){if(c)for(a=r.previousSibling;a&&3==a.nodeType;a=a.previousSibling)i+=a.nodeValue.length;o.push(i)}else s=r.childNodes,i>=s.length&&s.length&&(u=1,i=Math.max(0,s.length-1)),o.push(l.nodeIndex(s[i],c)+u);for(;r&&r!=n;r=r.parentNode)o.push(l.nodeIndex(r,c));return o}var n=l.getRoot(),r={};return r.start=t(e,!0),a.isCollapsed()||(r.end=t(e)),r}function h(e){function t(e){var t;if(n.isCaretContainer(e)){if(o.isText(e)&&n.isCaretContainerBlock(e)&&(e=e.parentNode),t=e.previousSibling,s(t))return t;if(t=e.nextSibling,s(t))return t}}return t(e.startContainer)||t(e.endContainer)}var p,m,g,v,y,b,C="",x;if(2==e)return b=a.getNode(),y=b?b.nodeName:null,p=a.getRng(),s(b)||"IMG"==y?{name:y,index:u(y,b)}:a.tridentSel?a.tridentSel.getBookmark(e):(b=h(p),b?(y=b.tagName,{name:y,index:u(y,b)}):f(p));if(3==e)return p=a.getRng(),{start:r.create(l.getRoot(),i.fromRangeStart(p)),end:r.create(l.getRoot(),i.fromRangeEnd(p))};if(e)return{rng:a.getRng()};if(p=a.getRng(),g=l.uniqueId(),v=a.isCollapsed(),x="overflow:hidden;line-height:0px",p.duplicate||p.item){if(p.item)return b=p.item(0),y=b.nodeName,{name:y,index:u(y,b)};m=p.duplicate();try{p.collapse(),p.pasteHTML(''+C+""),v||(m.collapse(!1),p.moveToElementText(m.parentElement()),0===p.compareEndPoints("StartToEnd",m)&&m.move("character",-1),m.pasteHTML(''+C+""))}catch(w){return null}}else{if(b=a.getNode(),y=b.nodeName,"IMG"==y)return{name:y,index:u(y,b)};m=d(p.cloneRange()),v||(m.collapse(!1),m.insertNode(l.create("span",{"data-mce-type":"bookmark",id:g+"_end",style:x},C))),p=d(p),p.collapse(!0),p.insertNode(l.create("span",{"data-mce-type":"bookmark",id:g+"_start",style:x},C))}return a.moveToBookmark({id:g,keep:1}),{id:g}},this.moveToBookmark=function(n){function i(e){var t=n[e?"start":"end"],r,i,o,a;if(t){for(o=t[0],i=d,r=t.length-1;r>=1;r--){if(a=i.childNodes,t[r]>a.length-1)return;i=a[t[r]]}3===i.nodeType&&(o=Math.min(t[0],i.nodeValue.length)),1===i.nodeType&&(o=Math.min(t[0],i.childNodes.length)),e?u.setStart(i,o):u.setEnd(i,o)}return!0}function o(r){var i=l.get(n.id+"_"+r),o,a,s,c,u=n.keep;if(i&&(o=i.parentNode,"start"==r?(u?(o=i.firstChild,a=1):a=l.nodeIndex(i),f=h=o,p=m=a):(u?(o=i.firstChild,a=1):a=l.nodeIndex(i),h=o,m=a),!u)){for(c=i.previousSibling,s=i.nextSibling,t.each(t.grep(i.childNodes),function(e){3==e.nodeType&&(e.nodeValue=e.nodeValue.replace(/\uFEFF/g,""))});i=l.get(n.id+"_"+r);)l.remove(i,1);c&&s&&c.nodeType==s.nodeType&&3==c.nodeType&&!e.opera&&(a=c.nodeValue.length,c.appendData(s.nodeValue),l.remove(s),"start"==r?(f=h=c,p=m=a):(h=c,m=a))}}function s(t){return!l.isBlock(t)||t.innerHTML||e.ie||(t.innerHTML='
    '),t}function c(){var e,t;return e=l.createRng(),t=r.resolve(l.getRoot(),n.start),e.setStart(t.container(),t.offset()),t=r.resolve(l.getRoot(),n.end),e.setEnd(t.container(),t.offset()),e}var u,d,f,h,p,m;if(n)if(t.isArray(n.start)){if(u=l.createRng(),d=l.getRoot(),a.tridentSel)return a.tridentSel.moveToBookmark(n);i(!0)&&i()&&a.setRng(u)}else"string"==typeof n.start?a.setRng(c(n)):n.id?(o("start"),o("end"),f&&(u=l.createRng(),u.setStart(s(f),p),u.setEnd(s(h),m),a.setRng(u))):n.name?a.select(l.select(n.name)[n.index]):n.rng&&a.setRng(n.rng)}}var s=o.isContentEditableFalse;return a.isBookmarkNode=function(e){return e&&"SPAN"===e.tagName&&"bookmark"===e.getAttribute("data-mce-type")},a}),r(Y,[y,O,F,T,j,_,h,m],function(e,n,r,i,o,a,s,l){function c(e,t,i,a){var s=this;s.dom=e,s.win=t,s.serializer=i,s.editor=a,s.bookmarkManager=new o(s),s.controlSelection=new r(s,a),s.win.getSelection||(s.tridentSel=new n(s))}var u=l.each,d=l.trim,f=s.ie;return c.prototype={setCursorLocation:function(e,t){var n=this,r=n.dom.createRng();e?(r.setStart(e,t),r.setEnd(e,t),n.setRng(r),n.collapse(!1)):(n._moveEndPoint(r,n.editor.getBody(),!0),n.setRng(r))},getContent:function(e){var n=this,r=n.getRng(),i=n.dom.create("body"),o=n.getSel(),a,s,l;return e=e||{},a=s="",e.get=!0,e.format=e.format||"html",e.selection=!0,n.editor.fire("BeforeGetContent",e),"text"==e.format?n.isCollapsed()?"":r.text||(o.toString?o.toString():""):(r.cloneContents?(l=r.cloneContents(),l&&i.appendChild(l)):r.item!==t||r.htmlText!==t?(i.innerHTML="
    "+(r.item?r.item(0).outerHTML:r.htmlText),i.removeChild(i.firstChild)):i.innerHTML=r.toString(),/^\s/.test(i.innerHTML)&&(a=" "),/\s+$/.test(i.innerHTML)&&(s=" "),e.getInner=!0,e.content=n.isCollapsed()?"":a+n.serializer.serialize(i,e)+s,n.editor.fire("GetContent",e),e.content)},setContent:function(e,t){var n=this,r=n.getRng(),i,o=n.win.document,a,s;if(t=t||{format:"html"},t.set=!0,t.selection=!0,t.content=e,t.no_events||n.editor.fire("BeforeSetContent",t),e=t.content,r.insertNode){e+='_',r.startContainer==o&&r.endContainer==o?o.body.innerHTML=e:(r.deleteContents(),0===o.body.childNodes.length?o.body.innerHTML=e:r.createContextualFragment?r.insertNode(r.createContextualFragment(e)):(a=o.createDocumentFragment(),s=o.createElement("div"),a.appendChild(s),s.outerHTML=e,r.insertNode(a))),i=n.dom.get("__caret"),r=o.createRange(),r.setStartBefore(i),r.setEndBefore(i),n.setRng(r),n.dom.remove("__caret");try{n.setRng(r)}catch(l){}}else r.item&&(o.execCommand("Delete",!1,null),r=n.getRng()),/^\s+/.test(e)?(r.pasteHTML('_'+e),n.dom.remove("__mce_tmp")):r.pasteHTML(e);t.no_events||n.editor.fire("SetContent",t)},getStart:function(e){var t=this,n=t.getRng(),r,i,o,a;if(n.duplicate||n.item){if(n.item)return n.item(0);for(o=n.duplicate(),o.collapse(1),r=o.parentElement(),r.ownerDocument!==t.dom.doc&&(r=t.dom.getRoot()),i=a=n.parentElement();a=a.parentNode;)if(a==r){r=i;break}return r}return r=n.startContainer,1==r.nodeType&&r.hasChildNodes()&&(e&&n.collapsed||(r=r.childNodes[Math.min(r.childNodes.length-1,n.startOffset)])),r&&3==r.nodeType?r.parentNode:r},getEnd:function(e){var t=this,n=t.getRng(),r,i;return n.duplicate||n.item?n.item?n.item(0):(n=n.duplicate(),n.collapse(0),r=n.parentElement(),r.ownerDocument!==t.dom.doc&&(r=t.dom.getRoot()),r&&"BODY"==r.nodeName?r.lastChild||r:r):(r=n.endContainer,i=n.endOffset,1==r.nodeType&&r.hasChildNodes()&&(e&&n.collapsed||(r=r.childNodes[i>0?i-1:i])),r&&3==r.nodeType?r.parentNode:r)},getBookmark:function(e,t){return this.bookmarkManager.getBookmark(e,t)},moveToBookmark:function(e){return this.bookmarkManager.moveToBookmark(e)},select:function(e,t){var n=this,r=n.dom,i=r.createRng(),o;if(n.lastFocusBookmark=null,e){if(!t&&n.controlSelection.controlSelect(e))return;o=r.nodeIndex(e),i.setStart(e.parentNode,o),i.setEnd(e.parentNode,o+1),t&&(n._moveEndPoint(i,e,!0),n._moveEndPoint(i,e)),n.setRng(i)}return e},isCollapsed:function(){var e=this,t=e.getRng(),n=e.getSel();return!t||t.item?!1:t.compareEndPoints?0===t.compareEndPoints("StartToEnd",t):!n||t.collapsed},collapse:function(e){var t=this,n=t.getRng(),r;n.item&&(r=n.item(0),n=t.win.document.body.createTextRange(),n.moveToElementText(r)),n.collapse(!!e),t.setRng(n)},getSel:function(){var e=this.win;return e.getSelection?e.getSelection():e.document.selection},getRng:function(e){function t(e,t,n){try{return t.compareBoundaryPoints(e,n)}catch(r){return-1}}var n=this,r,i,o,a,s,l;if(!n.win)return null;if(a=n.win.document,!e&&n.lastFocusBookmark){var c=n.lastFocusBookmark;return c.startContainer?(i=a.createRange(),i.setStart(c.startContainer,c.startOffset),i.setEnd(c.endContainer,c.endOffset)):i=c,i}if(e&&n.tridentSel)return n.tridentSel.getRangeAt(0);try{(r=n.getSel())&&(i=r.rangeCount>0?r.getRangeAt(0):r.createRange?r.createRange():a.createRange())}catch(u){}if(l=n.editor.fire("GetSelectionRange",{range:i}),l.range!==i)return l.range;if(f&&i&&i.setStart&&a.selection){try{s=a.selection.createRange()}catch(u){}s&&s.item&&(o=s.item(0),i=a.createRange(),i.setStartBefore(o),i.setEndAfter(o))}return i||(i=a.createRange?a.createRange():a.body.createTextRange()),i.setStart&&9===i.startContainer.nodeType&&i.collapsed&&(o=n.dom.getRoot(),i.setStart(o,0),i.setEnd(o,0)),n.selectedRange&&n.explicitRange&&(0===t(i.START_TO_START,i,n.selectedRange)&&0===t(i.END_TO_END,i,n.selectedRange)?i=n.explicitRange:(n.selectedRange=null,n.explicitRange=null)),i},setRng:function(e,t){var n=this,r,i,o;if(e)if(e.select){n.explicitRange=null;try{e.select()}catch(a){}}else if(n.tridentSel){if(e.cloneRange)try{n.tridentSel.addRange(e)}catch(a){}}else{if(r=n.getSel(),o=n.editor.fire("SetSelectionRange",{range:e}),e=o.range,r){n.explicitRange=e;try{r.removeAllRanges(),r.addRange(e)}catch(a){}t===!1&&r.extend&&(r.collapse(e.endContainer,e.endOffset),r.extend(e.startContainer,e.startOffset)),n.selectedRange=r.rangeCount>0?r.getRangeAt(0):null}e.collapsed||e.startContainer!=e.endContainer||!r.setBaseAndExtent||s.ie||e.endOffset-e.startOffset<2&&e.startContainer.hasChildNodes()&&(i=e.startContainer.childNodes[e.startOffset],i&&"IMG"==i.tagName&&n.getSel().setBaseAndExtent(i,0,i,1))}},setNode:function(e){var t=this;return t.setContent(t.dom.getOuterHTML(e)),e},getNode:function(){function e(e,t){for(var n=e;e&&3===e.nodeType&&0===e.length;)e=t?e.nextSibling:e.previousSibling;return e||n}var t=this,n=t.getRng(),r,i=n.startContainer,o=n.endContainer,a=n.startOffset,s=n.endOffset,l=t.dom.getRoot();return n?n.setStart?(r=n.commonAncestorContainer,!n.collapsed&&(i==o&&2>s-a&&i.hasChildNodes()&&(r=i.childNodes[a]),3===i.nodeType&&3===o.nodeType&&(i=i.length===a?e(i.nextSibling,!0):i.parentNode,o=0===s?e(o.previousSibling,!1):o.parentNode,i&&i===o))?i:r&&3==r.nodeType?r.parentNode:r):(r=n.item?n.item(0):n.parentElement(),r.ownerDocument!==t.win.document&&(r=l),r):l},getSelectedBlocks:function(t,n){var r=this,i=r.dom,o,a,s=[];if(a=i.getRoot(),t=i.getParent(t||r.getStart(),i.isBlock),n=i.getParent(n||r.getEnd(),i.isBlock),t&&t!=a&&s.push(t),t&&n&&t!=n){o=t;for(var l=new e(t,a);(o=l.next())&&o!=n;)i.isBlock(o)&&s.push(o)}return n&&t!=n&&n!=a&&s.push(n),s},isForward:function(){var e=this.dom,t=this.getSel(),n,r;return t&&t.anchorNode&&t.focusNode?(n=e.createRng(),n.setStart(t.anchorNode,t.anchorOffset),n.collapse(!0),r=e.createRng(),r.setStart(t.focusNode,t.focusOffset),r.collapse(!0),n.compareBoundaryPoints(n.START_TO_START,r)<=0):!0},normalize:function(){var e=this,t=e.getRng();return s.range&&new i(e.dom).normalize(t)&&e.setRng(t,e.isForward()),t},selectorChanged:function(e,t){var n=this,r;return n.selectorChangedData||(n.selectorChangedData={},r={},n.editor.on("NodeChange",function(e){var t=e.element,i=n.dom,o=i.getParents(t,null,i.getRoot()),a={};u(n.selectorChangedData,function(e,t){u(o,function(n){return i.is(n,t)?(r[t]||(u(e,function(e){e(!0,{node:n,selector:t,parents:o})}),r[t]=e),a[t]=e,!1):void 0})}),u(r,function(e,n){a[n]||(delete r[n],u(e,function(e){e(!1,{node:t,selector:n,parents:o})}))})})),n.selectorChangedData[e]||(n.selectorChangedData[e]=[]),n.selectorChangedData[e].push(t),n},getScrollContainer:function(){for(var e,t=this.dom.getRoot();t&&"BODY"!=t.nodeName;){if(t.scrollHeight>t.clientHeight){e=t;break}t=t.parentNode}return e},scrollIntoView:function(e,t){function n(e){for(var t=0,n=0,r=e;r&&r.nodeType;)t+=r.offsetLeft||0,n+=r.offsetTop||0,r=r.offsetParent;return{x:t,y:n}}var r,i,o=this,s=o.dom,l=s.getRoot(),c,u,d=0;if(a.isElement(e)){if(t===!1&&(d=e.offsetHeight),"BODY"!=l.nodeName){var f=o.getScrollContainer();if(f)return r=n(e).y-n(f).y+d,u=f.clientHeight,c=f.scrollTop,void((c>r||r+25>c+u)&&(f.scrollTop=c>r?r:r-u+25))}i=s.getViewPort(o.editor.getWin()),r=s.getPos(e).y+d,c=i.y,u=i.h,(rc+u)&&o.editor.getWin().scrollTo(0,c>r?r:r-u+25)}},placeCaretAt:function(e,t){this.setRng(i.getCaretRangeFromPoint(e,t,this.editor.getDoc()))},_moveEndPoint:function(t,n,r){var i=n,o=new e(n,i),a=this.dom.schema.getNonEmptyElements();do{if(3==n.nodeType&&0!==d(n.nodeValue).length)return void(r?t.setStart(n,0):t.setEnd(n,n.nodeValue.length));if(a[n.nodeName]&&!/^(TD|TH)$/.test(n.nodeName))return void(r?t.setStartBefore(n):"BR"==n.nodeName?t.setEndBefore(n):t.setEndAfter(n));if(s.ie&&s.ie<11&&this.dom.isBlock(n)&&this.dom.isEmpty(n))return void(r?t.setStart(n,0):t.setEnd(n,0))}while(n=r?o.next():o.prev());"BODY"==i.nodeName&&(r?t.setStart(i,0):t.setEnd(i,i.childNodes.length))},destroy:function(){this.win=null,this.controlSelection.destroy()}},c}),r(X,[j,m],function(e,t){function n(t){this.compare=function(n,i){function o(e){var n={};return r(t.getAttribs(e),function(r){var i=r.nodeName.toLowerCase();0!==i.indexOf("_")&&"style"!==i&&"data-mce-style"!==i&&(n[i]=t.getAttrib(e,i))}),n}function a(e,t){var n,r;for(r in e)if(e.hasOwnProperty(r)){if(n=t[r],"undefined"==typeof n)return!1;if(e[r]!=n)return!1;delete t[r]}for(r in t)if(t.hasOwnProperty(r))return!1;return!0}return n.nodeName!=i.nodeName?!1:a(o(n),o(i))&&a(t.parseStyle(t.getAttrib(n,"style")),t.parseStyle(t.getAttrib(i,"style")))?!e.isBookmarkNode(n)&&!e.isBookmarkNode(i):!1}}var r=t.each;return n}),r(K,[m],function(e){function t(e,t){function r(e){return e.replace(/%(\w+)/g,"")}var i,o,a=e.dom,s="",l,c;if(c=e.settings.preview_styles,c===!1)return"";if(c||(c="font-family font-size font-weight font-style text-decoration text-transform color background-color border border-radius outline text-shadow"),"string"==typeof t){if(t=e.formatter.get(t),!t)return;t=t[0]}return i=t.block||t.inline||"span",o=a.create(i),n(t.styles,function(e,t){e=r(e),e&&a.setStyle(o,t,e)}),n(t.attributes,function(e,t){e=r(e),e&&a.setAttrib(o,t,e)}),n(t.classes,function(e){e=r(e),a.hasClass(o,e)||a.addClass(o,e)}),e.fire("PreviewFormats"),a.setStyles(o,{position:"absolute",left:-65535}),e.getBody().appendChild(o),l=a.getStyle(e.getBody(),"fontSize",!0),l=/px$/.test(l)?parseInt(l,10):0,n(c.split(" "),function(t){var n=a.getStyle(o,t,!0);if(!("background-color"==t&&/transparent|rgba\s*\([^)]+,\s*0\)/.test(n)&&(n=a.getStyle(e.getBody(),t,!0),"#ffffff"==a.toHex(n).toLowerCase())||"color"==t&&"#000000"==a.toHex(n).toLowerCase())){if("font-size"==t&&/em|%$/.test(n)){if(0===l)return;n=parseFloat(n,10)/(/%$/.test(n)?100:1),n=n*l+"px"}"border"==t&&n&&(s+="padding:0 2px;"),s+=t+":"+n+";"}}),e.fire("AfterPreviewFormats"),a.remove(o),s}var n=e.each;return{getCssText:t}}),r(G,[y,T,j,X,m,K],function(e,t,n,r,i,o){return function(a){function s(e){return e.nodeType&&(e=e.nodeName),!!a.schema.getTextBlockElements()[e.toLowerCase()]}function l(e){return/^(TH|TD)$/.test(e.nodeName)}function c(e){return e&&/^(IMG)$/.test(e.nodeName)}function u(e,t){return q.getParents(e,t,q.getRoot())}function d(e){return 1===e.nodeType&&"_mce_caret"===e.id}function f(){m({valigntop:[{selector:"td,th",styles:{verticalAlign:"top"}}],valignmiddle:[{selector:"td,th",styles:{verticalAlign:"middle"}}],valignbottom:[{selector:"td,th",styles:{verticalAlign:"bottom"}}],alignleft:[{selector:"figure.image",collapsed:!1,classes:"align-left",ceFalseOverride:!0},{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"left"},defaultBlock:"div"},{selector:"img,table",collapsed:!1,styles:{"float":"left"}}],aligncenter:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"center"},defaultBlock:"div"},{selector:"figure.image",collapsed:!1,classes:"align-center",ceFalseOverride:!0},{selector:"img",collapsed:!1,styles:{display:"block",marginLeft:"auto",marginRight:"auto"}},{selector:"table",collapsed:!1,styles:{marginLeft:"auto",marginRight:"auto"}}],alignright:[{selector:"figure.image",collapsed:!1,classes:"align-right",ceFalseOverride:!0},{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"right"},defaultBlock:"div"},{selector:"img,table",collapsed:!1,styles:{"float":"right"}}],alignjustify:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"justify"},defaultBlock:"div"}],bold:[{inline:"strong",remove:"all"},{inline:"span",styles:{fontWeight:"bold"}},{inline:"b",remove:"all"}],italic:[{inline:"em",remove:"all"},{inline:"span",styles:{fontStyle:"italic"}},{inline:"i",remove:"all"}],underline:[{inline:"span",styles:{textDecoration:"underline"},exact:!0},{inline:"u",remove:"all"}],strikethrough:[{inline:"span",styles:{textDecoration:"line-through"},exact:!0},{inline:"strike",remove:"all"}],forecolor:{inline:"span",styles:{color:"%value"},links:!0,remove_similar:!0},hilitecolor:{inline:"span",styles:{backgroundColor:"%value"},links:!0,remove_similar:!0},fontname:{inline:"span",styles:{fontFamily:"%value"}},fontsize:{inline:"span",styles:{fontSize:"%value"}},fontsize_class:{inline:"span",attributes:{"class":"%value"}},blockquote:{block:"blockquote",wrapper:1,remove:"all"},subscript:{inline:"sub"},superscript:{inline:"sup"},code:{inline:"code"},link:{inline:"a",selector:"a",remove:"all",split:!0,deep:!0,onmatch:function(){return!0},onformat:function(e,t,n){le(n,function(t,n){q.setAttrib(e,n,t)})}},removeformat:[{selector:"b,strong,em,i,font,u,strike,sub,sup,dfn,code,samp,kbd,var,cite,mark,q,del,ins",remove:"all",split:!0,expand:!1,block_expand:!0,deep:!0},{selector:"span",attributes:["style","class"],remove:"empty",split:!0,expand:!1,deep:!0},{selector:"*",attributes:["style","class"],split:!1,expand:!1,deep:!0}]}),le("p h1 h2 h3 h4 h5 h6 div address pre div dt dd samp".split(/\s/),function(e){m(e,{block:e,remove:"all"})}),m(a.settings.formats)}function h(){a.addShortcut("meta+b","bold_desc","Bold"),a.addShortcut("meta+i","italic_desc","Italic"),a.addShortcut("meta+u","underline_desc","Underline");for(var e=1;6>=e;e++)a.addShortcut("access+"+e,"",["FormatBlock",!1,"h"+e]);a.addShortcut("access+7","",["FormatBlock",!1,"p"]),a.addShortcut("access+8","",["FormatBlock",!1,"div"]),a.addShortcut("access+9","",["FormatBlock",!1,"address"])}function p(e){return e?$[e]:$}function m(e,t){e&&("string"!=typeof e?le(e,function(e,t){m(t,e)}):(t=t.length?t:[t],le(t,function(e){e.deep===re&&(e.deep=!e.selector),e.split===re&&(e.split=!e.selector||e.inline),e.remove===re&&e.selector&&!e.inline&&(e.remove="none"),e.selector&&e.inline&&(e.mixed=!0,e.block_expand=!0),"string"==typeof e.classes&&(e.classes=e.classes.split(/\s+/))}),$[e]=t))}function g(e){return e&&$[e]&&delete $[e],$}function v(e){var t;return a.dom.getParent(e,function(e){return t=a.dom.getStyle(e,"text-decoration"),t&&"none"!==t}),t}function y(e){var t;1===e.nodeType&&e.parentNode&&1===e.parentNode.nodeType&&(t=v(e.parentNode),a.dom.getStyle(e,"color")&&t?a.dom.setStyle(e,"text-decoration",t):a.dom.getStyle(e,"text-decoration")===t&&a.dom.setStyle(e,"text-decoration",null))}function b(t,n,r){function i(e,t){if(t=t||u,e){if(t.onformat&&t.onformat(e,t,n,r),le(t.styles,function(t,r){q.setStyle(e,r,D(t,n))}),t.styles){var i=q.getAttrib(e,"style");i&&e.setAttribute("data-mce-style",i)}le(t.attributes,function(t,r){q.setAttrib(e,r,D(t,n))}),le(t.classes,function(t){t=D(t,n),q.hasClass(e,t)||q.addClass(e,t)})}}function o(){function t(t,n){var i=new e(n);for(r=i.current();r;r=i.prev())if(r.childNodes.length>1||r==t||"BR"==r.tagName)return r}var n=a.selection.getRng(),i=n.startContainer,o=n.endContainer;if(i!=o&&0===n.endOffset){var s=t(i,o),l=3==s.nodeType?s.length:s.childNodes.length;n.setEnd(s,l)}return n}function l(e,r,o){var a=[],l,f,h=!0;l=u.inline||u.block,f=q.create(l),i(f),Y.walk(e,function(e){function r(e){var g,v,y,b,C;return C=h,g=e.nodeName.toLowerCase(),v=e.parentNode.nodeName.toLowerCase(),1===e.nodeType&&ie(e)&&(C=h,h="true"===ie(e),b=!0),R(g,"br")?(p=0,void(u.block&&q.remove(e))):u.wrapper&&w(e,t,n)?void(p=0):h&&!b&&u.block&&!u.wrapper&&s(g)&&X(v,l)?(e=q.rename(e,l),i(e),a.push(e),void(p=0)):u.selector&&(le(c,function(t){return"collapsed"in t&&t.collapsed!==m?void 0:q.is(e,t.selector)&&!d(e)?(i(e,t),y=!0,!1):void 0}),!u.inline||y)?void(p=0):void(!h||b||!X(l,g)||!X(v,l)||!o&&3===e.nodeType&&1===e.nodeValue.length&&65279===e.nodeValue.charCodeAt(0)||d(e)||u.inline&&K(e)?(p=0,le(ce(e.childNodes),r),b&&(h=C),p=0):(p||(p=q.clone(f,ee),e.parentNode.insertBefore(p,e),a.push(p)),p.appendChild(e)))}var p;le(e,r)}),u.links===!0&&le(a,function(e){function t(e){"A"===e.nodeName&&i(e,u),le(ce(e.childNodes),t)}t(e)}),le(a,function(e){function r(e){var t=0;return le(e.childNodes,function(e){M(e)||se(e)||t++}),t}function o(e){var t,n;return le(e.childNodes,function(e){return 1!=e.nodeType||se(e)||d(e)?void 0:(t=e,ee)}),t&&!se(t)&&T(t,u)&&(n=q.clone(t,ee),i(n),q.replace(n,e,te),q.remove(t,1)),n||e}var s;if(s=r(e),(a.length>1||!K(e))&&0===s)return void q.remove(e,1);if(u.inline||u.wrapper){if(u.exact||1!==s||(e=o(e)),le(c,function(t){le(q.select(t.inline,e),function(e){se(e)||O(t,n,e,t.exact?e:null)})}),w(e.parentNode,t,n))return q.remove(e,1),e=0,te;u.merge_with_parents&&q.getParent(e.parentNode,function(r){return w(r,t,n)?(q.remove(e,1),e=0,te):void 0}),e&&u.merge_siblings!==!1&&(e=z(F(e),e),e=z(e,F(e,te)))}})}var c=p(t),u=c[0],f,h,m=!r&&j.isCollapsed();if("false"!==ie(j.getNode())){if(u)if(r)r.nodeType?(h=q.createRng(),h.setStartBefore(r),h.setEndAfter(r),l(P(h,c),null,!0)):l(r,null,!0);else if(m&&u.inline&&!q.select("td.mce-item-selected,th.mce-item-selected").length)V("apply",t,n);else{var g=a.selection.getNode();G||!c[0].defaultBlock||q.getParent(g,q.isBlock)||b(c[0].defaultBlock),a.selection.setRng(o()),f=j.getBookmark(),l(P(j.getRng(te),c),f),u.styles&&(u.styles.color||u.styles.textDecoration)&&(ue(g,y,"childNodes"),y(g)),j.moveToBookmark(f),U(j.getRng(te)),a.nodeChanged()}}else{r=j.getNode();for(var v=0,C=c.length;C>v;v++)if(c[v].ceFalseOverride&&q.is(r,c[v].selector))return void i(r,c[v])}}function C(e,t,n,r){function i(e){var n,r,o,a,s;if(1===e.nodeType&&ie(e)&&(a=b,b="true"===ie(e),s=!0),n=ce(e.childNodes),b&&!s)for(r=0,o=h.length;o>r&&!O(h[r],t,e,e);r++);if(m.deep&&n.length){for(r=0,o=n.length;o>r;r++)i(n[r]);s&&(b=a)}}function o(n){var i;return le(u(n.parentNode).reverse(),function(n){var o;i||"_start"==n.id||"_end"==n.id||(o=w(n,e,t,r),o&&o.split!==!1&&(i=n))}),i}function s(e,n,r,i){var o,a,s,l,c,u;if(e){for(u=e.parentNode,o=n.parentNode;o&&o!=u;o=o.parentNode){for(a=q.clone(o,ee),c=0;cC&&(!h[C].ceFalseOverride||!O(h[C],t,n,n));C++);}}function x(e,t,n){var r=p(e);!E(e,t,n)||"toggle"in r[0]&&!r[0].toggle?b(e,t,n):C(e,t,n)}function w(e,t,n,r){function i(e,t,i){var o,a,s=t[i],l;if(t.onmatch)return t.onmatch(e,t,i);if(s)if(s.length===re){for(o in s)if(s.hasOwnProperty(o)){if(a="attributes"===i?q.getAttrib(e,o):A(e,o),r&&!a&&!t.exact)return;if((!r||t.exact)&&!R(a,B(D(s[o],n),o)))return}}else for(l=0;l=0;o--){if(a=t[o].selector,!a||t[o].defaultBlock)return te;for(i=r.length-1;i>=0;i--)if(q.is(r[i],a))return te}return ee}function S(e,t,n){var r;return ne||(ne={},r={},a.on("NodeChange",function(e){var t=u(e.element),n={};t=i.grep(t,function(e){return 1==e.nodeType&&!e.getAttribute("data-mce-bogus")}),le(ne,function(e,i){le(t,function(o){return w(o,i,{},e.similar)?(r[i]||(le(e,function(e){e(!0,{node:o,format:i,parents:t})}),r[i]=e),n[i]=e,!1):void 0})}),le(r,function(i,o){n[o]||(delete r[o],le(i,function(n){n(!1,{node:e.element,format:o,parents:t})}))})})),le(e.split(","),function(e){ne[e]||(ne[e]=[],ne[e].similar=n),ne[e].push(t)}),this}function k(e){return o.getCssText(a,e)}function T(e,t){return R(e,t.inline)?te:R(e,t.block)?te:t.selector?1==e.nodeType&&q.is(e,t.selector):void 0}function R(e,t){return e=e||"",t=t||"",e=""+(e.nodeName||e),t=""+(t.nodeName||t),e.toLowerCase()==t.toLowerCase()}function A(e,t){return B(q.getStyle(e,t),t)}function B(e,t){return("color"==t||"backgroundColor"==t)&&(e=q.toHex(e)),"fontWeight"==t&&700==e&&(e="bold"),"fontFamily"==t&&(e=e.replace(/[\'\"]/g,"").replace(/,\s+/g,",")),""+e}function D(e,t){return"string"!=typeof e?e=e(t):t&&(e=e.replace(/%(\w+)/g,function(e,n){return t[n]||e})),e}function M(e){return e&&3===e.nodeType&&/^([\t \r\n]+|)$/.test(e.nodeValue)}function L(e,t,n){var r=q.create(t,n);return e.parentNode.insertBefore(r,e),r.appendChild(e),r}function P(t,n,r){function i(e){function t(e){return"BR"==e.nodeName&&e.getAttribute("data-mce-bogus")&&!e.nextSibling}var r,i,o,a,s;if(r=i=e?g:y,a=e?"previousSibling":"nextSibling",s=q.getRoot(),3==r.nodeType&&!M(r)&&(e?v>0:bo?n:o,-1===n||r||n++):(n=a.indexOf(" ",t),o=a.indexOf("\xa0",t),n=-1!==n&&(-1===o||o>n)?n:o),n}var s,l,c,u;if(3===t.nodeType){if(c=o(t,n),-1!==c)return{container:t,offset:c};u=t}for(s=new e(t,q.getParent(t,K)||a.getBody());l=s[i?"prev":"next"]();)if(3===l.nodeType){if(u=l,c=o(l),-1!==c)return{container:l,offset:c}}else if(K(l))break;return u?(n=i?0:u.length,{container:u,offset:n}):void 0}function d(e,r){var i,o,a,s;for(3==e.nodeType&&0===e.nodeValue.length&&e[r]&&(e=e[r]),i=u(e),o=0;oh?h:v],3==g.nodeType&&(v=0)),1==y.nodeType&&y.hasChildNodes()&&(h=y.childNodes.length-1,y=y.childNodes[b>h?h:b-1],3==y.nodeType&&(b=y.nodeValue.length)),g=l(g),y=l(y),(se(g.parentNode)||se(g))&&(g=se(g)?g:g.parentNode,g=g.nextSibling||g,3==g.nodeType&&(v=0)),(se(y.parentNode)||se(y))&&(y=se(y)?y:y.parentNode,y=y.previousSibling||y,3==y.nodeType&&(b=y.length)),n[0].inline&&(t.collapsed&&(m=c(g,v,!0),m&&(g=m.container,v=m.offset),m=c(y,b),m&&(y=m.container,b=m.offset)),p=o(y,b),p.node)){for(;p.node&&0===p.offset&&p.node.previousSibling;)p=o(p.node.previousSibling);p.node&&p.offset>0&&3===p.node.nodeType&&" "===p.node.nodeValue.charAt(p.offset-1)&&p.offset>1&&(y=p.node,y.splitText(p.offset-1))}return(n[0].inline||n[0].block_expand)&&(n[0].inline&&3==g.nodeType&&0!==v||(g=i(!0)),n[0].inline&&3==y.nodeType&&b!==y.nodeValue.length||(y=i())),n[0].selector&&n[0].expand!==ee&&!n[0].inline&&(g=d(g,"previousSibling"),y=d(y,"nextSibling")),(n[0].block||n[0].selector)&&(g=f(g,"previousSibling"),y=f(y,"nextSibling"),n[0].block&&(K(g)||(g=i(!0)),K(y)||(y=i()))),1==g.nodeType&&(v=J(g),g=g.parentNode),1==y.nodeType&&(b=J(y)+1,y=y.parentNode),{startContainer:g,startOffset:v,endContainer:y,endOffset:b}}function H(e,t){return t.links&&"A"==e.tagName}function O(e,t,n,r){var i,o,a;if(!T(n,e)&&!H(n,e))return ee;if("all"!=e.remove)for(le(e.styles,function(i,o){i=B(D(i,t),o),"number"==typeof o&&(o=i,r=0),(e.remove_similar||!r||R(A(r,o),i))&&q.setStyle(n,o,""),a=1}),a&&""===q.getAttrib(n,"style")&&(n.removeAttribute("style"),n.removeAttribute("data-mce-style")),le(e.attributes,function(e,i){var o;if(e=D(e,t),"number"==typeof i&&(i=e,r=0),!r||R(q.getAttrib(r,i),e)){if("class"==i&&(e=q.getAttrib(n,i),e&&(o="",le(e.split(/\s+/),function(e){/mce\-\w+/.test(e)&&(o+=(o?" ":"")+e)}),o)))return void q.setAttrib(n,i,o);"class"==i&&n.removeAttribute("className"),Z.test(i)&&n.removeAttribute("data-mce-"+i),n.removeAttribute(i)}}),le(e.classes,function(e){e=D(e,t),(!r||q.hasClass(r,e))&&q.removeClass(n,e)}),o=q.getAttribs(n),i=0;io?o:i]),3===r.nodeType&&n&&i>=r.nodeValue.length&&(r=new e(r,a.getBody()).next()||r),3!==r.nodeType||n||0!==i||(r=new e(r,a.getBody()).prev()||r),r}function V(t,n,r,i){function o(e){var t=q.create("span",{id:g,"data-mce-bogus":!0,style:v?"color:red":""});return e&&t.appendChild(a.getDoc().createTextNode(Q)),t}function l(e,t){for(;e;){if(3===e.nodeType&&e.nodeValue!==Q||e.childNodes.length>1)return!1;t&&1===e.nodeType&&t.push(e),e=e.firstChild}return!0}function c(e){for(;e;){if(e.id===g)return e;e=e.parentNode}}function u(t){var n;if(t)for(n=new e(t,t),t=n.current();t;t=n.next())if(3===t.nodeType)return t}function d(e,t){var n,r;if(e)r=j.getRng(!0),l(e)?(t!==!1&&(r.setStartBefore(e),r.setEndBefore(e)),q.remove(e)):(n=u(e),n.nodeValue.charAt(0)===Q&&(n.deleteData(0,1),r.startContainer==n&&r.startOffset>0&&r.setStart(n,r.startOffset-1),r.endContainer==n&&r.endOffset>0&&r.setEnd(n,r.endOffset-1)),q.remove(e,1)),j.setRng(r);else if(e=c(j.getStart()),!e)for(;e=q.get(g);)d(e,!1)}function f(){var e,t,i,a,s,l,d;e=j.getRng(!0),a=e.startOffset,l=e.startContainer,d=l.nodeValue,t=c(j.getStart()),t&&(i=u(t)),d&&a>0&&a=0;h--)u.appendChild(q.clone(f[h],!1)),u=u.firstChild;u.appendChild(q.doc.createTextNode(Q)),u=u.firstChild;var g=q.getParent(d,s);g&&q.isEmpty(g)?d.parentNode.replaceChild(m,d):q.insertAfter(m,d),j.setCursorLocation(u,1),q.isEmpty(d)&&q.remove(d)}}function m(){var e;e=c(j.getStart()),e&&!q.isEmpty(e)&&ue(e,function(e){1!=e.nodeType||e.id===g||q.isEmpty(e)||q.setAttrib(e,"data-mce-bogus",null)},"childNodes")}var g="_mce_caret",v=a.settings.caret_debug;a._hasCaretEvents||(ae=function(){var e=[],t;if(l(c(j.getStart()),e))for(t=e.length;t--;)q.setAttrib(e[t],"data-mce-bogus","1")},oe=function(e){var t=e.keyCode;d(),8==t&&j.isCollapsed()&&j.getStart().innerHTML==Q&&d(c(j.getStart())),(37==t||39==t)&&d(c(j.getStart())),m()},a.on("SetContent",function(e){e.selection&&m()}),a._hasCaretEvents=!0),"apply"==t?f():h()}function U(t){var n=t.startContainer,r=t.startOffset,i,o,a,s,l;if((t.startContainer!=t.endContainer||!c(t.startContainer.childNodes[t.startOffset]))&&(3==n.nodeType&&r>=n.nodeValue.length&&(r=J(n),n=n.parentNode,i=!0),1==n.nodeType))for(s=n.childNodes,n=s[Math.min(r,s.length-1)],o=new e(n,q.getParent(n,q.isBlock)),(r>s.length-1||i)&&o.next(),a=o.current();a;a=o.next())if(3==a.nodeType&&!M(a))return l=q.create("a",{"data-mce-bogus":"all"},Q),a.parentNode.insertBefore(l,a),t.setStart(a,0),j.setRng(t),void q.remove(l)}var $={},q=a.dom,j=a.selection,Y=new t(q),X=a.schema.isValidChild,K=q.isBlock,G=a.settings.forced_root_block,J=q.nodeIndex,Q="\ufeff",Z=/^(src|href|style)$/,ee=!1,te=!0,ne,re,ie=q.getContentEditable,oe,ae,se=n.isBookmarkNode,le=i.each,ce=i.grep,ue=i.walk,de=i.extend;de(this,{get:p,register:m,unregister:g,apply:b,remove:C,toggle:x,match:E,matchAll:N,matchNode:w,canApply:_,formatChanged:S,getCssText:k}),f(),h(),a.on("BeforeGetContent",function(e){ae&&"raw"!=e.format&&ae()}),a.on("mouseup keydown",function(e){oe&&oe(e)})}}),r(J,[I,h],function(e,t){return function(e){function n(){return e.serializer.getTrimmedContent()}function r(t){e.setDirty(t)}function i(e){o.typing=!1,o.add({},e)}var o=this,a=0,s=[],l,c,u=0;return e.on("init",function(){o.add()}),e.on("BeforeExecCommand",function(e){var t=e.command;"Undo"!=t&&"Redo"!=t&&"mceRepaint"!=t&&o.beforeChange()}),e.on("ExecCommand",function(e){var t=e.command;"Undo"!=t&&"Redo"!=t&&"mceRepaint"!=t&&i(e)}),e.on("ObjectResizeStart Cut",function(){o.beforeChange()}),e.on("SaveContent ObjectResized blur",i),e.on("DragEnd",i),e.on("KeyUp",function(a){var l=a.keyCode;a.isDefaultPrevented()||((l>=33&&36>=l||l>=37&&40>=l||45==l||13==l||a.ctrlKey)&&(i(),e.nodeChanged()),(46==l||8==l||t.mac&&(91==l||93==l))&&e.nodeChanged(),c&&o.typing&&(e.isDirty()||(r(s[0]&&n()!=s[0].content),e.isDirty()&&e.fire("change",{level:s[0],lastLevel:null})),e.fire("TypingUndo"),c=!1,e.nodeChanged()))}),e.on("KeyDown",function(e){var t=e.keyCode;if(!e.isDefaultPrevented()){if(t>=33&&36>=t||t>=37&&40>=t||45==t)return void(o.typing&&i(e));var n=e.ctrlKey&&!e.altKey||e.metaKey;!(16>t||t>20)||224==t||91==t||o.typing||n||(o.beforeChange(),o.typing=!0,o.add({},e),c=!0)}}),e.on("MouseDown",function(e){o.typing&&i(e)}),e.addShortcut("meta+z","","Undo"),e.addShortcut("meta+y,meta+shift+z","","Redo"),e.on("AddUndo Undo Redo ClearUndos",function(t){t.isDefaultPrevented()||e.nodeChanged()}),o={data:s,typing:!1,beforeChange:function(){u||(l=e.selection.getBookmark(2,!0))},add:function(t,i){var o,c=e.settings,d;if(t=t||{},t.content=n(),u||e.removed)return null;if(d=s[a],e.fire("BeforeAddUndo",{level:t,lastLevel:d,originalEvent:i}).isDefaultPrevented())return null;if(d&&d.content==t.content)return null;if(s[a]&&(s[a].beforeBookmark=l),c.custom_undo_redo_levels&&s.length>c.custom_undo_redo_levels){for(o=0;o0&&(r(!0),e.fire("change",f)),t},undo:function(){var t;return o.typing&&(o.add(),o.typing=!1),a>0&&(t=s[--a],e.setContent(t.content,{format:"raw"}),e.selection.moveToBookmark(t.beforeBookmark),r(!0),e.fire("undo",{level:t})),t},redo:function(){var t;return a0||o.typing&&s[0]&&n()!=s[0].content},hasRedo:function(){return aP)&&(u=a.create("br"),t.parentNode.insertBefore(u,t)),l.setStartBefore(t),l.setEndBefore(t)):(l.setStartAfter(t),l.setEndAfter(t)):(l.setStart(t,0),l.setEnd(t,0));s.setRng(l),a.remove(u),s.scrollIntoView(t)}}function y(e){var t=l.forced_root_block;t&&t.toLowerCase()===e.tagName.toLowerCase()&&a.setAttribs(e,l.forced_root_block_attrs)}function b(e){e.innerHTML=r?"":'
    '}function C(e){var t=D,n,i,o,s=u.getTextInlineElements();if(e||"TABLE"==z?(n=a.create(e||V),y(n)):n=L.cloneNode(!1),o=n,l.keep_styles!==!1)do if(s[t.nodeName]){if("_mce_caret"==t.id)continue;i=t.cloneNode(!1),a.setAttrib(i,"id",""),n.hasChildNodes()?(i.appendChild(n.firstChild),n.appendChild(i)):(o=i,n.appendChild(i))}while(t=t.parentNode);return r||(o.innerHTML='
    '),n}function x(t){var n,r,i;if(3==D.nodeType&&(t?M>0:MD.childNodes.length-1,D=D.childNodes[Math.min(M,D.childNodes.length-1)]||D,M=U&&3==D.nodeType?D.nodeValue.length:0),B=S(D)){if(c.beforeChange(),!a.isBlock(B)&&B!=a.getRoot())return void((!V||H)&&N());if((V&&!H||!V&&H)&&(D=w(D,M)),L=a.getParent(D,a.isBlock),F=L?a.getParent(L.parentNode,a.isBlock):null,z=L?L.nodeName.toUpperCase():"",W=F?F.nodeName.toUpperCase():"","LI"!=W||o.ctrlKey||(L=F,z=W),/^(LI|DT|DD)$/.test(z)){if(!V&&H)return void N();if(a.isEmpty(L))return void E()}if("PRE"==z&&l.br_in_pre!==!1){if(!H)return void N()}else if(!V&&!H&&"LI"!=z||V&&H)return void N();V&&L===i.getBody()||(V=V||"P",x()?T():x(!0)?(O=L.parentNode.insertBefore(C(),L),m(O),v(L)):(A=R.cloneRange(),A.setEndAfter(L),I=A.extractContents(),_(I),O=I.firstChild,a.insertAfter(I,L),g(O),k(L),a.isEmpty(L)&&b(L),O.normalize(),a.isEmpty(O)?(a.remove(O),T()):v(O)),a.setAttrib(O,"id",""),i.fire("NewBlock",{newBlock:O}),c.add())}}}var a=i.dom,s=i.selection,l=i.settings,c=i.undoManager,u=i.schema,d=u.getNonEmptyElements(),f=u.getMoveCaretBeforeOnEnterElements();i.on("keydown",function(e){13==e.keyCode&&o(e)!==!1&&e.preventDefault()})}}),r(Z,[],function(){return function(e){function t(){var t=i.getStart(),s=e.getBody(),l,c,u,d,f,h,p,m=-16777215,g,v,y,b,C;if(C=n.forced_root_block,t&&1===t.nodeType&&C){for(;t&&t!=s;){if(a[t.nodeName])return;t=t.parentNode}if(l=i.getRng(),l.setStart){c=l.startContainer,u=l.startOffset,d=l.endContainer,f=l.endOffset;try{v=e.getDoc().activeElement===s}catch(x){}}else l.item&&(t=l.item(0),l=e.getDoc().body.createTextRange(),l.moveToElementText(t)),v=l.parentElement().ownerDocument===e.getDoc(),y=l.duplicate(),y.collapse(!0),u=-1*y.move("character",m),y.collapsed||(y=l.duplicate(),y.collapse(!1),f=-1*y.move("character",m)-u);for(t=s.firstChild,b=s.nodeName.toLowerCase();t;)if((3===t.nodeType||1==t.nodeType&&!a[t.nodeName])&&o.isValidChild(b,C.toLowerCase())){if(3===t.nodeType&&0===t.nodeValue.length){p=t,t=t.nextSibling,r.remove(p);continue}h||(h=r.create(C,e.settings.forced_root_block_attrs),t.parentNode.insertBefore(h,t),g=!0),p=t,t=t.nextSibling,h.appendChild(p)}else h=null,t=t.nextSibling;if(g&&v){if(l.setStart)l.setStart(c,u),l.setEnd(d,f),i.setRng(l);else try{l=e.getDoc().body.createTextRange(),l.moveToElementText(s),l.collapse(!0),l.moveStart("character",u),f>0&&l.moveEnd("character",f),l.select()}catch(x){}e.nodeChanged()}}}var n=e.settings,r=e.dom,i=e.selection,o=e.schema,a=o.getBlockElements();n.forced_root_block&&e.on("NodeChange",t)}}),r(ee,[P,h,m,X,T,y],function(e,n,r,i,o,a){var s=r.each,l=r.extend,c=r.map,u=r.inArray,d=r.explode,f=n.ie,h=n.ie&&n.ie<11,p=!0,m=!1;return function(r){function g(e,t,n,i){var o,a,l=0;if(/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint)$/.test(e)||i&&i.skip_focus||r.focus(),i=r.fire("BeforeExecCommand",{command:e,ui:t,value:n}),i.isDefaultPrevented())return!1;if(a=e.toLowerCase(),o=M.exec[a])return o(a,t,n),r.fire("ExecCommand",{command:e,ui:t,value:n}),!0;if(s(r.plugins,function(i){return i.execCommand&&i.execCommand(e,t,n)?(r.fire("ExecCommand",{command:e,ui:t,value:n}),l=!0,!1):void 0}),l)return l;if(r.theme&&r.theme.execCommand&&r.theme.execCommand(e,t,n))return r.fire("ExecCommand",{command:e,ui:t,value:n}),!0;try{l=r.getDoc().execCommand(e,t,n)}catch(c){}return l?(r.fire("ExecCommand",{command:e,ui:t,value:n}),!0):!1}function v(e){var t;if(!r._isHidden()){if(e=e.toLowerCase(),t=M.state[e])return t(e);try{return r.getDoc().queryCommandState(e)}catch(n){}return!1}}function y(e){var t;if(!r._isHidden()){if(e=e.toLowerCase(),t=M.value[e])return t(e);try{return r.getDoc().queryCommandValue(e)}catch(n){}}}function b(e,t){t=t||"exec",s(e,function(e,n){s(n.toLowerCase().split(","),function(n){M[t][n]=e})})}function C(e,t,n){e=e.toLowerCase(),M.exec[e]=function(e,i,o,a){return t.call(n||r,i,o,a)}}function x(e){if(e=e.toLowerCase(),M.exec[e])return!0;try{return r.getDoc().queryCommandSupported(e)}catch(t){}return!1}function w(e,t,n){e=e.toLowerCase(),M.state[e]=function(){return t.call(n||r)}}function E(e,t,n){e=e.toLowerCase(),M.value[e]=function(){return t.call(n||r)}}function N(e){return e=e.toLowerCase(),!!M.exec[e]}function _(e,n,i){return n===t&&(n=m),i===t&&(i=null),r.getDoc().execCommand(e,n,i)}function S(e){return D.match(e)}function k(e,n){D.toggle(e,n?{value:n}:t),r.nodeChanged()}function T(e){P=B.getBookmark(e)}function R(){B.moveToBookmark(P)}var A,B,D,M={state:{},exec:{},value:{}},L=r.settings,P;r.on("PreInit",function(){A=r.dom,B=r.selection,L=r.settings,D=r.formatter}),l(this,{execCommand:g,queryCommandState:v,queryCommandValue:y,queryCommandSupported:x,addCommands:b,addCommand:C,addQueryStateHandler:w,addQueryValueHandler:E,hasCustomCommand:N}),b({"mceResetDesignMode,mceBeginUndoLevel":function(){},"mceEndUndoLevel,mceAddUndoLevel":function(){r.undoManager.add()},"Cut,Copy,Paste":function(e){var t=r.getDoc(),i;try{_(e)}catch(o){i=p}if(i||!t.queryCommandSupported(e)){var a=r.translate("Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead.");n.mac&&(a=a.replace(/Ctrl\+/g,"\u2318+")),r.notificationManager.open({text:a,type:"error"})}},unlink:function(){if(B.isCollapsed()){var e=B.getNode();return void("A"==e.tagName&&r.dom.remove(e,!0))}D.remove("link")},"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull,JustifyNone":function(e){var t=e.substring(7);"full"==t&&(t="justify"),s("left,center,right,justify".split(","),function(e){t!=e&&D.remove("align"+e)}),"none"!=t&&k("align"+t)},"InsertUnorderedList,InsertOrderedList":function(e){var t,n;_(e),t=A.getParent(B.getNode(),"ol,ul"),t&&(n=t.parentNode,/^(H[1-6]|P|ADDRESS|PRE)$/.test(n.nodeName)&&(T(),A.split(n,t),R()))},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(e){k(e)},"ForeColor,HiliteColor,FontName":function(e,t,n){k(e,n)},FontSize:function(e,t,n){var r,i;n>=1&&7>=n&&(i=d(L.font_size_style_values),r=d(L.font_size_classes),n=r?r[n-1]||n:i[n-1]||n),k(e,n)},RemoveFormat:function(e){D.remove(e)},mceBlockQuote:function(){k("blockquote")},FormatBlock:function(e,t,n){return k(n||"p")},mceCleanup:function(){var e=B.getBookmark();r.setContent(r.getContent({cleanup:p}),{cleanup:p}),B.moveToBookmark(e)},mceRemoveNode:function(e,t,n){var i=n||B.getNode();i!=r.getBody()&&(T(),r.dom.remove(i,p),R())},mceSelectNodeDepth:function(e,t,n){var i=0;A.getParent(B.getNode(),function(e){return 1==e.nodeType&&i++==n?(B.select(e),m):void 0},r.getBody())},mceSelectNode:function(e,t,n){B.select(n)},mceInsertContent:function(t,n,o){function a(e){function t(e){return r[e]&&3==r[e].nodeType}var n,r,i;return n=B.getRng(!0),r=n.startContainer,i=n.startOffset,3==r.nodeType&&(i>0?e=e.replace(/^ /," "):t("previousSibling")||(e=e.replace(/^ /," ")),i|)$/," "):t("nextSibling")||(e=e.replace(/( | )(
    |)$/," "))),e}function l(){var e,t,n;e=B.getRng(!0),t=e.startContainer,n=e.startOffset,3==t.nodeType&&e.collapsed&&("\xa0"===t.data[n]?(t.deleteData(n,1),/[\u00a0| ]$/.test(o)||(o+=" ")):"\xa0"===t.data[n-1]&&(t.deleteData(n-1,1),/[\u00a0| ]$/.test(o)||(o=" "+o)))}function c(e){if(N)for(x=e.firstChild;x;x=x.walk(!0))S[x.name]&&x.attr("data-mce-new","true")}function u(){if(N){var e=r.getBody(),t=new i(A);s(A.select("*[data-mce-new]"),function(n){n.removeAttribute("data-mce-new");for(var r=n.parentNode;r&&r!=e;r=r.parentNode)t.compare(r,n)&&A.remove(n,!0)})}}function d(e){function t(e){for(var t=r.getBody();e&&e!==t;e=e.parentNode)if("false"===r.dom.getContentEditable(e))return e;return null}var n;if(e){if(B.scrollIntoView(e),n=t(e))return A.remove(e),void B.select(n);C=A.createRng(),x=e.previousSibling,x&&3==x.nodeType?(C.setStart(x,x.nodeValue.length),f||(w=e.nextSibling,w&&3==w.nodeType&&(x.appendData(w.data),w.parentNode.removeChild(w)))):(C.setStartBefore(e),C.setEndBefore(e)),A.remove(e),B.setRng(C)}}var h,p,m,g,v,y,b,C,x,w,E,N,_,S=r.schema.getTextInlineElements();"string"!=typeof o&&(N=o.merge,_=o.data,o=o.content),/^ | $/.test(o)&&(o=a(o)),h=r.parser,p=new e({validate:L.validate},r.schema),E='​',y={content:o,format:"html",selection:!0},r.fire("BeforeSetContent",y),o=y.content,-1==o.indexOf("{$caret}")&&(o+="{$caret}"),o=o.replace(/\{\$caret\}/,E),C=B.getRng();var k=C.startContainer||(C.parentElement?C.parentElement():null),T=r.getBody();k===T&&B.isCollapsed()&&A.isBlock(T.firstChild)&&A.isEmpty(T.firstChild)&&(C=A.createRng(),C.setStart(T.firstChild,0),C.setEnd(T.firstChild,0),B.setRng(C)),B.isCollapsed()||(r.selection.setRng(r.selection.getRng()),r.getDoc().execCommand("Delete",!1,null),l()),m=B.getNode();var R={context:m.nodeName.toLowerCase(),data:_};if(v=h.parse(o,R),c(v),x=v.lastChild,"mce_marker"==x.attr("id"))for(b=x,x=x.prev;x;x=x.walk(!0))if(3==x.type||!A.isBlock(x.name)){r.schema.isValidChild(x.parent.name,"span")&&x.parent.insert(b,x,"br"===x.name);break}if(r._selectionOverrides.showBlockCaretContainer(m),R.invalid){for(B.setContent(E),m=B.getNode(),g=r.getBody(),9==m.nodeType?m=x=g:x=m;x!==g;)m=x,x=x.parentNode;o=m==g?g.innerHTML:A.getOuterHTML(m),o=p.serialize(h.parse(o.replace(//i,function(){return p.serialize(v)}))),m==g?A.setHTML(g,o):A.setOuterHTML(m,o)}else o=p.serialize(v),x=m.firstChild,w=m.lastChild,!x||x===w&&"BR"===x.nodeName?A.setHTML(m,o):B.setContent(o);u(),d(A.get("mce_marker")),r.fire("SetContent",y),r.addVisual()},mceInsertRawHTML:function(e,t,n){B.setContent("tiny_mce_marker"),r.setContent(r.getContent().replace(/tiny_mce_marker/g,function(){return n}))},mceToggleFormat:function(e,t,n){k(n)},mceSetContent:function(e,t,n){r.setContent(n)},"Indent,Outdent":function(e){var t,n,i;t=L.indentation,n=/[a-z%]+$/i.exec(t),t=parseInt(t,10),v("InsertUnorderedList")||v("InsertOrderedList")?_(e):(L.forced_root_block||A.getParent(B.getNode(),A.isBlock)||D.apply("div"),s(B.getSelectedBlocks(),function(o){if("false"!==A.getContentEditable(o)&&"LI"!=o.nodeName){var a=r.getParam("indent_use_margin",!1)?"margin":"padding";a+="rtl"==A.getStyle(o,"direction",!0)?"Right":"Left","outdent"==e?(i=Math.max(0,parseInt(o.style[a]||0,10)-t),A.setStyle(o,a,i?i+n:"")):(i=parseInt(o.style[a]||0,10)+t+n,A.setStyle(o,a,i))}}))},mceRepaint:function(){},InsertHorizontalRule:function(){r.execCommand("mceInsertContent",!1,"
    ")},mceToggleVisualAid:function(){r.hasVisual=!r.hasVisual,r.addVisual()},mceReplaceContent:function(e,t,n){r.execCommand("mceInsertContent",!1,n.replace(/\{\$selection\}/g,B.getContent({format:"text"})))},mceInsertLink:function(e,t,n){var r;"string"==typeof n&&(n={href:n}),r=A.getParent(B.getNode(),"a"),n.href=n.href.replace(" ","%20"),r&&n.href||D.remove("link"),n.href&&D.apply("link",n,r)},selectAll:function(){var e=A.getRoot(),t;B.getRng().setStart?(t=A.createRng(),t.setStart(e,0),t.setEnd(e,e.childNodes.length),B.setRng(t)):(t=B.getRng(),t.item||(t.moveToElementText(e),t.select()))},"delete":function(){_("Delete");var e=r.getBody();A.isEmpty(e)&&(r.setContent(""),e.firstChild&&A.isBlock(e.firstChild)?r.selection.setCursorLocation(e.firstChild,0):r.selection.setCursorLocation(e,0))},mceNewDocument:function(){r.setContent("")},InsertLineBreak:function(e,t,n){function i(){for(var e=new a(m,v),t,n=r.schema.getNonEmptyElements();t=e.next();)if(n[t.nodeName.toLowerCase()]||t.length>0)return!0}var s=n,l,c,u,d=B.getRng(!0);new o(A).normalize(d);var f=d.startOffset,m=d.startContainer;if(1==m.nodeType&&m.hasChildNodes()){var g=f>m.childNodes.length-1;m=m.childNodes[Math.min(f,m.childNodes.length-1)]||m,f=g&&3==m.nodeType?m.nodeValue.length:0}var v=A.getParent(m,A.isBlock),y=v?v.nodeName.toUpperCase():"",b=v?A.getParent(v.parentNode,A.isBlock):null,C=b?b.nodeName.toUpperCase():"",x=s&&s.ctrlKey;"LI"!=C||x||(v=b,y=C),m&&3==m.nodeType&&f>=m.nodeValue.length&&(h||i()||(l=A.create("br"),d.insertNode(l),d.setStartAfter(l),d.setEndAfter(l),c=!0)),l=A.create("br"),d.insertNode(l);var w=A.doc.documentMode;return h&&"PRE"==y&&(!w||8>w)&&l.parentNode.insertBefore(A.doc.createTextNode("\r"),l),u=A.create("span",{}," "),l.parentNode.insertBefore(u,l),B.scrollIntoView(u),A.remove(u),c?(d.setStartBefore(l),d.setEndBefore(l)):(d.setStartAfter(l),d.setEndAfter(l)),B.setRng(d),r.undoManager.add(),p}}),b({"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(e){var t="align"+e.substring(7),n=B.isCollapsed()?[A.getParent(B.getNode(),A.isBlock)]:B.getSelectedBlocks(),r=c(n,function(e){return!!D.matchNode(e,t)});return-1!==u(r,p)},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(e){return S(e)},mceBlockQuote:function(){return S("blockquote")},Outdent:function(){var e;if(L.inline_styles){if((e=A.getParent(B.getStart(),A.isBlock))&&parseInt(e.style.paddingLeft,10)>0)return p;if((e=A.getParent(B.getEnd(),A.isBlock))&&parseInt(e.style.paddingLeft,10)>0)return p}return v("InsertUnorderedList")||v("InsertOrderedList")||!L.inline_styles&&!!A.getParent(B.getNode(),"BLOCKQUOTE")},"InsertUnorderedList,InsertOrderedList":function(e){var t=A.getParent(B.getNode(),"ul,ol");return t&&("insertunorderedlist"===e&&"UL"===t.tagName||"insertorderedlist"===e&&"OL"===t.tagName)}},"state"),b({"FontSize,FontName":function(e){var t=0,n;return(n=A.getParent(B.getNode(),"span"))&&(t="fontsize"==e?n.style.fontSize:n.style.fontFamily.replace(/, /g,",").replace(/[\'\"]/g,"").toLowerCase()),t}},"value"),b({Undo:function(){r.undoManager.undo()},Redo:function(){r.undoManager.redo()}})}}),r(te,[m],function(e){function t(e,o){var a=this,s,l;if(e=r(e), +o=a.settings=o||{},s=o.base_uri,/^([\w\-]+):([^\/]{2})/i.test(e)||/^\s*#/.test(e))return void(a.source=e);var c=0===e.indexOf("//");0!==e.indexOf("/")||c||(e=(s?s.protocol||"http":"http")+"://mce_host"+e),/^[\w\-]*:?\/\//.test(e)||(l=o.base_uri?o.base_uri.path:new t(location.href).directory,""===o.base_uri.protocol?e="//mce_host"+a.toAbsPath(l,e):(e=/([^#?]*)([#?]?.*)/.exec(e),e=(s&&s.protocol||"http")+"://mce_host"+a.toAbsPath(l,e[1])+e[2])),e=e.replace(/@@/g,"(mce_at)"),e=/^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@\/]*):?([^:@\/]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(e),n(i,function(t,n){var r=e[n];r&&(r=r.replace(/\(mce_at\)/g,"@@")),a[t]=r}),s&&(a.protocol||(a.protocol=s.protocol),a.userInfo||(a.userInfo=s.userInfo),a.port||"mce_host"!==a.host||(a.port=s.port),a.host&&"mce_host"!==a.host||(a.host=s.host),a.source=""),c&&(a.protocol="")}var n=e.each,r=e.trim,i="source protocol authority userInfo user password host port relative path directory file query anchor".split(" "),o={ftp:21,http:80,https:443,mailto:25};return t.prototype={setPath:function(e){var t=this;e=/^(.*?)\/?(\w+)?$/.exec(e),t.path=e[0],t.directory=e[1],t.file=e[2],t.source="",t.getURI()},toRelative:function(e){var n=this,r;if("./"===e)return e;if(e=new t(e,{base_uri:n}),"mce_host"!=e.host&&n.host!=e.host&&e.host||n.port!=e.port||n.protocol!=e.protocol&&""!==e.protocol)return e.getURI();var i=n.getURI(),o=e.getURI();return i==o||"/"==i.charAt(i.length-1)&&i.substr(0,i.length-1)==o?i:(r=n.toRelPath(n.path,e.path),e.query&&(r+="?"+e.query),e.anchor&&(r+="#"+e.anchor),r)},toAbsolute:function(e,n){return e=new t(e,{base_uri:this}),e.getURI(n&&this.isSameOrigin(e))},isSameOrigin:function(e){if(this.host==e.host&&this.protocol==e.protocol){if(this.port==e.port)return!0;var t=o[this.protocol];if(t&&(this.port||t)==(e.port||t))return!0}return!1},toRelPath:function(e,t){var n,r=0,i="",o,a;if(e=e.substring(0,e.lastIndexOf("/")),e=e.split("/"),n=t.split("/"),e.length>=n.length)for(o=0,a=e.length;a>o;o++)if(o>=n.length||e[o]!=n[o]){r=o+1;break}if(e.lengtho;o++)if(o>=e.length||e[o]!=n[o]){r=o+1;break}if(1===r)return t;for(o=0,a=e.length-(r-1);a>o;o++)i+="../";for(o=r-1,a=n.length;a>o;o++)i+=o!=r-1?"/"+n[o]:n[o];return i},toAbsPath:function(e,t){var r,i=0,o=[],a,s;for(a=/\/$/.test(t)?"/":"",e=e.split("/"),t=t.split("/"),n(e,function(e){e&&o.push(e)}),e=o,r=t.length-1,o=[];r>=0;r--)0!==t[r].length&&"."!==t[r]&&(".."!==t[r]?i>0?i--:o.push(t[r]):i++);return r=e.length-i,s=0>=r?o.reverse().join("/"):e.slice(0,r).join("/")+"/"+o.reverse().join("/"),0!==s.indexOf("/")&&(s="/"+s),a&&s.lastIndexOf("/")!==s.length-1&&(s+=a),s},getURI:function(e){var t,n=this;return(!n.source||e)&&(t="",e||(t+=n.protocol?n.protocol+"://":"//",n.userInfo&&(t+=n.userInfo+"@"),n.host&&(t+=n.host),n.port&&(t+=":"+n.port)),n.path&&(t+=n.path),n.query&&(t+="?"+n.query),n.anchor&&(t+="#"+n.anchor),n.source=t),n.source}},t.parseDataUri=function(e){var t,n;return e=decodeURIComponent(e).split(","),n=/data:([^;]+)/.exec(e[0]),n&&(t=n[1]),{type:t,data:e[1]}},t}),r(ne,[m],function(e){function t(){}var n=e.each,r=e.extend,i,o;return t.extend=i=function(e){function t(){var e,t,n,r=this;if(!o&&(r.init&&r.init.apply(r,arguments),t=r.Mixins))for(e=t.length;e--;)n=t[e],n.init&&n.init.apply(r,arguments)}function a(){return this}function s(e,t){return function(){var n=this,r=n._super,i;return n._super=c[e],i=t.apply(n,arguments),n._super=r,i}}var l=this,c=l.prototype,u,d,f;o=!0,u=new l,o=!1,e.Mixins&&(n(e.Mixins,function(t){t=t;for(var n in t)"init"!==n&&(e[n]=t[n])}),c.Mixins&&(e.Mixins=c.Mixins.concat(e.Mixins))),e.Methods&&n(e.Methods.split(","),function(t){e[t]=a}),e.Properties&&n(e.Properties.split(","),function(t){var n="_"+t;e[t]=function(e){var t=this,r;return e!==r?(t[n]=e,t):t[n]}}),e.Statics&&n(e.Statics,function(e,n){t[n]=e}),e.Defaults&&c.Defaults&&(e.Defaults=r({},c.Defaults,e.Defaults));for(d in e)f=e[d],"function"==typeof f&&c[d]?u[d]=s(d,f):u[d]=f;return t.prototype=u,t.constructor=t,t.extend=i,t},t}),r(re,[m],function(e){function t(t){function n(){return!1}function r(){return!0}function i(e,i){var o,s,l,c;if(e=e.toLowerCase(),i=i||{},i.type=e,i.target||(i.target=u),i.preventDefault||(i.preventDefault=function(){i.isDefaultPrevented=r},i.stopPropagation=function(){i.isPropagationStopped=r},i.stopImmediatePropagation=function(){i.isImmediatePropagationStopped=r},i.isDefaultPrevented=n,i.isPropagationStopped=n,i.isImmediatePropagationStopped=n),t.beforeFire&&t.beforeFire(i),o=d[e])for(s=0,l=o.length;l>s;s++){if(c=o[s],c.once&&a(e,c.func),i.isImmediatePropagationStopped())return i.stopPropagation(),i;if(c.func.call(u,i)===!1)return i.preventDefault(),i}return i}function o(t,r,i,o){var a,s,l;if(r===!1&&(r=n),r)for(r={func:r},o&&e.extend(r,o),s=t.toLowerCase().split(" "),l=s.length;l--;)t=s[l],a=d[t],a||(a=d[t]=[],f(t,!0)),i?a.unshift(r):a.push(r);return c}function a(e,t){var n,r,i,o,a;if(e)for(o=e.toLowerCase().split(" "),n=o.length;n--;){if(e=o[n],r=d[e],!e){for(i in d)f(i,!1),delete d[i];return c}if(r){if(t)for(a=r.length;a--;)r[a].func===t&&(r=r.slice(0,a).concat(r.slice(a+1)),d[e]=r);else r.length=0;r.length||(f(e,!1),delete d[e])}}else{for(e in d)f(e,!1);d={}}return c}function s(e,t,n){return o(e,t,n,{once:!0})}function l(e){return e=e.toLowerCase(),!(!d[e]||0===d[e].length)}var c=this,u,d={},f;t=t||{},u=t.scope||c,f=t.toggleEvent||n,c.fire=i,c.on=o,c.off=a,c.once=s,c.has=l}var n=e.makeMap("focus blur focusin focusout click dblclick mousedown mouseup mousemove mouseover beforepaste paste cut copy selectionchange mouseout mouseenter mouseleave wheel keydown keypress keyup input contextmenu dragstart dragend dragover draggesture dragdrop drop drag submit compositionstart compositionend compositionupdate touchstart touchend"," ");return t.isNative=function(e){return!!n[e.toLowerCase()]},t}),r(ie,[],function(){function e(e){this.create=e.create}return e.create=function(t,n){return new e({create:function(e,r){function i(t){e.set(r,t.value)}function o(e){t.set(n,e.value)}var a;return e.on("change:"+r,o),t.on("change:"+n,i),a=e._bindings,a||(a=e._bindings=[],e.on("destroy",function(){for(var e=a.length;e--;)a[e]()})),a.push(function(){t.off("change:"+n,i)}),t.get(n)}})},e}),r(oe,[re],function(e){function t(t){return t._eventDispatcher||(t._eventDispatcher=new e({scope:t,toggleEvent:function(n,r){e.isNative(n)&&t.toggleNativeEvent&&t.toggleNativeEvent(n,r)}})),t._eventDispatcher}return{fire:function(e,n,r){var i=this;if(i.removed&&"remove"!==e)return n;if(n=t(i).fire(e,n,r),r!==!1&&i.parent)for(var o=i.parent();o&&!n.isPropagationStopped();)o.fire(e,n,!1),o=o.parent();return n},on:function(e,n,r){return t(this).on(e,n,r)},off:function(e,n){return t(this).off(e,n)},once:function(e,n){return t(this).once(e,n)},hasEventListeners:function(e){return t(this).has(e)}}}),r(ae,[ie,oe,ne,m],function(e,t,n,r){function i(e){return e.nodeType>0}function o(e,t){var n,a;if(e===t)return!0;if(null===e||null===t)return e===t;if("object"!=typeof e||"object"!=typeof t)return e===t;if(r.isArray(t)){if(e.length!==t.length)return!1;for(n=e.length;n--;)if(!o(e[n],t[n]))return!1}if(i(e)||i(t))return e===t;a={};for(n in t){if(!o(e[n],t[n]))return!1;a[n]=!0}for(n in e)if(!a[n]&&!o(e[n],t[n]))return!1;return!0}return n.extend({Mixins:[t],init:function(t){var n,r;t=t||{};for(n in t)r=t[n],r instanceof e&&(t[n]=r.create(this,n));this.data=t},set:function(t,n){var r,i,a=this.data[t];if(n instanceof e&&(n=n.create(this,t)),"object"==typeof t){for(r in t)this.set(r,t[r]);return this}return o(a,n)||(this.data[t]=n,i={target:this,name:t,value:n,oldValue:a},this.fire("change:"+t,i),this.fire("change",i)),this},get:function(e){return this.data[e]},has:function(e){return e in this.data},bind:function(t){return e.create(this,t)},destroy:function(){this.fire("destroy")}})}),r(se,[ne],function(e){function t(e){for(var t=[],n=e.length,r;n--;)r=e[n],r.__checked||(t.push(r),r.__checked=1);for(n=t.length;n--;)delete t[n].__checked;return t}var n=/^([\w\\*]+)?(?:#([\w\\]+))?(?:\.([\w\\\.]+))?(?:\[\@?([\w\\]+)([\^\$\*!~]?=)([\w\\]+)\])?(?:\:(.+))?/i,r=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,i=/^\s*|\s*$/g,o,a=e.extend({init:function(e){function t(e){return e?(e=e.toLowerCase(),function(t){return"*"===e||t.type===e}):void 0}function o(e){return e?function(t){return t._name===e}:void 0}function a(e){return e?(e=e.split("."),function(t){for(var n=e.length;n--;)if(!t.classes.contains(e[n]))return!1;return!0}):void 0}function s(e,t,n){return e?function(r){var i=r[e]?r[e]():"";return t?"="===t?i===n:"*="===t?i.indexOf(n)>=0:"~="===t?(" "+i+" ").indexOf(" "+n+" ")>=0:"!="===t?i!=n:"^="===t?0===i.indexOf(n):"$="===t?i.substr(i.length-n.length)===n:!1:!!n}:void 0}function l(e){var t;return e?(e=/(?:not\((.+)\))|(.+)/i.exec(e),e[1]?(t=u(e[1],[]),function(e){return!d(e,t)}):(e=e[2],function(t,n,r){return"first"===e?0===n:"last"===e?n===r-1:"even"===e?n%2===0:"odd"===e?n%2===1:t[e]?t[e]():!1})):void 0}function c(e,r,c){function u(e){e&&r.push(e)}var d;return d=n.exec(e.replace(i,"")),u(t(d[1])),u(o(d[2])),u(a(d[3])),u(s(d[4],d[5],d[6])),u(l(d[7])),r.pseudo=!!d[7],r.direct=c,r}function u(e,t){var n=[],i,o,a;do if(r.exec(""),o=r.exec(e),o&&(e=o[3],n.push(o[1]),o[2])){i=o[3];break}while(o);for(i&&u(i,t),e=[],a=0;a"!=n[a]&&e.push(c(n[a],[],">"===n[a-1]));return t.push(e),t}var d=this.match;this._selectors=u(e,[])},match:function(e,t){var n,r,i,o,a,s,l,c,u,d,f,h,p;for(t=t||this._selectors,n=0,r=t.length;r>n;n++){for(a=t[n],o=a.length,p=e,h=0,i=o-1;i>=0;i--)for(c=a[i];p;){if(c.pseudo)for(f=p.parent().items(),u=d=f.length;u--&&f[u]!==p;);for(s=0,l=c.length;l>s;s++)if(!c[s](p,u,d)){s=l+1;break}if(s===l){h++;break}if(i===o-1)break;p=p.parent()}if(h===o)return!0}return!1},find:function(e){function n(e,t,i){var o,a,s,l,c,u=t[i];for(o=0,a=e.length;a>o;o++){for(c=e[o],s=0,l=u.length;l>s;s++)if(!u[s](c,o,a)){s=l+1;break}if(s===l)i==t.length-1?r.push(c):c.items&&n(c.items(),t,i+1);else if(u.direct)return;c.items&&n(c.items(),t,i)}}var r=[],i,s,l=this._selectors;if(e.items){for(i=0,s=l.length;s>i;i++)n(e.items(),l[i],0);s>1&&(r=t(r))}return o||(o=a.Collection),new o(r)}});return a}),r(le,[m,se,ne],function(e,t,n){var r,i,o=Array.prototype.push,a=Array.prototype.slice;return i={length:0,init:function(e){e&&this.add(e)},add:function(t){var n=this;return e.isArray(t)?o.apply(n,t):t instanceof r?n.add(t.toArray()):o.call(n,t),n},set:function(e){var t=this,n=t.length,r;for(t.length=0,t.add(e),r=t.length;n>r;r++)delete t[r];return t},filter:function(e){var n=this,i,o,a=[],s,l;for("string"==typeof e?(e=new t(e),l=function(t){return e.match(t)}):l=e,i=0,o=n.length;o>i;i++)s=n[i],l(s)&&a.push(s);return new r(a)},slice:function(){return new r(a.apply(this,arguments))},eq:function(e){return-1===e?this.slice(e):this.slice(e,+e+1)},each:function(t){return e.each(this,t),this},toArray:function(){return e.toArray(this)},indexOf:function(e){for(var t=this,n=t.length;n--&&t[n]!==e;);return n},reverse:function(){return new r(e.toArray(this).reverse())},hasClass:function(e){return this[0]?this[0].classes.contains(e):!1},prop:function(e,t){var n=this,r,i;return t!==r?(n.each(function(n){n[e]&&n[e](t)}),n):(i=n[0],i&&i[e]?i[e]():void 0)},exec:function(t){var n=this,r=e.toArray(arguments).slice(1);return n.each(function(e){e[t]&&e[t].apply(e,r)}),n},remove:function(){for(var e=this.length;e--;)this[e].remove();return this},addClass:function(e){return this.each(function(t){t.classes.add(e)})},removeClass:function(e){return this.each(function(t){t.classes.remove(e)})}},e.each("fire on off show hide append prepend before after reflow".split(" "),function(t){i[t]=function(){var n=e.toArray(arguments);return this.each(function(e){t in e&&e[t].apply(e,n)}),this}}),e.each("text name disabled active selected checked visible parent value data".split(" "),function(e){i[e]=function(t){return this.prop(e,t)}}),r=n.extend(i),t.Collection=r,r}),r(ce,[m,w],function(e,t){var n=0;return{id:function(){return"mceu_"+n++},createFragment:function(e){return t.DOM.createFragment(e)},getWindowSize:function(){return t.DOM.getViewPort()},getSize:function(e){var t,n;if(e.getBoundingClientRect){var r=e.getBoundingClientRect();t=Math.max(r.width||r.right-r.left,e.offsetWidth),n=Math.max(r.height||r.bottom-r.bottom,e.offsetHeight)}else t=e.offsetWidth,n=e.offsetHeight;return{width:t,height:n}},getPos:function(e,n){return t.DOM.getPos(e,n)},getViewPort:function(e){return t.DOM.getViewPort(e)},get:function(e){return document.getElementById(e)},addClass:function(e,n){return t.DOM.addClass(e,n)},removeClass:function(e,n){return t.DOM.removeClass(e,n)},hasClass:function(e,n){return t.DOM.hasClass(e,n)},toggleClass:function(e,n,r){return t.DOM.toggleClass(e,n,r)},css:function(e,n,r){return t.DOM.setStyle(e,n,r)},getRuntimeStyle:function(e,n){return t.DOM.getStyle(e,n,!0)},on:function(e,n,r,i){return t.DOM.bind(e,n,r,i)},off:function(e,n,r){return t.DOM.unbind(e,n,r)},fire:function(e,n,r){return t.DOM.fire(e,n,r)},innerHtml:function(e,n){t.DOM.setHTML(e,n)}}}),r(ue,[],function(){return{parseBox:function(e){var t,n=10;if(e)return"number"==typeof e?(e=e||0,{top:e,left:e,bottom:e,right:e}):(e=e.split(" "),t=e.length,1===t?e[1]=e[2]=e[3]=e[0]:2===t?(e[2]=e[0],e[3]=e[1]):3===t&&(e[3]=e[1]),{top:parseInt(e[0],n)||0,right:parseInt(e[1],n)||0,bottom:parseInt(e[2],n)||0,left:parseInt(e[3],n)||0})},measureBox:function(e,t){function n(t){var n=document.defaultView;return n?(t=t.replace(/[A-Z]/g,function(e){return"-"+e}),n.getComputedStyle(e,null).getPropertyValue(t)):e.currentStyle[t]}function r(e){var t=parseFloat(n(e),10);return isNaN(t)?0:t}return{top:r(t+"TopWidth"),right:r(t+"RightWidth"),bottom:r(t+"BottomWidth"),left:r(t+"LeftWidth")}}}}),r(de,[m],function(e){function t(){}function n(e){this.cls=[],this.cls._map={},this.onchange=e||t,this.prefix=""}return e.extend(n.prototype,{add:function(e){return e&&!this.contains(e)&&(this.cls._map[e]=!0,this.cls.push(e),this._change()),this},remove:function(e){if(this.contains(e)){for(var t=0;t0&&(e+=" "),e+=this.prefix+this.cls[t];return e},n}),r(fe,[u],function(e){var t={},n;return{add:function(r){var i=r.parent();if(i){if(!i._layout||i._layout.isNative())return;t[i._id]||(t[i._id]=i),n||(n=!0,e.requestAnimationFrame(function(){var e,r;n=!1;for(e in t)r=t[e],r.state.get("rendered")&&r.reflow();t={}},document.body))}},remove:function(e){t[e._id]&&delete t[e._id]}}}),r(he,[ne,m,re,ae,le,ce,g,ue,de,fe],function(e,t,n,r,i,o,a,s,l,c){function u(e){return e._eventDispatcher||(e._eventDispatcher=new n({scope:e,toggleEvent:function(t,r){r&&n.isNative(t)&&(e._nativeEvents||(e._nativeEvents={}),e._nativeEvents[t]=!0,e.state.get("rendered")&&d(e))}})),e._eventDispatcher}function d(e){function t(t){var n=e.getParentCtrl(t.target);n&&n.fire(t.type,t)}function n(){var e=c._lastHoverCtrl;e&&(e.fire("mouseleave",{target:e.getEl()}),e.parents().each(function(e){e.fire("mouseleave",{target:e.getEl()})}),c._lastHoverCtrl=null)}function r(t){var n=e.getParentCtrl(t.target),r=c._lastHoverCtrl,i=0,o,a,s;if(n!==r){if(c._lastHoverCtrl=n,a=n.parents().toArray().reverse(),a.push(n),r){for(s=r.parents().toArray().reverse(),s.push(r),i=0;i=i;o--)r=s[o],r.fire("mouseleave",{target:r.getEl()})}for(o=i;oo;o++)c=l[o]._eventsRoot;for(c||(c=l[l.length-1]||e),e._eventsRoot=c,s=o,o=0;s>o;o++)l[o]._eventsRoot=c;var p=c._delegates;p||(p=c._delegates={});for(d in u){if(!u)return!1;"wheel"!==d||h?("mouseenter"===d||"mouseleave"===d?c._hasMouseEnter||(a(c.getEl()).on("mouseleave",n).on("mouseover",r),c._hasMouseEnter=1):p[d]||(a(c.getEl()).on(d,t),p[d]=!0),u[d]=!1):f?a(e.getEl()).on("mousewheel",i):a(e.getEl()).on("DOMMouseScroll",i)}}}var f="onmousewheel"in document,h=!1,p="mce-",m,g=0,v={Statics:{classPrefix:p},isRtl:function(){return m.rtl},classPrefix:p,init:function(e){function n(e){var t;for(e=e.split(" "),t=0;tn.maxW?n.maxW:i,n.w=i,n.innerW=i-o),i=e.h,i!==s&&(i=in.maxH?n.maxH:i,n.h=i,n.innerH=i-a),i=e.innerW,i!==s&&(i=in.maxW-o?n.maxW-o:i,n.innerW=i,n.w=i+o),i=e.innerH,i!==s&&(i=in.maxH-a?n.maxH-a:i,n.innerH=i,n.h=i+a),e.contentW!==s&&(n.contentW=e.contentW),e.contentH!==s&&(n.contentH=e.contentH),r=t._lastLayoutRect,(r.x!==n.x||r.y!==n.y||r.w!==n.w||r.h!==n.h)&&(l=m.repaintControls,l&&l.map&&!l.map[t._id]&&(l.push(t),l.map[t._id]=!0),r.x=n.x,r.y=n.y,r.w=n.w,r.h=n.h),t):n},repaint:function(){var e=this,t,n,r,i,o,a,s,l,c,u;c=document.createRange?function(e){return e}:Math.round,t=e.getEl().style,i=e._layoutRect,l=e._lastRepaintRect||{},o=e.borderBox,a=o.left+o.right,s=o.top+o.bottom,i.x!==l.x&&(t.left=c(i.x)+"px",l.x=i.x),i.y!==l.y&&(t.top=c(i.y)+"px",l.y=i.y),i.w!==l.w&&(u=c(i.w-a),t.width=(u>=0?u:0)+"px",l.w=i.w),i.h!==l.h&&(u=c(i.h-s),t.height=(u>=0?u:0)+"px",l.h=i.h),e._hasBody&&i.innerW!==l.innerW&&(u=c(i.innerW),r=e.getEl("body"),r&&(n=r.style,n.width=(u>=0?u:0)+"px"),l.innerW=i.innerW),e._hasBody&&i.innerH!==l.innerH&&(u=c(i.innerH),r=r||e.getEl("body"),r&&(n=n||r.style,n.height=(u>=0?u:0)+"px"),l.innerH=i.innerH),e._lastRepaintRect=l,e.fire("repaint",{},!1)},on:function(e,t){function n(e){var t,n;return"string"!=typeof e?e:function(i){return t||r.parentsAndSelf().each(function(r){var i=r.settings.callbacks;return i&&(t=i[e])?(n=r,!1):void 0}),t?t.call(n,i):(i.action=e,void this.fire("execute",i))}}var r=this;return u(r).on(e,n(t)),r},off:function(e,t){return u(this).off(e,t),this},fire:function(e,t,n){var r=this;if(t=t||{},t.control||(t.control=r),t=u(r).fire(e,t),n!==!1&&r.parent)for(var i=r.parent();i&&!t.isPropagationStopped();)i.fire(e,t,!1),i=i.parent();return t},hasEventListeners:function(e){return u(this).has(e)},parents:function(e){var t=this,n,r=new i;for(n=t.parent();n;n=n.parent())r.add(n);return e&&(r=r.filter(e)),r},parentsAndSelf:function(e){return new i(this).add(this.parents(e))},next:function(){var e=this.parent().items();return e[e.indexOf(this)+1]},prev:function(){var e=this.parent().items();return e[e.indexOf(this)-1]},innerHtml:function(e){return this.$el.html(e),this},getEl:function(e){var t=e?this._id+"-"+e:this._id;return this._elmCache[t]||(this._elmCache[t]=a("#"+t)[0]),this._elmCache[t]},show:function(){return this.visible(!0)},hide:function(){return this.visible(!1)},focus:function(){try{this.getEl().focus()}catch(e){}return this},blur:function(){return this.getEl().blur(),this},aria:function(e,t){var n=this,r=n.getEl(n.ariaTarget);return"undefined"==typeof t?n._aria[e]:(n._aria[e]=t,n.state.get("rendered")&&r.setAttribute("role"==e?e:"aria-"+e,t),n)},encode:function(e,t){return t!==!1&&(e=this.translate(e)),(e||"").replace(/[&<>"]/g,function(e){return"&#"+e.charCodeAt(0)+";"})},translate:function(e){return m.translate?m.translate(e):e},before:function(e){var t=this,n=t.parent();return n&&n.insert(e,n.items().indexOf(t),!0),t},after:function(e){var t=this,n=t.parent();return n&&n.insert(e,n.items().indexOf(t)),t},remove:function(){var e=this,t=e.getEl(),n=e.parent(),r,i;if(e.items){var o=e.items().toArray();for(i=o.length;i--;)o[i].remove()}n&&n.items&&(r=[],n.items().each(function(t){t!==e&&r.push(t)}),n.items().set(r),n._lastRect=null),e._eventsRoot&&e._eventsRoot==e&&a(t).off();var s=e.getRoot().controlIdLookup;return s&&delete s[e._id],t&&t.parentNode&&t.parentNode.removeChild(t),e.state.set("rendered",!1),e.state.destroy(),e.fire("remove"),e},renderBefore:function(e){return a(e).before(this.renderHtml()),this.postRender(),this},renderTo:function(e){return a(e||this.getContainerElm()).append(this.renderHtml()),this.postRender(),this},preRender:function(){},render:function(){},renderHtml:function(){return'
    '},postRender:function(){var e=this,t=e.settings,n,r,i,o,s;e.$el=a(e.getEl()),e.state.set("rendered",!0);for(o in t)0===o.indexOf("on")&&e.on(o.substr(2),t[o]);if(e._eventsRoot){for(i=e.parent();!s&&i;i=i.parent())s=i._eventsRoot;if(s)for(o in s._nativeEvents)e._nativeEvents[o]=!0}d(e),t.style&&(n=e.getEl(),n&&(n.setAttribute("style",t.style),n.style.cssText=t.style)),e.settings.border&&(r=e.borderBox,e.$el.css({"border-top-width":r.top,"border-right-width":r.right,"border-bottom-width":r.bottom,"border-left-width":r.left}));var l=e.getRoot();l.controlIdLookup||(l.controlIdLookup={}),l.controlIdLookup[e._id]=e;for(var u in e._aria)e.aria(u,e._aria[u]);e.state.get("visible")===!1&&(e.getEl().style.display="none"),e.bindStates(),e.state.on("change:visible",function(t){var n=t.value,r;e.state.get("rendered")&&(e.getEl().style.display=n===!1?"none":"",e.getEl().getBoundingClientRect()),r=e.parent(),r&&(r._lastRect=null),e.fire(n?"show":"hide"),c.add(e)}),e.fire("postrender",{},!1)},bindStates:function(){},scrollIntoView:function(e){function t(e,t){var n,r,i=e;for(n=r=0;i&&i!=t&&i.nodeType;)n+=i.offsetLeft||0,r+=i.offsetTop||0,i=i.offsetParent;return{x:n,y:r}}var n=this.getEl(),r=n.parentNode,i,o,a,s,l,c,u=t(n,r);return i=u.x,o=u.y,a=n.offsetWidth,s=n.offsetHeight,l=r.clientWidth,c=r.clientHeight,"end"==e?(i-=l-a,o-=c-s):"center"==e&&(i-=l/2-a/2,o-=c/2-s/2),r.scrollLeft=i,r.scrollTop=o,this},getRoot:function(){for(var e=this,t,n=[];e;){if(e.rootControl){t=e.rootControl;break}n.push(e),t=e,e=e.parent()}t||(t=this);for(var r=n.length;r--;)n[r].rootControl=t;return t},reflow:function(){c.remove(this);var e=this.parent();return e._layout&&!e._layout.isNative()&&e.reflow(),this}};return t.each("text title visible disabled active value".split(" "),function(e){v[e]=function(t){return 0===arguments.length?this.state.get(e):("undefined"!=typeof t&&this.state.set(e,t),this)}}),m=e.extend(v)}),r(pe,[],function(){var e={},t;return{add:function(t,n){e[t.toLowerCase()]=n},has:function(t){return!!e[t.toLowerCase()]},create:function(n,r){var i,o,a;if(!t){a=tinymce.ui;for(o in a)e[o.toLowerCase()]=a[o];t=!0}if("string"==typeof n?(r=r||{},r.type=n):(r=n,n=r.type),n=n.toLowerCase(),i=e[n],!i)throw new Error("Could not find control by type: "+n);return i=new i(r),i.type=n,i}}}),r(me,[],function(){return function(e){function t(e){return e&&1===e.nodeType}function n(e){return e=e||C,t(e)?e.getAttribute("role"):null}function r(e){for(var t,r=e||C;r=r.parentNode;)if(t=n(r))return t}function i(e){var n=C;return t(n)?n.getAttribute("aria-"+e):void 0}function o(e){var t=e.tagName.toUpperCase();return"INPUT"==t||"TEXTAREA"==t}function a(e){return o(e)&&!e.hidden?!0:/^(button|menuitem|checkbox|tab|menuitemcheckbox|option|gridcell)$/.test(n(e))?!0:!1}function s(e){function t(e){if(1==e.nodeType&&"none"!=e.style.display){a(e)&&n.push(e);for(var r=0;re?e=t.length-1:e>=t.length&&(e=0),t[e]&&t[e].focus(),e}function d(e,t){var n=-1,r=l();t=t||s(r.getEl());for(var i=0;i=0&&(n=t.getEl(),n&&n.parentNode.removeChild(n),n=e.getEl(),n&&n.parentNode.removeChild(n)),t.parent(this)},create:function(t){var n=this,i,a=[];return o.isArray(t)||(t=[t]),o.each(t,function(t){t&&(t instanceof e||("string"==typeof t&&(t={type:t}),i=o.extend({},n.settings.defaults,t),t.type=i.type=i.type||t.type||n.settings.defaultType||(i.defaults?i.defaults.type:null),t=r.create(i)),a.push(t))}),a},renderNew:function(){var e=this;return e.items().each(function(t,n){var r;t.parent(e),t.state.get("rendered")||(r=e.getEl("body"),r.hasChildNodes()&&n<=r.childNodes.length-1?a(r.childNodes[n]).before(t.renderHtml()):a(r).append(t.renderHtml()),t.postRender(),l.add(t))}),e._layout.applyClasses(e.items().filter(":visible")),e._lastRect=null,e},append:function(e){return this.add(e).renderNew()},prepend:function(e){var t=this;return t.items().set(t.create(e).concat(t.items().toArray())),t.renderNew()},insert:function(e,t,n){var r=this,i,o,a;return e=r.create(e),i=r.items(),!n&&t=0&&t
    '+(e.settings.html||"")+t.renderHtml(e)+"
    "},postRender:function(){var e=this,t;return e.items().exec("postRender"),e._super(),e._layout.postRender(e),e.state.set("rendered",!0),e.settings.style&&e.$el.css(e.settings.style),e.settings.border&&(t=e.borderBox,e.$el.css({"border-top-width":t.top,"border-right-width":t.right,"border-bottom-width":t.bottom,"border-left-width":t.left})),e.parent()||(e.keyboardNav=new i({root:e})),e},initLayoutRect:function(){var e=this,t=e._super();return e._layout.recalc(e),t},recalc:function(){var e=this,t=e._layoutRect,n=e._lastRect;return n&&n.w==t.w&&n.h==t.h?void 0:(e._layout.recalc(e),t=e.layoutRect(),e._lastRect={x:t.x,y:t.y,w:t.w,h:t.h},!0)},reflow:function(){var t;if(l.remove(this),this.visible()){for(e.repaintControls=[],e.repaintControls.map={},this.recalc(),t=e.repaintControls.length;t--;)e.repaintControls[t].repaint();"flow"!==this.settings.layout&&"stack"!==this.settings.layout&&this.repaint(),e.repaintControls=[]}return this}})}),r(ve,[g],function(e){function t(e){var t,n,r,i,o,a,s,l,c=Math.max;return t=e.documentElement,n=e.body,r=c(t.scrollWidth,n.scrollWidth),i=c(t.clientWidth,n.clientWidth),o=c(t.offsetWidth,n.offsetWidth),a=c(t.scrollHeight,n.scrollHeight),s=c(t.clientHeight,n.clientHeight),l=c(t.offsetHeight,n.offsetHeight),{width:o>r?i:r,height:l>a?s:a}}function n(e){var t,n;if(e.changedTouches)for(t="screenX screenY pageX pageY clientX clientY".split(" "),n=0;n").css({position:"absolute",top:0,left:0,width:c.width,height:c.height,zIndex:2147483647,opacity:1e-4,cursor:m}).appendTo(s.body),e(s).on("mousemove touchmove",d).on("mouseup touchend",u),i.start(r)},d=function(e){return n(e),e.button!==l?u(e):(e.deltaX=e.screenX-f,e.deltaY=e.screenY-h,e.preventDefault(),void i.drag(e))},u=function(t){n(t),e(s).off("mousemove touchmove",d).off("mouseup touchend",u),a.remove(),i.stop&&i.stop(t)},this.destroy=function(){e(o()).off()},e(o()).on("mousedown touchstart",c); +}}),r(ye,[g,ve],function(e,t){return{init:function(){var e=this;e.on("repaint",e.renderScroll)},renderScroll:function(){function n(){function t(t,a,s,l,c,u){var d,f,h,p,m,g,v,y,b;if(f=i.getEl("scroll"+t)){if(y=a.toLowerCase(),b=s.toLowerCase(),e(i.getEl("absend")).css(y,i.layoutRect()[l]-1),!c)return void e(f).css("display","none");e(f).css("display","block"),d=i.getEl("body"),h=i.getEl("scroll"+t+"t"),p=d["client"+s]-2*o,p-=n&&r?f["client"+u]:0,m=d["scroll"+s],g=p/m,v={},v[y]=d["offset"+a]+o,v[b]=p,e(f).css(v),v={},v[y]=d["scroll"+a]*g,v[b]=p*g,e(h).css(v)}}var n,r,a;a=i.getEl("body"),n=a.scrollWidth>a.clientWidth,r=a.scrollHeight>a.clientHeight,t("h","Left","Width","contentW",n,"Height"),t("v","Top","Height","contentH",r,"Width")}function r(){function n(n,r,a,s,l){var c,u=i._id+"-scroll"+n,d=i.classPrefix;e(i.getEl()).append('
    '),i.draghelper=new t(u+"t",{start:function(){c=i.getEl("body")["scroll"+r],e("#"+u).addClass(d+"active")},drag:function(e){var t,u,d,f,h=i.layoutRect();u=h.contentW>h.innerW,d=h.contentH>h.innerH,f=i.getEl("body")["client"+a]-2*o,f-=u&&d?i.getEl("scroll"+n)["client"+l]:0,t=f/i.getEl("body")["scroll"+a],i.getEl("body")["scroll"+r]=c+e["delta"+s]/t},stop:function(){e("#"+u).removeClass(d+"active")}})}i.classes.add("scroll"),n("v","Top","Height","Y","Width"),n("h","Left","Width","X","Height")}var i=this,o=2;i.settings.autoScroll&&(i._hasScroll||(i._hasScroll=!0,r(),i.on("wheel",function(e){var t=i.getEl("body");t.scrollLeft+=10*(e.deltaX||0),t.scrollTop+=10*e.deltaY,n()}),e(i.getEl("body")).on("scroll",n)),n())}}}),r(be,[ge,ye],function(e,t){return e.extend({Defaults:{layout:"fit",containerCls:"panel"},Mixins:[t],renderHtml:function(){var e=this,t=e._layout,n=e.settings.html;return e.preRender(),t.preRender(e),"undefined"==typeof n?n='
    '+t.renderHtml(e)+"
    ":("function"==typeof n&&(n=n.call(e)),e._hasBody=!1),'
    '+(e._preBodyHtml||"")+n+"
    "}})}),r(Ce,[ce],function(e){function t(t,n,r){var i,o,a,s,l,c,u,d,f,h;return f=e.getViewPort(),o=e.getPos(n),a=o.x,s=o.y,t.state.get("fixed")&&"static"==e.getRuntimeStyle(document.body,"position")&&(a-=f.x,s-=f.y),i=t.getEl(),h=e.getSize(i),l=h.width,c=h.height,h=e.getSize(n),u=h.width,d=h.height,r=(r||"").split(""),"b"===r[0]&&(s+=d),"r"===r[1]&&(a+=u),"c"===r[0]&&(s+=Math.round(d/2)),"c"===r[1]&&(a+=Math.round(u/2)),"b"===r[3]&&(s-=c),"r"===r[4]&&(a-=l),"c"===r[3]&&(s-=Math.round(c/2)),"c"===r[4]&&(a-=Math.round(l/2)),{x:a,y:s,w:l,h:c}}return{testMoveRel:function(n,r){for(var i=e.getViewPort(),o=0;o0&&a.x+a.w0&&a.y+a.hi.x&&a.x+a.wi.y&&a.y+a.he?0:e+n>t?(e=t-n,0>e?0:e):e}var i=this;if(i.settings.constrainToViewport){var o=e.getViewPort(window),a=i.layoutRect();t=r(t,o.w+o.x,a.w),n=r(n,o.h+o.y,a.h)}return i.state.get("rendered")?i.layoutRect({x:t,y:n}).repaint():(i.settings.x=t,i.settings.y=n),i.fire("move",{x:t,y:n}),i}}}),r(xe,[ce],function(e){return{resizeToContent:function(){this._layoutRect.autoResize=!0,this._lastRect=null,this.reflow()},resizeTo:function(t,n){if(1>=t||1>=n){var r=e.getWindowSize();t=1>=t?t*r.w:t,n=1>=n?n*r.h:n}return this._layoutRect.autoResize=!1,this.layoutRect({minW:t,minH:n,w:t,h:n}).reflow()},resizeBy:function(e,t){var n=this,r=n.layoutRect();return n.resizeTo(r.w+e,r.h+t)}}}),r(we,[be,Ce,xe,ce,g,u],function(e,t,n,r,i,o){function a(e,t){for(;e;){if(e==t)return!0;e=e.parent()}}function s(e){for(var t=v.length;t--;){var n=v[t],r=n.getParentCtrl(e.target);if(n.settings.autohide){if(r&&(a(r,n)||n.parent()===r))continue;e=n.fire("autohide",{target:e.target}),e.isDefaultPrevented()||n.hide()}}}function l(){p||(p=function(e){2!=e.button&&s(e)},i(document).on("click touchstart",p))}function c(){m||(m=function(){var e;for(e=v.length;e--;)d(v[e])},i(window).on("scroll",m))}function u(){if(!g){var e=document.documentElement,t=e.clientWidth,n=e.clientHeight;g=function(){document.all&&t==e.clientWidth&&n==e.clientHeight||(t=e.clientWidth,n=e.clientHeight,C.hideAll())},i(window).on("resize",g)}}function d(e){function t(t,n){for(var r,i=0;in&&(e.fixed(!1).layoutRect({y:e._autoFixY}).repaint(),t(!1,e._autoFixY-n)):(e._autoFixY=e.layoutRect().y,e._autoFixY
    ').appendTo(t.getContainerElm())),o.setTimeout(function(){n.addClass(r+"in"),i(t.getEl()).addClass(r+"in")}),b=!0),f(!0,t)}}),t.on("show",function(){t.parents().each(function(e){return e.state.get("fixed")?(t.fixed(!0),!1):void 0})}),e.popover&&(t._preBodyHtml='
    ',t.classes.add("popover").add("bottom").add(t.isRtl()?"end":"start"))},fixed:function(e){var t=this;if(t.state.get("fixed")!=e){if(t.state.get("rendered")){var n=r.getViewPort();e?t.layoutRect().y-=n.y:t.layoutRect().y+=n.y}t.classes.toggle("fixed",e),t.state.set("fixed",e)}return t},show:function(){var e=this,t,n=e._super();for(t=v.length;t--&&v[t]!==e;);return-1===t&&v.push(e),n},hide:function(){return h(this),f(!1,this),this._super()},hideAll:function(){C.hideAll()},close:function(){var e=this;return e.fire("close").isDefaultPrevented()||(e.remove(),f(!1,e)),e},remove:function(){h(this),this._super()},postRender:function(){var e=this;return e.settings.bodyRole&&this.getEl("body").setAttribute("role",e.settings.bodyRole),e._super()}});return C.hideAll=function(){for(var e=v.length;e--;){var t=v[e];t&&t.settings.autohide&&(t.hide(),v.splice(e,1))}},C}),r(Ee,[we,be,ce,g,ve,ue,h,u],function(e,t,n,r,i,o,a,s){function l(e){var t="width=device-width,initial-scale=1.0,user-scalable=0,minimum-scale=1.0,maximum-scale=1.0",n=r("meta[name=viewport]")[0],i;a.overrideViewPort!==!1&&(n||(n=document.createElement("meta"),n.setAttribute("name","viewport"),document.getElementsByTagName("head")[0].appendChild(n)),i=n.getAttribute("content"),i&&"undefined"!=typeof f&&(f=i),n.setAttribute("content",e?t:f))}function c(e){for(var t=0;tr.w&&(o=r.x-Math.max(0,i/2),e.layoutRect({w:i,x:o}),a=!0)),t&&(t.layoutRect({w:e.layoutRect().innerW}).recalc(),i=t.layoutRect().minW+r.deltaW,i>r.w&&(o=r.x-Math.max(0,i-r.w),e.layoutRect({w:i,x:o}),a=!0)),a&&e.recalc()},initLayoutRect:function(){var e=this,t=e._super(),r=0,i;if(e.settings.title&&!e._fullscreen){i=e.getEl("head");var o=n.getSize(i);t.headerW=o.width,t.headerH=o.height,r+=t.headerH}e.statusbar&&(r+=e.statusbar.layoutRect().h),t.deltaH+=r,t.minH+=r,t.h+=r;var a=n.getWindowSize();return t.x=e.settings.x||Math.max(0,a.w/2-t.w/2),t.y=e.settings.y||Math.max(0,a.h/2-t.h/2),t},renderHtml:function(){var e=this,t=e._layout,n=e._id,r=e.classPrefix,i=e.settings,o="",a="",s=i.html;return e.preRender(),t.preRender(e),i.title&&(o='
    '+e.encode(i.title)+'
    '),i.url&&(s=''),"undefined"==typeof s&&(s=t.renderHtml(e)),e.statusbar&&(a=e.statusbar.renderHtml()),'
    '+o+'
    '+s+"
    "+a+"
    "},fullscreen:function(e){var t=this,i=document.documentElement,a,l=t.classPrefix,c;if(e!=t._fullscreen)if(r(window).on("resize",function(){var e;if(t._fullscreen)if(a)t._timer||(t._timer=s.setTimeout(function(){var e=n.getWindowSize();t.moveTo(0,0).resizeTo(e.w,e.h),t._timer=0},50));else{e=(new Date).getTime();var r=n.getWindowSize();t.moveTo(0,0).resizeTo(r.w,r.h),(new Date).getTime()-e>50&&(a=!0)}}),c=t.layoutRect(),t._fullscreen=e,e){t._initial={x:c.x,y:c.y,w:c.w,h:c.h},t.borderBox=o.parseBox("0"),t.getEl("head").style.display="none",c.deltaH-=c.headerH+2,r([i,document.body]).addClass(l+"fullscreen"),t.classes.add("fullscreen");var u=n.getWindowSize();t.moveTo(0,0).resizeTo(u.w,u.h)}else t.borderBox=o.parseBox(t.settings.border),t.getEl("head").style.display="",c.deltaH+=c.headerH,r([i,document.body]).removeClass(l+"fullscreen"),t.classes.remove("fullscreen"),t.moveTo(t._initial.x,t._initial.y).resizeTo(t._initial.w,t._initial.h);return t.reflow()},postRender:function(){var e=this,t;setTimeout(function(){e.classes.add("in")},0),e._super(),e.statusbar&&e.statusbar.postRender(),e.focus(),this.dragHelper=new i(e._id+"-dragh",{start:function(){t={x:e.layoutRect().x,y:e.layoutRect().y}},drag:function(n){e.moveTo(t.x+n.deltaX,t.y+n.deltaY)}}),e.on("submit",function(t){t.isDefaultPrevented()||e.close()}),d.push(e),l(!0)},submit:function(){return this.fire("submit",{data:this.toJSON()})},remove:function(){var e=this,t;for(e.dragHelper.destroy(),e._super(),e.statusbar&&this.statusbar.remove(),t=d.length;t--;)d[t]===e&&d.splice(t,1);l(d.length>0),c(e.classPrefix)},getContentWindow:function(){var e=this.getEl().getElementsByTagName("iframe")[0];return e?e.contentWindow:null}});return a.desktop||u(),h}),r(Ne,[Ee],function(e){var t=e.extend({init:function(e){e={border:1,padding:20,layout:"flex",pack:"center",align:"center",containerCls:"panel",autoScroll:!0,buttons:{type:"button",text:"Ok",action:"ok"},items:{type:"label",multiline:!0,maxWidth:500,maxHeight:200}},this._super(e)},Statics:{OK:1,OK_CANCEL:2,YES_NO:3,YES_NO_CANCEL:4,msgBox:function(n){function r(e,t,n){return{type:"button",text:e,subtype:n?"primary":"",onClick:function(e){e.control.parents()[1].close(),o(t)}}}var i,o=n.callback||function(){};switch(n.buttons){case t.OK_CANCEL:i=[r("Ok",!0,!0),r("Cancel",!1)];break;case t.YES_NO:case t.YES_NO_CANCEL:i=[r("Yes",1,!0),r("No",0)],n.buttons==t.YES_NO_CANCEL&&i.push(r("Cancel",-1));break;default:i=[r("Ok",!0,!0)]}return new e({padding:20,x:n.x,y:n.y,minWidth:300,minHeight:100,layout:"flex",pack:"center",align:"center",buttons:i,title:n.title,role:"alertdialog",items:{type:"label",multiline:!0,maxWidth:500,maxHeight:200,text:n.text},onPostRender:function(){this.aria("describedby",this.items()[0]._id)},onClose:n.onClose,onCancel:function(){o(!1)}}).renderTo(document.body).reflow()},alert:function(e,n){return"string"==typeof e&&(e={text:e}),e.callback=n,t.msgBox(e)},confirm:function(e,n){return"string"==typeof e&&(e={text:e}),e.callback=n,e.buttons=t.OK_CANCEL,t.msgBox(e)}}});return t}),r(_e,[Ee,Ne],function(e,t){return function(n){function r(){return o.length?o[o.length-1]:void 0}var i=this,o=[];i.windows=o,n.on("remove",function(){for(var e=o.length;e--;)o[e].close()}),i.open=function(t,r){var i;return n.editorManager.setActive(n),t.title=t.title||" ",t.url=t.url||t.file,t.url&&(t.width=parseInt(t.width||320,10),t.height=parseInt(t.height||240,10)),t.body&&(t.items={defaults:t.defaults,type:t.bodyType||"form",items:t.body}),t.url||t.buttons||(t.buttons=[{text:"Ok",subtype:"primary",onclick:function(){i.find("form")[0].submit()}},{text:"Cancel",onclick:function(){i.close()}}]),i=new e(t),o.push(i),i.on("close",function(){for(var e=o.length;e--;)o[e]===i&&o.splice(e,1);o.length||n.focus()}),t.data&&i.on("postRender",function(){this.find("*").each(function(e){var n=e.name();n in t.data&&e.value(t.data[n])})}),i.features=t||{},i.params=r||{},1===o.length&&n.nodeChanged(),i.renderTo().reflow()},i.alert=function(e,r,i){t.alert(e,function(){r?r.call(i||this):n.focus()})},i.confirm=function(e,n,r){t.confirm(e,function(e){n.call(r||this,e)})},i.close=function(){r()&&r().close()},i.getParams=function(){return r()?r().params:null},i.setParams=function(e){r()&&(r().params=e)},i.getWindows=function(){return o}}}),r(Se,[he,Ce],function(e,t){return e.extend({Mixins:[t],Defaults:{classes:"widget tooltip tooltip-n"},renderHtml:function(){var e=this,t=e.classPrefix;return'"},bindStates:function(){var e=this;return e.state.on("change:text",function(t){e.getEl().lastChild.innerHTML=e.encode(t.value)}),e._super()},repaint:function(){var e=this,t,n;t=e.getEl().style,n=e._layoutRect,t.left=n.x+"px",t.top=n.y+"px",t.zIndex=131070}})}),r(ke,[he,Se],function(e,t){var n,r=e.extend({init:function(e){var t=this;t._super(e),e=t.settings,t.canFocus=!0,e.tooltip&&r.tooltips!==!1&&(t.on("mouseenter",function(n){var r=t.tooltip().moveTo(-65535);if(n.control==t){var i=r.text(e.tooltip).show().testMoveRel(t.getEl(),["bc-tc","bc-tl","bc-tr"]);r.classes.toggle("tooltip-n","bc-tc"==i),r.classes.toggle("tooltip-nw","bc-tl"==i),r.classes.toggle("tooltip-ne","bc-tr"==i),r.moveRel(t.getEl(),i)}else r.hide()}),t.on("mouseleave mousedown click",function(){t.tooltip().hide()})),t.aria("label",e.ariaLabel||e.tooltip)},tooltip:function(){return n||(n=new t({type:"tooltip"}),n.renderTo()),n},postRender:function(){var e=this,t=e.settings;e._super(),e.parent()||!t.width&&!t.height||(e.initLayoutRect(),e.repaint()),t.autofocus&&e.focus()},bindStates:function(){function e(e){n.aria("disabled",e),n.classes.toggle("disabled",e)}function t(e){n.aria("pressed",e),n.classes.toggle("active",e)}var n=this;return n.state.on("change:disabled",function(t){e(t.value)}),n.state.on("change:active",function(e){t(e.value)}),n.state.get("disabled")&&e(!0),n.state.get("active")&&t(!0),n._super()},remove:function(){this._super(),n&&(n.remove(),n=null)}});return r}),r(Te,[ke],function(e){return e.extend({Defaults:{value:0},init:function(e){var t=this;t._super(e),t.classes.add("progress"),t.settings.filter||(t.settings.filter=function(e){return Math.round(e)})},renderHtml:function(){var e=this,t=e._id,n=this.classPrefix;return'
    0%
    '},postRender:function(){var e=this;return e._super(),e.value(e.settings.value),e},bindStates:function(){function e(e){e=t.settings.filter(e),t.getEl().lastChild.innerHTML=e+"%",t.getEl().firstChild.firstChild.style.width=e+"%"}var t=this;return t.state.on("change:value",function(t){e(t.value)}),e(t.state.get("value")),t._super()}})}),r(Re,[he,Ce,Te],function(e,t,n){return e.extend({Mixins:[t],Defaults:{classes:"widget notification"},init:function(e){var t=this;t._super(e),e.text&&t.text(e.text),e.icon&&(t.icon=e.icon),e.color&&(t.color=e.color),e.type&&t.classes.add("notification-"+e.type),e.timeout&&(e.timeout<0||e.timeout>0)&&!e.closeButton?t.closeButton=!1:(t.classes.add("has-close"),t.closeButton=!0),e.progressBar&&(t.progressBar=new n),t.on("click",function(e){-1!=e.target.className.indexOf(t.classPrefix+"close")&&t.close()})},renderHtml:function(){var e=this,t=e.classPrefix,n="",r="",i="",o="";return e.icon&&(n=''),e.color&&(o=' style="background-color: '+e.color+'"'),e.closeButton&&(r=''),e.progressBar&&(i=e.progressBar.renderHtml()),'"},bindStates:function(){var e=this;return e.state.on("change:text",function(t){e.getEl().childNodes[1].innerHTML=t.value}),e.progressBar&&e.progressBar.bindStates(),e._super()},close:function(){var e=this;return e.fire("close").isDefaultPrevented()||e.remove(),e},repaint:function(){var e=this,t,n;t=e.getEl().style,n=e._layoutRect,t.left=n.x+"px",t.top=n.y+"px",t.zIndex=131070}})}),r(Ae,[Re,u],function(e,t){return function(n){function r(){return l.length?l[l.length-1]:void 0}function i(){t.requestAnimationFrame(function(){o(),a()})}function o(){for(var e=0;e0){var e=l.slice(0,1)[0],t=n.inline?n.getElement():n.getContentAreaContainer();if(e.moveRel(t,"tc-tc"),l.length>1)for(var r=1;r0&&(r.timer=setTimeout(function(){r.close()},t.timeout)),r.on("close",function(){var e=l.length;for(r.timer&&n.getWin().clearTimeout(r.timer);e--;)l[e]===r&&l.splice(e,1);a()}),r.renderTo(),a(),r},s.close=function(){r()&&r().close()},s.getNotifications=function(){return l}}}),r(Be,[w],function(e){function t(t,n,r){for(var i=[];n&&n!=t;n=n.parentNode)i.push(e.nodeIndex(n,r));return i}function n(e,t){var n,r,i;for(r=e,n=t.length-1;n>=0;n--){if(i=r.childNodes,t[n]>i.length-1)return null;r=i[t[n]]}return r}return{create:t,resolve:n}}),r(De,[I,T,y,Be,A,C,h,m,u,k],function(e,t,n,r,i,o,a,s,l,c){return function(u){function d(e,t){try{u.getDoc().execCommand(e,!1,t)}catch(n){}}function f(){var e=u.getDoc().documentMode;return e?e:6}function h(e){return e.isDefaultPrevented()}function p(e){var t,n;e.dataTransfer&&(u.selection.isCollapsed()&&"IMG"==e.target.tagName&&Q.select(e.target),t=u.selection.getContent(),t.length>0&&(n=oe+escape(u.id)+","+escape(t),e.dataTransfer.setData(ae,n)))}function m(e){var t;return e.dataTransfer&&(t=e.dataTransfer.getData(ae),t&&t.indexOf(oe)>=0)?(t=t.substr(oe.length).split(","),{id:unescape(t[0]),html:unescape(t[1])}):null}function g(e){u.queryCommandSupported("mceInsertClipboardContent")?u.execCommand("mceInsertClipboardContent",!1,{content:e}):u.execCommand("mceInsertContent",!1,e)}function v(){function i(e){var t=C.schema.getBlockElements(),n=u.getBody();if("BR"!=e.nodeName)return!1;for(e=e;e!=n&&!t[e.nodeName];e=e.parentNode)if(e.nextSibling)return!1;return!0}function o(e,t){var n;for(n=e.nextSibling;n&&n!=t;n=n.nextSibling)if((3!=n.nodeType||0!==X.trim(n.data).length)&&n!==t)return!1;return n===t}function a(e,t,r){var o,a,s;for(s=C.schema.getNonEmptyElements(),o=new n(r||e,e);a=o[t?"next":"prev"]();){if(s[a.nodeName]&&!i(a))return a;if(3==a.nodeType&&a.data.length>0)return a}}function c(e){var n,r,i,o,s;if(!e.collapsed&&(n=C.getParent(t.getNode(e.startContainer,e.startOffset),C.isBlock),r=C.getParent(t.getNode(e.endContainer,e.endOffset),C.isBlock),s=u.schema.getTextBlockElements(),n!=r&&s[n.nodeName]&&s[r.nodeName]&&"false"!==C.getContentEditable(n)&&"false"!==C.getContentEditable(r)))return e.deleteContents(),i=a(n,!1),o=a(r,!0),C.isEmpty(r)||X(n).append(r.childNodes),X(r).remove(),i?1==i.nodeType?"BR"==i.nodeName?(e.setStartBefore(i),e.setEndBefore(i)):(e.setStartAfter(i),e.setEndAfter(i)):(e.setStart(i,i.data.length),e.setEnd(i,i.data.length)):o&&(1==o.nodeType?(e.setStartBefore(o),e.setEndBefore(o)):(e.setStart(o,0),e.setEnd(o,0))),x.setRng(e),!0}function d(e,n){var r,i,s,l,c,d;if(!e.collapsed)return e;if(c=e.startContainer,d=e.startOffset,3==c.nodeType)if(n){if(d0)return e;if(r=t.getNode(e.startContainer,e.startOffset),s=C.getParent(r,C.isBlock),i=a(u.getBody(),n,r),l=C.getParent(i,C.isBlock),!r||!i)return e;if(l&&s!=l)if(n){if(!o(s,l))return e;1==r.nodeType?"BR"==r.nodeName?e.setStartBefore(r):e.setStartAfter(r):e.setStart(r,r.data.length),1==i.nodeType?e.setEnd(i,0):e.setEndBefore(i)}else{if(!o(l,s))return e;1==i.nodeType?"BR"==i.nodeName?e.setStartBefore(i):e.setStartAfter(i):e.setStart(i,i.data.length),1==r.nodeType?e.setEnd(r,0):e.setEndBefore(r)}return e}function f(e){var t=x.getRng();return t=d(t,e),c(t)?!0:void 0}function v(e,t){function n(e,n){return m=X(n).parents().filter(function(e,t){return!!u.schema.getTextInlineElements()[t.nodeName]}),l=e.cloneNode(!1),m=s.map(m,function(e){return e=e.cloneNode(!1),l.hasChildNodes()?(e.appendChild(l.firstChild),l.appendChild(e)):l.appendChild(e),l.appendChild(e),e}),m.length?(p=C.create("br"),m[0].appendChild(p),C.replace(l,e),t.setStartBefore(p),t.setEndBefore(p),u.selection.setRng(t),p):null}function i(e){return e&&u.schema.getTextBlockElements()[e.tagName]}var o,a,l,c,d,f,h,p,m;if(t.collapsed&&(f=t.startContainer,h=t.startOffset,a=C.getParent(f,C.isBlock),i(a)))if(1==f.nodeType){if(f=f.childNodes[h],f&&"BR"!=f.tagName)return;if(d=e?a.nextSibling:a.previousSibling,C.isEmpty(a)&&i(d)&&C.isEmpty(d)&&n(a,f))return C.remove(d),!0}else if(3==f.nodeType){if(o=r.create(a,f),c=a.cloneNode(!0),f=r.resolve(c,o),e){if(h>=f.data.length)return;f.deleteData(h,1)}else{if(0>=h)return;f.deleteData(h-1,1)}if(C.isEmpty(c))return n(a,f)}}function y(e){var t,n,r;f(e)||(s.each(u.getBody().getElementsByTagName("*"),function(e){"SPAN"==e.tagName&&e.setAttribute("mce-data-marked",1),!e.hasAttribute("data-mce-style")&&e.hasAttribute("style")&&u.dom.setAttrib(e,"style",u.dom.getAttrib(e,"style"))}),t=new w(function(){}),t.observe(u.getDoc(),{childList:!0,attributes:!0,subtree:!0,attributeFilter:["style"]}),u.getDoc().execCommand(e?"ForwardDelete":"Delete",!1,null),n=u.selection.getRng(),r=n.startContainer.parentNode,s.each(t.takeRecords(),function(e){if(C.isChildOf(e.target,u.getBody())){if("style"==e.attributeName){var t=e.target.getAttribute("data-mce-style");t?e.target.setAttribute("style",t):e.target.removeAttribute("style")}s.each(e.addedNodes,function(e){if("SPAN"==e.nodeName&&!e.getAttribute("mce-data-marked")){var t,i;e==r&&(t=n.startOffset,i=e.firstChild),C.remove(e,!0),i&&(n.setStart(i,t),n.setEnd(i,t),u.selection.setRng(n))}})}}),t.disconnect(),s.each(u.dom.select("span[mce-data-marked]"),function(e){e.removeAttribute("mce-data-marked")}))}var b=u.getDoc(),C=u.dom,x=u.selection,w=window.MutationObserver,E,N;w||(E=!0,w=function(){function e(e){var t=e.relatedNode||e.target;n.push({target:t,addedNodes:[t]})}function t(e){var t=e.relatedNode||e.target;n.push({target:t,attributeName:e.attrName})}var n=[],r;this.observe=function(n){r=n,r.addEventListener("DOMSubtreeModified",e,!1),r.addEventListener("DOMNodeInsertedIntoDocument",e,!1),r.addEventListener("DOMNodeInserted",e,!1),r.addEventListener("DOMAttrModified",t,!1)},this.disconnect=function(){r.removeEventListener("DOMSubtreeModified",e,!1),r.removeEventListener("DOMNodeInsertedIntoDocument",e,!1),r.removeEventListener("DOMNodeInserted",e,!1),r.removeEventListener("DOMAttrModified",t,!1)},this.takeRecords=function(){return n}}),u.on("keydown",function(e){var t=e.keyCode==G,n=e.ctrlKey||e.metaKey;if(!h(e)&&(t||e.keyCode==K)){var r=u.selection.getRng(),i=r.startContainer,o=r.startOffset;if(t&&e.shiftKey)return;if(v(t,r))return void e.preventDefault();if(!n&&r.collapsed&&3==i.nodeType&&(t?o0))return;e.preventDefault(),n&&u.selection.getSel().modify("extend",t?"forward":"backward",e.metaKey?"lineboundary":"word"),y(t)}}),u.on("keypress",function(t){if(!h(t)&&!x.isCollapsed()&&t.charCode>31&&!e.metaKeyPressed(t)){var n,r,i,o,a,s;n=u.selection.getRng(),s=String.fromCharCode(t.charCode),t.preventDefault(),r=X(n.startContainer).parents().filter(function(e,t){return!!u.schema.getTextInlineElements()[t.nodeName]}),y(!0),r=r.filter(function(e,t){return!X.contains(u.getBody(),t)}),r.length?(i=C.createFragment(),r.each(function(e,t){t=t.cloneNode(!1),i.hasChildNodes()?(t.appendChild(i.firstChild),i.appendChild(t)):(a=t,i.appendChild(t)),i.appendChild(t)}),a.appendChild(u.getDoc().createTextNode(s)),o=C.getParent(n.startContainer,C.isBlock),C.isEmpty(o)?X(o).empty().append(i):n.insertNode(i),n.setStart(a.firstChild,1),n.setEnd(a.firstChild,1),u.selection.setRng(n)):u.selection.setContent(s)}}),u.addCommand("Delete",function(){y()}),u.addCommand("ForwardDelete",function(){y(!0)}),E||(u.on("dragstart",function(e){N=x.getRng(),p(e)}),u.on("drop",function(e){if(!h(e)){var n=m(e);n&&(e.preventDefault(),l.setEditorTimeout(u,function(){var r=t.getCaretRangeFromPoint(e.x,e.y,b);N&&(x.setRng(N),N=null),y(),x.setRng(r),g(n.html)}))}}),u.on("cut",function(e){h(e)||!e.clipboardData||u.selection.isCollapsed()||(e.preventDefault(),e.clipboardData.clearData(),e.clipboardData.setData("text/html",u.selection.getContent()),e.clipboardData.setData("text/plain",u.selection.getContent({format:"text"})),l.setEditorTimeout(u,function(){y(!0)}))}))}function y(){function e(e){var t=J.create("body"),n=e.cloneContents();return t.appendChild(n),Q.serializer.serialize(t,{format:"html"})}function n(n){if(!n.setStart){if(n.item)return!1;var r=n.duplicate();return r.moveToElementText(u.getBody()),t.compareRanges(n,r)}var i=e(n),o=J.createRng();o.selectNode(u.getBody());var a=e(o);return i===a}u.on("keydown",function(e){var t=e.keyCode,r,i;if(!h(e)&&(t==G||t==K)){if(r=u.selection.isCollapsed(),i=u.getBody(),r&&!J.isEmpty(i))return;if(!r&&!n(u.selection.getRng()))return;e.preventDefault(),u.setContent(""),i.firstChild&&J.isBlock(i.firstChild)?u.selection.setCursorLocation(i.firstChild,0):u.selection.setCursorLocation(i,0),u.nodeChanged()}})}function b(){u.shortcuts.add("meta+a",null,"SelectAll")}function C(){u.settings.content_editable||J.bind(u.getDoc(),"mousedown mouseup",function(e){var t;if(e.target==u.getDoc().documentElement)if(t=Q.getRng(),u.getBody().focus(),"mousedown"==e.type){if(c.isCaretContainer(t.startContainer))return;Q.placeCaretAt(e.clientX,e.clientY)}else Q.setRng(t)})}function x(){u.on("keydown",function(e){if(!h(e)&&e.keyCode===K){if(!u.getBody().getElementsByTagName("hr").length)return;if(Q.isCollapsed()&&0===Q.getRng(!0).startOffset){var t=Q.getNode(),n=t.previousSibling;if("HR"==t.nodeName)return J.remove(t),void e.preventDefault();n&&n.nodeName&&"hr"===n.nodeName.toLowerCase()&&(J.remove(n),e.preventDefault())}}})}function w(){window.Range.prototype.getClientRects||u.on("mousedown",function(e){if(!h(e)&&"HTML"===e.target.nodeName){var t=u.getBody();t.blur(),l.setEditorTimeout(u,function(){t.focus()})}})}function E(){u.on("click",function(e){var t=e.target;/^(IMG|HR)$/.test(t.nodeName)&&"false"!==J.getContentEditableParent(t)&&(e.preventDefault(),Q.getSel().setBaseAndExtent(t,0,t,1),u.nodeChanged()),"A"==t.nodeName&&J.hasClass(t,"mce-item-anchor")&&(e.preventDefault(),Q.select(t))})}function N(){function e(){var e=J.getAttribs(Q.getStart().cloneNode(!1));return function(){var t=Q.getStart();t!==u.getBody()&&(J.setAttrib(t,"style",null),Y(e,function(e){t.setAttributeNode(e.cloneNode(!0))}))}}function t(){return!Q.isCollapsed()&&J.getParent(Q.getStart(),J.isBlock)!=J.getParent(Q.getEnd(),J.isBlock)}u.on("keypress",function(n){var r;return h(n)||8!=n.keyCode&&46!=n.keyCode||!t()?void 0:(r=e(),u.getDoc().execCommand("delete",!1,null),r(),n.preventDefault(),!1)}),J.bind(u.getDoc(),"cut",function(n){var r;!h(n)&&t()&&(r=e(),l.setEditorTimeout(u,function(){r()}))})}function _(){document.body.setAttribute("role","application")}function S(){u.on("keydown",function(e){if(!h(e)&&e.keyCode===K&&Q.isCollapsed()&&0===Q.getRng(!0).startOffset){var t=Q.getNode().previousSibling;if(t&&t.nodeName&&"table"===t.nodeName.toLowerCase())return e.preventDefault(),!1}})}function k(){f()>7||(d("RespectVisibilityInDesign",!0),u.contentStyles.push(".mceHideBrInPre pre br {display: none}"),J.addClass(u.getBody(),"mceHideBrInPre"),ee.addNodeFilter("pre",function(e){for(var t=e.length,n,r,o,a;t--;)for(n=e[t].getAll("br"),r=n.length;r--;)o=n[r],a=o.prev,a&&3===a.type&&"\n"!=a.value.charAt(a.value-1)?a.value+="\n":o.parent.insert(new i("#text",3),o,!0).value="\n"}),te.addNodeFilter("pre",function(e){for(var t=e.length,n,r,i,o;t--;)for(n=e[t].getAll("br"),r=n.length;r--;)i=n[r],o=i.prev,o&&3==o.type&&(o.value=o.value.replace(/\r?\n$/,""))}))}function T(){J.bind(u.getBody(),"mouseup",function(){var e,t=Q.getNode();"IMG"==t.nodeName&&((e=J.getStyle(t,"width"))&&(J.setAttrib(t,"width",e.replace(/[^0-9%]+/g,"")),J.setStyle(t,"width","")),(e=J.getStyle(t,"height"))&&(J.setAttrib(t,"height",e.replace(/[^0-9%]+/g,"")),J.setStyle(t,"height","")))})}function R(){u.on("keydown",function(t){var n,r,i,o,a;if(!h(t)&&t.keyCode==e.BACKSPACE&&(n=Q.getRng(),r=n.startContainer,i=n.startOffset,o=J.getRoot(),a=r,n.collapsed&&0===i)){for(;a&&a.parentNode&&a.parentNode.firstChild==a&&a.parentNode!=o;)a=a.parentNode;"BLOCKQUOTE"===a.tagName&&(u.formatter.toggle("blockquote",null,a),n=J.createRng(),n.setStart(r,0),n.setEnd(r,0),Q.setRng(n))}})}function A(){function e(){u._refreshContentEditable(),d("StyleWithCSS",!1),d("enableInlineTableEditing",!1),Z.object_resizing||d("enableObjectResizing",!1)}Z.readonly||u.on("BeforeExecCommand MouseDown",e)}function B(){function e(){Y(J.select("a"),function(e){var t=e.parentNode,n=J.getRoot();if(t.lastChild===e){for(;t&&!J.isBlock(t);){if(t.parentNode.lastChild!==t||t===n)return;t=t.parentNode}J.add(t,"br",{"data-mce-bogus":1})}})}u.on("SetContent ExecCommand",function(t){("setcontent"==t.type||"mceInsertLink"===t.command)&&e()})}function D(){Z.forced_root_block&&u.on("init",function(){d("DefaultParagraphSeparator",Z.forced_root_block)})}function M(){u.on("keydown",function(e){var t;h(e)||e.keyCode!=K||(t=u.getDoc().selection.createRange(),t&&t.item&&(e.preventDefault(),u.undoManager.beforeChange(),J.remove(t.item(0)),u.undoManager.add()))})}function L(){var e;f()>=10&&(e="",Y("p div h1 h2 h3 h4 h5 h6".split(" "),function(t,n){ +e+=(n>0?",":"")+t+":empty"}),u.contentStyles.push(e+"{padding-right: 1px !important}"))}function P(){f()<9&&(ee.addNodeFilter("noscript",function(e){for(var t=e.length,n,r;t--;)n=e[t],r=n.firstChild,r&&n.attr("data-mce-innertext",r.value)}),te.addNodeFilter("noscript",function(e){for(var t=e.length,n,r,a;t--;)n=e[t],r=e[t].firstChild,r?r.value=o.decode(r.value):(a=n.attributes.map["data-mce-innertext"],a&&(n.attr("data-mce-innertext",null),r=new i("#text",3),r.value=a,r.raw=!0,n.append(r)))}))}function H(){function e(e,t){var n=i.createTextRange();try{n.moveToPoint(e,t)}catch(r){n=null}return n}function t(t){var r;t.button?(r=e(t.x,t.y),r&&(r.compareEndPoints("StartToStart",a)>0?r.setEndPoint("StartToStart",a):r.setEndPoint("EndToEnd",a),r.select())):n()}function n(){var e=r.selection.createRange();a&&!e.item&&0===e.compareEndPoints("StartToEnd",e)&&a.select(),J.unbind(r,"mouseup",n),J.unbind(r,"mousemove",t),a=o=0}var r=J.doc,i=r.body,o,a,s;r.documentElement.unselectable=!0,J.bind(r,"mousedown contextmenu",function(i){if("HTML"===i.target.nodeName){if(o&&n(),s=r.documentElement,s.scrollHeight>s.clientHeight)return;o=1,a=e(i.x,i.y),a&&(J.bind(r,"mouseup",n),J.bind(r,"mousemove",t),J.getRoot().focus(),a.select())}})}function O(){u.on("keyup focusin mouseup",function(t){65==t.keyCode&&e.metaKeyPressed(t)||Q.normalize()},!0)}function I(){u.contentStyles.push("img:-moz-broken {-moz-force-broken-image-icon:1;min-width:24px;min-height:24px}")}function F(){u.inline||u.on("keydown",function(){document.activeElement==document.body&&u.getWin().focus()})}function z(){u.inline||(u.contentStyles.push("body {min-height: 150px}"),u.on("click",function(e){var t;if("HTML"==e.target.nodeName){if(a.ie>11)return void u.getBody().focus();t=u.selection.getRng(),u.getBody().focus(),u.selection.setRng(t),u.selection.normalize(),u.nodeChanged()}}))}function W(){a.mac&&u.on("keydown",function(t){!e.metaKeyPressed(t)||t.shiftKey||37!=t.keyCode&&39!=t.keyCode||(t.preventDefault(),u.selection.getSel().modify("move",37==t.keyCode?"backward":"forward","lineboundary"))})}function V(){d("AutoUrlDetect",!1)}function U(){u.on("click",function(e){var t=e.target;do if("A"===t.tagName)return void e.preventDefault();while(t=t.parentNode)}),u.contentStyles.push(".mce-content-body {-webkit-touch-callout: none}")}function $(){u.on("init",function(){u.dom.bind(u.getBody(),"submit",function(e){e.preventDefault()})})}function q(){ee.addNodeFilter("br",function(e){for(var t=e.length;t--;)"Apple-interchange-newline"==e[t].attr("class")&&e[t].remove()})}function j(){u.on("dragstart",function(e){p(e)}),u.on("drop",function(e){if(!h(e)){var n=m(e);if(n&&n.id!=u.id){e.preventDefault();var r=t.getCaretRangeFromPoint(e.x,e.y,u.getDoc());Q.setRng(r),g(n.html)}}})}var Y=s.each,X=u.$,K=e.BACKSPACE,G=e.DELETE,J=u.dom,Q=u.selection,Z=u.settings,ee=u.parser,te=u.serializer,ne=a.gecko,re=a.ie,ie=a.webkit,oe="data:text/mce-internal,",ae=re?"Text":"URL";R(),y(),O(),ie&&(v(),C(),E(),D(),$(),S(),q(),a.iOS?(F(),z(),U()):b()),re&&a.ie<11&&(x(),_(),k(),T(),M(),L(),P(),H()),a.ie>=11&&(z(),S()),a.ie&&(b(),V(),j()),ne&&(x(),w(),N(),A(),B(),I(),W(),S())}}),r(Me,[oe,w,m],function(e,t,n){function r(e,t){return"selectionchange"==t?e.getDoc():!e.inline&&/^mouse|click|contextmenu|drop|dragover|dragend/.test(t)?e.getDoc().documentElement:e.settings.event_root?(e.eventRoot||(e.eventRoot=o.select(e.settings.event_root)[0]),e.eventRoot):e.getBody()}function i(e,t){function n(e){return!e.hidden&&!e.readonly}var i=r(e,t),s;if(e.delegates||(e.delegates={}),!e.delegates[t])if(e.settings.event_root){if(a||(a={},e.editorManager.on("removeEditor",function(){var t;if(!e.editorManager.activeEditor&&a){for(t in a)e.dom.unbind(r(e,t));a=null}})),a[t])return;s=function(r){for(var i=r.target,a=e.editorManager.editors,s=a.length;s--;){var l=a[s].getBody();(l===i||o.isChildOf(i,l))&&n(a[s])&&a[s].fire(t,r)}},a[t]=s,o.bind(i,t,s)}else s=function(r){n(e)&&e.fire(t,r)},o.bind(i,t,s),e.delegates[t]=s}var o=t.DOM,a,s={bindPendingEventDelegates:function(){var e=this;n.each(e._pendingNativeEvents,function(t){i(e,t)})},toggleNativeEvent:function(e,t){var n=this;"focus"!=e&&"blur"!=e&&(t?n.initialized?i(n,e):n._pendingNativeEvents?n._pendingNativeEvents.push(e):n._pendingNativeEvents=[e]:n.initialized&&(n.dom.unbind(r(n,e),e,n.delegates[e]),delete n.delegates[e]))},unbindAllNativeEvents:function(){var e=this,t;if(e.delegates){for(t in e.delegates)e.dom.unbind(r(e,t),t,e.delegates[t]);delete e.delegates}e.inline||(e.getBody().onload=null,e.dom.unbind(e.getWin()),e.dom.unbind(e.getDoc())),e.dom.unbind(e.getBody()),e.dom.unbind(e.getContainer())}};return s=n.extend({},e,s)}),r(Le,[],function(){function e(e,t,n){try{e.getDoc().execCommand(t,!1,n)}catch(r){}}function t(t,n){var r=t.readonly?"readonly":"design";n!=r&&("readonly"==n?(t.selection.controlSelection.hideResizeRect(),t.readonly=!0,t.getBody().contentEditable=!1):(t.readonly=!1,t.getBody().contentEditable=!0,e(t,"StyleWithCSS",!1),e(t,"enableInlineTableEditing",!1),e(t,"enableObjectResizing",!1),t.focus(),t.nodeChanged()),t.fire("SwitchMode",{mode:n}))}return{setMode:t}}),r(Pe,[m,h],function(e,t){var n=e.each,r=e.explode,i={f9:120,f10:121,f11:122},o=e.makeMap("alt,ctrl,shift,meta,access");return function(a){function s(e,s,l,c){var u,d,f;f={func:l,scope:c||a,desc:a.translate(s)},n(r(e,"+"),function(e){e in o?f[e]=!0:/^[0-9]{2,}$/.test(e)?f.keyCode=parseInt(e,10):(f.charCode=e.charCodeAt(0),f.keyCode=i[e]||e.toUpperCase().charCodeAt(0))}),u=[f.keyCode];for(d in o)f[d]?u.push(d):f[d]=!1;return f.id=u.join(","),f.access&&(f.alt=!0,t.mac?f.ctrl=!0:f.shift=!0),f.meta&&(t.mac?f.meta=!0:(f.ctrl=!0,f.meta=!1)),f}var l=this,c={};a.on("keyup keypress keydown",function(e){(e.altKey||e.ctrlKey||e.metaKey)&&!e.isDefaultPrevented()&&n(c,function(t){return t.ctrl==e.ctrlKey&&t.meta==e.metaKey&&t.alt==e.altKey&&t.shift==e.shiftKey&&(e.keyCode==t.keyCode||e.charCode&&e.charCode==t.charCode)?(e.preventDefault(),"keydown"==e.type&&t.func.call(t.scope),!0):void 0})}),l.add=function(t,i,o,l){var u;return u=o,"string"==typeof o?o=function(){a.execCommand(u,!1,null)}:e.isArray(u)&&(o=function(){a.execCommand(u[0],u[1],u[2])}),n(r(t.toLowerCase()),function(e){var t=s(e,i,o,l);c[t.id]=t}),!0},l.remove=function(e){var t=s(e);return c[t.id]?(delete c[t.id],!0):!1}}}),r(He,[c,m,z],function(e,t,n){return function(r){function i(e){var t,n;return n={"image/jpeg":"jpg","image/jpg":"jpg","image/gif":"gif","image/png":"png"},t=n[e.blob().type.toLowerCase()]||"dat",e.id()+"."+t}function o(e,t){return e?e.replace(/\/$/,"")+"/"+t.replace(/^\//,""):t}function a(e){return{id:e.id,blob:e.blob,base64:e.base64,filename:n.constant(i(e))}}function s(e,t,n,a){var s,l,c;s=new XMLHttpRequest,s.open("POST",r.url),s.withCredentials=r.credentials,c=a(),s.upload.onprogress=function(e){var t=Math.round(e.loaded/e.total*100);c.progressBar.value(t)},s.onload=function(){var e;return c.close(),200!=s.status?void n("HTTP Error: "+s.status):(e=JSON.parse(s.responseText),e&&"string"==typeof e.location?void t(o(r.basePath,e.location)):void n("Invalid JSON: "+s.responseText))},l=new FormData,l.append("file",e.blob(),i(e)),s.send(l)}function l(){return new e(function(e){e([])})}function c(e){return e.then(function(e){return e})["catch"](function(e){return e})}function u(e,t,n){var r=e(n),i=c(r);return delete p[t],p[t]=i,i}function d(e,n){return t.map(e,function(e){var t=e.id();return p[t]?p[t]:u(n,t,e)})}function f(t,n){function i(t){return new e(function(e){var i=r.handler;i(a(t),function(n){e({url:n,blobInfo:t,status:!0})},function(n){e({url:"",blobInfo:t,status:!1,error:n})},n)})}var o=d(t,i);return e.all(o)}function h(e,t){return r.url||r.handler!==s?f(e,t):l()}var p={};return r=t.extend({credentials:!1,handler:s},r),{upload:h}}}),r(Oe,[c],function(e){function t(t){return new e(function(e){var n=new XMLHttpRequest;n.open("GET",t,!0),n.responseType="blob",n.onload=function(){200==this.status&&e(this.response)},n.send()})}function n(e){var t,n;return e=decodeURIComponent(e).split(","),n=/data:([^;]+)/.exec(e[0]),n&&(t=n[1]),{type:t,data:e[1]}}function r(t){return new e(function(e){var r,i,o;t=n(t);try{r=atob(t.data)}catch(a){return void e(new Blob([]))}for(i=new Uint8Array(r.length),o=0;o0}function s(e){return 0>e}function l(e,n,r,i,o){var l=new t(e,i);if(s(n)){if(C(e)&&(e=l.prev(!0),r(e)))return e;for(;e=l.prev(o);)if(r(e))return e}if(a(n)){if(C(e)&&(e=l.next(!0),r(e)))return e;for(;e=l.next(o);)if(r(e))return e}return null}function c(e,t){for(e=e.parentNode;e&&e!=t;e=e.parentNode)if(b(e))return e;return t}function u(e,t){for(;e&&e!=t;){if(x(e))return e;e=e.parentNode}return null}function d(e,t,n){return u(e.container(),n)==u(t.container(),n)}function f(e,t,n){return c(e.container(),n)==c(t.container(),n)}function h(e,t){var n,r;return t?(n=t.container(),r=t.offset(),N(n)?n.childNodes[r+e]:null):null}function p(e,t){var n=t.ownerDocument.createRange();return e?(n.setStartBefore(t),n.setEndBefore(t)):(n.setStartAfter(t),n.setEndAfter(t)),n}function m(e,t,n){return u(t,e)==u(n,e)}function g(e,t,n){var r,i;for(i=e?"previousSibling":"nextSibling";n&&n!=t;){if(r=n[i],w(r)&&(r=r[i]),C(r)){if(m(t,r,n))return r;break}if(_(r))break;n=n.parentNode}return null}function v(e,t,r){var o,a,s,l,c=E(g,!0,t),u=E(g,!1,t);if(a=r.startContainer,s=r.startOffset,i.isCaretContainerBlock(a)){if(N(a)||(a=a.parentNode),l=a.getAttribute("data-mce-caret"),"before"==l&&(o=a.nextSibling,C(o)))return S(o);if("after"==l&&(o=a.previousSibling,C(o)))return k(o)}if(!r.collapsed)return r;if(n.isText(a)){if(w(a)){if(1===e){if(o=u(a))return S(o);if(o=c(a))return k(o)}if(-1===e){if(o=c(a))return k(o);if(o=u(a))return S(o)}return r}if(i.endsWithCaretContainer(a)&&s>=a.data.length-1)return 1===e&&(o=u(a))?S(o):r;if(i.startsWithCaretContainer(a)&&1>=s)return-1===e&&(o=c(a))?k(o):r;if(s===a.data.length)return o=u(a),o?S(o):r;if(0===s)return o=c(a),o?k(o):r}return r}function y(e,t){return C(h(e,t))}var b=n.isContentEditableTrue,C=n.isContentEditableFalse,x=n.matchStyleValues("display","block table table-cell table-caption"),w=i.isCaretContainer,E=e.curry,N=n.isElement,_=o.isCaretCandidate,S=E(p,!0),k=E(p,!1);return{isForwards:a,isBackwards:s,findNode:l,getEditingHost:c,getParentBlock:u,isInSameBlock:d,isInSameEditingHost:f,isBeforeContentEditableFalse:E(y,0),isAfterContentEditableFalse:E(y,-1),normalizeRange:v}}),r(Ve,[_,W,$,We,p,z],function(e,t,n,r,i,o){function a(e,t){for(var n=[];e&&e!=t;)n.push(e),e=e.parentNode;return n}function s(e,t){return e.hasChildNodes()&&t0)return n(y,--b);if(h(e)&&b0&&(x=s(y,b-1),m(x)))return!g(x)&&(w=r.findNode(x,e,v,x))?d(w)?n(w,w.data.length):n.after(w):d(x)?n(x,x.data.length):n.before(x);if(h(e)&&b0&&(n&&(l*=-1),r.left+=l,r.right+=l),r}function l(){var n,r,o,a,s;for(n=i("*[contentEditable=false]",t),a=0;a
    ').css(l).appendTo(t),o&&m.addClass("mce-visual-caret-before"),d(),c=a.ownerDocument.createRange(),f=g.firstChild,c.setStart(f,0),c.setEnd(f,1),c):(g=e.insertInline(a,o),c=a.ownerDocument.createRange(),s(g.nextSibling)?(c.setStart(g,0),c.setEnd(g,0)):(c.setStart(g,1),c.setEnd(g,1)),c)}function u(){l(),g&&(e.remove(g),g=null),m&&(m.remove(),m=null),clearInterval(p)}function d(){p=a.setInterval(function(){i("div.mce-visual-caret",t).toggleClass("mce-visual-caret-hidden")},500)}function f(){a.clearInterval(p)}function h(){return".mce-visual-caret {position: absolute;background-color: black;background-color: currentcolor;}.mce-visual-caret-hidden {display: none;}*[data-mce-caret] {position: absolute;left: -1000px;right: auto;top: 0;margin: 0;padding: 0;}"}var p,m,g;return{show:c,hide:u,getCss:h,destroy:f}}}),r($e,[p,_,V],function(e,t,n){function r(i){function o(t){return e.map(t,function(e){return e=n.clone(e),e.node=i,e})}if(e.isArray(i))return e.reduce(i,function(e,t){return e.concat(r(t))},[]);if(t.isElement(i))return o(i.getClientRects());if(t.isText(i)){var a=i.ownerDocument.createRange();return a.setStart(i,0),a.setEnd(i,i.data.length),o(a.getClientRects())}}return{getClientRects:r}}),r(qe,[z,p,$e,W,We,Ve,$,V],function(e,t,n,r,i,o,a,s){function l(e,t,n,o){for(;o=i.findNode(o,e,r.isEditableCaretCandidate,t);)if(n(o))return}function c(e,r,i,o,a,s){function c(o){var s,l,c;for(c=n.getClientRects(o),-1==e&&(c=c.reverse()),s=0;s0&&r(l,t.last(f))&&u++,l.line=u,a(l))return!0;f.push(l)}}var u=0,d,f=[],h;return(h=t.last(s.getClientRects()))?(d=s.getNode(),c(d),l(e,o,c,d),f):f}function u(e,t){return t.line>e}function d(e,t){return t.line===e}function f(e,n,r,i){function l(n){return 1==e?t.last(n.getClientRects()):t.last(n.getClientRects())}var c=new o(n),u,d,f,h,p=[],m=0,g,v;1==e?(u=c.next,d=s.isBelow,f=s.isAbove,h=a.after(i)):(u=c.prev,d=s.isAbove,f=s.isBelow,h=a.before(i)),v=l(h);do if(h.isVisible()&&(g=l(h),!f(g,v))){if(p.length>0&&d(g,t.last(p))&&m++,g=s.clone(g),g.position=h,g.line=m,r(g))return p;p.push(g)}while(h=u(h));return p}var h=e.curry,p=h(c,-1,s.isAbove,s.isBelow),m=h(c,1,s.isBelow,s.isAbove);return{upUntil:p,downUntil:m,positionsUntil:f,isAboveLine:h(u),isLine:h(d)}}),r(je,[z,p,_,$e,V,We,W],function(e,t,n,r,i,o,a){function s(e,t){return Math.abs(e.left-t)}function l(e,t){return Math.abs(e.right-t)}function c(e,n){function r(e,t){return e>=t.left&&e<=t.right}return t.reduce(e,function(e,t){var i,o;return i=Math.min(s(e,n),l(e,n)),o=Math.min(s(t,n),l(t,n)),r(n,t)?t:r(n,e)?e:o==i&&m(t.node)?t:i>o?t:e})}function u(e,t,n,r){for(;r=g(r,e,a.isEditableCaretCandidate,t);)if(n(r))return}function d(e,n){function o(e,i){var o;return o=t.filter(r.getClientRects(i),function(t){return!e(t,n)}),a=a.concat(o),0===o.length}var a=[];return a.push(n),u(-1,e,v(o,i.isAbove),n.node),u(1,e,v(o,i.isBelow),n.node),a}function f(e){return t.filter(t.toArray(e.getElementsByTagName("*")),m)}function h(e,t){return{node:e.node,before:s(e,t)=e.top&&i<=e.bottom}),a=c(o,n),a&&(a=c(d(e,a),n),a&&m(a.node))?h(a,n):null}var m=n.isContentEditableFalse,g=o.findNode,v=e.curry;return{findClosestClientRect:c,findLineNodeRects:d,closestCaret:p}}),r(Ye,[_],function(e){function t(e){function t(e){return n(e)}function r(t){c(e.getBody()).css("cursor",t)}function i(t){return t==h.element||e.dom.isChildOf(t,h.element)?!1:n(t)?!1:!0}function o(t){var n,i,o,a,s=0,l=0,u,d,p,m;0===t.button&&(n=t.screenX-h.screenX,i=t.screenY-h.screenY,u=Math.max(Math.abs(n),Math.abs(i)),!h.dragging&&u>10&&(h.dragging=!0,r("default"),h.clone=h.element.cloneNode(!0),o=f.getPos(h.element),h.relX=h.clientX-o.x,h.relY=h.clientY-o.y,h.width=h.element.offsetWidth,h.height=h.element.offsetHeight,c(h.clone).css({width:h.width,height:h.height}).removeAttr("data-mce-selected"),h.ghost=c("
    ").css({position:"absolute",opacity:.5,overflow:"hidden",width:h.width,height:h.height}).attr({"data-mce-bogus":"all",unselectable:"on",contenteditable:"false"}).addClass("mce-drag-container mce-reset").append(h.clone).appendTo(e.getBody())[0],a=e.dom.getViewPort(e.getWin()),h.maxX=a.w,h.maxY=a.h),h.dragging&&(e.selection.placeCaretAt(t.clientX,t.clientY),d=h.clientX+n-h.relX,p=h.clientY+i+5,d+h.width>h.maxX&&(s=d+h.width-h.maxX),p+h.height>h.maxY&&(l=p+h.height-h.maxY),m="BODY"!=e.getBody().nodeName?e.getBody().getBoundingClientRect():{left:0,top:0},c(h.ghost).css({left:d-m.left,top:p-m.top,width:h.width-s,height:h.height-l})))}function a(){h.dragging&&(e.selection.setRng(e.selection.getSel().getRangeAt(0)),i(e.selection.getNode())&&e.undoManager.transact(function(){e.insertContent(f.getOuterHTML(h.element)),c(h.element).remove()})),l()}function s(n){if(l(),t(n.target)){if(e.fire("dragstart",{target:n.target}).isDefaultPrevented())return;e.on("mousemove",o),e.on("mouseup",a),u!=d&&(f.bind(u,"mousemove",o),f.bind(u,"mouseup",a)),h={screenX:n.screenX,screenY:n.screenY,clientX:n.clientX,clientY:n.clientY,element:n.target}}}function l(){c(h.ghost).remove(),r(null),e.off("mousemove",o),e.off("mouseup",l),u!=d&&(f.unbind(u,"mousemove",o),f.unbind(u,"mouseup",l)),h={}}var c=e.$,u=document,d=e.getDoc(),f=e.dom,h={};e.on("mousedown",s),e.on("drop",function(t){var r=e.getDoc().elementFromPoint(t.clientX,t.clientY);(n(r)||n(e.dom.getContentEditableParent(r)))&&t.preventDefault()})}var n=e.isContentEditableFalse;return{init:t}}),r(Xe,[h,Ve,$,k,We,Ue,qe,je,_,T,I,z,p,u,Ye],function(e,t,n,r,i,o,a,s,l,c,u,d,f,h,p){function m(e,t){for(;t=e(t);)if(t.isVisible())return t;return t}function g(c){function d(e){return c.dom.isBlock(e)}function g(e){e&&c.selection.setRng(e)}function N(){return c.selection.getRng()}function _(e,t){c.selection.scrollIntoView(e,t)}function S(e,t,n){var r;return r=c.fire("ShowCaret",{target:t,direction:e,before:n}),r.isDefaultPrevented()?null:(_(t,-1===e),Z.show(n,t))}function k(e){var t;return t=c.fire("ObjectSelected",{target:e}),t.isDefaultPrevented()?null:(Z.hide(),T(e))}function T(e){var t=e.ownerDocument.createRange();return t.selectNode(e),t}function R(e,t){var n=i.isInSameBlock(e,t);return!n&&l.isBr(e.getNode())?!0:n}function A(e,t){return t=i.normalizeRange(e,K,t),-1==e?n.fromRangeStart(t):n.fromRangeEnd(t)}function B(e){return r.isCaretContainerBlock(e.startContainer)}function D(e,t,n,r){var i,o,a,s;return!r.collapsed&&(i=E(r),b(i))?S(e,i,-1==e):(s=B(r),o=A(e,r),n(o)?k(o.getNode(-1==e)):(o=t(o))?n(o)?S(e,o.getNode(-1==e),1==e):(a=t(o),n(a)&&R(o,a)?S(e,a.getNode(-1==e),1==e):s?z(o.toRange()):null):s?r:null)}function M(e,t,n){var r,i,o,l,c,u,d,h,p;if(p=E(n),r=A(e,n),i=t(K,a.isAboveLine(1),r),o=f.filter(i,a.isLine(1)),c=f.last(r.getClientRects()),w(r)&&(p=r.getNode()),x(r)&&(p=r.getNode(!0)),!c)return null;if(u=c.left,l=s.findClosestClientRect(o,u),l&&b(l.node))return d=Math.abs(u-l.left),h=Math.abs(u-l.right),S(e,l.node,h>d);if(p){var m=a.positionsUntil(e,K,a.isAboveLine(1),p);if(l=s.findClosestClientRect(f.filter(m,a.isLine(1)),u))return z(l.position.toRange());if(l=f.last(f.filter(m,a.isLine(0))))return z(l.position.toRange())}}function L(t,r){function i(){var t=c.dom.create(c.settings.forced_root_block);return(!e.ie||e.ie>=11)&&(t.innerHTML='
    '),t}var o,a,s;if(r.collapsed&&c.settings.forced_root_block){if(o=c.dom.getParent(r.startContainer,"PRE"),!o)return;a=1==t?J(n.fromRangeStart(r)):Q(n.fromRangeStart(r)),a||(s=i(),1==t?c.$(o).after(s):c.$(o).before(s),c.selection.select(s,!0),c.selection.collapse())}}function P(e,t,n,r){var i;return(i=D(e,t,n,r))?i:(i=L(e,r),i?i:null)}function H(e,t,n){var r;return(r=M(e,t,n))?r:(r=L(e,n),r?r:null)}function O(){return ne("*[data-mce-caret]")[0]}function I(e){e=ne(e),e.attr("data-mce-caret")&&(Z.hide(),e.removeAttr("data-mce-caret"),e.removeAttr("data-mce-bogus"),e.removeAttr("style"),g(N()),_(e[0]))}function F(e){var t;return e=i.normalizeRange(1,K,e),t=n.fromRangeStart(e),b(t.getNode())?S(1,t.getNode(),!t.isAtEnd()):b(t.getNode(!0))?S(1,t.getNode(!0),!1):(Z.hide(),null)}function z(e){var t;return e&&e.collapsed?(t=F(e),t?t:e):e}function W(e){var t,i,o,a;return b(e)?(b(e.previousSibling)&&(o=e.previousSibling),i=Q(n.before(e)),i||(t=J(n.after(e))),t&&C(t.getNode())&&(a=t.getNode()),r.remove(e.previousSibling),r.remove(e.nextSibling),c.dom.remove(e),Y(),c.dom.isEmpty(c.getBody())?(c.setContent(""),void c.focus()):o?n.after(o).toRange():a?n.before(a).toRange():i?i.toRange():t?t.toRange():null):null}function V(e,t,n){var r,i;return!n.collapsed&&(r=E(n),b(r))?z(W(r)):(i=A(e,n),t(i)?z(W(i.getNode(-1==e))):void 0)}function U(){function e(e){var t=e(N());return t?(g(t),!0):!1}function t(e){for(var t=c.getBody();e&&e!=t;){if(y(e)||b(e))return e;e=e.parentNode}return null}function r(){var e,r=t(c.selection.getNode());y(r)&&d(r)&&c.dom.isEmpty(r)&&(e=c.dom.create("br",{"data-mce-bogus":"1"}),c.$(r).empty().append(e),c.selection.setRng(n.before(e).toRange()))}function i(e){var t=O();if(t)return"compositionstart"==e.type?(e.preventDefault(),e.stopPropagation(),void I(t)):void(" "!=t.innerHTML&&I(t))}function o(e){var t;switch(e.keyCode){case u.DELETE:t=r();break;case u.BACKSPACE:t=r()}t&&e.preventDefault()}var l=v(P,1,J,w),f=v(P,-1,Q,x),m=v(V,1,w),C=v(V,-1,x),E=v(H,-1,a.upUntil),_=v(H,1,a.downUntil);c.on("mouseup",function(){var e=N();e.collapsed&&g(F(e))}),c.on("mousedown",function(e){var n;if(n=t(e.target))b(n)?(e.preventDefault(),j(k(n),!1)):c.selection.placeCaretAt(e.clientX,e.clientY);else{Y(),Z.hide();var r=s.closestCaret(K,e.clientX,e.clientY);r&&(e.preventDefault(),c.getBody().focus(),g(S(1,r.node,r.before)))}}),c.on("keydown",function(t){var n;if(!u.modifierPressed(t)){switch(t.keyCode){case u.RIGHT:n=e(l);break;case u.DOWN:n=e(_);break;case u.LEFT:n=e(f);break;case u.UP:n=e(E);break;case u.DELETE:n=e(m);break;case u.BACKSPACE:n=e(C);break;default:n=b(c.selection.getNode())}n&&t.preventDefault()}}),c.on("keyup compositionstart",function(e){i(e),o(e)},!0),c.on("cut",function(){var e=c.selection.getNode();b(e)&&h.setEditorTimeout(c,function(){g(z(W(e)))})}),c.on("getSelectionRange",function(e){var t=e.range;if(te){if(!te.parentNode)return void(te=null);t=t.cloneRange(),t.selectNode(te),e.range=t}}),c.on("setSelectionRange",function(e){var t;t=j(e.range),t&&(e.range=t)}),c.on("focus",function(){h.setEditorTimeout(c,function(){c.selection.setRng(z(c.selection.getRng()))})}),p.init(c)}function $(){var e=c.contentStyles,t=".mce-content-body";e.push(Z.getCss()),e.push(t+" .mce-offscreen-selection {position: absolute;left: -9999999999px;width: 100pxheight: 100px}"+t+" *[contentEditable=false] {cursor: default;}"+t+" *[contentEditable=true] {cursor: text;}")}function q(e){return r.isCaretContainer(e.startContainer)||r.isCaretContainer(e.endContainer)}function j(e,t){var n,r=c.$,i=c.dom,o,a,s,l,u,d,f;if(!e)return Y(),null;if(e.collapsed){if(Y(),!q(e)){if(f=A(1,e),b(f.getNode()))return S(1,f.getNode(),!f.isAtEnd());if(b(f.getNode(!0)))return S(1,f.getNode(!0),!1)}return null}return s=e.startContainer,l=e.startOffset,u=e.endOffset,3==s.nodeType&&0==l&&b(s.parentNode)&&(s=s.parentNode,l=i.nodeIndex(s),s=s.parentNode),1!=s.nodeType?(Y(),null):(u==l+1&&(n=s.childNodes[l]),b(n)?t!==!1&&(d=c.fire("ObjectSelected",{target:n}),d.isDefaultPrevented())?(Y(),null):(o=r("#"+ee),0===o.length&&(o=r('
    ').attr("id",ee),o.appendTo(c.getBody())),o.empty().append("\xa0").append(n.cloneNode(!0)).append("\xa0").css({top:i.getPos(n,c.getBody()).y}),e=c.dom.createRng(),e.setStart(o[0].firstChild,1),e.setEnd(o[0].lastChild,0),c.getBody().focus(),o[0].focus(),a=c.selection.getSel(),a.removeAllRanges(),a.addRange(e),c.$("*[data-mce-selected]").removeAttr("data-mce-selected"),n.setAttribute("data-mce-selected",1),te=n,e):(Y(),null))}function Y(){te&&(te.removeAttribute("data-mce-selected"),c.$("#"+ee).remove(),te=null)}function X(){Z.destroy(),te=null}var K=c.getBody(),G=new t(K),J=v(m,G.next),Q=v(m,G.prev),Z=new o(c.getBody(),d),ee="sel-"+c.dom.uniqueId(),te,ne=c.$;return e.ceFalse&&(U(),$()),{showBlockCaretContainer:I,destroy:X}}var v=d.curry,y=l.isContentEditableTrue,b=l.isContentEditableFalse,C=l.isElement,x=i.isAfterContentEditableFalse,w=i.isBeforeContentEditableFalse,E=c.getSelectedNode;return g}),r(Ke,[w,g,N,R,A,H,P,Y,G,J,Q,Z,ee,te,E,d,_e,Ae,B,M,De,h,m,u,Me,Le,Pe,ze,Xe],function(e,n,r,i,o,a,s,l,c,u,d,f,h,p,m,g,v,y,b,C,x,w,E,N,_,S,k,T,R){function A(e,t,i){var o=this,a,s;a=o.documentBaseUrl=i.documentBaseURL,s=i.baseURI,o.settings=t=L({id:e,theme:"modern",delta_width:0,delta_height:0,popup_css:"",plugins:"",document_base_url:a,add_form_submit_trigger:!0,submit_patch:!0,add_unload_trigger:!0,convert_urls:!0,relative_urls:!0,remove_script_host:!0,object_resizing:!0,doctype:"",visual:!0,font_size_style_values:"xx-small,x-small,small,medium,large,x-large,xx-large",font_size_legacy_values:"xx-small,small,medium,large,x-large,xx-large,300%",forced_root_block:"p",hidden_input:!0,padd_empty_editor:!0,render_ui:!0,indentation:"30px",inline_styles:!0,convert_fonts_to_spans:!0,indent:"simple",indent_before:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,th,ul,ol,li,dl,dt,dd,area,table,thead,tfoot,tbody,tr,section,article,hgroup,aside,figure,figcaption,option,optgroup,datalist",indent_after:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,th,ul,ol,li,dl,dt,dd,area,table,thead,tfoot,tbody,tr,section,article,hgroup,aside,figure,figcaption,option,optgroup,datalist",validate:!0,entity_encoding:"named",url_converter:o.convertURL,url_converter_scope:o,ie7_compat:!0},t),r.language=t.language||"en",r.languageLoad=t.language_load,r.baseURL=i.baseURL,o.id=t.id=e,o.setDirty(!1),o.plugins={},o.documentBaseURI=new p(t.document_base_url||a,{base_uri:s}),o.baseURI=s,o.contentCSS=[],o.contentStyles=[],o.shortcuts=new k(o),o.loadedCSS={},o.editorCommands=new h(o),t.target&&(o.targetElm=t.target),o.suffix=i.suffix,o.editorManager=i,o.inline=t.inline,t.cache_suffix&&(w.cacheSuffix=t.cache_suffix.replace(/^[\?\&]+/,"")),t.override_viewport===!1&&(w.overrideViewPort=!1),i.fire("SetupEditor",o),o.execCallback("setup",o),o.$=n.overrideDefaults(function(){return{context:o.inline?o.getBody():o.getDoc(),element:o.getBody()}})}var B=e.DOM,D=r.ThemeManager,M=r.PluginManager,L=E.extend,P=E.each,H=E.explode,O=E.inArray,I=E.trim,F=E.resolve,z=g.Event,W=w.gecko,V=w.ie;return A.prototype={render:function(){function e(){B.unbind(window,"ready",e),n.render()}function t(){var e=m.ScriptLoader;if(r.language&&"en"!=r.language&&!r.language_url&&(r.language_url=n.editorManager.baseURL+"/langs/"+r.language+".js"),r.language_url&&e.add(r.language_url),r.theme&&"function"!=typeof r.theme&&"-"!=r.theme.charAt(0)&&!D.urls[r.theme]){var t=r.theme_url;t=t?n.documentBaseURI.toAbsolute(t):"themes/"+r.theme+"/theme"+o+".js",D.load(r.theme,t)}E.isArray(r.plugins)&&(r.plugins=r.plugins.join(" ")),P(r.external_plugins,function(e,t){M.load(t,e),r.plugins+=" "+t}),P(r.plugins.split(/[ ,]/),function(e){if(e=I(e),e&&!M.urls[e])if("-"==e.charAt(0)){e=e.substr(1,e.length);var t=M.dependencies(e);P(t,function(e){var t={prefix:"plugins/",resource:e,suffix:"/plugin"+o+".js"};e=M.createUrl(t,e),M.load(e.resource,e)})}else M.load(e,{prefix:"plugins/",resource:e,suffix:"/plugin"+o+".js"})}),e.loadQueue(function(){n.removed||n.init()})}var n=this,r=n.settings,i=n.id,o=n.suffix;if(!z.domLoaded)return void B.bind(window,"ready",e);if(n.getElement()&&w.contentEditable){ +r.inline?n.inline=!0:(n.orgVisibility=n.getElement().style.visibility,n.getElement().style.visibility="hidden");var a=n.getElement().form||B.getParent(i,"form");a&&(n.formElement=a,r.hidden_input&&!/TEXTAREA|INPUT/i.test(n.getElement().nodeName)&&(B.insertAfter(B.create("input",{type:"hidden",name:i}),i),n.hasHiddenInput=!0),n.formEventDelegate=function(e){n.fire(e.type,e)},B.bind(a,"submit reset",n.formEventDelegate),n.on("reset",function(){n.setContent(n.startContent,{format:"raw"})}),!r.submit_patch||a.submit.nodeType||a.submit.length||a._mceOldSubmit||(a._mceOldSubmit=a.submit,a.submit=function(){return n.editorManager.triggerSave(),n.setDirty(!1),a._mceOldSubmit(a)})),n.windowManager=new v(n),n.notificationManager=new y(n),"xml"==r.encoding&&n.on("GetContent",function(e){e.save&&(e.content=B.encode(e.content))}),r.add_form_submit_trigger&&n.on("submit",function(){n.initialized&&n.save()}),r.add_unload_trigger&&(n._beforeUnload=function(){!n.initialized||n.destroyed||n.isHidden()||n.save({format:"raw",no_events:!0,set_dirty:!1})},n.editorManager.on("BeforeUnload",n._beforeUnload)),t()}},init:function(){function e(n){var r=M.get(n),i,o;if(i=M.urls[n]||t.documentBaseUrl.replace(/\/$/,""),n=I(n),r&&-1===O(m,n)){if(P(M.dependencies(n),function(t){e(t)}),t.plugins[n])return;o=new r(t,i,t.$),t.plugins[n]=o,o.init&&(o.init(t,i),m.push(n))}}var t=this,n=t.settings,r=t.getElement(),i,o,a,s,l,c,u,d,f,h,p,m=[];if(this.editorManager.i18n.setCode(n.language),t.rtl=n.rtl_ui||this.editorManager.i18n.rtl,t.editorManager.add(t),n.aria_label=n.aria_label||B.getAttrib(r,"aria-label",t.getLang("aria.rich_text_area")),n.theme&&("function"!=typeof n.theme?(n.theme=n.theme.replace(/-/,""),c=D.get(n.theme),t.theme=new c(t,D.urls[n.theme]),t.theme.init&&t.theme.init(t,D.urls[n.theme]||t.documentBaseUrl.replace(/\/$/,""),t.$)):t.theme=n.theme),P(n.plugins.replace(/\-/g,"").split(/[ ,]/),e),n.render_ui&&t.theme&&(t.orgDisplay=r.style.display,"function"!=typeof n.theme?(i=n.width||r.style.width||r.offsetWidth,o=n.height||r.style.height||r.offsetHeight,a=n.min_height||100,h=/^[0-9\.]+(|px)$/i,h.test(""+i)&&(i=Math.max(parseInt(i,10),100)),h.test(""+o)&&(o=Math.max(parseInt(o,10),a)),l=t.theme.renderUI({targetNode:r,width:i,height:o,deltaWidth:n.delta_width,deltaHeight:n.delta_height}),n.content_editable||(o=(l.iframeHeight||o)+("number"==typeof o?l.deltaHeight||0:""),a>o&&(o=a))):(l=n.theme(t,r),l.editorContainer.nodeType&&(l.editorContainer=l.editorContainer.id=l.editorContainer.id||t.id+"_parent"),l.iframeContainer.nodeType&&(l.iframeContainer=l.iframeContainer.id=l.iframeContainer.id||t.id+"_iframecontainer"),o=l.iframeHeight||r.offsetHeight),t.editorContainer=l.editorContainer),n.content_css&&P(H(n.content_css),function(e){t.contentCSS.push(t.documentBaseURI.toAbsolute(e))}),n.content_style&&t.contentStyles.push(n.content_style),n.content_editable)return r=s=l=null,t.initContentBody();for(t.iframeHTML=n.doctype+"",n.document_base_url!=t.documentBaseUrl&&(t.iframeHTML+=''),!w.caretAfter&&n.ie7_compat&&(t.iframeHTML+=''),t.iframeHTML+='',p=0;p',t.loadedCSS[g]=!0}d=n.body_id||"tinymce",-1!=d.indexOf("=")&&(d=t.getParam("body_id","","hash"),d=d[t.id]||d),f=n.body_class||"",-1!=f.indexOf("=")&&(f=t.getParam("body_class","","hash"),f=f[t.id]||""),n.content_security_policy&&(t.iframeHTML+=''),t.iframeHTML+='
    ';var v='javascript:(function(){document.open();document.domain="'+document.domain+'";var ed = window.parent.tinymce.get("'+t.id+'");document.write(ed.iframeHTML);document.close();ed.initContentBody(true);})()';document.domain!=location.hostname&&w.ie&&w.ie<12&&(u=v);var y=B.create("iframe",{id:t.id+"_ifr",frameBorder:"0",allowTransparency:"true",title:t.editorManager.translate("Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help"),style:{width:"100%",height:o,display:"block"}});if(y.onload=function(){y.onload=null,t.fire("load")},B.setAttrib(y,"src",u||'javascript:""'),t.contentAreaContainer=l.iframeContainer,t.iframeElement=y,s=B.add(l.iframeContainer,y),V)try{t.getDoc()}catch(b){s.src=u=v}l.editorContainer&&(B.get(l.editorContainer).style.display=t.orgDisplay,t.hidden=B.isHidden(l.editorContainer)),t.getElement().style.display="none",B.setAttrib(t.id,"aria-hidden",!0),u||t.initContentBody(),r=s=l=null},initContentBody:function(t){var n=this,r=n.settings,s=n.getElement(),h=n.getDoc(),p,m;r.inline||(n.getElement().style.visibility=n.orgVisibility),t||r.content_editable||(h.open(),h.write(n.iframeHTML),h.close()),r.content_editable&&(n.on("remove",function(){var e=this.getBody();B.removeClass(e,"mce-content-body"),B.removeClass(e,"mce-edit-focus"),B.setAttrib(e,"contentEditable",null)}),B.addClass(s,"mce-content-body"),n.contentDocument=h=r.content_document||document,n.contentWindow=r.content_window||window,n.bodyElement=s,r.content_document=r.content_window=null,r.root_name=s.nodeName.toLowerCase()),p=n.getBody(),p.disabled=!0,n.readonly=r.readonly,n.readonly||(n.inline&&"static"==B.getStyle(p,"position",!0)&&(p.style.position="relative"),p.contentEditable=n.getParam("content_editable_state",!0)),p.disabled=!1,n.editorUpload=new T(n),n.schema=new b(r),n.dom=new e(h,{keep_values:!0,url_converter:n.convertURL,url_converter_scope:n,hex_colors:r.force_hex_style_colors,class_filter:r.class_filter,update_styles:!0,root_element:n.inline?n.getBody():null,collect:r.content_editable,schema:n.schema,onSetAttrib:function(e){n.fire("SetAttrib",e)}}),n.parser=new C(r,n.schema),n.parser.addAttributeFilter("src,href,style,tabindex",function(e,t){for(var r=e.length,i,o=n.dom,a,s;r--;)if(i=e[r],a=i.attr(t),s="data-mce-"+t,!i.attributes.map[s]){if(0===a.indexOf("data:")||0===a.indexOf("blob:"))continue;"style"===t?(a=o.serializeStyle(o.parseStyle(a),i.name),a.length||(a=null),i.attr(s,a),i.attr(t,a)):"tabindex"===t?(i.attr(s,a),i.attr(t,null)):i.attr(s,n.convertURL(a,t,i.name))}}),n.parser.addNodeFilter("script",function(e){for(var t=e.length,n,r;t--;)n=e[t],r=n.attr("type")||"no/type",0!==r.indexOf("mce-")&&n.attr("type","mce-"+r)}),n.parser.addNodeFilter("#cdata",function(e){for(var t=e.length,n;t--;)n=e[t],n.type=8,n.name="#comment",n.value="[CDATA["+n.value+"]]"}),n.parser.addNodeFilter("p,h1,h2,h3,h4,h5,h6,div",function(e){for(var t=e.length,r,i=n.schema.getNonEmptyElements();t--;)r=e[t],r.isEmpty(i)&&(r.append(new o("br",1)).shortEnded=!0)}),n.serializer=new a(r,n),n.selection=new l(n.dom,n.getWin(),n.serializer,n),n.formatter=new c(n),n.undoManager=new u(n),n.forceBlocks=new f(n),n.enterKey=new d(n),n._nodeChangeDispatcher=new i(n),n._selectionOverrides=new R(n),n.fire("PreInit"),r.browser_spellcheck||r.gecko_spellcheck||(h.body.spellcheck=!1,B.setAttrib(p,"spellcheck","false")),n.fire("PostRender"),n.quirks=new x(n),r.directionality&&(p.dir=r.directionality),r.nowrap&&(p.style.whiteSpace="nowrap"),r.protect&&n.on("BeforeSetContent",function(e){P(r.protect,function(t){e.content=e.content.replace(t,function(e){return""})})}),n.on("SetContent",function(){n.addVisual(n.getBody())}),r.padd_empty_editor&&n.on("PostProcess",function(e){e.content=e.content.replace(/^(]*>( | |\s|\u00a0|)<\/p>[\r\n]*|
    [\r\n]*)$/,"")}),n.load({initial:!0,format:"html"}),n.startContent=n.getContent({format:"raw"}),n.initialized=!0,n.bindPendingEventDelegates(),n.fire("init"),n.focus(!0),n.nodeChanged({initial:!0}),n.execCallback("init_instance_callback",n),n.contentStyles.length>0&&(m="",P(n.contentStyles,function(e){m+=e+"\r\n"}),n.dom.addStyle(m)),P(n.contentCSS,function(e){n.loadedCSS[e]||(n.dom.loadCSS(e),n.loadedCSS[e]=!0)}),r.auto_focus&&N.setEditorTimeout(n,function(){var e;e=r.auto_focus===!0?n:n.editorManager.get(r.auto_focus),e.destroyed||e.focus()},100),s=h=p=null},focus:function(e){function t(e){return n.dom.getParent(e,function(e){return"true"===n.dom.getContentEditable(e)})}var n=this,r=n.selection,i=n.settings.content_editable,o,a,s=n.getDoc(),l=n.getBody(),c;if(!e){if(o=r.getRng(),o.item&&(a=o.item(0)),n._refreshContentEditable(),c=t(r.getNode()),n.$.contains(l,c))return c.focus(),r.normalize(),void n.editorManager.setActive(n);if(i||(w.opera||n.getBody().focus(),n.getWin().focus()),W||i){if(l.setActive)try{l.setActive()}catch(u){l.focus()}else l.focus();i&&r.normalize()}a&&a.ownerDocument==s&&(o=s.body.createControlRange(),o.addElement(a),o.select())}n.editorManager.setActive(n)},execCallback:function(e){var t=this,n=t.settings[e],r;if(n)return t.callbackLookup&&(r=t.callbackLookup[e])&&(n=r.func,r=r.scope),"string"==typeof n&&(r=n.replace(/\.\w+$/,""),r=r?F(r):0,n=F(n),t.callbackLookup=t.callbackLookup||{},t.callbackLookup[e]={func:n,scope:r}),n.apply(r||t,Array.prototype.slice.call(arguments,1))},translate:function(e){var t=this.settings.language||"en",n=this.editorManager.i18n;return e?n.data[t+"."+e]||e.replace(/\{\#([^\}]+)\}/g,function(e,r){return n.data[t+"."+r]||"{#"+r+"}"}):""},getLang:function(e,n){return this.editorManager.i18n.data[(this.settings.language||"en")+"."+e]||(n!==t?n:"{#"+e+"}")},getParam:function(e,t,n){var r=e in this.settings?this.settings[e]:t,i;return"hash"===n?(i={},"string"==typeof r?P(r.indexOf("=")>0?r.split(/[;,](?![^=;,]*(?:[;,]|$))/):r.split(","),function(e){e=e.split("="),e.length>1?i[I(e[0])]=I(e[1]):i[I(e[0])]=I(e)}):i=r,i):r},nodeChanged:function(e){this._nodeChangeDispatcher.nodeChanged(e)},addButton:function(e,t){var n=this;t.cmd&&(t.onclick=function(){n.execCommand(t.cmd)}),t.text||t.icon||(t.icon=e),n.buttons=n.buttons||{},t.tooltip=t.tooltip||t.title,n.buttons[e]=t},addMenuItem:function(e,t){var n=this;t.cmd&&(t.onclick=function(){n.execCommand(t.cmd)}),n.menuItems=n.menuItems||{},n.menuItems[e]=t},addContextToolbar:function(e,t){var n=this,r;n.contextToolbars=n.contextToolbars||[],"string"==typeof e&&(r=e,e=function(e){return n.dom.is(e,r)}),n.contextToolbars.push({predicate:e,items:t})},addCommand:function(e,t,n){this.editorCommands.addCommand(e,t,n)},addQueryStateHandler:function(e,t,n){this.editorCommands.addQueryStateHandler(e,t,n)},addQueryValueHandler:function(e,t,n){this.editorCommands.addQueryValueHandler(e,t,n)},addShortcut:function(e,t,n,r){this.shortcuts.add(e,t,n,r)},execCommand:function(e,t,n,r){return this.editorCommands.execCommand(e,t,n,r)},queryCommandState:function(e){return this.editorCommands.queryCommandState(e)},queryCommandValue:function(e){return this.editorCommands.queryCommandValue(e)},queryCommandSupported:function(e){return this.editorCommands.queryCommandSupported(e)},show:function(){var e=this;e.hidden&&(e.hidden=!1,e.inline?e.getBody().contentEditable=!0:(B.show(e.getContainer()),B.hide(e.id)),e.load(),e.fire("show"))},hide:function(){var e=this,t=e.getDoc();e.hidden||(V&&t&&!e.inline&&t.execCommand("SelectAll"),e.save(),e.inline?(e.getBody().contentEditable=!1,e==e.editorManager.focusedEditor&&(e.editorManager.focusedEditor=null)):(B.hide(e.getContainer()),B.setStyle(e.id,"display",e.orgDisplay)),e.hidden=!0,e.fire("hide"))},isHidden:function(){return!!this.hidden},setProgressState:function(e,t){this.fire("ProgressState",{state:e,time:t})},load:function(e){var n=this,r=n.getElement(),i;return r?(e=e||{},e.load=!0,i=n.setContent(r.value!==t?r.value:r.innerHTML,e),e.element=r,e.no_events||n.fire("LoadContent",e),e.element=r=null,i):void 0},save:function(e){var t=this,n=t.getElement(),r,i;if(n&&t.initialized)return e=e||{},e.save=!0,e.element=n,r=e.content=t.getContent(e),e.no_events||t.fire("SaveContent",e),"raw"==e.format&&t.fire("RawSaveContent",e),r=e.content,/TEXTAREA|INPUT/i.test(n.nodeName)?n.value=r:(t.inline||(n.innerHTML=r),(i=B.getParent(t.id,"form"))&&P(i.elements,function(e){return e.name==t.id?(e.value=r,!1):void 0})),e.element=n=null,e.set_dirty!==!1&&t.setDirty(!1),r},setContent:function(e,t){var n=this,r=n.getBody(),i,o;return t=t||{},t.format=t.format||"html",t.set=!0,t.content=e,t.no_events||n.fire("BeforeSetContent",t),e=t.content,0===e.length||/^\s+$/.test(e)?(o=V&&11>V?"":'
    ',"TABLE"==r.nodeName?e=""+o+"":/^(UL|OL)$/.test(r.nodeName)&&(e="
  • "+o+"
    • "),i=n.settings.forced_root_block,i&&n.schema.isValidChild(r.nodeName.toLowerCase(),i.toLowerCase())?(e=o,e=n.dom.createHTML(i,n.settings.forced_root_block_attrs,e)):V||e||(e='
    '),n.dom.setHTML(r,e),n.fire("SetContent",t)):("raw"!==t.format&&(e=new s({validate:n.validate},n.schema).serialize(n.parser.parse(e,{isRootContent:!0}))),t.content=I(e),n.dom.setHTML(r,t.content),t.no_events||n.fire("SetContent",t)),t.content},getContent:function(e){var t=this,n,r=t.getBody();return e=e||{},e.format=e.format||"html",e.get=!0,e.getInner=!0,e.no_events||t.fire("BeforeGetContent",e),n="raw"==e.format?t.serializer.getTrimmedContent():"text"==e.format?r.innerText||r.textContent:t.serializer.serialize(r,e),"text"!=e.format?e.content=I(n):e.content=n,e.no_events||t.fire("GetContent",e),e.content},insertContent:function(e,t){t&&(e=L({content:e},t)),this.execCommand("mceInsertContent",!1,e)},isDirty:function(){return!this.isNotDirty},setDirty:function(e){var t=!this.isNotDirty;this.isNotDirty=!e,e&&e!=t&&this.fire("dirty")},setMode:function(e){S.setMode(this,e)},getContainer:function(){var e=this;return e.container||(e.container=B.get(e.editorContainer||e.id+"_parent")),e.container},getContentAreaContainer:function(){return this.contentAreaContainer},getElement:function(){return this.targetElm||(this.targetElm=B.get(this.id)),this.targetElm},getWin:function(){var e=this,t;return e.contentWindow||(t=e.iframeElement,t&&(e.contentWindow=t.contentWindow)),e.contentWindow},getDoc:function(){var e=this,t;return e.contentDocument||(t=e.getWin(),t&&(e.contentDocument=t.document)),e.contentDocument},getBody:function(){return this.bodyElement||this.getDoc().body},convertURL:function(e,t,n){var r=this,i=r.settings;return i.urlconverter_callback?r.execCallback("urlconverter_callback",e,n,!0,t):!i.convert_urls||n&&"LINK"==n.nodeName||0===e.indexOf("file:")||0===e.length?e:i.relative_urls?r.documentBaseURI.toRelative(e):e=r.documentBaseURI.toAbsolute(e,i.remove_script_host)},addVisual:function(e){var n=this,r=n.settings,i=n.dom,o;e=e||n.getBody(),n.hasVisual===t&&(n.hasVisual=r.visual),P(i.select("table,a",e),function(e){var t;switch(e.nodeName){case"TABLE":return o=r.visual_table_class||"mce-item-table",t=i.getAttrib(e,"border"),void(t&&"0"!=t||!n.hasVisual?i.removeClass(e,o):i.addClass(e,o));case"A":return void(i.getAttrib(e,"href",!1)||(t=i.getAttrib(e,"name")||e.id,o=r.visual_anchor_class||"mce-item-anchor",t&&n.hasVisual?i.addClass(e,o):i.removeClass(e,o)))}}),n.fire("VisualAid",{element:e,hasVisual:n.hasVisual})},remove:function(){var e=this;e.removed||(e.save(),e.removed=1,e.unbindAllNativeEvents(),e.hasHiddenInput&&B.remove(e.getElement().nextSibling),e.inline||(V&&10>V&&e.getDoc().execCommand("SelectAll",!1,null),B.setStyle(e.id,"display",e.orgDisplay),e.getBody().onload=null),e.fire("remove"),e.editorManager.remove(e),B.remove(e.getContainer()),e._selectionOverrides.destroy(),e.editorUpload.destroy(),e.destroy())},destroy:function(e){var t=this,n;if(!t.destroyed){if(!e&&!t.removed)return void t.remove();e||(t.editorManager.off("beforeunload",t._beforeUnload),t.theme&&t.theme.destroy&&t.theme.destroy(),t.selection.destroy(),t.dom.destroy()),n=t.formElement,n&&(n._mceOldSubmit&&(n.submit=n._mceOldSubmit,n._mceOldSubmit=null),B.unbind(n,"submit reset",t.formEventDelegate)),t.contentAreaContainer=t.formElement=t.container=t.editorContainer=null,t.bodyElement=t.contentDocument=t.contentWindow=null,t.iframeElement=t.targetElm=null,t.selection&&(t.selection=t.selection.win=t.selection.dom=t.selection.dom.doc=null),t.destroyed=1}},uploadImages:function(e){return this.editorUpload.uploadImages(e)},_scanForImages:function(){return this.editorUpload.scanForImages()},_refreshContentEditable:function(){var e=this,t,n;e._isHidden()&&(t=e.getBody(),n=t.parentNode,n.removeChild(t),n.appendChild(t),t.focus())},_isHidden:function(){var e;return W?(e=this.selection.getSel(),!e||!e.rangeCount||0===e.rangeCount):0}},L(A.prototype,_),A}),r(Ge,[],function(){var e={},t="en";return{setCode:function(e){e&&(t=e,this.rtl=this.data[e]?"rtl"===this.data[e]._dir:!1)},getCode:function(){return t},rtl:!1,add:function(t,n){var r=e[t];r||(e[t]=r={});for(var i in n)r[i]=n[i];this.setCode(t)},translate:function(n){var r;if(r=e[t],r||(r={}),"undefined"==typeof n)return n;if("string"!=typeof n&&n.raw)return n.raw;if(n.push){var i=n.slice(1);n=(r[n[0]]||n[0]).replace(/\{([0-9]+)\}/g,function(e,t){return i[t]})}return(r[n]||n).replace(/{context:\w+}$/,"")},data:e}}),r(Je,[w,u,h],function(e,t,n){function r(e){function l(){try{return document.activeElement}catch(e){return document.body}}function c(e,t){if(t&&t.startContainer){if(!e.isChildOf(t.startContainer,e.getRoot())||!e.isChildOf(t.endContainer,e.getRoot()))return;return{startContainer:t.startContainer,startOffset:t.startOffset,endContainer:t.endContainer,endOffset:t.endOffset}}return t}function u(e,t){var n;return t.startContainer?(n=e.getDoc().createRange(),n.setStart(t.startContainer,t.startOffset),n.setEnd(t.endContainer,t.endOffset)):n=t,n}function d(e){return!!s.getParent(e,r.isEditorUIElement)}function f(r){var f=r.editor;f.on("init",function(){(f.inline||n.ie)&&("onbeforedeactivate"in document&&n.ie<9?f.dom.bind(f.getBody(),"beforedeactivate",function(e){if(e.target==f.getBody())try{f.lastRng=f.selection.getRng()}catch(t){}}):f.on("nodechange mouseup keyup",function(e){var t=l();"nodechange"==e.type&&e.selectionChange||(t&&t.id==f.id+"_ifr"&&(t=f.getBody()),f.dom.isChildOf(t,f.getBody())&&(f.lastRng=f.selection.getRng()))}),n.webkit&&!i&&(i=function(){var t=e.activeEditor;if(t&&t.selection){var n=t.selection.getRng();n&&!n.collapsed&&(f.lastRng=n)}},s.bind(document,"selectionchange",i)))}),f.on("setcontent",function(){f.lastRng=null}),f.on("mousedown",function(){f.selection.lastFocusBookmark=null}),f.on("focusin",function(){var t=e.focusedEditor,n;f.selection.lastFocusBookmark&&(n=u(f,f.selection.lastFocusBookmark),f.selection.lastFocusBookmark=null,f.selection.setRng(n)),t!=f&&(t&&t.fire("blur",{focusedEditor:f}),e.setActive(f),e.focusedEditor=f,f.fire("focus",{blurredEditor:t}),f.focus(!0)),f.lastRng=null}),f.on("focusout",function(){t.setEditorTimeout(f,function(){var t=e.focusedEditor;d(l())||t!=f||(f.fire("blur",{focusedEditor:null}),e.focusedEditor=null,f.selection&&(f.selection.lastFocusBookmark=null))})}),o||(o=function(t){var n=e.activeEditor;n&&t.target.ownerDocument==document&&(n.selection&&t.target!=n.getBody()&&(n.selection.lastFocusBookmark=c(n.dom,n.lastRng)),t.target==document.body||d(t.target)||e.focusedEditor!=n||(n.fire("blur",{focusedEditor:null}),e.focusedEditor=null))},s.bind(document,"focusin",o)),f.inline&&!a&&(a=function(t){var n=e.activeEditor;if(n.inline&&!n.dom.isChildOf(t.target,n.getBody())){var r=n.selection.getRng();r.collapsed||(n.lastRng=r)}},s.bind(document,"mouseup",a))}function h(t){e.focusedEditor==t.editor&&(e.focusedEditor=null),e.activeEditor||(s.unbind(document,"selectionchange",i),s.unbind(document,"focusin",o),s.unbind(document,"mouseup",a),i=o=a=null)}e.on("AddEditor",f),e.on("RemoveEditor",h)}var i,o,a,s=e.DOM;return r.isEditorUIElement=function(e){return-1!==e.className.toString().indexOf("mce-")},r}),r(Qe,[Ke,g,w,te,h,m,oe,Ge,Je],function(e,t,n,r,i,o,a,s,l){function c(e){m(b.editors,function(t){t.fire("ResizeWindow",e)})}function u(e,n){n!==C&&(n?t(window).on("resize",c):t(window).off("resize",c),C=n)}function d(e){var t=b.editors,n;delete t[e.id];for(var r=0;r0&&m(p(e),function(e){var n;(n=h.get(e))?r(e,t,n):m(document.forms,function(n){m(n.elements,function(n){n.name===e&&(e="mce_editor_"+v++,h.setAttrib(n,"id",e),r(e,t,n))})})});break;case"textareas":case"specific_textareas":m(h.select("textarea"),function(e){t.editor_deselector&&o(e,t.editor_deselector)||(!t.editor_selector||o(e,t.editor_selector))&&r(n(e),t,e)})}t.oninit&&(e=s=0,m(l,function(t){s++,t.initialized?e++:t.on("init",function(){e++,e==s&&i("oninit")}),e==s&&i("oninit")}))}var s=this,l=[];s.settings=t,h.bind(window,"ready",a)},get:function(e){return arguments.length?e in this.editors?this.editors[e]:null:this.editors},add:function(e){var t=this,n=t.editors;return n[e.id]=e,n.push(e),u(n,!0),t.activeEditor=e,t.fire("AddEditor",{editor:e}),y||(y=function(){t.fire("BeforeUnload")},h.bind(window,"beforeunload",y)),e},createEditor:function(t,n){return this.add(new e(t,n,this))},remove:function(e){var t=this,n,r=t.editors,i;{if(e)return"string"==typeof e?(e=e.selector||e,void m(h.select(e),function(e){i=r[e.id],i&&t.remove(i)})):(i=e,r[i.id]?(d(i)&&t.fire("RemoveEditor",{editor:i}),r.length||h.unbind(window,"beforeunload",y),i.remove(),u(r,r.length>0),i):null);for(n=r.length-1;n>=0;n--)t.remove(r[n])}},execCommand:function(t,n,r){var i=this,o=i.get(r);switch(t){case"mceAddEditor":return i.get(r)||new e(r,i.settings,i).render(),!0;case"mceRemoveEditor":return o&&o.remove(),!0;case"mceToggleEditor":return o?(o.isHidden()?o.show():o.hide(),!0):(i.execCommand("mceAddEditor",0,r),!0)}return i.activeEditor?i.activeEditor.execCommand(t,n,r):!1},triggerSave:function(){m(this.editors,function(e){e.save()})},addI18n:function(e,t){s.add(e,t)},translate:function(e){return s.translate(e)},setActive:function(e){var t=this.activeEditor;this.activeEditor!=e&&(t&&t.fire("deactivate",{relatedTarget:e}),e.fire("activate",{relatedTarget:t})),this.activeEditor=e}},g(b,a),b.setup(),window.tinymce=window.tinyMCE=b,b}),r(Ze,[Qe,m],function(e,t){var n=t.each,r=t.explode;e.on("AddEditor",function(e){var t=e.editor;t.on("preInit",function(){function e(e,t){n(t,function(t,n){t&&s.setStyle(e,n,t)}),s.rename(e,"span")}function i(e){s=t.dom,l.convert_fonts_to_spans&&n(s.select("font,u,strike",e.node),function(e){o[e.nodeName.toLowerCase()](s,e)})}var o,a,s,l=t.settings;l.inline_styles&&(a=r(l.font_size_legacy_values),o={font:function(t,n){e(n,{backgroundColor:n.style.backgroundColor,color:n.color,fontFamily:n.face,fontSize:a[parseInt(n.size,10)-1]})},u:function(n,r){"html4"===t.settings.schema&&e(r,{textDecoration:"underline"})},strike:function(t,n){e(n,{textDecoration:"line-through"})}},t.on("PreProcess SetContent",i))})})}),r(et,[oe,m],function(e,t){var n={send:function(e){function r(){!e.async||4==i.readyState||o++>1e4?(e.success&&1e4>o&&200==i.status?e.success.call(e.success_scope,""+i.responseText,i,e):e.error&&e.error.call(e.error_scope,o>1e4?"TIMED_OUT":"GENERAL",i,e),i=null):setTimeout(r,10)}var i,o=0;if(e.scope=e.scope||this,e.success_scope=e.success_scope||e.scope,e.error_scope=e.error_scope||e.scope,e.async=e.async===!1?!1:!0,e.data=e.data||"",n.fire("beforeInitialize",{settings:e}),i=new XMLHttpRequest){if(i.overrideMimeType&&i.overrideMimeType(e.content_type),i.open(e.type||(e.data?"POST":"GET"),e.url,e.async),e.crossDomain&&(i.withCredentials=!0),e.content_type&&i.setRequestHeader("Content-Type",e.content_type),e.requestheaders&&t.each(e.requestheaders,function(e){i.setRequestHeader(e.key,e.value)}),i.setRequestHeader("X-Requested-With","XMLHttpRequest"),i=n.fire("beforeSend",{xhr:i,settings:e}).xhr,i.send(e.data),!e.async)return r();setTimeout(r,10)}}};return t.extend(n,e),n}),r(tt,[],function(){function e(t,n){var r,i,o,a;if(n=n||'"',null===t)return"null";if(o=typeof t,"string"==o)return i="\bb t\nn\ff\rr\"\"''\\\\",n+t.replace(/([\u0080-\uFFFF\x00-\x1f\"\'\\])/g,function(e,t){return'"'===n&&"'"===e?e:(r=i.indexOf(t),r+1?"\\"+i.charAt(r+1):(e=t.charCodeAt().toString(16),"\\u"+"0000".substring(e.length)+e))})+n;if("object"==o){if(t.hasOwnProperty&&"[object Array]"===Object.prototype.toString.call(t)){for(r=0,i="[";r0?",":"")+e(t[r],n);return i+"]"}i="{";for(a in t)t.hasOwnProperty(a)&&(i+="function"!=typeof t[a]?(i.length>1?","+n:n)+a+n+":"+e(t[a],n):"");return i+"}"}return""+t}return{serialize:e,parse:function(e){try{return window[String.fromCharCode(101)+"val"]("("+e+")")}catch(t){}}}}),r(nt,[tt,et,m],function(e,t,n){function r(e){this.settings=i({},e),this.count=0}var i=n.extend;return r.sendRPC=function(e){return(new r).send(e)},r.prototype={send:function(n){var r=n.error,o=n.success;n=i(this.settings,n),n.success=function(t,i){t=e.parse(t),"undefined"==typeof t&&(t={error:"JSON Parse error."}),t.error?r.call(n.error_scope||n.scope,t.error,i):o.call(n.success_scope||n.scope,t.result)},n.error=function(e,t){r&&r.call(n.error_scope||n.scope,e,t)},n.data=e.serialize({id:n.id||"c"+this.count++,method:n.method,params:n.params}),n.content_type="application/json",t.send(n)}},r}),r(rt,[w],function(e){return{callbacks:{},count:0,send:function(n){var r=this,i=e.DOM,o=n.count!==t?n.count:r.count,a="tinymce_jsonp_"+o;r.callbacks[o]=function(e){i.remove(a),delete r.callbacks[o],n.callback(e)},i.add(i.doc.body,"script",{id:a,src:n.url,type:"text/javascript"}),r.count++}}}),r(it,[],function(){function e(){s=[];for(var e in a)s.push(e);i.length=s.length}function n(){function n(e){var n,r;return r=e!==t?u+e:i.indexOf(",",u),-1===r||r>i.length?null:(n=i.substring(u,r),u=r+1,n)}var r,i,s,u=0;if(a={},c){o.load(l),i=o.getAttribute(l)||"";do{var d=n();if(null===d)break;if(r=n(parseInt(d,32)||0),null!==r){if(d=n(),null===d)break;s=n(parseInt(d,32)||0),r&&(a[r]=s)}}while(null!==r);e()}}function r(){var t,n="";if(c){for(var r in a)t=a[r],n+=(n?",":"")+r.length.toString(32)+","+r+","+t.length.toString(32)+","+t;o.setAttribute(l,n);try{o.save(l)}catch(i){}e()}}var i,o,a,s,l,c;try{if(window.localStorage)return localStorage}catch(u){}return l="tinymce",o=document.documentElement,c=!!o.addBehavior,c&&o.addBehavior("#default#userData"),i={key:function(e){return s[e]},getItem:function(e){return e in a?a[e]:null},setItem:function(e,t){a[e]=""+t,r()},removeItem:function(e){delete a[e],r()},clear:function(){a={},r()}},n(),i}),r(ot,[w,d,E,N,m,h],function(e,t,n,r,i,o){var a=window.tinymce;return a.DOM=e.DOM,a.ScriptLoader=n.ScriptLoader,a.PluginManager=r.PluginManager,a.ThemeManager=r.ThemeManager,a.dom=a.dom||{},a.dom.Event=t.Event,i.each(i,function(e,t){a[t]=e}),i.each("isOpera isWebKit isIE isGecko isMac".split(" "),function(e){a[e]=o[e.substr(2).toLowerCase()]}),{}}),r(at,[ne,m],function(e,t){return e.extend({Defaults:{firstControlClass:"first",lastControlClass:"last"},init:function(e){this.settings=t.extend({},this.Defaults,e)},preRender:function(e){e.bodyClasses.add(this.settings.containerClass)},applyClasses:function(e){var t=this,n=t.settings,r,i,o,a;r=n.firstControlClass,i=n.lastControlClass,e.each(function(e){e.classes.remove(r).remove(i).add(n.controlClass),e.visible()&&(o||(o=e),a=e)}),o&&o.classes.add(r),a&&a.classes.add(i)},renderHtml:function(e){var t=this,n="";return t.applyClasses(e.items()),e.items().each(function(e){n+=e.renderHtml()}),n},recalc:function(){},postRender:function(){},isNative:function(){return!1}})}),r(st,[at],function(e){return e.extend({Defaults:{containerClass:"abs-layout",controlClass:"abs-layout-item"},recalc:function(e){e.items().filter(":visible").each(function(e){var t=e.settings;e.layoutRect({x:t.x,y:t.y,w:t.w,h:t.h}),e.recalc&&e.recalc()})},renderHtml:function(e){return'
    '+this._super(e)}})}),r(lt,[ke],function(e){return e.extend({Defaults:{classes:"widget btn",role:"button"},init:function(e){var t=this,n;t._super(e),e=t.settings,n=t.settings.size,t.on("click mousedown",function(e){e.preventDefault()}),t.on("touchstart",function(e){t.fire("click",e),e.preventDefault()}),e.subtype&&t.classes.add(e.subtype),n&&t.classes.add("btn-"+n),e.icon&&t.icon(e.icon)},icon:function(e){return arguments.length?(this.state.set("icon",e),this):this.state.get("icon")},repaint:function(){var e=this.getEl().firstChild,t;e&&(t=e.style,t.width=t.height="100%"),this._super()},renderHtml:function(){var e=this,t=e._id,n=e.classPrefix,r=e.state.get("icon"),i,o=e.state.get("text"),a="";return i=e.settings.image,i?(r="none","string"!=typeof i&&(i=window.getSelection?i[0]:i[1]),i=" style=\"background-image: url('"+i+"')\""):i="",o&&(e.classes.add("btn-has-text"),a=''+e.encode(o)+""),r=e.settings.icon?n+"ico "+n+"i-"+r:"",'
    "},bindStates:function(){function e(e){var i=n("span."+r,t.getEl());e?(i[0]||(n("button:first",t.getEl()).append(''),i=n("span."+r,t.getEl())),i.html(t.encode(e))):i.remove(),t.classes.toggle("btn-has-text",!!e)}var t=this,n=t.$,r=t.classPrefix+"txt";return t.state.on("change:text",function(t){e(t.value)}),t.state.on("change:icon",function(n){var r=n.value,i=t.classPrefix;t.settings.icon=r,r=r?i+"ico "+i+"i-"+t.settings.icon:"";var o=t.getEl().firstChild,a=o.getElementsByTagName("i")[0];r?(a&&a==o.firstChild||(a=document.createElement("i"),o.insertBefore(a,o.firstChild)),a.className=r):a&&o.removeChild(a),e(t.state.get("text"))}),t._super()}})}),r(ct,[ge],function(e){return e.extend({Defaults:{defaultType:"button",role:"group"},renderHtml:function(){var e=this,t=e._layout;return e.classes.add("btn-group"),e.preRender(),t.preRender(e),'
    '+(e.settings.html||"")+t.renderHtml(e)+"
    "}})}),r(ut,[ke],function(e){return e.extend({Defaults:{classes:"checkbox",role:"checkbox",checked:!1},init:function(e){var t=this;t._super(e),t.on("click mousedown",function(e){e.preventDefault()}),t.on("click",function(e){e.preventDefault(),t.disabled()||t.checked(!t.checked())}),t.checked(t.settings.checked); +},checked:function(e){return arguments.length?(this.state.set("checked",e),this):this.state.get("checked")},value:function(e){return arguments.length?this.checked(e):this.checked()},renderHtml:function(){var e=this,t=e._id,n=e.classPrefix;return'
    '+e.encode(e.state.get("text"))+"
    "},bindStates:function(){function e(e){t.classes.toggle("checked",e),t.aria("checked",e)}var t=this;return t.state.on("change:text",function(e){t.getEl("al").firstChild.data=t.translate(e.value)}),t.state.on("change:checked change:value",function(n){t.fire("change"),e(n.value)}),t.state.on("change:icon",function(e){var n=e.value,r=t.classPrefix;if("undefined"==typeof n)return t.settings.icon;t.settings.icon=n,n=n?r+"ico "+r+"i-"+t.settings.icon:"";var i=t.getEl().firstChild,o=i.getElementsByTagName("i")[0];n?(o&&o==i.firstChild||(o=document.createElement("i"),i.insertBefore(o,i.firstChild)),o.className=n):o&&i.removeChild(o)}),t.state.get("checked")&&e(!0),t._super()}})}),r(dt,[ke,pe,ce,g],function(e,t,n,r){return e.extend({init:function(e){var t=this;t._super(e),e=t.settings,t.classes.add("combobox"),t.subinput=!0,t.ariaTarget="inp",e.menu=e.menu||e.values,e.menu&&(e.icon="caret"),t.on("click",function(n){var i=n.target,o=t.getEl();if(r.contains(o,i)||i==o)for(;i&&i!=o;)i.id&&-1!=i.id.indexOf("-open")&&(t.fire("action"),e.menu&&(t.showMenu(),n.aria&&t.menu.items()[0].focus())),i=i.parentNode}),t.on("keydown",function(e){"INPUT"==e.target.nodeName&&13==e.keyCode&&t.parents().reverse().each(function(n){var r=t.state.get("value"),i=t.getEl("inp").value;return e.preventDefault(),t.state.set("value",i),r!=i&&t.fire("change"),n.hasEventListeners("submit")&&n.toJSON?(n.fire("submit",{data:n.toJSON()}),!1):void 0})}),t.on("keyup",function(e){"INPUT"==e.target.nodeName&&t.state.set("value",e.target.value)})},showMenu:function(){var e=this,n=e.settings,r;e.menu||(r=n.menu||[],r.length?r={type:"menu",items:r}:r.type=r.type||"menu",e.menu=t.create(r).parent(e).renderTo(e.getContainerElm()),e.fire("createmenu"),e.menu.reflow(),e.menu.on("cancel",function(t){t.control===e.menu&&e.focus()}),e.menu.on("show hide",function(t){t.control.items().each(function(t){t.active(t.value()==e.value())})}).fire("show"),e.menu.on("select",function(t){e.value(t.control.value())}),e.on("focusin",function(t){"INPUT"==t.target.tagName.toUpperCase()&&e.menu.hide()}),e.aria("expanded",!0)),e.menu.show(),e.menu.layoutRect({w:e.layoutRect().w}),e.menu.moveRel(e.getEl(),e.isRtl()?["br-tr","tr-br"]:["bl-tl","tl-bl"])},focus:function(){this.getEl("inp").focus()},repaint:function(){var e=this,t=e.getEl(),i=e.getEl("open"),o=e.layoutRect(),a,s;a=i?o.w-n.getSize(i).width-10:o.w-10;var l=document;return l.all&&(!l.documentMode||l.documentMode<=8)&&(s=e.layoutRect().h-2+"px"),r(t.firstChild).css({width:a,lineHeight:s}),e._super(),e},postRender:function(){var e=this;return r(this.getEl("inp")).on("change",function(t){e.state.set("value",t.target.value),e.fire("change",t)}),e._super()},renderHtml:function(){var e=this,t=e._id,n=e.settings,r=e.classPrefix,i=e.state.get("value")||"",o,a,s="",l="";return"spellcheck"in n&&(l+=' spellcheck="'+n.spellcheck+'"'),n.maxLength&&(l+=' maxlength="'+n.maxLength+'"'),n.size&&(l+=' size="'+n.size+'"'),n.subtype&&(l+=' type="'+n.subtype+'"'),e.disabled()&&(l+=' disabled="disabled"'),o=n.icon,o&&"caret"!=o&&(o=r+"ico "+r+"i-"+n.icon),a=e.state.get("text"),(o||a)&&(s='
    ",e.classes.add("has-open")),'
    '+s+"
    "},value:function(e){return arguments.length?(this.state.set("value",e),this):(this.state.get("rendered")&&this.state.set("value",this.getEl("inp").value),this.state.get("value"))},bindStates:function(){var e=this;return e.state.on("change:value",function(t){e.getEl("inp").value!=t.value&&(e.getEl("inp").value=t.value)}),e.state.on("change:disabled",function(t){e.getEl("inp").disabled=t.value}),e._super()},remove:function(){r(this.getEl("inp")).off(),this._super()}})}),r(ft,[dt],function(e){return e.extend({init:function(e){var t=this;e.spellcheck=!1,e.onaction&&(e.icon="none"),t._super(e),t.classes.add("colorbox"),t.on("change keyup postrender",function(){t.repaintColor(t.value())})},repaintColor:function(e){var t=this.getEl().getElementsByTagName("i")[0];if(t)try{t.style.background=e}catch(n){}},bindStates:function(){var e=this;return e.state.on("change:value",function(t){e._rendered&&e.repaintColor(t.value)}),e._super()}})}),r(ht,[lt,we],function(e,t){return e.extend({showPanel:function(){var e=this,n=e.settings;if(e.active(!0),e.panel)e.panel.show();else{var r=n.panel;r.type&&(r={layout:"grid",items:r}),r.role=r.role||"dialog",r.popover=!0,r.autohide=!0,r.ariaRoot=!0,e.panel=new t(r).on("hide",function(){e.active(!1)}).on("cancel",function(t){t.stopPropagation(),e.focus(),e.hidePanel()}).parent(e).renderTo(e.getContainerElm()),e.panel.fire("show"),e.panel.reflow()}e.panel.moveRel(e.getEl(),n.popoverAlign||(e.isRtl()?["bc-tr","bc-tc"]:["bc-tl","bc-tc"]))},hidePanel:function(){var e=this;e.panel&&e.panel.hide()},postRender:function(){var e=this;return e.aria("haspopup",!0),e.on("click",function(t){t.control===e&&(e.panel&&e.panel.visible()?e.hidePanel():(e.showPanel(),e.panel.focus(!!t.aria)))}),e._super()},remove:function(){return this.panel&&(this.panel.remove(),this.panel=null),this._super()}})}),r(pt,[ht,w],function(e,t){var n=t.DOM;return e.extend({init:function(e){this._super(e),this.classes.add("colorbutton")},color:function(e){return e?(this._color=e,this.getEl("preview").style.backgroundColor=e,this):this._color},resetColor:function(){return this._color=null,this.getEl("preview").style.backgroundColor=null,this},renderHtml:function(){var e=this,t=e._id,n=e.classPrefix,r=e.state.get("text"),i=e.settings.icon?n+"ico "+n+"i-"+e.settings.icon:"",o=e.settings.image?" style=\"background-image: url('"+e.settings.image+"')\"":"",a="";return r&&(e.classes.add("btn-has-text"),a=''+e.encode(r)+""),'
    '},postRender:function(){var e=this,t=e.settings.onclick;return e.on("click",function(r){r.aria&&"down"==r.aria.key||r.control!=e||n.getParent(r.target,"."+e.classPrefix+"open")||(r.stopImmediatePropagation(),t.call(e,r))}),delete e.settings.onclick,e._super()}})}),r(mt,[],function(){function e(e){function i(e,i,o){var a,s,l,c,u,d;return a=0,s=0,l=0,e/=255,i/=255,o/=255,u=t(e,t(i,o)),d=n(e,n(i,o)),u==d?(l=u,{h:0,s:0,v:100*l}):(c=e==u?i-o:o==u?e-i:o-e,a=e==u?3:o==u?1:5,a=60*(a-c/(d-u)),s=(d-u)/d,l=d,{h:r(a),s:r(100*s),v:r(100*l)})}function o(e,i,o){var a,s,l,c;if(e=(parseInt(e,10)||0)%360,i=parseInt(i,10)/100,o=parseInt(o,10)/100,i=n(0,t(i,1)),o=n(0,t(o,1)),0===i)return void(d=f=h=r(255*o));switch(a=e/60,s=o*i,l=s*(1-Math.abs(a%2-1)),c=o-s,Math.floor(a)){case 0:d=s,f=l,h=0;break;case 1:d=l,f=s,h=0;break;case 2:d=0,f=s,h=l;break;case 3:d=0,f=l,h=s;break;case 4:d=l,f=0,h=s;break;case 5:d=s,f=0,h=l;break;default:d=f=h=0}d=r(255*(d+c)),f=r(255*(f+c)),h=r(255*(h+c))}function a(){function e(e){return e=parseInt(e,10).toString(16),e.length>1?e:"0"+e}return"#"+e(d)+e(f)+e(h)}function s(){return{r:d,g:f,b:h}}function l(){return i(d,f,h)}function c(e){var t;return"object"==typeof e?"r"in e?(d=e.r,f=e.g,h=e.b):"v"in e&&o(e.h,e.s,e.v):(t=/rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)[^\)]*\)/gi.exec(e))?(d=parseInt(t[1],10),f=parseInt(t[2],10),h=parseInt(t[3],10)):(t=/#([0-F]{2})([0-F]{2})([0-F]{2})/gi.exec(e))?(d=parseInt(t[1],16),f=parseInt(t[2],16),h=parseInt(t[3],16)):(t=/#([0-F])([0-F])([0-F])/gi.exec(e))&&(d=parseInt(t[1]+t[1],16),f=parseInt(t[2]+t[2],16),h=parseInt(t[3]+t[3],16)),d=0>d?0:d>255?255:d,f=0>f?0:f>255?255:f,h=0>h?0:h>255?255:h,u}var u=this,d=0,f=0,h=0;e&&c(e),u.toRgb=s,u.toHsv=l,u.toHex=a,u.parse=c}var t=Math.min,n=Math.max,r=Math.round;return e}),r(gt,[ke,ve,ce,mt],function(e,t,n,r){return e.extend({Defaults:{classes:"widget colorpicker"},init:function(e){this._super(e)},postRender:function(){function e(e,t){var r=n.getPos(e),i,o;return i=t.pageX-r.x,o=t.pageY-r.y,i=Math.max(0,Math.min(i/e.clientWidth,1)),o=Math.max(0,Math.min(o/e.clientHeight,1)),{x:i,y:o}}function i(e,t){var i=(360-e.h)/360;n.css(d,{top:100*i+"%"}),t||n.css(h,{left:e.s+"%",top:100-e.v+"%"}),f.style.background=new r({s:100,v:100,h:e.h}).toHex(),s.color().parse({s:e.s,v:e.v,h:e.h})}function o(t){var n;n=e(f,t),c.s=100*n.x,c.v=100*(1-n.y),i(c),s.fire("change")}function a(t){var n;n=e(u,t),c=l.toHsv(),c.h=360*(1-n.y),i(c,!0),s.fire("change")}var s=this,l=s.color(),c,u,d,f,h;u=s.getEl("h"),d=s.getEl("hp"),f=s.getEl("sv"),h=s.getEl("svp"),s._repaint=function(){c=l.toHsv(),i(c)},s._super(),s._svdraghelper=new t(s._id+"-sv",{start:o,drag:o}),s._hdraghelper=new t(s._id+"-h",{start:a,drag:a}),s._repaint()},rgb:function(){return this.color().toRgb()},value:function(e){var t=this;return arguments.length?(t.color().parse(e),void(t._rendered&&t._repaint())):t.color().toHex()},color:function(){return this._color||(this._color=new r),this._color},renderHtml:function(){function e(){var e,t,n="",i,a;for(i="filter:progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=",a=o.split(","),e=0,t=a.length-1;t>e;e++)n+='
    ';return n}var t=this,n=t._id,r=t.classPrefix,i,o="#ff0000,#ff0080,#ff00ff,#8000ff,#0000ff,#0080ff,#00ffff,#00ff80,#00ff00,#80ff00,#ffff00,#ff8000,#ff0000",a="background: -ms-linear-gradient(top,"+o+");background: linear-gradient(to bottom,"+o+");";return i='
    '+e()+'
    ','
    '+i+"
    "}})}),r(vt,[ke],function(e){return e.extend({init:function(e){var t=this;e.delimiter||(e.delimiter="\xbb"),t._super(e),t.classes.add("path"),t.canFocus=!0,t.on("click",function(e){var n,r=e.target;(n=r.getAttribute("data-index"))&&t.fire("select",{value:t.row()[n],index:n})}),t.row(t.settings.row)},focus:function(){var e=this;return e.getEl().firstChild.focus(),e},row:function(e){return arguments.length?(this.state.set("row",e),this):this.state.get("row")},renderHtml:function(){var e=this;return'
    '+e._getDataPathHtml(e.state.get("row"))+"
    "},bindStates:function(){var e=this;return e.state.on("change:row",function(t){e.innerHtml(e._getDataPathHtml(t.value))}),e._super()},_getDataPathHtml:function(e){var t=this,n=e||[],r,i,o="",a=t.classPrefix;for(r=0,i=n.length;i>r;r++)o+=(r>0?'":"")+'
    '+n[r].name+"
    ";return o||(o='
    \xa0
    '),o}})}),r(yt,[vt,Qe],function(e,t){return e.extend({postRender:function(){function e(e){if(1===e.nodeType){if("BR"==e.nodeName||e.getAttribute("data-mce-bogus"))return!0;if("bookmark"===e.getAttribute("data-mce-type"))return!0}return!1}var n=this,r=t.activeEditor;return r.settings.elementpath!==!1&&(n.on("select",function(e){r.focus(),r.selection.select(this.row()[e.index].element),r.nodeChanged()}),r.on("nodeChange",function(t){for(var i=[],o=t.parents,a=o.length;a--;)if(1==o[a].nodeType&&!e(o[a])){var s=r.fire("ResolveName",{name:o[a].nodeName.toLowerCase(),target:o[a]});if(s.isDefaultPrevented()||i.push({name:s.name,element:o[a]}),s.isPropagationStopped())break}n.row(i)})),n._super()}})}),r(bt,[ge],function(e){return e.extend({Defaults:{layout:"flex",align:"center",defaults:{flex:1}},renderHtml:function(){var e=this,t=e._layout,n=e.classPrefix;return e.classes.add("formitem"),t.preRender(e),'
    '+(e.settings.title?'
    '+e.settings.title+"
    ":"")+'
    '+(e.settings.html||"")+t.renderHtml(e)+"
    "}})}),r(Ct,[ge,bt,m],function(e,t,n){return e.extend({Defaults:{containerCls:"form",layout:"flex",direction:"column",align:"stretch",flex:1,padding:20,labelGap:30,spacing:10,callbacks:{submit:function(){this.submit()}}},preRender:function(){var e=this,r=e.items();e.settings.formItemDefaults||(e.settings.formItemDefaults={layout:"flex",autoResize:"overflow",defaults:{flex:1}}),r.each(function(r){var i,o=r.settings.label;o&&(i=new t(n.extend({items:{type:"label",id:r._id+"-l",text:o,flex:0,forId:r._id,disabled:r.disabled()}},e.settings.formItemDefaults)),i.type="formitem",r.aria("labelledby",r._id+"-l"),"undefined"==typeof r.settings.flex&&(r.settings.flex=1),e.replace(r,i),i.add(r))})},submit:function(){return this.fire("submit",{data:this.toJSON()})},postRender:function(){var e=this;e._super(),e.fromJSON(e.settings.data)},bindStates:function(){function e(){var e=0,n=[],r,i,o;if(t.settings.labelGapCalc!==!1)for(o="children"==t.settings.labelGapCalc?t.find("formitem"):t.items(),o.filter("formitem").each(function(t){var r=t.items()[0],i=r.getEl().clientWidth;e=i>e?i:e,n.push(r)}),i=t.settings.labelGap||0,r=n.length;r--;)n[r].settings.minWidth=e+i}var t=this;t._super(),t.on("show",e),e()}})}),r(xt,[Ct],function(e){return e.extend({Defaults:{containerCls:"fieldset",layout:"flex",direction:"column",align:"stretch",flex:1,padding:"25 15 5 15",labelGap:30,spacing:10,border:1},renderHtml:function(){var e=this,t=e._layout,n=e.classPrefix;return e.preRender(),t.preRender(e),'
    '+(e.settings.title?''+e.settings.title+"":"")+'
    '+(e.settings.html||"")+t.renderHtml(e)+"
    "}})}),r(wt,[dt,m],function(e,t){return e.extend({init:function(e){var n=this,r=tinymce.activeEditor,i=r.settings,o,a,s;e.spellcheck=!1,s=i.file_picker_types||i.file_browser_callback_types,s&&(s=t.makeMap(s,/[, ]/)),(!s||s[e.filetype])&&(a=i.file_picker_callback,!a||s&&!s[e.filetype]?(a=i.file_browser_callback,!a||s&&!s[e.filetype]||(o=function(){a(n.getEl("inp").id,n.value(),e.filetype,window)})):o=function(){var i=n.fire("beforecall").meta;i=t.extend({filetype:e.filetype},i),a.call(r,function(e,t){n.value(e).fire("change",{meta:t})},n.value(),i)}),o&&(e.icon="browse",e.onaction=o),n._super(e)}})}),r(Et,[st],function(e){return e.extend({recalc:function(e){var t=e.layoutRect(),n=e.paddingBox;e.items().filter(":visible").each(function(e){e.layoutRect({x:n.left,y:n.top,w:t.innerW-n.right-n.left,h:t.innerH-n.top-n.bottom}),e.recalc&&e.recalc()})}})}),r(Nt,[st],function(e){return e.extend({recalc:function(e){var t,n,r,i,o,a,s,l,c,u,d,f,h,p,m,g,v=[],y,b,C,x,w,E,N,_,S,k,T,R,A,B,D,M,L,P,H,O,I,F,z=Math.max,W=Math.min;for(r=e.items().filter(":visible"),i=e.layoutRect(),o=e.paddingBox,a=e.settings,f=e.isRtl()?a.direction||"row-reversed":a.direction,s=a.align,l=e.isRtl()?a.pack||"end":a.pack,c=a.spacing||0,("row-reversed"==f||"column-reverse"==f)&&(r=r.set(r.toArray().reverse()),f=f.split("-")[0]),"column"==f?(S="y",N="h",_="minH",k="maxH",R="innerH",T="top",A="deltaH",B="contentH",H="left",L="w",D="x",M="innerW",P="minW",O="right",I="deltaW",F="contentW"):(S="x",N="w",_="minW",k="maxW",R="innerW",T="left",A="deltaW",B="contentW",H="top",L="h",D="y",M="innerH",P="minH",O="bottom",I="deltaH",F="contentH"),d=i[R]-o[T]-o[T],E=u=0,t=0,n=r.length;n>t;t++)h=r[t],p=h.layoutRect(),m=h.settings,g=m.flex,d-=n-1>t?c:0,g>0&&(u+=g,p[k]&&v.push(h),p.flex=g),d-=p[_],y=o[H]+p[P]+o[O],y>E&&(E=y);if(x={},0>d?x[_]=i[_]-d+i[A]:x[_]=i[R]-d+i[A],x[P]=E+i[I],x[B]=i[R]-d,x[F]=E,x.minW=W(x.minW,i.maxW),x.minH=W(x.minH,i.maxH),x.minW=z(x.minW,i.startMinWidth),x.minH=z(x.minH,i.startMinHeight),!i.autoResize||x.minW==i.minW&&x.minH==i.minH){for(C=d/u,t=0,n=v.length;n>t;t++)h=v[t],p=h.layoutRect(),b=p[k],y=p[_]+p.flex*C,y>b?(d-=p[k]-p[_],u-=p.flex,p.flex=0,p.maxFlexSize=b):p.maxFlexSize=0;for(C=d/u,w=o[T],x={},0===u&&("end"==l?w=d+o[T]:"center"==l?(w=Math.round(i[R]/2-(i[R]-d)/2)+o[T],0>w&&(w=o[T])):"justify"==l&&(w=o[T],c=Math.floor(d/(r.length-1)))),x[D]=o[H],t=0,n=r.length;n>t;t++)h=r[t],p=h.layoutRect(),y=p.maxFlexSize||p[_],"center"===s?x[D]=Math.round(i[M]/2-p[L]/2):"stretch"===s?(x[L]=z(p[P]||0,i[M]-o[H]-o[O]),x[D]=o[H]):"end"===s&&(x[D]=i[M]-p[L]-o.top),p.flex>0&&(y+=p.flex*C),x[N]=y,x[S]=w,h.layoutRect(x),h.recalc&&h.recalc(),w+=y+c}else if(x.w=x.minW,x.h=x.minH,e.layoutRect(x),this.recalc(e),null===e._lastRect){var V=e.parent();V&&(V._lastRect=null,V.recalc())}}})}),r(_t,[at],function(e){return e.extend({Defaults:{containerClass:"flow-layout",controlClass:"flow-layout-item",endClass:"break"},recalc:function(e){e.items().filter(":visible").each(function(e){e.recalc&&e.recalc()})},isNative:function(){return!0}})}),r(St,[he,ke,we,m,Qe,h],function(e,t,n,r,i,o){function a(e){function t(t,n){return function(){var r=this;e.on("nodeChange",function(i){var o=e.formatter,a=null;s(i.parents,function(e){return s(t,function(t){return n?o.matchNode(e,n,{value:t.value})&&(a=t.value):o.matchNode(e,t.value)&&(a=t.value),a?!1:void 0}),a?!1:void 0}),r.value(a)})}}function r(e){e=e.replace(/;$/,"").split(";");for(var t=e.length;t--;)e[t]=e[t].split("=");return e}function i(){function t(e){var n=[];if(e)return s(e,function(e){var o={text:e.title,icon:e.icon};if(e.items)o.menu=t(e.items);else{var a=e.format||"custom"+r++;e.format||(e.name=a,i.push(e)),o.format=a,o.cmd=e.cmd}n.push(o)}),n}function n(){var n;return n=t(e.settings.style_formats_merge?e.settings.style_formats?o.concat(e.settings.style_formats):o:e.settings.style_formats||o)}var r=0,i=[],o=[{title:"Headings",items:[{title:"Heading 1",format:"h1"},{title:"Heading 2",format:"h2"},{title:"Heading 3",format:"h3"},{title:"Heading 4",format:"h4"},{title:"Heading 5",format:"h5"},{title:"Heading 6",format:"h6"}]},{title:"Inline",items:[{title:"Bold",icon:"bold",format:"bold"},{title:"Italic",icon:"italic",format:"italic"},{title:"Underline",icon:"underline",format:"underline"},{title:"Strikethrough",icon:"strikethrough",format:"strikethrough"},{title:"Superscript",icon:"superscript",format:"superscript"},{title:"Subscript",icon:"subscript",format:"subscript"},{title:"Code",icon:"code",format:"code"}]},{title:"Blocks",items:[{title:"Paragraph",format:"p"},{title:"Blockquote",format:"blockquote"},{title:"Div",format:"div"},{title:"Pre",format:"pre"}]},{title:"Alignment",items:[{title:"Left",icon:"alignleft",format:"alignleft"},{title:"Center",icon:"aligncenter",format:"aligncenter"},{title:"Right",icon:"alignright",format:"alignright"},{title:"Justify",icon:"alignjustify",format:"alignjustify"}]}];return e.on("init",function(){s(i,function(t){e.formatter.register(t.name,t)})}),{type:"menu",items:n(),onPostRender:function(t){e.fire("renderFormatsMenu",{control:t.control})},itemDefaults:{preview:!0,textStyle:function(){return this.settings.format?e.formatter.getCssText(this.settings.format):void 0},onPostRender:function(){var t=this;t.parent().on("show",function(){var n,r;n=t.settings.format,n&&(t.disabled(!e.formatter.canApply(n)),t.active(e.formatter.match(n))),r=t.settings.cmd,r&&t.active(e.queryCommandState(r))})},onclick:function(){this.settings.format&&c(this.settings.format),this.settings.cmd&&e.execCommand(this.settings.cmd)}}}}function o(t){return function(){var n=this;e.formatter?e.formatter.formatChanged(t,function(e){n.active(e)}):e.on("init",function(){e.formatter.formatChanged(t,function(e){n.active(e)})})}}function a(t){return function(){function n(){return e.undoManager?e.undoManager[t]():!1}var r=this;t="redo"==t?"hasRedo":"hasUndo",r.disabled(!n()),e.on("Undo Redo AddUndo TypingUndo ClearUndos SwitchMode",function(){r.disabled(e.readonly||!n())})}}function l(){var t=this;e.on("VisualAid",function(e){t.active(e.hasVisual)}),t.active(e.hasVisual)}function c(t){t.control&&(t=t.control.value()),t&&e.execCommand("mceToggleFormat",!1,t)}var u;u=i(),s({bold:"Bold",italic:"Italic",underline:"Underline",strikethrough:"Strikethrough",subscript:"Subscript",superscript:"Superscript"},function(t,n){e.addButton(n,{tooltip:t,onPostRender:o(n),onclick:function(){c(n)}})}),s({outdent:["Decrease indent","Outdent"],indent:["Increase indent","Indent"],cut:["Cut","Cut"],copy:["Copy","Copy"],paste:["Paste","Paste"],help:["Help","mceHelp"],selectall:["Select all","SelectAll"],removeformat:["Clear formatting","RemoveFormat"],visualaid:["Visual aids","mceToggleVisualAid"],newdocument:["New document","mceNewDocument"]},function(t,n){e.addButton(n,{tooltip:t[0],cmd:t[1]})}),s({blockquote:["Blockquote","mceBlockQuote"],numlist:["Numbered list","InsertOrderedList"],bullist:["Bullet list","InsertUnorderedList"],subscript:["Subscript","Subscript"],superscript:["Superscript","Superscript"],alignleft:["Align left","JustifyLeft"],aligncenter:["Align center","JustifyCenter"],alignright:["Align right","JustifyRight"],alignjustify:["Justify","JustifyFull"],alignnone:["No alignment","JustifyNone"]},function(t,n){e.addButton(n,{tooltip:t[0],cmd:t[1],onPostRender:o(n)})}),e.addButton("undo",{tooltip:"Undo",onPostRender:a("undo"),cmd:"undo"}),e.addButton("redo",{tooltip:"Redo",onPostRender:a("redo"),cmd:"redo"}),e.addMenuItem("newdocument",{text:"New document",icon:"newdocument",cmd:"mceNewDocument"}),e.addMenuItem("undo",{text:"Undo",icon:"undo",shortcut:"Meta+Z",onPostRender:a("undo"),cmd:"undo"}),e.addMenuItem("redo",{text:"Redo",icon:"redo",shortcut:"Meta+Y",onPostRender:a("redo"),cmd:"redo"}),e.addMenuItem("visualaid",{text:"Visual aids",selectable:!0,onPostRender:l,cmd:"mceToggleVisualAid"}),e.addButton("remove",{tooltip:"Remove",icon:"remove",cmd:"Delete"}),s({cut:["Cut","Cut","Meta+X"],copy:["Copy","Copy","Meta+C"],paste:["Paste","Paste","Meta+V"],selectall:["Select all","SelectAll","Meta+A"],bold:["Bold","Bold","Meta+B"],italic:["Italic","Italic","Meta+I"],underline:["Underline","Underline"],strikethrough:["Strikethrough","Strikethrough"],subscript:["Subscript","Subscript"],superscript:["Superscript","Superscript"],removeformat:["Clear formatting","RemoveFormat"]},function(t,n){e.addMenuItem(n,{text:t[0],icon:n,shortcut:t[2],cmd:t[1]})}),e.on("mousedown",function(){n.hideAll()}),e.addButton("styleselect",{type:"menubutton",text:"Formats",menu:u}),e.addButton("formatselect",function(){var n=[],i=r(e.settings.block_formats||"Paragraph=p;Heading 1=h1;Heading 2=h2;Heading 3=h3;Heading 4=h4;Heading 5=h5;Heading 6=h6;Preformatted=pre");return s(i,function(t){n.push({text:t[0],value:t[1],textStyle:function(){return e.formatter.getCssText(t[1])}})}),{type:"listbox",text:i[0][0],values:n,fixedWidth:!0,onselect:c,onPostRender:t(n)}}),e.addButton("fontselect",function(){var n="Andale Mono=andale mono,monospace;Arial=arial,helvetica,sans-serif;Arial Black=arial black,sans-serif;Book Antiqua=book antiqua,palatino,serif;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,palatino,serif;Helvetica=helvetica,arial,sans-serif;Impact=impact,sans-serif;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco,monospace;Times New Roman=times new roman,times,serif;Trebuchet MS=trebuchet ms,geneva,sans-serif;Verdana=verdana,geneva,sans-serif;Webdings=webdings;Wingdings=wingdings,zapf dingbats",i=[],o=r(e.settings.font_formats||n);return s(o,function(e){i.push({text:{raw:e[0]},value:e[1],textStyle:-1==e[1].indexOf("dings")?"font-family:"+e[1]:""})}),{type:"listbox",text:"Font Family",tooltip:"Font Family",values:i,fixedWidth:!0,onPostRender:t(i,"fontname"),onselect:function(t){t.control.settings.value&&e.execCommand("FontName",!1,t.control.settings.value)}}}),e.addButton("fontsizeselect",function(){var n=[],r="8pt 10pt 12pt 14pt 18pt 24pt 36pt",i=e.settings.fontsize_formats||r;return s(i.split(" "),function(e){var t=e,r=e,i=e.split("=");i.length>1&&(t=i[0],r=i[1]),n.push({text:t,value:r})}),{type:"listbox",text:"Font Sizes",tooltip:"Font Sizes",values:n,fixedWidth:!0,onPostRender:t(n,"fontsize"),onclick:function(t){t.control.settings.value&&e.execCommand("FontSize",!1,t.control.settings.value)}}}),e.addMenuItem("formats",{text:"Formats",menu:u})}var s=r.each;i.on("AddEditor",function(t){t.editor.rtl&&(e.rtl=!0),a(t.editor)}),e.translate=function(e){return i.translate(e)},t.tooltips=!o.iOS}),r(kt,[st],function(e){return e.extend({recalc:function(e){var t,n,r,i,o,a,s,l,c,u,d,f,h,p,m,g,v,y,b,C,x,w,E,N=[],_=[],S,k,T,R,A,B;t=e.settings,i=e.items().filter(":visible"),o=e.layoutRect(),r=t.columns||Math.ceil(Math.sqrt(i.length)),n=Math.ceil(i.length/r),y=t.spacingH||t.spacing||0,b=t.spacingV||t.spacing||0,C=t.alignH||t.align,x=t.alignV||t.align,g=e.paddingBox,A="reverseRows"in t?t.reverseRows:e.isRtl(),C&&"string"==typeof C&&(C=[C]),x&&"string"==typeof x&&(x=[x]);for(d=0;r>d;d++)N.push(0);for(f=0;n>f;f++)_.push(0);for(f=0;n>f;f++)for(d=0;r>d&&(u=i[f*r+d],u);d++)c=u.layoutRect(),S=c.minW,k=c.minH,N[d]=S>N[d]?S:N[d],_[f]=k>_[f]?k:_[f];for(T=o.innerW-g.left-g.right,w=0,d=0;r>d;d++)w+=N[d]+(d>0?y:0),T-=(d>0?y:0)+N[d];for(R=o.innerH-g.top-g.bottom,E=0,f=0;n>f;f++)E+=_[f]+(f>0?b:0),R-=(f>0?b:0)+_[f];if(w+=g.left+g.right,E+=g.top+g.bottom,l={},l.minW=w+(o.w-o.innerW),l.minH=E+(o.h-o.innerH),l.contentW=l.minW-o.deltaW,l.contentH=l.minH-o.deltaH,l.minW=Math.min(l.minW,o.maxW),l.minH=Math.min(l.minH,o.maxH),l.minW=Math.max(l.minW,o.startMinWidth),l.minH=Math.max(l.minH,o.startMinHeight),!o.autoResize||l.minW==o.minW&&l.minH==o.minH){o.autoResize&&(l=e.layoutRect(l),l.contentW=l.minW-o.deltaW,l.contentH=l.minH-o.deltaH);var D;D="start"==t.packV?0:R>0?Math.floor(R/n):0;var M=0,L=t.flexWidths;if(L)for(d=0;dd;d++)N[d]+=L?L[d]*P:P;for(p=g.top,f=0;n>f;f++){for(h=g.left,s=_[f]+D,d=0;r>d&&(B=A?f*r+r-1-d:f*r+d,u=i[B],u);d++)m=u.settings,c=u.layoutRect(),a=Math.max(N[d],c.startMinWidth),c.x=h,c.y=p,v=m.alignH||(C?C[d]||C[0]:null),"center"==v?c.x=h+a/2-c.w/2:"right"==v?c.x=h+a-c.w:"stretch"==v&&(c.w=a),v=m.alignV||(x?x[d]||x[0]:null),"center"==v?c.y=p+s/2-c.h/2:"bottom"==v?c.y=p+s-c.h:"stretch"==v&&(c.h=s),u.layoutRect(c),h+=a+y,u.recalc&&u.recalc();p+=s+b}}else if(l.w=l.minW,l.h=l.minH,e.layoutRect(l),this.recalc(e),null===e._lastRect){var H=e.parent();H&&(H._lastRect=null,H.recalc())}}})}),r(Tt,[ke,u],function(e,t){return e.extend({renderHtml:function(){var e=this;return e.classes.add("iframe"),e.canFocus=!1,''},src:function(e){this.getEl().src=e},html:function(e,n){var r=this,i=this.getEl().contentWindow.document.body;return i?(i.innerHTML=e,n&&n()):t.setTimeout(function(){r.html(e)}),this}})}),r(Rt,[ke,ce],function(e,t){return e.extend({init:function(e){var t=this;t._super(e),t.classes.add("widget").add("label"),t.canFocus=!1,e.multiline&&t.classes.add("autoscroll"),e.strong&&t.classes.add("strong")},initLayoutRect:function(){var e=this,n=e._super();if(e.settings.multiline){var r=t.getSize(e.getEl());r.width>n.maxW&&(n.minW=n.maxW,e.classes.add("multiline")),e.getEl().style.width=n.minW+"px",n.startMinH=n.h=n.minH=Math.min(n.maxH,t.getSize(e.getEl()).height)}return n},repaint:function(){var e=this;return e.settings.multiline||(e.getEl().style.lineHeight=e.layoutRect().h+"px"),e._super()},renderHtml:function(){var e=this,t=e.settings.forId;return'"},bindStates:function(){var e=this;return e.state.on("change:text",function(t){e.innerHtml(e.encode(t.value))}),e._super()}})}),r(At,[ge],function(e){return e.extend({Defaults:{role:"toolbar",layout:"flow"},init:function(e){var t=this;t._super(e),t.classes.add("toolbar")},postRender:function(){var e=this;return e.items().each(function(e){e.classes.add("toolbar-item")}),e._super()}})}),r(Bt,[At],function(e){return e.extend({Defaults:{role:"menubar",containerCls:"menubar",ariaRoot:!0,defaults:{type:"menubutton"}}})}),r(Dt,[lt,pe,Bt],function(e,t,n){function r(e,t){for(;e;){if(t===e)return!0;e=e.parentNode}return!1}var i=e.extend({init:function(e){var t=this;t._renderOpen=!0,t._super(e),e=t.settings,t.classes.add("menubtn"),e.fixedWidth&&t.classes.add("fixed-width"),t.aria("haspopup",!0),t.state.set("menu",e.menu||t.render())},showMenu:function(){var e=this,n;return e.menu&&e.menu.visible()?e.hideMenu():(e.menu||(n=e.state.get("menu")||[],n.length?n={type:"menu",items:n}:n.type=n.type||"menu",n.renderTo?e.menu=n.parent(e).show().renderTo():e.menu=t.create(n).parent(e).renderTo(),e.fire("createmenu"),e.menu.reflow(),e.menu.on("cancel",function(t){t.control.parent()===e.menu&&(t.stopPropagation(),e.focus(),e.hideMenu())}),e.menu.on("select",function(){e.focus()}),e.menu.on("show hide",function(t){t.control==e.menu&&e.activeMenu("show"==t.type),e.aria("expanded","show"==t.type)}).fire("show")),e.menu.show(),e.menu.layoutRect({w:e.layoutRect().w}),void e.menu.moveRel(e.getEl(),e.isRtl()?["br-tr","tr-br"]:["bl-tl","tl-bl"]))},hideMenu:function(){var e=this;e.menu&&(e.menu.items().each(function(e){e.hideMenu&&e.hideMenu()}),e.menu.hide())},activeMenu:function(e){this.classes.toggle("active",e)},renderHtml:function(){var e=this,t=e._id,r=e.classPrefix,i=e.settings.icon,o,a=e.state.get("text"),s="";return o=e.settings.image,o?(i="none","string"!=typeof o&&(o=window.getSelection?o[0]:o[1]),o=" style=\"background-image: url('"+o+"')\""):o="",a&&(e.classes.add("btn-has-text"),s=''+e.encode(a)+""),i=e.settings.icon?r+"ico "+r+"i-"+i:"",e.aria("role",e.parent()instanceof n?"menuitem":"button"),'
    '},postRender:function(){var e=this;return e.on("click",function(t){t.control===e&&r(t.target,e.getEl())&&(e.showMenu(),t.aria&&e.menu.items()[0].focus())}),e.on("mouseenter",function(t){var n=t.control,r=e.parent(),o;n&&r&&n instanceof i&&n.parent()==r&&(r.items().filter("MenuButton").each(function(e){e.hideMenu&&e!=n&&(e.menu&&e.menu.visible()&&(o=!0),e.hideMenu())}),o&&(n.focus(),n.showMenu()))}),e._super()},bindStates:function(){var e=this;return e.state.on("change:menu",function(){e.menu&&e.menu.remove(),e.menu=null}),e._super()},remove:function(){this._super(),this.menu&&this.menu.remove()}});return i}),r(Mt,[ke,pe,h],function(e,t,n){return e.extend({Defaults:{border:0,role:"menuitem"},init:function(e){var t=this,n;t._super(e),e=t.settings,t.classes.add("menu-item"),e.menu&&t.classes.add("menu-item-expand"),e.preview&&t.classes.add("menu-item-preview"),n=t.state.get("text"),("-"===n||"|"===n)&&(t.classes.add("menu-item-sep"),t.aria("role","separator"), +t.state.set("text","-")),e.selectable&&(t.aria("role","menuitemcheckbox"),t.classes.add("menu-item-checkbox"),e.icon="selected"),e.preview||e.selectable||t.classes.add("menu-item-normal"),t.on("mousedown",function(e){e.preventDefault()}),e.menu&&!e.ariaHideMenu&&t.aria("haspopup",!0)},hasMenus:function(){return!!this.settings.menu},showMenu:function(){var e=this,n=e.settings,r,i=e.parent();if(i.items().each(function(t){t!==e&&t.hideMenu()}),n.menu){r=e.menu,r?r.show():(r=n.menu,r.length?r={type:"menu",items:r}:r.type=r.type||"menu",i.settings.itemDefaults&&(r.itemDefaults=i.settings.itemDefaults),r=e.menu=t.create(r).parent(e).renderTo(),r.reflow(),r.on("cancel",function(t){t.stopPropagation(),e.focus(),r.hide()}),r.on("show hide",function(e){e.control.items().each(function(e){e.active(e.settings.selected)})}).fire("show"),r.on("hide",function(t){t.control===r&&e.classes.remove("selected")}),r.submenu=!0),r._parentMenu=i,r.classes.add("menu-sub");var o=r.testMoveRel(e.getEl(),e.isRtl()?["tl-tr","bl-br","tr-tl","br-bl"]:["tr-tl","br-bl","tl-tr","bl-br"]);r.moveRel(e.getEl(),o),r.rel=o,o="menu-sub-"+o,r.classes.remove(r._lastRel).add(o),r._lastRel=o,e.classes.add("selected"),e.aria("expanded",!0)}},hideMenu:function(){var e=this;return e.menu&&(e.menu.items().each(function(e){e.hideMenu&&e.hideMenu()}),e.menu.hide(),e.aria("expanded",!1)),e},renderHtml:function(){function e(e){var t,r,i={};for(i=n.mac?{alt:"⌥",ctrl:"⌘",shift:"⇧",meta:"⌘"}:{meta:"Ctrl"},e=e.split("+"),t=0;t'+("-"!==a?'\xa0":"")+("-"!==a?''+a+"":"")+(c?'
    '+c+"
    ":"")+(i.menu?'
    ':"")+"
    "},postRender:function(){var e=this,t=e.settings,n=t.textStyle;if("function"==typeof n&&(n=n.call(this)),n){var r=e.getEl("text");r&&r.setAttribute("style",n)}return e.on("mouseenter click",function(n){n.control===e&&(t.menu||"click"!==n.type?(e.showMenu(),n.aria&&e.menu.focus(!0)):(e.fire("select"),e.parent().hideAll()))}),e._super(),e},active:function(e){return"undefined"!=typeof e&&this.aria("checked",e),this._super(e)},remove:function(){this._super(),this.menu&&this.menu.remove()}})}),r(Lt,[we,Mt,m],function(e,t,n){return e.extend({Defaults:{defaultType:"menuitem",border:1,layout:"stack",role:"application",bodyRole:"menu",ariaRoot:!0},init:function(e){var t=this;if(e.autohide=!0,e.constrainToViewport=!0,e.itemDefaults)for(var r=e.items,i=r.length;i--;)r[i]=n.extend({},e.itemDefaults,r[i]);t._super(e),t.classes.add("menu")},repaint:function(){return this.classes.toggle("menu-align",!0),this._super(),this.getEl().style.height="",this.getEl("body").style.height="",this},cancel:function(){var e=this;e.hideAll(),e.fire("select")},hideAll:function(){var e=this;return this.find("menuitem").exec("hideMenu"),e._super()},preRender:function(){var e=this;return e.items().each(function(t){var n=t.settings;return n.icon||n.image||n.selectable?(e._hasIcons=!0,!1):void 0}),e._super()}})}),r(Pt,[Dt,Lt],function(e,t){return e.extend({init:function(e){function t(r){for(var a=0;a0&&(o=r[0].text,n.state.set("value",r[0].value)),n.state.set("menu",r)),n.state.set("text",e.text||o),n.classes.add("listbox"),n.on("select",function(t){var r=t.control;a&&(t.lastControl=a),e.multiple?r.active(!r.active()):n.value(t.control.value()),a=r})},bindStates:function(){function e(e,n){e instanceof t&&e.items().each(function(e){e.hasMenus()||e.active(e.value()===n)})}function n(e,t){var r;if(e)for(var i=0;i
    '},postRender:function(){var e=this;e._super(),e.resizeDragHelper=new t(this._id,{start:function(){e.fire("ResizeStart")},drag:function(t){"both"!=e.settings.direction&&(t.deltaX=0),e.fire("Resize",t)},stop:function(){e.fire("ResizeEnd")}})},remove:function(){return this.resizeDragHelper&&this.resizeDragHelper.destroy(),this._super()}})}),r(It,[ke],function(e){function t(e){var t="";if(e)for(var n=0;n'+e[n]+"";return t}return e.extend({Defaults:{classes:"selectbox",role:"selectbox",options:[]},init:function(e){var t=this;t._super(e),t.settings.size&&(t.size=t.settings.size),t.settings.options&&(t._options=t.settings.options)},options:function(e){return arguments.length?(this.state.set("options",e),this):this.state.get("options")},renderHtml:function(){var e=this,n,r="";return n=t(e._options),e.size&&(r=' size = "'+e.size+'"'),'"},bindStates:function(){var e=this;return e.state.on("change:options",function(n){e.getEl().innerHTML=t(n.value)}),e._super()}})}),r(Ft,[ke,ve,ce],function(e,t,n){function r(e,t,n){return t>e&&(e=t),e>n&&(e=n),e}function i(e,t){var r,i,o,a,s;"v"==e.settings.orientation?(a="top",o="height",i="h"):(a="left",o="width",i="w"),r=(e.layoutRect()[i]||100)-n.getSize(e.getEl("handle"))[o],s=r*((t-e._minValue)/(e._maxValue-e._minValue))+"px",e.getEl("handle").style[a]=s,e.getEl("handle").style.height=e.layoutRect().h+"px"}return e.extend({init:function(e){var t=this;e.previewFilter||(e.previewFilter=function(e){return Math.round(100*e)/100}),t._super(e),t.classes.add("slider"),"v"==e.orientation&&t.classes.add("vertical"),t._minValue=e.minValue||0,t._maxValue=e.maxValue||100,t._initValue=t.state.get("value")},renderHtml:function(){var e=this,t=e._id,n=e.classPrefix;return'
    '},reset:function(){this.value(this._initValue).repaint()},postRender:function(){var e=this,i,o,a=0,s,l,c,u,d,f,h,p;l=e._minValue,c=e._maxValue,s=e.value(),"v"==e.settings.orientation?(d="screenY",f="top",h="height",p="h"):(d="screenX",f="left",h="width",p="w"),e._super(),e._dragHelper=new t(e._id,{handle:e._id+"-handle",start:function(t){i=t[d],o=parseInt(e.getEl("handle").style[f],10),u=(e.layoutRect()[p]||100)-n.getSize(e.getEl("handle"))[h],e.fire("dragstart",{value:s})},drag:function(t){var n=t[d]-i,h=e.getEl("handle");a=r(o+n,0,u),h.style[f]=a+"px",s=l+a/u*(c-l),e.value(s),e.tooltip().text(""+e.settings.previewFilter(s)).show().moveRel(h,"bc tc"),e.fire("drag",{value:s})},stop:function(){e.tooltip().hide(),e.fire("dragend",{value:s})}})},repaint:function(){this._super(),i(this,this.value())},bindStates:function(){var e=this;return e.state.on("change:value",function(t){i(e,t.value)}),e._super()}})}),r(zt,[ke],function(e){return e.extend({renderHtml:function(){var e=this;return e.classes.add("spacer"),e.canFocus=!1,'
    '}})}),r(Wt,[Dt,ce,g],function(e,t,n){return e.extend({Defaults:{classes:"widget btn splitbtn",role:"button"},repaint:function(){var e=this,r=e.getEl(),i=e.layoutRect(),o,a;return e._super(),o=r.firstChild,a=r.lastChild,n(o).css({width:i.w-t.getSize(a).width,height:i.h-2}),n(a).css({height:i.h-2}),e},activeMenu:function(e){var t=this;n(t.getEl().lastChild).toggleClass(t.classPrefix+"active",e)},renderHtml:function(){var e=this,t=e._id,n=e.classPrefix,r,i=e.state.get("icon"),o=e.state.get("text"),a="";return r=e.settings.image,r?(i="none","string"!=typeof r&&(r=window.getSelection?r[0]:r[1]),r=" style=\"background-image: url('"+r+"')\""):r="",i=e.settings.icon?n+"ico "+n+"i-"+i:"",o&&(e.classes.add("btn-has-text"),a=''+e.encode(o)+""),'
    '},postRender:function(){var e=this,t=e.settings.onclick;return e.on("click",function(e){var n=e.target;if(e.control==this)for(;n;){if(e.aria&&"down"!=e.aria.key||"BUTTON"==n.nodeName&&-1==n.className.indexOf("open"))return e.stopImmediatePropagation(),void(t&&t.call(this,e));n=n.parentNode}}),delete e.settings.onclick,e._super()}})}),r(Vt,[_t],function(e){return e.extend({Defaults:{containerClass:"stack-layout",controlClass:"stack-layout-item",endClass:"break"},isNative:function(){return!0}})}),r(Ut,[be,g,ce],function(e,t,n){return e.extend({Defaults:{layout:"absolute",defaults:{type:"panel"}},activateTab:function(e){var n;this.activeTabId&&(n=this.getEl(this.activeTabId),t(n).removeClass(this.classPrefix+"active"),n.setAttribute("aria-selected","false")),this.activeTabId="t"+e,n=this.getEl("t"+e),n.setAttribute("aria-selected","true"),t(n).addClass(this.classPrefix+"active"),this.items()[e].show().fire("showtab"),this.reflow(),this.items().each(function(t,n){e!=n&&t.hide()})},renderHtml:function(){var e=this,t=e._layout,n="",r=e.classPrefix;return e.preRender(),t.preRender(e),e.items().each(function(t,i){var o=e._id+"-t"+i;t.aria("role","tabpanel"),t.aria("labelledby",o),n+='"}),'
    '+n+'
    '+t.renderHtml(e)+"
    "},postRender:function(){var e=this;e._super(),e.settings.activeTab=e.settings.activeTab||0,e.activateTab(e.settings.activeTab),this.on("click",function(t){var n=t.target.parentNode;if(t.target.parentNode.id==e._id+"-head")for(var r=n.childNodes.length;r--;)n.childNodes[r]==t.target&&e.activateTab(r)})},initLayoutRect:function(){var e=this,t,r,i;r=n.getSize(e.getEl("head")).width,r=0>r?0:r,i=0,e.items().each(function(e){r=Math.max(r,e.layoutRect().minW),i=Math.max(i,e.layoutRect().minH)}),e.items().each(function(e){e.settings.x=0,e.settings.y=0,e.settings.w=r,e.settings.h=i,e.layoutRect({x:0,y:0,w:r,h:i})});var o=n.getSize(e.getEl("head")).height;return e.settings.minWidth=r,e.settings.minHeight=i+o,t=e._super(),t.deltaH+=o,t.innerH=t.h-t.deltaH,t}})}),r($t,[ke],function(e){return e.extend({init:function(e){var t=this;t._super(e),t.classes.add("textbox"),e.multiline?t.classes.add("multiline"):(t.on("keydown",function(e){var n;13==e.keyCode&&(e.preventDefault(),t.parents().reverse().each(function(e){return e.toJSON?(n=e,!1):void 0}),t.fire("submit",{data:n.toJSON()}))}),t.on("keyup",function(e){t.state.set("value",e.target.value)}))},repaint:function(){var e=this,t,n,r,i,o=0,a;t=e.getEl().style,n=e._layoutRect,a=e._lastRepaintRect||{};var s=document;return!e.settings.multiline&&s.all&&(!s.documentMode||s.documentMode<=8)&&(t.lineHeight=n.h-o+"px"),r=e.borderBox,i=r.left+r.right+8,o=r.top+r.bottom+(e.settings.multiline?8:0),n.x!==a.x&&(t.left=n.x+"px",a.x=n.x),n.y!==a.y&&(t.top=n.y+"px",a.y=n.y),n.w!==a.w&&(t.width=n.w-i+"px",a.w=n.w),n.h!==a.h&&(t.height=n.h-o+"px",a.h=n.h),e._lastRepaintRect=a,e.fire("repaint",{},!1),e},renderHtml:function(){var e=this,t=e._id,n=e.settings,r=e.encode(e.state.get("value"),!1),i="";return"spellcheck"in n&&(i+=' spellcheck="'+n.spellcheck+'"'),n.maxLength&&(i+=' maxlength="'+n.maxLength+'"'),n.size&&(i+=' size="'+n.size+'"'),n.subtype&&(i+=' type="'+n.subtype+'"'),e.disabled()&&(i+=' disabled="disabled"'),n.multiline?'":'"},value:function(e){return arguments.length?(this.state.set("value",e),this):(this.state.get("rendered")&&this.state.set("value",this.getEl().value),this.state.get("value"))},postRender:function(){var e=this;e._super(),e.$el.on("change",function(t){e.state.set("value",t.target.value),e.fire("change",t)})},bindStates:function(){var e=this;return e.state.on("change:value",function(t){e.getEl().value!=t.value&&(e.getEl().value=t.value)}),e.state.on("change:disabled",function(t){e.getEl().disabled=t.value}),e._super()},remove:function(){this.$el.off(),this._super()}})}),r(qt,[g,he,u],function(e,t,n){return function(r,i){var o=this,a,s=t.classPrefix;o.show=function(t,l){return o.hide(),a=!0,n.setTimeout(function(){a&&(e(r).append('
    '),l&&l())},t),o},o.hide=function(){var e=r.lastChild;return e&&-1!=e.className.indexOf("throbber")&&e.parentNode.removeChild(e),a=!1,o}}}),a([l,c,u,d,f,h,m,g,v,y,C,w,E,N,T,A,B,D,M,L,P,H,I,F,j,Y,G,J,ee,te,ne,re,oe,se,le,fe,he,pe,me,ge,ve,ye,be,Ce,xe,we,Ee,Ne,_e,Se,ke,Te,Re,Ae,Me,Pe,Ke,Ge,Je,Qe,et,tt,nt,rt,it,ot,at,st,lt,ct,ut,dt,ft,ht,pt,mt,gt,vt,yt,bt,Ct,xt,wt,Et,Nt,_t,St,kt,Tt,Rt,At,Bt,Dt,Mt,Lt,Pt,Ht,Ot,It,Ft,zt,Wt,Vt,Ut,$t,qt])}(this); \ No newline at end of file diff --git a/media/jui/css/bootstrap-rtl.css b/media/jui/css/bootstrap-rtl.css index 53eae1552d74b..640911e0d16a0 100644 --- a/media/jui/css/bootstrap-rtl.css +++ b/media/jui/css/bootstrap-rtl.css @@ -437,7 +437,14 @@ body { } .dl-horizontal dt { float: right; + text-align: left; + clear: right; +} +.dl-horizontal dd { + margin-left: 0; + margin-right: 180px; } +.dl-horizontal dt .profile> ul { margin: 9px 25px 0 0; } diff --git a/media/jui/css/chosen-sprite.png b/media/jui/css/chosen-sprite.png index e6f799a7f717d..ebaf1b6c39303 100644 Binary files a/media/jui/css/chosen-sprite.png and b/media/jui/css/chosen-sprite.png differ diff --git a/media/jui/css/chosen-sprite@2x.png b/media/jui/css/chosen-sprite@2x.png index ffe4d7d1121ca..301e388525a3a 100644 Binary files a/media/jui/css/chosen-sprite@2x.png and b/media/jui/css/chosen-sprite@2x.png differ diff --git a/media/jui/css/jquery.searchtools.css b/media/jui/css/jquery.searchtools.css index 4b8fe776c6bb5..00c1226781717 100644 --- a/media/jui/css/jquery.searchtools.css +++ b/media/jui/css/jquery.searchtools.css @@ -8,6 +8,13 @@ .js-stools-container-bar .input-append { margin-bottom: 0; } +/* Use up caret to hide the search filters */ +.js-stools-container-bar .btn-primary .caret { + border-top: 0; + border-bottom: 4px solid #FFF; + margin-top: 7px; + margin-bottom: 8px; +} .js-stools .btn-wrapper { display: inline-block; margin: 0 5px 0 0; @@ -36,6 +43,9 @@ html[dir=rtl] .js-stools .chzn-container { .js-stools .js-stools-container-filters .chzn-container.active .chzn-single{ border: 2px solid #2384D3; } +.js-stools .js-stools-container-filters-visible { + display: inline-block; +} .js-stools .chzn-container-single .chzn-single span { overflow: visible; } @@ -80,4 +90,4 @@ html[dir=rtl] .js-stools .chzn-container { display: block; margin-top: 10px; } -} \ No newline at end of file +} diff --git a/media/jui/css/sortablelist.css b/media/jui/css/sortablelist.css index b57a620607080..26aad9563f022 100644 --- a/media/jui/css/sortablelist.css +++ b/media/jui/css/sortablelist.css @@ -1,5 +1,5 @@ /** - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. * @license GNU General Public License version 2 or later; see LICENSE.txt */ .dnd-list-highlight { diff --git a/media/jui/img/alpha.png b/media/jui/img/alpha.png index 18cc2b158256c..833c856185f93 100644 Binary files a/media/jui/img/alpha.png and b/media/jui/img/alpha.png differ diff --git a/media/jui/img/bg-overlay.png b/media/jui/img/bg-overlay.png index 0bf9cb3e735cf..0bdb164617403 100644 Binary files a/media/jui/img/bg-overlay.png and b/media/jui/img/bg-overlay.png differ diff --git a/media/jui/img/glyphicons-halflings-white.png b/media/jui/img/glyphicons-halflings-white.png index cec126351bfe4..7507bf61f46fc 100644 Binary files a/media/jui/img/glyphicons-halflings-white.png and b/media/jui/img/glyphicons-halflings-white.png differ diff --git a/media/jui/img/glyphicons-halflings.png b/media/jui/img/glyphicons-halflings.png index 73da3899f502f..f241c76f9adb7 100644 Binary files a/media/jui/img/glyphicons-halflings.png and b/media/jui/img/glyphicons-halflings.png differ diff --git a/media/jui/img/joomla.png b/media/jui/img/joomla.png index a816a39698176..21fe24d1ed017 100644 Binary files a/media/jui/img/joomla.png and b/media/jui/img/joomla.png differ diff --git a/media/jui/img/jquery.minicolors.png b/media/jui/img/jquery.minicolors.png index aa59fd169c667..33e4a33ecba93 100644 Binary files a/media/jui/img/jquery.minicolors.png and b/media/jui/img/jquery.minicolors.png differ diff --git a/media/jui/img/saturation.png b/media/jui/img/saturation.png index 170841cba2fe5..a1598af6de47c 100644 Binary files a/media/jui/img/saturation.png and b/media/jui/img/saturation.png differ diff --git a/media/jui/js/cms-uncompressed.js b/media/jui/js/cms-uncompressed.js new file mode 100644 index 0000000000000..af1d63ab51593 --- /dev/null +++ b/media/jui/js/cms-uncompressed.js @@ -0,0 +1,102 @@ +/** + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @license GNU General Public License version 2 or later; see LICENSE.txt + */ + +// Only define the Joomla namespace if not defined. +if (typeof(Joomla) === 'undefined') { + var Joomla = {}; +} + +/** + * Sets the HTML of the container-collapse element + */ +Joomla.setcollapse = function(url, name, height) { + if (!document.getElementById('collapse-' + name)) { + document.getElementById('container-collapse').innerHTML = '
    '; + } +} + +if (jQuery) { + jQuery(document).ready(function($) { + var linkedoptions = function(target) { + var showfield = true, itemval, jsondata = target.data('showon'); + + // Check if target conditions are satisfied + $.each(jsondata, function(j, item) { + $fields = $('[name="' + jsondata[j]['field'] + '"], [name="' + jsondata[j]['field'] + '[]"]'); + jsondata[j]['valid'] = 0; + + // Test in each of the elements in the field array if condition is valid + $fields.each(function() { + // If checkbox or radio box the value is read from proprieties + if (['checkbox','radio'].indexOf($(this).attr('type')) != -1) + { + itemval = $(this).prop('checked') ? $(this).val() : ''; + } + else + { + itemval = $(this).val(); + } + + // Convert to array to allow multiple values in the field (e.g. type=list multiple) and normalize as string + if (!(typeof itemval === 'object')) + { + itemval = JSON.parse('["' + itemval + '"]'); + } + + // Test if any of the values of the field exists in showon conditions + for (var i in itemval) + { + if (jsondata[j]['values'].indexOf(itemval[i]) != -1) + { + jsondata[j]['valid'] = 1; + } + } + }); + + // Verify conditions + // First condition (no operator): current condition must be valid + if (jsondata[j]['op'] == '') + { + if (jsondata[j]['valid'] == 0) + { + showfield = false; + } + } + // Other conditions (if exists) + else + { + // AND operator: both the previous and current conditions must be valid + if (jsondata[j]['op'] == 'AND' && jsondata[j]['valid'] + jsondata[j-1]['valid'] < 2) + { + showfield = false; + } + // OR operator: one of the previous and current conditions must be valid + if (jsondata[j]['op'] == 'OR' && jsondata[j]['valid'] + jsondata[j-1]['valid'] > 0) + { + showfield = true; + } + } + }); + + // If conditions are satisfied show the target field(s), else hide + (showfield) ? target.slideDown() : target.slideUp(); + }; + + $('[data-showon]').each(function() { + var target = $(this), jsondata = $(this).data('showon'); + + // Attach events to referenced element + $.each(jsondata, function(j, item) { + $fields = $('[name="' + jsondata[j]['field'] + '"], [name="' + jsondata[j]['field'] + '[]"]'); + // Attach events to referenced element + $fields.each(function() { + linkedoptions(target); + }).bind('change', function() { + linkedoptions(target); + }); + }); + }); + }); +} \ No newline at end of file diff --git a/media/jui/js/cms.js b/media/jui/js/cms.js index 88e8c3fe7fc2e..aa7becd61b052 100644 --- a/media/jui/js/cms.js +++ b/media/jui/js/cms.js @@ -1,50 +1 @@ -/** - * @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved. - * @license GNU General Public License version 2 or later; see LICENSE.txt - */ - -// Only define the Joomla namespace if not defined. -if (typeof(Joomla) === 'undefined') { - var Joomla = {}; -} - -/** - * Sets the HTML of the container-collapse element - */ -Joomla.setcollapse = function(url, name, height) { - if (!document.getElementById('collapse-' + name)) { - document.getElementById('container-collapse').innerHTML = '
    '; - } -} - -if (jQuery) { - jQuery(document).ready(function($) { - var elements = {}, - linkedoptions = function(element, target, checkType) { - var v = element.val(), id = element.attr('id'); - if(checkType && !element.is(':checked')) - return; - $('[rel=\"showon_'+target+'\"]').each(function(){ - var i = jQuery(this); - if (i.hasClass('showon_' + v)) - i.slideDown(); - else - i.slideUp(); - }); - }; - $('[rel^=\"showon_\"]').each(function(){ - var el = $(this), target = el.attr('rel').replace('showon_', ''), targetEl = $('[name=\"' + target+'\"]'); - if (!elements[target]) { - var targetType = targetEl.attr('type'), checkType = (targetType == 'checkbox' || targetType == 'radio'); - targetEl.bind('change', function(){ - linkedoptions( $(this), target, checkType); - }).bind('click', function(){ - linkedoptions( $(this), target, checkType ); - }).each(function(){ - linkedoptions( $(this), target, checkType ); - }); - elements[target] = true; - } - }); - }); -} +if("undefined"===typeof Joomla)var Joomla={};Joomla.setcollapse=function(e,i,a){if(!document.getElementById("collapse-"+i))document.getElementById("container-collapse").innerHTML='
    '};if(jQuery)jQuery(document).ready(function(e){var i=function(i){var a=true,n,l=i.data("showon");e.each(l,function(i,o){$fields=e('[name="'+l[i]["field"]+'"], [name="'+l[i]["field"]+'[]"]');l[i]["valid"]=0;$fields.each(function(){if(["checkbox","radio"].indexOf(e(this).attr("type"))!=-1)n=e(this).prop("checked")?e(this).val():"";else n=e(this).val();if(!("object"===typeof n))n=JSON.parse('["'+n+'"]');for(var a in n)if(l[i]["values"].indexOf(n[a])!=-1)l[i]["valid"]=1});if(""==l[i]["op"]){if(0==l[i]["valid"])a=false}else{if("AND"==l[i]["op"]&&l[i]["valid"]+l[i-1]["valid"]<2)a=false;if("OR"==l[i]["op"]&&l[i]["valid"]+l[i-1]["valid"]>0)a=true}});a?i.slideDown():i.slideUp()};e("[data-showon]").each(function(){var a=e(this),n=e(this).data("showon");e.each(n,function(l,o){$fields=e('[name="'+n[l]["field"]+'"], [name="'+n[l]["field"]+'[]"]');$fields.each(function(){i(a)}).bind("change",function(){i(a)})})})}); \ No newline at end of file diff --git a/media/jui/js/fielduser.js b/media/jui/js/fielduser.js new file mode 100644 index 0000000000000..ffc1f0a288d0a --- /dev/null +++ b/media/jui/js/fielduser.js @@ -0,0 +1,144 @@ +/** + * @copyright Copyright (C) 2005 - 2016 Open Source Matters, Inc. All rights reserved. + * @license GNU General Public License version 2 or later; see LICENSE.txt + */ + +/** + * Field user + */ +;(function($){ + 'use strict'; + + $.fieldUser = function(container, options){ + // Merge options with defaults + this.options = $.extend({}, $.fieldUser.defaults, options); + + // Set up elements + this.$container = $(container); + this.$modal = this.$container.find(this.options.modal); + this.$modalBody = this.$modal.children('.modal-body'); + this.$input = this.$container.find(this.options.input); + this.$inputName = this.$container.find(this.options.inputName); + this.$buttonSelect = this.$container.find(this.options.buttonSelect); + + // Bind events + this.$buttonSelect.on('click', this.modalOpen.bind(this)); + this.$modal.on('hide', this.removeIframe.bind(this)); + + // Check for onchange callback, + var onchangeStr = this.$input.attr('data-onchange'), onchangeCallback; + if(onchangeStr) { + onchangeCallback = new Function(onchangeStr); + this.$input.on('change', onchangeCallback.bind(this.$input)); + } + + }; + + // display modal for select the file + $.fieldUser.prototype.modalOpen = function() { + var $iframe = $(''; + if (typeof($f) == 'function') { // froogaloop available + var player = $f(container.childNodes[0]); + + player.addEvent('ready', function() { + + player.playVideo = function() { + player.api( 'play' ); + } + player.stopVideo = function() { + player.api( 'unload' ); + } + player.pauseVideo = function() { + player.api( 'pause' ); + } + player.seekTo = function( seconds ) { + player.api( 'seekTo', seconds ); + } + player.setVolume = function( volume ) { + player.api( 'setVolume', volume ); + } + player.setMuted = function( muted ) { + if( muted ) { + player.lastVolume = player.api( 'getVolume' ); + player.api( 'setVolume', 0 ); + } else { + player.api( 'setVolume', player.lastVolume ); + delete player.lastVolume; + } + } + + function createEvent(player, pluginMediaElement, eventName, e) { + var event = { + type: eventName, + target: pluginMediaElement + }; + if (eventName == 'timeupdate') { + pluginMediaElement.currentTime = event.currentTime = e.seconds; + pluginMediaElement.duration = event.duration = e.duration; + } + pluginMediaElement.dispatchEvent(event); + } + + player.addEvent('play', function() { + createEvent(player, pluginMediaElement, 'play'); + createEvent(player, pluginMediaElement, 'playing'); + }); + + player.addEvent('pause', function() { + createEvent(player, pluginMediaElement, 'pause'); + }); + + player.addEvent('finish', function() { + createEvent(player, pluginMediaElement, 'ended'); + }); + + player.addEvent('playProgress', function(e) { + createEvent(player, pluginMediaElement, 'timeupdate', e); + }); + + pluginMediaElement.pluginElement = container; + pluginMediaElement.pluginApi = player; + + // init mejs + mejs.MediaPluginBridge.initPlugin(pluginid); + }); + } + else { + console.warn("You need to include froogaloop for vimeo to work"); + } + break; + } + // hide original element + htmlMediaElement.style.display = 'none'; + // prevent browser from autoplaying when using a plugin + htmlMediaElement.removeAttribute('autoplay'); + + // FYI: options.success will be fired by the MediaPluginBridge + + return pluginMediaElement; + }, + + updateNative: function(playback, options, autoplay, preload) { + + var htmlMediaElement = playback.htmlMediaElement, + m; + + + // add methods to video object to bring it into parity with Flash Object + for (m in mejs.HtmlMediaElement) { + htmlMediaElement[m] = mejs.HtmlMediaElement[m]; + } + + /* + Chrome now supports preload="none" + if (mejs.MediaFeatures.isChrome) { + + // special case to enforce preload attribute (Chrome doesn't respect this) + if (preload === 'none' && !autoplay) { + + // forces the browser to stop loading (note: fails in IE9) + htmlMediaElement.src = ''; + htmlMediaElement.load(); + htmlMediaElement.canceledPreload = true; + + htmlMediaElement.addEventListener('play',function() { + if (htmlMediaElement.canceledPreload) { + htmlMediaElement.src = playback.url; + htmlMediaElement.load(); + htmlMediaElement.play(); + htmlMediaElement.canceledPreload = false; + } + }, false); + // for some reason Chrome forgets how to autoplay sometimes. + } else if (autoplay) { + htmlMediaElement.load(); + htmlMediaElement.play(); + } + } + */ + + // fire success code + options.success(htmlMediaElement, htmlMediaElement); + + return htmlMediaElement; + } +}; + +/* + - test on IE (object vs. embed) + - determine when to use iframe (Firefox, Safari, Mobile) vs. Flash (Chrome, IE) + - fullscreen? +*/ + +// YouTube Flash and Iframe API +mejs.YouTubeApi = { + isIframeStarted: false, + isIframeLoaded: false, + loadIframeApi: function() { + if (!this.isIframeStarted) { + var tag = document.createElement('script'); + tag.src = "//www.youtube.com/player_api"; + var firstScriptTag = document.getElementsByTagName('script')[0]; + firstScriptTag.parentNode.insertBefore(tag, firstScriptTag); + this.isIframeStarted = true; + } + }, + iframeQueue: [], + enqueueIframe: function(yt) { + + if (this.isLoaded) { + this.createIframe(yt); + } else { + this.loadIframeApi(); + this.iframeQueue.push(yt); + } + }, + createIframe: function(settings) { + + var + pluginMediaElement = settings.pluginMediaElement, + player = new YT.Player(settings.containerId, { + height: settings.height, + width: settings.width, + videoId: settings.videoId, + playerVars: {controls:0,wmode:'transparent'}, + events: { + 'onReady': function() { + + // wrapper to match + player.setVideoSize = function(width, height) { + player.setSize(width, height); + } + + // hook up iframe object to MEjs + settings.pluginMediaElement.pluginApi = player; + settings.pluginMediaElement.pluginElement = document.getElementById(settings.containerId); + + // init mejs + mejs.MediaPluginBridge.initPlugin(settings.pluginId); + + // create timer + setInterval(function() { + mejs.YouTubeApi.createEvent(player, pluginMediaElement, 'timeupdate'); + }, 250); + }, + 'onStateChange': function(e) { + + mejs.YouTubeApi.handleStateChange(e.data, player, pluginMediaElement); + + } + } + }); + }, + + createEvent: function (player, pluginMediaElement, eventName) { + var event = { + type: eventName, + target: pluginMediaElement + }; + + if (player && player.getDuration) { + + // time + pluginMediaElement.currentTime = event.currentTime = player.getCurrentTime(); + pluginMediaElement.duration = event.duration = player.getDuration(); + + // state + event.paused = pluginMediaElement.paused; + event.ended = pluginMediaElement.ended; + + // sound + event.muted = player.isMuted(); + event.volume = player.getVolume() / 100; + + // progress + event.bytesTotal = player.getVideoBytesTotal(); + event.bufferedBytes = player.getVideoBytesLoaded(); + + // fake the W3C buffered TimeRange + var bufferedTime = event.bufferedBytes / event.bytesTotal * event.duration; + + event.target.buffered = event.buffered = { + start: function(index) { + return 0; + }, + end: function (index) { + return bufferedTime; + }, + length: 1 + }; + + } + + // send event up the chain + pluginMediaElement.dispatchEvent(event); + }, + + iFrameReady: function() { + + this.isLoaded = true; + this.isIframeLoaded = true; + + while (this.iframeQueue.length > 0) { + var settings = this.iframeQueue.pop(); + this.createIframe(settings); + } + }, + + // FLASH! + flashPlayers: {}, + createFlash: function(settings) { + + this.flashPlayers[settings.pluginId] = settings; + + /* + settings.container.innerHTML = + '' + + '' + + '' + + ''; + */ + + var specialIEContainer, + youtubeUrl = '//www.youtube.com/apiplayer?enablejsapi=1&playerapiid=' + settings.pluginId + '&version=3&autoplay=0&controls=0&modestbranding=1&loop=0'; + + if (mejs.MediaFeatures.isIE) { + + specialIEContainer = document.createElement('div'); + settings.container.appendChild(specialIEContainer); + specialIEContainer.outerHTML = '' + + '' + + '' + + '' + + '' + +''; + } else { + settings.container.innerHTML = + '' + + '' + + '' + + ''; + } + + }, + + flashReady: function(id) { + var + settings = this.flashPlayers[id], + player = document.getElementById(id), + pluginMediaElement = settings.pluginMediaElement; + + // hook up and return to MediaELementPlayer.success + pluginMediaElement.pluginApi = + pluginMediaElement.pluginElement = player; + mejs.MediaPluginBridge.initPlugin(id); + + // load the youtube video + player.cueVideoById(settings.videoId); + + var callbackName = settings.containerId + '_callback'; + + window[callbackName] = function(e) { + mejs.YouTubeApi.handleStateChange(e, player, pluginMediaElement); + } + + player.addEventListener('onStateChange', callbackName); + + setInterval(function() { + mejs.YouTubeApi.createEvent(player, pluginMediaElement, 'timeupdate'); + }, 250); + + mejs.YouTubeApi.createEvent(player, pluginMediaElement, 'canplay'); + }, + + handleStateChange: function(youTubeState, player, pluginMediaElement) { + switch (youTubeState) { + case -1: // not started + pluginMediaElement.paused = true; + pluginMediaElement.ended = true; + mejs.YouTubeApi.createEvent(player, pluginMediaElement, 'loadedmetadata'); + //createYouTubeEvent(player, pluginMediaElement, 'loadeddata'); + break; + case 0: + pluginMediaElement.paused = false; + pluginMediaElement.ended = true; + mejs.YouTubeApi.createEvent(player, pluginMediaElement, 'ended'); + break; + case 1: + pluginMediaElement.paused = false; + pluginMediaElement.ended = false; + mejs.YouTubeApi.createEvent(player, pluginMediaElement, 'play'); + mejs.YouTubeApi.createEvent(player, pluginMediaElement, 'playing'); + break; + case 2: + pluginMediaElement.paused = true; + pluginMediaElement.ended = false; + mejs.YouTubeApi.createEvent(player, pluginMediaElement, 'pause'); + break; + case 3: // buffering + mejs.YouTubeApi.createEvent(player, pluginMediaElement, 'progress'); + break; + case 5: + // cued? + break; + + } + + } +} +// IFRAME +window.onYouTubePlayerAPIReady = function() { + mejs.YouTubeApi.iFrameReady(); +}; +// FLASH +window.onYouTubePlayerReady = function(id) { + mejs.YouTubeApi.flashReady(id); +}; + +window.mejs = mejs; +window.MediaElement = mejs.MediaElement; + +/* + * Adds Internationalization and localization to mediaelement. + * + * This file does not contain translations, you have to add them manually. + * The schema is always the same: me-i18n-locale-[IETF-language-tag].js + * + * Examples are provided both for german and chinese translation. + * + * + * What is the concept beyond i18n? + * http://en.wikipedia.org/wiki/Internationalization_and_localization + * + * What langcode should i use? + * http://en.wikipedia.org/wiki/IETF_language_tag + * https://tools.ietf.org/html/rfc5646 + * + * + * License? + * + * The i18n file uses methods from the Drupal project (drupal.js): + * - i18n.methods.t() (modified) + * - i18n.methods.checkPlain() (full copy) + * + * The Drupal project is (like mediaelementjs) licensed under GPLv2. + * - http://drupal.org/licensing/faq/#q1 + * - https://github.com/johndyer/mediaelement + * - http://www.gnu.org/licenses/old-licenses/gpl-2.0.html + * + * + * @author + * Tim Latz (latz.tim@gmail.com) + * + * + * @params + * - context - document, iframe .. + * - exports - CommonJS, window .. + * + */ +;(function(context, exports, undefined) { + "use strict"; + + var i18n = { + "locale": { + // Ensure previous values aren't overwritten. + "language" : (exports.i18n && exports.i18n.locale.language) || '', + "strings" : (exports.i18n && exports.i18n.locale.strings) || {} + }, + "ietf_lang_regex" : /^(x\-)?[a-z]{2,}(\-\w{2,})?(\-\w{2,})?$/, + "methods" : {} + }; +// start i18n + + + /** + * Get language, fallback to browser's language if empty + * + * IETF: RFC 5646, https://tools.ietf.org/html/rfc5646 + * Examples: en, zh-CN, cmn-Hans-CN, sr-Latn-RS, es-419, x-private + */ + i18n.getLanguage = function () { + var language = i18n.locale.language || window.navigator.userLanguage || window.navigator.language; + return i18n.ietf_lang_regex.exec(language) ? language : null; + + //(WAS: convert to iso 639-1 (2-letters, lower case)) + //return language.substr(0, 2).toLowerCase(); + }; + + // i18n fixes for compatibility with WordPress + if ( typeof mejsL10n != 'undefined' ) { + i18n.locale.language = mejsL10n.language; + } + + + + /** + * Encode special characters in a plain-text string for display as HTML. + */ + i18n.methods.checkPlain = function (str) { + var character, regex, + replace = { + '&': '&', + '"': '"', + '<': '<', + '>': '>' + }; + str = String(str); + for (character in replace) { + if (replace.hasOwnProperty(character)) { + regex = new RegExp(character, 'g'); + str = str.replace(regex, replace[character]); + } + } + return str; + }; + + /** + * Translate strings to the page language or a given language. + * + * + * @param str + * A string containing the English string to translate. + * + * @param options + * - 'context' (defaults to the default context): The context the source string + * belongs to. + * + * @return + * The translated string, escaped via i18n.methods.checkPlain() + */ + i18n.methods.t = function (str, options) { + + // Fetch the localized version of the string. + if (i18n.locale.strings && i18n.locale.strings[options.context] && i18n.locale.strings[options.context][str]) { + str = i18n.locale.strings[options.context][str]; + } + + return i18n.methods.checkPlain(str); + }; + + + /** + * Wrapper for i18n.methods.t() + * + * @see i18n.methods.t() + * @throws InvalidArgumentException + */ + i18n.t = function(str, options) { + + if (typeof str === 'string' && str.length > 0) { + + // check every time due language can change for + // different reasons (translation, lang switcher ..) + var language = i18n.getLanguage(); + + options = options || { + "context" : language + }; + + return i18n.methods.t(str, options); + } + else { + throw { + "name" : 'InvalidArgumentException', + "message" : 'First argument is either not a string or empty.' + }; + } + }; + +// end i18n + exports.i18n = i18n; +}(document, mejs)); + +// i18n fixes for compatibility with WordPress +;(function(exports, undefined) { + + "use strict"; + + if ( typeof mejsL10n != 'undefined' ) { + exports[mejsL10n.language] = mejsL10n.strings; + } + +}(mejs.i18n.locale.strings)); + +/*! + * + * MediaElementPlayer + * http://mediaelementjs.com/ + * + * Creates a controller bar for HTML5