diff --git a/composer.json b/composer.json index 37f3a0b15..c4a2b665f 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,7 @@ "symfony/finder": "~2.2" }, "require-dev": { - "phpunit/phpunit": "3.7.*", + "phpunit/phpunit": "4.1.*", "fzaninotto/faker": "dev-master", "maximebf/debugbar": "dev-master" }, diff --git a/composer.lock b/composer.lock index d7da926ba..30991c403 100644 --- a/composer.lock +++ b/composer.lock @@ -1,9 +1,10 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" + "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "This file is @generated automatically" ], - "hash": "d1e1c31ed8e38f2282ab431898cf8b08", + "hash": "73a6895063dd76bcb25eb14ef329e745", "packages": [ { "name": "doctrine/cache", @@ -1959,40 +1960,44 @@ }, { "name": "phpunit/php-code-coverage", - "version": "1.2.12", + "version": "2.0.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "1.2.12" + "reference": "58401826c8cfc8fd689b60026e91c337df374bca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/1.2.12", - "reference": "1.2.12", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/58401826c8cfc8fd689b60026e91c337df374bca", + "reference": "58401826c8cfc8fd689b60026e91c337df374bca", "shasum": "" }, "require": { "php": ">=5.3.3", - "phpunit/php-file-iterator": ">=1.3.0@stable", - "phpunit/php-text-template": ">=1.1.1@stable", - "phpunit/php-token-stream": ">=1.1.3@stable" + "phpunit/php-file-iterator": "~1.3.1", + "phpunit/php-text-template": "~1.2.0", + "phpunit/php-token-stream": "~1.2.2", + "sebastian/environment": "~1.0.0", + "sebastian/version": "~1.0.3" }, "require-dev": { - "phpunit/phpunit": "3.7.*@dev" + "ext-xdebug": ">=2.1.4", + "phpunit/phpunit": "~4.0.14" }, "suggest": { "ext-dom": "*", - "ext-xdebug": ">=2.0.5" + "ext-xdebug": ">=2.2.1", + "ext-xmlwriter": "*" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { "classmap": [ - "PHP/" + "src/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -2016,20 +2021,20 @@ "testing", "xunit" ], - "time": "2013-07-06 06:26:16" + "time": "2014-05-26 14:55:24" }, { "name": "phpunit/php-file-iterator", - "version": "1.3.3", + "version": "1.3.4", "source": { "type": "git", - "url": "git://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "1.3.3" + "url": "https://github.com/sebastianbergmann/php-file-iterator.git", + "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb" }, "dist": { "type": "zip", - "url": "https://github.com/sebastianbergmann/php-file-iterator/zipball/1.3.3", - "reference": "1.3.3", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/acd690379117b042d1c8af1fafd61bde001bf6bb", + "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb", "shasum": "" }, "require": { @@ -2056,25 +2061,25 @@ } ], "description": "FilterIterator implementation that filters files based on a list of suffixes.", - "homepage": "http://www.phpunit.de/", + "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", "keywords": [ "filesystem", "iterator" ], - "time": "2012-10-11 04:44:38" + "time": "2013-10-10 15:34:57" }, { "name": "phpunit/php-text-template", - "version": "1.1.4", + "version": "1.2.0", "source": { "type": "git", - "url": "git://github.com/sebastianbergmann/php-text-template.git", - "reference": "1.1.4" + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a" }, "dist": { "type": "zip", - "url": "https://github.com/sebastianbergmann/php-text-template/zipball/1.1.4", - "reference": "1.1.4", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/206dfefc0ffe9cebf65c413e3d0e809c82fbf00a", + "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a", "shasum": "" }, "require": { @@ -2105,7 +2110,7 @@ "keywords": [ "template" ], - "time": "2012-10-31 11:15:28" + "time": "2014-01-30 17:20:04" }, { "name": "phpunit/php-timer", @@ -2153,16 +2158,16 @@ }, { "name": "phpunit/php-token-stream", - "version": "1.2.0", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "1.2.0" + "reference": "ad4e1e23ae01b483c16f600ff1bebec184588e32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/1.2.0", - "reference": "1.2.0", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/ad4e1e23ae01b483c16f600ff1bebec184588e32", + "reference": "ad4e1e23ae01b483c16f600ff1bebec184588e32", "shasum": "" }, "require": { @@ -2199,56 +2204,56 @@ "keywords": [ "tokenizer" ], - "time": "2013-08-04 05:57:48" + "time": "2014-03-03 05:10:30" }, { "name": "phpunit/phpunit", - "version": "3.7.24", + "version": "4.1.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "3.7.24" + "reference": "939cb801b3b2aa253aedd0b279f40bb8f35cec91" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3.7.24", - "reference": "3.7.24", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/939cb801b3b2aa253aedd0b279f40bb8f35cec91", + "reference": "939cb801b3b2aa253aedd0b279f40bb8f35cec91", "shasum": "" }, "require": { "ext-dom": "*", + "ext-json": "*", "ext-pcre": "*", "ext-reflection": "*", "ext-spl": "*", "php": ">=5.3.3", - "phpunit/php-code-coverage": "~1.2.1", - "phpunit/php-file-iterator": ">=1.3.1", - "phpunit/php-text-template": ">=1.1.1", - "phpunit/php-timer": ">=1.0.4", - "phpunit/phpunit-mock-objects": "~1.2.0", + "phpunit/php-code-coverage": "~2.0", + "phpunit/php-file-iterator": "~1.3.1", + "phpunit/php-text-template": "~1.2", + "phpunit/php-timer": "~1.0.2", + "phpunit/phpunit-mock-objects": "~2.1", + "sebastian/comparator": "~1.0", + "sebastian/diff": "~1.1", + "sebastian/environment": "~1.0", + "sebastian/exporter": "~1.0", + "sebastian/version": "~1.0", "symfony/yaml": "~2.0" }, - "require-dev": { - "pear-pear/pear": "1.9.4" - }, "suggest": { - "ext-json": "*", - "ext-simplexml": "*", - "ext-tokenizer": "*", - "phpunit/php-invoker": ">=1.1.0,<1.2.0" + "phpunit/php-invoker": "~1.1" }, "bin": [ - "composer/bin/phpunit" + "phpunit" ], "type": "library", "extra": { "branch-alias": { - "dev-master": "3.7.x-dev" + "dev-master": "4.1.x-dev" } }, "autoload": { "classmap": [ - "PHPUnit/" + "src/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -2273,33 +2278,41 @@ "testing", "xunit" ], - "time": "2013-08-09 06:58:24" + "time": "2014-06-11 14:15:47" }, { "name": "phpunit/phpunit-mock-objects", - "version": "1.2.3", + "version": "2.1.4", "source": { "type": "git", - "url": "git://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "1.2.3" + "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", + "reference": "1a894a16b6c15fcdc5ef2b110f0e6233952c9b0f" }, "dist": { "type": "zip", - "url": "https://github.com/sebastianbergmann/phpunit-mock-objects/archive/1.2.3.zip", - "reference": "1.2.3", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/1a894a16b6c15fcdc5ef2b110f0e6233952c9b0f", + "reference": "1a894a16b6c15fcdc5ef2b110f0e6233952c9b0f", "shasum": "" }, "require": { "php": ">=5.3.3", - "phpunit/php-text-template": ">=1.1.1@stable" + "phpunit/php-text-template": "~1.2" + }, + "require-dev": { + "phpunit/phpunit": "~4.1" }, "suggest": { "ext-soap": "*" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1.x-dev" + } + }, "autoload": { "classmap": [ - "PHPUnit/" + "src/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -2322,7 +2335,275 @@ "mock", "xunit" ], - "time": "2013-01-13 10:24:48" + "time": "2014-06-07 16:22:57" + }, + { + "name": "sebastian/comparator", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/comparator.git", + "reference": "f7069ee51fa9fb6c038e16a9d0e3439f5449dcf2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/f7069ee51fa9fb6c038e16a9d0e3439f5449dcf2", + "reference": "f7069ee51fa9fb6c038e16a9d0e3439f5449dcf2", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "sebastian/diff": "~1.1", + "sebastian/exporter": "~1.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + }, + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + } + ], + "description": "Provides the functionality to compare PHP values for equality", + "homepage": "http://www.github.com/sebastianbergmann/comparator", + "keywords": [ + "comparator", + "compare", + "equality" + ], + "time": "2014-05-02 07:05:58" + }, + { + "name": "sebastian/diff", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "1e091702a5a38e6b4c1ba9ca816e3dd343df2e2d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/1e091702a5a38e6b4c1ba9ca816e3dd343df2e2d", + "reference": "1e091702a5a38e6b4c1ba9ca816e3dd343df2e2d", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + }, + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + } + ], + "description": "Diff implementation", + "homepage": "http://www.github.com/sebastianbergmann/diff", + "keywords": [ + "diff" + ], + "time": "2013-08-03 16:46:33" + }, + { + "name": "sebastian/environment", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/environment.git", + "reference": "79517609ec01139cd7e9fded0dd7ce08c952ef6a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/79517609ec01139cd7e9fded0dd7ce08c952ef6a", + "reference": "79517609ec01139cd7e9fded0dd7ce08c952ef6a", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "4.0.*@dev" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Provides functionality to handle HHVM/PHP environments", + "homepage": "http://www.github.com/sebastianbergmann/environment", + "keywords": [ + "Xdebug", + "environment", + "hhvm" + ], + "time": "2014-02-18 16:17:19" + }, + { + "name": "sebastian/exporter", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/exporter.git", + "reference": "1f9a98e6f5dfe0524cb8c6166f7c82f3e9ae1529" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/1f9a98e6f5dfe0524cb8c6166f7c82f3e9ae1529", + "reference": "1f9a98e6f5dfe0524cb8c6166f7c82f3e9ae1529", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "4.0.*@dev" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + }, + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net", + "role": "Lead" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + } + ], + "description": "Provides the functionality to export PHP variables for visualization", + "homepage": "http://www.github.com/sebastianbergmann/exporter", + "keywords": [ + "export", + "exporter" + ], + "time": "2014-02-16 08:26:31" + }, + { + "name": "sebastian/version", + "version": "1.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43", + "reference": "b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43", + "shasum": "" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that helps with managing the version number of Git-hosted PHP projects", + "homepage": "https://github.com/sebastianbergmann/version", + "time": "2014-03-07 15:35:33" } ], "aliases": [ diff --git a/core/lib/Thelia/Core/Thelia.php b/core/lib/Thelia/Core/Thelia.php index 671a375f7..20b57e088 100644 --- a/core/lib/Thelia/Core/Thelia.php +++ b/core/lib/Thelia/Core/Thelia.php @@ -21,30 +21,28 @@ namespace Thelia\Core; * @author Manuel Raynaud */ +use Propel\Runtime\Connection\ConnectionManagerSingle; use Propel\Runtime\Connection\ConnectionWrapper; +use Propel\Runtime\Propel; +use Symfony\Component\Config\FileLocator; +use Symfony\Component\Config\Loader\LoaderInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Definition; +use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag; use Symfony\Component\DependencyInjection\Reference; use Symfony\Component\Finder\Finder; use Symfony\Component\HttpKernel\Kernel; -use Symfony\Component\Config\Loader\LoaderInterface; use Symfony\Component\Yaml\Yaml; -use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag; - -use Thelia\Core\Event\TheliaEvents; use Thelia\Config\DatabaseConfiguration; use Thelia\Config\DefinePropel; +use Thelia\Core\DependencyInjection\Loader\XmlFileLoader; +use Thelia\Core\Event\TheliaEvents; use Thelia\Core\Template\ParserInterface; use Thelia\Core\Template\TemplateDefinition; - -use Thelia\Core\DependencyInjection\Loader\XmlFileLoader; -use Symfony\Component\Config\FileLocator; - -use Propel\Runtime\Propel; -use Propel\Runtime\Connection\ConnectionManagerSingle; use Thelia\Core\Template\TemplateHelper; use Thelia\Log\Tlog; use Thelia\Model\Module; +use Thelia\Model\ModuleQuery; class Thelia extends Kernel { @@ -143,7 +141,7 @@ class Thelia extends Kernel } } } catch (\UnexpectedValueException $ex) { - // The directory does not exists, ignore it. + // The directory does not exists, ignore it. } } @@ -162,12 +160,13 @@ class Thelia extends Kernel ->depth(0) ->in(THELIA_ROOT . "/core/lib/Thelia/Config/Resources"); + /** @var \SplFileInfo $file */ foreach ($finder as $file) { $loader->load($file->getBaseName()); } if (defined("THELIA_INSTALL_MODE") === false) { - $modules = \Thelia\Model\ModuleQuery::getActivated(); + $modules = ModuleQuery::getActivated(); $translationDirs = array(); @@ -233,12 +232,16 @@ class Thelia extends Kernel $translationDirs[$module->getFrontOfficeTemplateTranslationDomain($template->getName())] = $module->getAbsoluteFrontOfficeI18nTemplatePath($template->getName()); } + $this->addStandardModuleTemplatesToParserEnvironment($parser, $module); } catch (\InvalidArgumentException $e) { + Tlog::getInstance()->addError( sprintf("Failed to load module %s: %s", $module->getCode(), $e->getMessage()), $e ); + + throw $e; } } diff --git a/core/lib/Thelia/Model/ConfigQuery.php b/core/lib/Thelia/Model/ConfigQuery.php index 31c56e229..9a688b80b 100644 --- a/core/lib/Thelia/Model/ConfigQuery.php +++ b/core/lib/Thelia/Model/ConfigQuery.php @@ -73,6 +73,11 @@ class ConfigQuery extends BaseConfigQuery return true; } + public static function getConfiguredShopUrl() + { + return ConfigQuery::read("url_site", ''); + } + public static function getDefaultLangWhenNoTranslationAvailable() { return ConfigQuery::read("default_lang_without_translation", 1); diff --git a/core/lib/Thelia/Tests/Tools/FileManagerTest.php b/core/lib/Thelia/Tests/Tools/FileManagerTest.php index 9fe76878b..8c9de5965 100644 --- a/core/lib/Thelia/Tests/Tools/FileManagerTest.php +++ b/core/lib/Thelia/Tests/Tools/FileManagerTest.php @@ -787,7 +787,7 @@ class FileManagerTest extends \PHPUnit_Framework_TestCase ->getMock(); $stubUploadedFile = $this->getMockBuilder('\Symfony\Component\HttpFoundation\File\UploadedFile') - ->disableOriginalConstructor() + ->setConstructorArgs([__DIR__ . '/fixtures/test.xml', 'test.xml']) ->getMock(); $stubUploadedFile->expects($this->any()) ->method('getClientOriginalExtension') @@ -814,8 +814,9 @@ class FileManagerTest extends \PHPUnit_Framework_TestCase ->getMock(); $stubUploadedFile = $this->getMockBuilder('\Symfony\Component\HttpFoundation\File\UploadedFile') - ->disableOriginalConstructor() + ->setConstructorArgs([__DIR__ . '/fixtures/test.xml', 'test.xml']) ->getMock(); + $stubUploadedFile->expects($this->any()) ->method('getClientOriginalExtension') ->will($this->returnValue('')); diff --git a/local/modules/Tinymce/Resources/media/.gitkeep b/core/lib/Thelia/Tests/Tools/fixtures/test.xml old mode 100755 new mode 100644 similarity index 100% rename from local/modules/Tinymce/Resources/media/.gitkeep rename to core/lib/Thelia/Tests/Tools/fixtures/test.xml diff --git a/local/modules/Tinymce/.gitignore b/local/modules/Tinymce/.gitignore deleted file mode 100644 index fc9e06409..000000000 --- a/local/modules/Tinymce/.gitignore +++ /dev/null @@ -1 +0,0 @@ -Resources/* \ No newline at end of file diff --git a/local/modules/Tinymce/AdminIncludes/category-edit-js.html b/local/modules/Tinymce/AdminIncludes/category-edit-js.html index a75604b18..8e2952d56 100644 --- a/local/modules/Tinymce/AdminIncludes/category-edit-js.html +++ b/local/modules/Tinymce/AdminIncludes/category-edit-js.html @@ -1 +1 @@ -{include file="include/tinymce_init.tpl"} \ No newline at end of file +{include file="includes/tinymce_init.tpl"} \ No newline at end of file diff --git a/local/modules/Tinymce/AdminIncludes/content-edit-js.html b/local/modules/Tinymce/AdminIncludes/content-edit-js.html index a75604b18..8e2952d56 100644 --- a/local/modules/Tinymce/AdminIncludes/content-edit-js.html +++ b/local/modules/Tinymce/AdminIncludes/content-edit-js.html @@ -1 +1 @@ -{include file="include/tinymce_init.tpl"} \ No newline at end of file +{include file="includes/tinymce_init.tpl"} \ No newline at end of file diff --git a/local/modules/Tinymce/AdminIncludes/coupon-create-js.html b/local/modules/Tinymce/AdminIncludes/coupon-create-js.html index 209efdd16..8e2952d56 100644 --- a/local/modules/Tinymce/AdminIncludes/coupon-create-js.html +++ b/local/modules/Tinymce/AdminIncludes/coupon-create-js.html @@ -1 +1 @@ -{include file="include/tinymce_init.tpl"} +{include file="includes/tinymce_init.tpl"} \ No newline at end of file diff --git a/local/modules/Tinymce/AdminIncludes/coupon-update-js.html b/local/modules/Tinymce/AdminIncludes/coupon-update-js.html index a75604b18..8e2952d56 100644 --- a/local/modules/Tinymce/AdminIncludes/coupon-update-js.html +++ b/local/modules/Tinymce/AdminIncludes/coupon-update-js.html @@ -1 +1 @@ -{include file="include/tinymce_init.tpl"} \ No newline at end of file +{include file="includes/tinymce_init.tpl"} \ No newline at end of file diff --git a/local/modules/Tinymce/AdminIncludes/document-edit-js.html b/local/modules/Tinymce/AdminIncludes/document-edit-js.html index a75604b18..8e2952d56 100644 --- a/local/modules/Tinymce/AdminIncludes/document-edit-js.html +++ b/local/modules/Tinymce/AdminIncludes/document-edit-js.html @@ -1 +1 @@ -{include file="include/tinymce_init.tpl"} \ No newline at end of file +{include file="includes/tinymce_init.tpl"} \ No newline at end of file diff --git a/local/modules/Tinymce/AdminIncludes/folder-edit-js.html b/local/modules/Tinymce/AdminIncludes/folder-edit-js.html index a75604b18..8e2952d56 100644 --- a/local/modules/Tinymce/AdminIncludes/folder-edit-js.html +++ b/local/modules/Tinymce/AdminIncludes/folder-edit-js.html @@ -1 +1 @@ -{include file="include/tinymce_init.tpl"} \ No newline at end of file +{include file="includes/tinymce_init.tpl"} \ No newline at end of file diff --git a/local/modules/Tinymce/AdminIncludes/image-edit-js.html b/local/modules/Tinymce/AdminIncludes/image-edit-js.html index a75604b18..8e2952d56 100644 --- a/local/modules/Tinymce/AdminIncludes/image-edit-js.html +++ b/local/modules/Tinymce/AdminIncludes/image-edit-js.html @@ -1 +1 @@ -{include file="include/tinymce_init.tpl"} \ No newline at end of file +{include file="includes/tinymce_init.tpl"} \ No newline at end of file diff --git a/local/modules/Tinymce/AdminIncludes/product-edit-js.html b/local/modules/Tinymce/AdminIncludes/product-edit-js.html index a75604b18..8e2952d56 100644 --- a/local/modules/Tinymce/AdminIncludes/product-edit-js.html +++ b/local/modules/Tinymce/AdminIncludes/product-edit-js.html @@ -1 +1 @@ -{include file="include/tinymce_init.tpl"} \ No newline at end of file +{include file="includes/tinymce_init.tpl"} \ No newline at end of file diff --git a/local/modules/Tinymce/Config/config.xml b/local/modules/Tinymce/Config/config.xml index df0ef054b..b3ee6037b 100644 --- a/local/modules/Tinymce/Config/config.xml +++ b/local/modules/Tinymce/Config/config.xml @@ -4,33 +4,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://thelia.net/schema/dic/config http://thelia.net/schema/dic/config/thelia-1.0.xsd"> - - - - - - - - - - - - - - - - - - + + + + diff --git a/local/modules/Tinymce/Config/module.xml b/local/modules/Tinymce/Config/module.xml index c27913441..69c4f304c 100644 --- a/local/modules/Tinymce/Config/module.xml +++ b/local/modules/Tinymce/Config/module.xml @@ -7,12 +7,12 @@ Editeur visuel TinyMCE - 0.1 + 0.5 Manuel Raynaud manu@thelia.net classic 2.0.0 - alpha + beta diff --git a/local/modules/Tinymce/Config/schema.xml b/local/modules/Tinymce/Config/schema.xml deleted file mode 100644 index 1866f6300..000000000 --- a/local/modules/Tinymce/Config/schema.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/local/modules/Tinymce/I18n/backOffice/default/fr_FR.php b/local/modules/Tinymce/I18n/backOffice/default/fr_FR.php new file mode 100644 index 000000000..7a985ce9b --- /dev/null +++ b/local/modules/Tinymce/I18n/backOffice/default/fr_FR.php @@ -0,0 +1,5 @@ + 'Explorateur de fichiers', +); diff --git a/local/modules/Tinymce/Listener/VerifyTinymceListener.php b/local/modules/Tinymce/Listener/VerifyTinymceListener.php deleted file mode 100644 index 2b8e5efce..000000000 --- a/local/modules/Tinymce/Listener/VerifyTinymceListener.php +++ /dev/null @@ -1,81 +0,0 @@ - - */ -class VerifyTinymceListener implements EventSubscriberInterface -{ - - public function verifyTinymce(Event $event) - { - $fs = new Filesystem(); - if (false === file_exists(THELIA_WEB_DIR . '/tinymce')) { - $fs->mirror(__DIR__ . DS .'..'. DS .'Resources'.DS.'js'.DS.'tinymce', THELIA_WEB_DIR . 'tinymce'); - } - - if (false === file_exists(THELIA_WEB_DIR . '/media')) { - $fs->symlink(__DIR__ . DS .'..'.DS.'Resources'.DS.'media', THELIA_WEB_DIR . 'media'); - } - } - - public function clearCache(CacheEvent $event) - { - if (true === file_exists(THELIA_WEB_DIR . '/tinymce')) { - $fs = new Filesystem(); - - $directory = new \DirectoryIterator(THELIA_WEB_DIR . '/tinymce'); - - $fs->remove($directory); - } - } - - /** - * Returns an array of event names this subscriber wants to listen to. - * - * The array keys are event names and the value can be: - * - * * The method name to call (priority defaults to 0) - * * An array composed of the method name to call and the priority - * * An array of arrays composed of the method names to call and respective - * priorities, or 0 if unset - * - * For instance: - * - * * array('eventName' => 'methodName') - * * array('eventName' => array('methodName', $priority)) - * * array('eventName' => array(array('methodName1', $priority), array('methodName2')) - * - * @return array The event names to listen to - * - * @api - */ - public static function getSubscribedEvents() - { - return array( - TheliaEvents::BOOT => array('verifyTinymce', 128), - TheliaEvents::CACHE_CLEAR => array("clearCache", 0) - ); - } -} \ No newline at end of file diff --git a/local/modules/Tinymce/Resources/js/tinymce/filemanager/ajax_calls.php b/local/modules/Tinymce/Resources/js/tinymce/filemanager/ajax_calls.php new file mode 100644 index 000000000..6802ee276 --- /dev/null +++ b/local/modules/Tinymce/Resources/js/tinymce/filemanager/ajax_calls.php @@ -0,0 +1,295 @@ +open($path) === TRUE) { + //make all the folders + for($i = 0; $i < $zip->numFiles; $i++) + { + $OnlyFileName = $zip->getNameIndex($i); + $FullFileName = $zip->statIndex($i); + if (substr($FullFileName['name'], -1, 1) =="/") + { + create_folder($base_folder.$FullFileName['name']); + } + } + //unzip into the folders + for($i = 0; $i < $zip->numFiles; $i++) + { + $OnlyFileName = $zip->getNameIndex($i); + $FullFileName = $zip->statIndex($i); + + if (!(substr($FullFileName['name'], -1, 1) =="/")) + { + $fileinfo = pathinfo($OnlyFileName); + if(in_array(strtolower($fileinfo['extension']),$ext)) + { + copy('zip://'. $path .'#'. $OnlyFileName , $base_folder.$FullFileName['name'] ); + } + } + } + $zip->close(); + } + else { + die(lang_Zip_No_Extract); + } + + break; + + case "gz": + $p = new PharData($path); + $p->decompress(); // creates files.tar + + break; + + case "tar": + // unarchive from the tar + $phar = new PharData($path); + $phar->decompressFiles(); + $files = array(); + check_files_extensions_on_phar( $phar, $files, '', $ext ); + $phar->extractTo( $current_path.fix_dirname( $_POST['path'] )."/", $files, TRUE ); + + break; + + default: + die(lang_Zip_Invalid); + } + break; + case 'media_preview': + $preview_file = $_GET["file"]; + $info = pathinfo($preview_file); + ?> +
+ +
+ + + + + + + + + \ No newline at end of file diff --git a/local/modules/Tinymce/Resources/js/tinymce/plugins/filemanager/config/.htaccess b/local/modules/Tinymce/Resources/js/tinymce/filemanager/config/.htaccess old mode 100755 new mode 100644 similarity index 100% rename from local/modules/Tinymce/Resources/js/tinymce/plugins/filemanager/config/.htaccess rename to local/modules/Tinymce/Resources/js/tinymce/filemanager/config/.htaccess diff --git a/local/modules/Tinymce/Resources/js/tinymce/plugins/filemanager/config/config.php b/local/modules/Tinymce/Resources/js/tinymce/filemanager/config/config.php similarity index 55% rename from local/modules/Tinymce/Resources/js/tinymce/plugins/filemanager/config/config.php rename to local/modules/Tinymce/Resources/js/tinymce/filemanager/config/config.php index 9c2cd533b..02fb90f44 100644 --- a/local/modules/Tinymce/Resources/js/tinymce/plugins/filemanager/config/config.php +++ b/local/modules/Tinymce/Resources/js/tinymce/filemanager/config/config.php @@ -1,16 +1,16 @@ boot(); $httpKernel = $thelia->getContainer()->get('http_kernel'); @@ -18,64 +18,100 @@ $httpKernel = $thelia->getContainer()->get('http_kernel'); $httpKernel->getContainer()->enterScope('request'); $httpKernel->getContainer()->set('request', $request, 'request'); $httpKernel->initSession($request); + /** @var \Thelia\Core\Security\SecurityContext $securityContext */ $securityContext = $httpKernel->getContainer()->get('thelia.securityContext'); +// We just check the current user has the ADMIN role. $isGranted = $securityContext->isGranted( - array('ADMIN'), - array( - \Thelia\Core\Security\Resource\AdminResources::PRODUCT, - \Thelia\Core\Security\Resource\AdminResources::CATEGORY, - \Thelia\Core\Security\Resource\AdminResources::FOLDER, - \Thelia\Core\Security\Resource\AdminResources::CONTENT, - ), - array(), - array( - \Thelia\Core\Security\AccessManager::UPDATE, - \Thelia\Core\Security\AccessManager::CREATE, - ) + array('ADMIN'), array(), array(), array() ); if (false === $isGranted) { + echo "Sorry, it seems that you're not allowed to use this function. ADMIN role is required."; + exit; } - //------------------------------------------------------------------------------ -// DON'T COPY THIS VARIABLES IN FOLDERS config.php FILES +// DO NOT COPY THESE VARIABLES IN FOLDERS config.php FILES //------------------------------------------------------------------------------ //********************** //Path configuration //********************** -// In this configuration the folder tree is -// root -// |- source <- upload folder -// |- thumbs <- thumbnail folder [must have write permission (755)] -// |- filemanager -// |- js -// | |- tinymce -// | | |- plugins -// | | | |- responsivefilemanager -// | | | | |- plugin.min.js -$base_url=rtrim(\Thelia\Model\ConfigQuery::read('url_site'), '/'); // base url (only domain) of site (without final /). If you prefer relative urls leave empty -$upload_dir = '/media/'; // path from base_url to base of upload folder (with start and final /) -$current_path = '../../../media/'; // relative path from filemanager folder to upload folder (with final /) -//thumbs folder can't put inside upload folder -$thumbs_base_path = '../../../media/'; // relative path from filemanager folder to thumbs folder (with final /) +// In this configuration the media folder is located in the /web directory. -//------------------------------------------------------------------------------ -// YOU CAN COPY AND CHANGE THESE VARIABLES IN FOLDERS config.php FILES -//------------------------------------------------------------------------------ +// base url of site (without final /). if you prefer relative urls leave empty. +$base_url = rtrim(ConfigQuery::getConfiguredShopUrl(), '/'); -$MaxSizeUpload=100; //Mb +// Argh, url_site is not defined ?! +if (empty($base_url)) { + // A we did not used the router to access this dialog, we cannot use the URL class. Use the good old method. + $base_url = $request->getSchemeAndHttpHost() . preg_replace('!/tinymce/filemanager/dialog.php.*$!', '', $_SERVER['REQUEST_URI']); +} -$default_language="en_EN"; //default language file name +// path from base_url to base of upload folder (with start and final /) +$upload_dir = '/media/upload/'; -$show_folder_size=true; //Show or not show folder size in list view feature in filemanager (is possible, if there is a large folder, to greatly increase the calculations) -$show_sorting_bar=true; //Show or not show sorting feature in filemanager -$loading_bar=true; //Show or not show loading bar +// path to file manager folder to upload folder (with final /) +$current_path = THELIA_WEB_DIR . DS . 'media'. DS .'upload'. DS; + +// path to file manager folder to thumbs folder (with final /) +// WARNING: thumbs folder should not be inside the upload folder +$thumbs_base_path = THELIA_WEB_DIR . DS . 'media'. DS .'thumbs'. DS; + +// Set the language to the back-office current language, if it is available +$current_locale = $request->getSession()->getLang()->getLocale(); + +if (file_exists(__DIR__.DS.'..'.DS.'lang.'.DS.$current_locale.'.php')) { + $default_language = $current_locale; +} +else { + $default_language = 'en_EN'; +} + +// OPTIONAL SECURITY +// if set to true only those will access RF whose url contains the access key(akey) like: +// +// in tinymce a new parameter added: filemanager_access_key:"myPrivateKey" +// example tinymce config: +// tiny init ... +// +// external_filemanager_path:"../filemanager/", +// filemanager_title:"Filemanager" , +// filemanager_access_key:"myPrivateKey" , +// ... +define('USE_ACCESS_KEYS', FALSE); // TRUE or FALSE + +// add access keys eg: array('myPrivateKey', 'someoneElseKey'); +// keys should only containt (a-z A-Z 0-9 \ . _ -) characters +// if you are integrating lets say to a cms for admins, i recommend making keys randomized something like this: +// $username = 'Admin'; +// $salt = 'dsflFWR9u2xQa' (a hard coded string) +// $akey = md5($username.$salt); +// DO NOT use 'key' as access key! +// Keys are CASE SENSITIVE! +$access_keys = array('myPrivateKey','someoneElseKey'); + +//-------------------------------------------------------------------------------------------------------- +// YOU CAN COPY AND CHANGE THESE VARIABLES INTO FOLDERS config.php FILES TO CUSTOMIZE EACH FOLDER OPTIONS +//-------------------------------------------------------------------------------------------------------- + +$MaxSizeUpload = 100; //Mb + +// SERVER OVERRIDE +if ((int)(ini_get('post_max_size')) < $MaxSizeUpload){ + $MaxSizeUpload = (int)(ini_get('post_max_size')); +} + +// $default_language = "en_EN"; //default language file name +$icon_theme = "ico"; //ico or ico_dark you can cusatomize just putting a folder inside filemanager/img +$show_folder_size = TRUE; //Show or not show folder size in list view feature in filemanager (is possible, if there is a large folder, to greatly increase the calculations) +$show_sorting_bar = TRUE; //Show or not show sorting feature in filemanager +$loading_bar = TRUE; //Show or not show loading bar +$transliteration = FALSE; //active or deactive the transliteration (mean convert all strange characters in A..Za..z0..9 characters) //******************************************* //Images limit and resizing configuration @@ -84,16 +120,16 @@ $loading_bar=true; //Show or not show loading bar // set maximum pixel width and/or maximum pixel height for all images // If you set a maximum width or height, oversized images are converted to those limits. Images smaller than the limit(s) are unaffected // if you don't need a limit set both to 0 -$image_max_width=0; -$image_max_height=0; +$image_max_width = 0; +$image_max_height = 0; //Automatic resizing // -// If you set $image_resizing to true the script converts all uploaded images exactly to image_resizing_width x image_resizing_height dimension +// If you set $image_resizing to TRUE the script converts all uploaded images exactly to image_resizing_width x image_resizing_height dimension // If you set width or height to 0 the script automatically calculates the other dimension // Is possible that if you upload very big images the script not work to overcome this increase the php configuration of memory and time limit -$image_resizing=false; -$image_resizing_width=0; -$image_resizing_height=0; +$image_resizing = FALSE; +$image_resizing_width = 0; +$image_resizing_height = 0; //****************** // Default layout setting @@ -101,23 +137,35 @@ $image_resizing_height=0; // 0 => boxes // 1 => detailed list (1 column) // 2 => columns list (multiple columns depending on the width of the page) -// YOU CAN ALSO PASS THIS PARAMETERS USING SESSION VAR => $_SESSION["VIEW"]= +// YOU CAN ALSO PASS THIS PARAMETERS USING SESSION VAR => $_SESSION['RF']["VIEW"]= // //****************** -$default_view=0; +$default_view = 0; //set if the filename is truncated when overflow first row -$ellipsis_title_after_first_row=true; +$ellipsis_title_after_first_row = TRUE; //************************* //Permissions configuration //****************** -$delete_files=true; -$create_folders=true; -$delete_folders=true; -$upload_files=true; -$rename_files=true; -$rename_folders=true; +$delete_files = TRUE; +$create_folders = TRUE; +$delete_folders = TRUE; +$upload_files = TRUE; +$rename_files = TRUE; +$rename_folders = TRUE; +$duplicate_files = TRUE; +$copy_cut_files = TRUE; // for copy/cut files +$copy_cut_dirs = TRUE; // for copy/cut directories + + +// defines size limit for paste in MB / operation +// set 'FALSE' for no limit +$copy_cut_max_size = 100; +// defines file count limit for paste / operation +// set 'FALSE' for no limit +$copy_cut_max_count = 200; +//IF any of these limits reached, operation won't start and generate warning //********************** //Allowed extensions (lowercase insert) @@ -128,22 +176,22 @@ $ext_video = array('mov', 'mpeg', 'mp4', 'avi', 'mpg','wma',"flv","webm"); //Vid $ext_music = array('mp3', 'm4a', 'ac3', 'aiff', 'mid','ogg','wav'); //Audio $ext_misc = array('zip', 'rar','gz','tar','iso','dmg'); //Archives -$ext=array_merge($ext_img, $ext_file, $ext_misc, $ext_video,$ext_music); //allowed extensions - +$ext = array_merge($ext_img, $ext_file, $ext_misc, $ext_video,$ext_music); //allowed extensions /****************** * AVIARY config - *******************/ -$aviary_key="dvh8qudbp6yx2bnp"; -$aviary_secret="m6xaym5q42rpw433"; -$aviary_version=3; -$aviary_language='en'; +*******************/ +$aviary_active = FALSE; +$aviary_key = "dvh8qudbp6yx2bnp"; +$aviary_secret = "m6xaym5q42rpw433"; +$aviary_version = 3; +$aviary_language= 'en'; //The filter and sorter are managed through both javascript and php scripts because if you have a lot of //file in a folder the javascript script can't sort all or filter all, so the filemanager switch to php script. //The plugin automatic swich javascript to php when the current folder exceeds the below limit of files number -$file_number_limit_js=500; +$file_number_limit_js = 500; //********************** // Hidden files and folders @@ -154,10 +202,10 @@ $hidden_folders = array(); $hidden_files = array('config.php'); /******************* - * JAVA upload + * JAVA upload *******************/ -$java_upload=true; -$JAVAMaxSizeUpload=200; //Gb +$java_upload = TRUE; +$JAVAMaxSizeUpload = 200; //Gb //************************************ @@ -171,7 +219,7 @@ $JAVAMaxSizeUpload=200; //Gb // Remember than the image creation respect the folder hierarchy so if you are inside source/test/test1/ the new image will create at // path_from_filemanager/test/test1/ // PS if there isn't write permission in your destination folder you must set it -$fixed_image_creation = false; //activate or not the creation of one or more image resized with fixed path from filemanager folder +$fixed_image_creation = FALSE; //activate or not the creation of one or more image resized with fixed path from filemanager folder $fixed_path_from_filemanager = array('../test/','../test1/'); //fixed path of the image folder from the current position on upload folder $fixed_image_creation_name_to_prepend = array('','test_'); //name to prepend on filename $fixed_image_creation_to_append = array('_test',''); //name to appendon filename @@ -183,7 +231,7 @@ $fixed_image_creation_height = array(200,''); //height of image (you // With Responsive filemanager you can create automatically resized image inside the upload folder, also more than one at a time // just simply add a value in the array // The image creation path is always relative so if i'm inside source/test/test1 and I upload an image, the path start from here -$relative_image_creation = false; //activate or not the creation of one or more image resized with relative path from upload folder +$relative_image_creation = FALSE; //activate or not the creation of one or more image resized with relative path from upload folder $relative_path_from_current_pos = array('thumb/','thumb/'); //relative path of the image folder from the current position on upload folder $relative_image_creation_name_to_prepend= array('','test_'); //name to prepend on filename $relative_image_creation_name_to_append = array('_test',''); //name to append on filename diff --git a/local/modules/Tinymce/Resources/js/tinymce/plugins/filemanager/css/bootstrap-lightbox.min.css b/local/modules/Tinymce/Resources/js/tinymce/filemanager/css/bootstrap-lightbox.min.css similarity index 100% rename from local/modules/Tinymce/Resources/js/tinymce/plugins/filemanager/css/bootstrap-lightbox.min.css rename to local/modules/Tinymce/Resources/js/tinymce/filemanager/css/bootstrap-lightbox.min.css diff --git a/local/modules/Tinymce/Resources/js/tinymce/filemanager/css/bootstrap-modal.min.css b/local/modules/Tinymce/Resources/js/tinymce/filemanager/css/bootstrap-modal.min.css new file mode 100644 index 000000000..373c1b6ba --- /dev/null +++ b/local/modules/Tinymce/Resources/js/tinymce/filemanager/css/bootstrap-modal.min.css @@ -0,0 +1,8 @@ +/*! + * Bootstrap Modal + * + * Copyright Jordan Schroter + * Licensed under the Apache License v2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + */.modal-open{overflow:hidden}.modal-open.page-overflow .page-container,.modal-open.page-overflow .page-container .navbar-fixed-top,.modal-open.page-overflow .page-container .navbar-fixed-bottom,.modal-open.page-overflow .modal-scrollable{overflow-y:scroll}@media (max-width:840px){.modal-open.page-overflow .page-container .navbar-fixed-top,.modal-open.page-overflow .page-container .navbar-fixed-bottom{overflow-y:visible}}.modal-scrollable{position:fixed;top:0;bottom:0;left:0;right:0;overflow:auto}.modal{outline:0;position:absolute;margin-top:0;top:50%;overflow:visible}.modal.fade{top:-100%;-webkit-transition:opacity .3s linear,top .3s ease-out,bottom .3s ease-out,margin-top .3s ease-out;-moz-transition:opacity .3s linear,top .3s ease-out,bottom .3s ease-out,margin-top .3s ease-out;-o-transition:opacity .3s linear,top .3s ease-out,bottom .3s ease-out,margin-top .3s ease-out;transition:opacity .3s linear,top .3s ease-out,bottom .3s ease-out,margin-top .3s ease-out}.modal.fade.in{top:50%}.modal-body{max-height:none;overflow:visible}.modal.modal-absolute{position:absolute;z-index:950}.modal .loading-mask{position:absolute;top:0;bottom:0;left:0;right:0;background:#fff;border-radius:6px}.modal-backdrop.modal-absolute{position:absolute;z-index:940}.modal-backdrop,.modal-backdrop.fade.in{opacity:.85;filter:alpha(opacity=85);background:#eee}.modal.container{width:940px;margin-left:-470px}.modal-overflow.modal{top:1%}.modal-overflow.modal.fade{top:-100%}.modal-overflow.modal.fade.in{top:1%}.modal-overflow .modal-body{overflow:auto;-webkit-overflow-scrolling:touch}@media (min-width:1200px){.modal.container{width:1170px;margin-left:-585px}}@media (max-width:840px){.modal,.modal.container,.modal.modal-overflow{top:1%;right:1%;left:1%;bottom:auto;width:auto!important;height:auto!important;margin:0!important;padding:0!important}.modal.fade.in,.modal.container.fade.in,.modal.modal-overflow.fade.in{top:1%;bottom:auto}.modal-body,.modal-overflow .modal-body{position:static;margin:0;height:auto!important;max-height:none!important;overflow:visible!important}.modal-footer,.modal-overflow .modal-footer{position:static}}.loading-spinner{position:absolute;top:50%;left:50%;margin:-12px 0 0 -12px}.animated{-webkit-animation-duration:1s;-moz-animation-duration:1s;-o-animation-duration:1s;animation-duration:1s;-webkit-animation-fill-mode:both;-moz-animation-fill-mode:both;-o-animation-fill-mode:both;animation-fill-mode:both}@-webkit-keyframes shake{0%,100%{-webkit-transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px)}}@-moz-keyframes shake{0%,100%{-moz-transform:translateX(0)}10%,30%,50%,70%,90%{-moz-transform:translateX(-10px)}20%,40%,60%,80%{-moz-transform:translateX(10px)}}@-o-keyframes shake{0%,100%{-o-transform:translateX(0)}10%,30%,50%,70%,90%{-o-transform:translateX(-10px)}20%,40%,60%,80%{-o-transform:translateX(10px)}}@keyframes shake{0%,100%{transform:translateX(0)}10%,30%,50%,70%,90%{transform:translateX(-10px)}20%,40%,60%,80%{transform:translateX(10px)}}.shake{-webkit-animation-name:shake;-moz-animation-name:shake;-o-animation-name:shake;animation-name:shake} \ No newline at end of file diff --git a/local/modules/Tinymce/Resources/js/tinymce/plugins/filemanager/css/bootstrap-responsive.min.css b/local/modules/Tinymce/Resources/js/tinymce/filemanager/css/bootstrap-responsive.min.css similarity index 100% rename from local/modules/Tinymce/Resources/js/tinymce/plugins/filemanager/css/bootstrap-responsive.min.css rename to local/modules/Tinymce/Resources/js/tinymce/filemanager/css/bootstrap-responsive.min.css diff --git a/local/modules/Tinymce/Resources/js/tinymce/plugins/filemanager/css/bootstrap.min.css b/local/modules/Tinymce/Resources/js/tinymce/filemanager/css/bootstrap.min.css similarity index 100% rename from local/modules/Tinymce/Resources/js/tinymce/plugins/filemanager/css/bootstrap.min.css rename to local/modules/Tinymce/Resources/js/tinymce/filemanager/css/bootstrap.min.css diff --git a/local/modules/Tinymce/Resources/js/tinymce/plugins/filemanager/css/dropzone.css b/local/modules/Tinymce/Resources/js/tinymce/filemanager/css/dropzone.css similarity index 97% rename from local/modules/Tinymce/Resources/js/tinymce/plugins/filemanager/css/dropzone.css rename to local/modules/Tinymce/Resources/js/tinymce/filemanager/css/dropzone.css index 569645a19..bb839c214 100644 --- a/local/modules/Tinymce/Resources/js/tinymce/plugins/filemanager/css/dropzone.css +++ b/local/modules/Tinymce/Resources/js/tinymce/filemanager/css/dropzone.css @@ -169,7 +169,7 @@ -o-transition: opacity 0.3s ease-in-out; -ms-transition: opacity 0.3s ease-in-out; transition: opacity 0.3s ease-in-out; - background-image: url("../img/spritemap.png"); + /*background-image: url("../img/spritemap.png");*/ background-repeat: no-repeat; background-position: 0 0; position: absolute; @@ -182,7 +182,7 @@ } @media all and (-webkit-min-device-pixel-ratio:1.5),(min--moz-device-pixel-ratio:1.5),(-o-min-device-pixel-ratio:1.5/1),(min-device-pixel-ratio:1.5),(min-resolution:138dpi),(min-resolution:1.5dppx) { .dropzone .dz-default.dz-message { - background-image: url("../img/spritemap@2x.png"); + /*background-image: url("../img/spritemap@2x.png");*/ -webkit-background-size: 428px 406px; -moz-background-size: 428px 406px; background-size: 428px 406px; @@ -251,7 +251,7 @@ -o-transition: opacity 0.4s ease-in-out; -ms-transition: opacity 0.4s ease-in-out; transition: opacity 0.4s ease-in-out; - background-image: url("../img/spritemap.png"); + /*background-image: url("../img/spritemap.png");*/ background-repeat: no-repeat; } @media all and (-webkit-min-device-pixel-ratio:1.5),(min--moz-device-pixel-ratio:1.5),(-o-min-device-pixel-ratio:1.5/1),(min-device-pixel-ratio:1.5),(min-resolution:138dpi),(min-resolution:1.5dppx) { @@ -259,7 +259,7 @@ .dropzone-previews .dz-preview .dz-error-mark, .dropzone .dz-preview .dz-success-mark, .dropzone-previews .dz-preview .dz-success-mark { - background-image: url("../img/spritemap@2x.png"); + /*background-image: url("../img/spritemap@2x.png");*/ -webkit-background-size: 428px 406px; -moz-background-size: 428px 406px; background-size: 428px 406px; @@ -298,14 +298,14 @@ left: 0; width: 0%; height: 100%; - background-image: url("../img/spritemap.png"); + /*background-image: url("../img/spritemap.png");*/ background-repeat: repeat-x; background-position: 0px -400px; } @media all and (-webkit-min-device-pixel-ratio:1.5),(min--moz-device-pixel-ratio:1.5),(-o-min-device-pixel-ratio:1.5/1),(min-device-pixel-ratio:1.5),(min-resolution:138dpi),(min-resolution:1.5dppx) { .dropzone .dz-preview .dz-progress .dz-upload, .dropzone-previews .dz-preview .dz-progress .dz-upload { - background-image: url("../img/spritemap@2x.png"); + /*background-image: url("../img/spritemap@2x.png");*/ -webkit-background-size: 428px 406px; -moz-background-size: 428px 406px; background-size: 428px 406px; diff --git a/local/modules/Tinymce/Resources/js/tinymce/plugins/filemanager/css/dropzone.min.css b/local/modules/Tinymce/Resources/js/tinymce/filemanager/css/dropzone.min.css similarity index 100% rename from local/modules/Tinymce/Resources/js/tinymce/plugins/filemanager/css/dropzone.min.css rename to local/modules/Tinymce/Resources/js/tinymce/filemanager/css/dropzone.min.css diff --git a/local/modules/Tinymce/Resources/js/tinymce/plugins/filemanager/css/jquery.contextMenu.min.css b/local/modules/Tinymce/Resources/js/tinymce/filemanager/css/jquery.contextMenu.min.css similarity index 82% rename from local/modules/Tinymce/Resources/js/tinymce/plugins/filemanager/css/jquery.contextMenu.min.css rename to local/modules/Tinymce/Resources/js/tinymce/filemanager/css/jquery.contextMenu.min.css index f7fb23a44..21d6805da 100644 --- a/local/modules/Tinymce/Resources/js/tinymce/plugins/filemanager/css/jquery.contextMenu.min.css +++ b/local/modules/Tinymce/Resources/js/tinymce/filemanager/css/jquery.contextMenu.min.css @@ -1,5 +1,5 @@ -.context-menu-list{font-family:'Open Sans', sans-serif;width:200px;display:inline-block;position:absolute;list-style-type:none;border:1px solid #DDD;background:#fff;-webkit-box-shadow:0 2px 5px rgba(0,0,0,0.5);-moz-box-shadow:0 2px 5px rgba(0,0,0,0.5);-ms-box-shadow:0 2px 5px rgba(0,0,0,0.5);-o-box-shadow:0 2px 5px rgba(0,0,0,0.5);box-shadow:0 2px 5px rgba(0,0,0,0.5);font-size:12px;margin:0;padding:5px} -.context-menu-item{background-color:#fff;position:relative;border-bottom:1px solid #eee;height:auto;word-wrap:break-word;-webkit-user-select:none;-moz-user-select:0;-ms-user-select:none;user-select:none;padding:5px 5px 5px 30px} +.context-menu-list{font-family:'Open Sans', sans-serif;width:200px;display:inline-block;position:absolute;list-style-type:none;border:1px solid #DDD;background:#fff;font-size:12px;margin:0;padding:5px} +.context-menu-item{background-color:#fff;position:relative;height:auto;word-wrap:break-word;-webkit-user-select:none;-moz-user-select:0;-ms-user-select:none;user-select:none;padding:5px 5px 5px 30px} .context-menu-item:last-child{border:none} .context-menu-separator{padding-bottom:0;border-bottom:1px solid #DDD} .context-menu-item > label > input,.context-menu-item > label > textarea{-webkit-user-select:text;-moz-user-select:text;-ms-user-select:text;user-select:text} @@ -10,7 +10,7 @@ .context-menu-item.icon{min-height:18px;vertical-align:middle;background-repeat:no-repeat;background-position:4px 5px;width:auto;display:list-item} .context-menu-item.icon-edit{background-image:url(../img/page_white_edit.png)} .context-menu-item.icon-cut{background-image:url(../img/cut.png)} -.context-menu-item.icon-copy{background-image:url(../img/page_white_copy.png)} +.context-menu-item.icon-copy{background-image:url(../img/copy.png)} .context-menu-item.icon-rename{background-image:url(../img/rename.png)} .context-menu-item.icon-preview{background-image:url(../img/preview.png)} .context-menu-item.icon-dimension{background-image:url(../img/dimension.png)} @@ -19,6 +19,7 @@ .context-menu-item.icon-size{background-image:url(../img/size.png)} .context-menu-item.icon-download{background-image:url(../img/download.png)} .context-menu-item.icon-paste{background-image:url(../img/page_white_paste.png)} +.context-menu-item.icon-clipboard-apply {background-image:url(../img/clipboard_apply.png)} .context-menu-item.icon-delete{background-image:url(../img/page_white_delete.png)} .context-menu-item.icon-add{background-image:url(../img/page_white_add.png)} .context-menu-item.icon-quit{background-image:url(../img/door.png)} @@ -26,6 +27,7 @@ .context-menu-item.icon-extract{background-image:url(../img/zip.png)} .context-menu-item.icon-url{background-image:url(../img/url.png)} .context-menu-item.icon-edit_img{background-image:url(../img/edit_img.png)} +.context-menu-item.icon-duplicate{background-image:url(../img/duplicate.png)} .context-menu-input > label > *{vertical-align:top} .context-menu-input > label > input[type=checkbox],.context-menu-input > label > input[type=radio]{margin-left:-17px} .context-menu-input > label > span{margin-left:5px} diff --git a/local/modules/Tinymce/Resources/js/tinymce/filemanager/css/style.css b/local/modules/Tinymce/Resources/js/tinymce/filemanager/css/style.css new file mode 100644 index 000000000..061ef75b4 --- /dev/null +++ b/local/modules/Tinymce/Resources/js/tinymce/filemanager/css/style.css @@ -0,0 +1 @@ +*,*:after,*:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}body,html{font-family:'Open Sans',sans-serif;font-size:100%;padding:0;margin:0}body{padding-top:32px;font-weight:200;background:#ececec;overflow:-moz-scrollbars-vertical}#qLpercentage{font-family:'Open Sans',sans-serif;font-size:40px;line-height:40px;color:#bbb;font-weight:200;height:60px;-webkit-border-radius:10px;border-radius:10px;padding:10px;text-shadow:1px 1px 2px #fff;filter:dropshadow(color=#fff, offx=1, offy=1)}#qLbar{background:url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzdhN2E3YSIgc3RvcC1vcGFjaXR5PSIwLjQiLz4KICAgIDxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzdhN2E3YSIgc3RvcC1vcGFjaXR5PSIwLjQiLz4KICA8L2xpbmVhckdyYWRpZW50PgogIDxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZ3JhZC11Y2dnLWdlbmVyYXRlZCkiIC8+Cjwvc3ZnPg==);background:-moz-linear-gradient(top, rgba(122,122,122,0.4) 0, rgba(122,122,122,0.4) 100%);background:-webkit-gradient(linear, left top, left bottom, color-stop(0, rgba(122,122,122,0.4)), color-stop(100%, rgba(122,122,122,0.4)));background:-webkit-linear-gradient(top, rgba(122,122,122,0.4) 0, rgba(122,122,122,0.4) 100%);background:-o-linear-gradient(top, rgba(122,122,122,0.4) 0, rgba(122,122,122,0.4) 100%);background:-ms-linear-gradient(top, rgba(122,122,122,0.4) 0, rgba(122,122,122,0.4) 100%);background:linear-gradient(to bottom, rgba(122,122,122,0.4) 0, rgba(122,122,122,0.4) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#667a7a7a', endColorstr='#667a7a7a', GradientType=0);z-index:200;margin:0;overflow:hidden}[class^="rficon-"],[class*=" rficon-"]{display:inline-block;width:16px;height:16px;margin-top:1px;*margin-right:.3em;line-height:16px;vertical-align:text-top;background-position:0 0;background-repeat:no-repeat}.rficon-clipboard-apply{background-image:url(../img/clipboard_apply.png)}.rficon-clipboard-clear{background-image:url(../img/clipboard_clear.png)}.btn{-webkit-border-radius:0;border-radius:0}.container-fluid{padding-right:0 !important;margin-top:10px !important}.img-precontainer{margin:auto;width:100%;text-align:center;background:#fff;border:none}.img-container{height:91px;width:122px;padding:0;border:none;overflow:hidden;display:table-cell;text-align:center;vertical-align:middle;margin:auto}ul.breadcrumb{margin-bottom:5px;-webkit-border-radius:0;border-radius:0;padding-bottom:4px;padding-top:6px;background:#f0f0f0;-webkit-box-shadow:0 1px 4px rgba(0,0,0,0.065);-moz-box-shadow:0 1px 4px rgba(0,0,0,0.065);box-shadow:0 1px 4px rgba(0,0,0,0.065);border-bottom:1px solid #bbb}ul.breadcrumb .pull-left i{margin-top:2px}.alert{padding:8px 35px 8px 14px;margin-bottom:2px;border:1px solid #aaa;color:#666;font-weight:200;font-size:13px;-webkit-border-radius:0;border-radius:0;background:#fff}.img-container *,.img-container-mini *{vertical-align:middle}#help{display:none}iframe{overflow:auto;-webkit-overflow-scrolling:touch}.upload-tabbable{margin-left:5px;margin-right:5px}.upload-tabbable .upload-help{font-size:11px;font-weight:200;color:#777;text-shadow:0 1px 0 #fff;text-align:center}.upload-tabbable .nav{margin:0}.upload-tabbable .nav li a{font-size:13px;font-weight:200;color:#777;text-shadow:0 1px 0 #fff}.upload-tabbable .tab-content{padding:5px;border-bottom:1px solid #ddd;border-left:1px solid #ddd;border-rigth:1px solid #ddd;background:#fff;margin-bottom:5px}input#filter-input{margin:0;width:84px;height:26px;vertical-align:bottom;margin-bottom:2px;-webkit-border-radius:0;border-radius:0;font-size:12px;font-weight:200;position:relative;left:1px}.qq-uploader .span9{margin-left:14px !important;width:690px !important}.space10{clear:both;height:10px}h4{font-size:12px;font-weight:200;margin:0;text-align:center;padding:0;margin-top:6px;line-height:18px}h3{font-size:14px;font-weight:200}.boxes{border:1px solid #ccc;word-wrap:break-word;background:#fff;-webkit-box-shadow:1px 1px 2px 0 rgba(0,0,0,0.2);box-shadow:1px 1px 2px 0 rgba(0,0,0,0.2);min-height:115px;text-align:center}.container-fluid{padding:0 10px !important}body .avpw .avpw_primary_button,body .avpw .avpw_primary_button:link,body .avpw .avpw_primary_button:visited,body .avpw .avpw_primary_button:active{background-color:#999;color:#fff;background-image:none;border:none}body .avpw .avpw_primary_button:hover{border:none;background-color:#666}.uploader{position:fixed;top:50px;left:14px;margin:auto;width:100%;z-index:9999;overflow:hidden;background:#eee;padding-top:20px;border:1px solid #ccc;display:none;-webkit-box-shadow:0 0 10px 0 rgba(1,1,1,0.5);box-shadow:0 0 10px 0 rgba(1,1,1,0.5)}.download-form{margin-bottom:25px}.grid li i{margin-left:2px;margin-right:2px;z-index:0}.box,.boxx{text-align:center;word-wrap:break-word;vertical-align:top;text-align:left;position:relative;border:none;box-shadow:none;z-index:100;padding:4px}.box .btn{width:100%;background:none;box-shadow:none;border:none;z-index:200}.navbar{margin-bottom:0;border-bottom:1px solid #bbb}.navbar .navbar-inner{border:none;min-height:35px;-webkit-border-radius:0;border-radius:0;padding-bottom:2px;margin:0;padding-right:8px;padding-left:8px}.navbar .navbar-inner .container-fluid{margin:0;margin-top:0 !important;padding:0}.navbar .navbar-inner .container-fluid .brand{display:none}.navbar .navbar-inner .container-fluid .filters span{margin-top:0;font-size:13px;font-weight:200;color:#777;text-shadow:0 1px 0 #fff}ul.sorting{position:absolute;left:-25px;top:20px;min-width:0;background:#eee}ul.sorting li a:hover{background:#aaa}.btn-group .dropdown-toggle.sorting-btn{background:none;border:none;box-shadow:none;position:relative;-webkit-box-shadow:none;top:-5px;font-size:13px}.btn-group .dropdown-toggle.sorting-btn:hover{background:none;border:none;box-shadow:none;-webkit-box-shadow:none}ul.sorting.dropdown-menu>li>a{font-size:12px;text-shadow:none}ul.sorting.dropdown-menu>li>a.ascending{background-image:url(../img/down.png);background-repeat:no-repeat;background-position:6px 8px}ul.sorting.dropdown-menu>li>a.descending{background-image:url(../img/up.png);background-repeat:no-repeat;background-position:6px 8px}.sorter-container{margin-top:5px;margin-bottom:0;-webkit-border-radius:0;border-radius:0;padding-bottom:4px;padding-top:6px;-webkit-box-shadow:0 1px 4px rgba(0,0,0,0.065);-moz-box-shadow:0 1px 4px rgba(0,0,0,0.065);box-shadow:0 1px 4px rgba(0,0,0,0.065);background-color:#f5f5f5;position:relative;border-bottom:1px solid #bbb;height:24px}.sorter-container a.sorter{color:#000}.sorter-container a.ascending{padding-left:9px;background-image:url(../img/down.png);background-repeat:no-repeat;background-position:0 3px}.sorter-container a.descending{padding-left:9px;background-image:url(../img/up.png);background-repeat:no-repeat;background-position:0 4px}.sorter-container .img-dimension,.sorter-container .file-date,.sorter-container .file-size,.sorter-container .file-extension,.sorter-container .file-name,.sorter-container .file-operations{display:block;position:absolute;top:0;z-index:100;-webkit-box-shadow:none;box-shadow:none;text-align:left;font-size:13px;margin-top:1px;color:#999}.sorter-container .file-operations{width:110px;right:0}.sorter-container .img-dimension{width:65px;right:123px}.sorter-container .file-date{width:70px;right:188px}.sorter-container .file-size{width:55px;right:258px}.sorter-container .file-extension{width:40px;right:313px}.sorter-container .file-name{width:50px;left:52px}.img-dimension,.file-date,.file-size,.file-extension,.file-name,.file-operations{font-size:12px;font-weight:200;color:#777;text-shadow:0 1px 0 #fff;display:none}.view-controller{text-align:left}.view-controller .btn-group>.btn:first-child,.view-controller .btn-group>.btn:last-child{-webkit-border-radius:0;border-radius:0}.navbar .filters .btn{margin-bottom:2px;padding-top:2px;padding-bottom:2px;padding-left:8px;padding-right:8px;margin-top:5px}.filters .types{text-align:right}@media (max-width:780px){#view2{display:none}}@media (max-width:839px){body{padding-top:0}.filters .types{text-align:left}.navbar .navbar-inner .container-fluid .brand{display:block}.navbar .navbar-inner{padding-bottom:4px}.filters div.span3.half,.filters div.half.span6{float:none;width:100%}.container-fluid{margin:0 !important;padding:0}#qLbar{height:50px !important}}@media (min-width:400px) and (max-width:839px){.filters .row-fluid .half{width:48.61878453038674%;*width:48.56559304102504%;float:left}}.tooltip.in{z-index:10000;opacity:1;filter:alpha(opacity=1);font-weight:bold}.tooltip{font-weight:bold;z-index:10000}.grid{padding:0 0;margin:0 auto;list-style:none;-webkit-overflow-scrolling:touch}.grid li{display:inline-block;width:124px;border:none;margin:4px;margin-bottom:8px;padding:0;vertical-align:top}.grid figure{margin:0;position:relative;display:block;width:122px;margin:auto}.grid figure:hover{background:#e0e0e0 !important}.list-view1.grid li{width:100%}.list-view1.grid li figure{width:100%}.grid figcaption{text-align:center;padding:2px;padding-top:8px;color:#fff;height:30px;width:122px;margin-left:0;margin-right:0;position:absolute;top:auto;bottom:0;-webkit-box-shadow:inset 0 0 8px 0 rgba(41,41,41,0.5);box-shadow:inset 0 0 8px 0 rgba(41,41,41,0.5)}.grid figcaption a{margin:0;padding:3px}.grid figcaption h3{margin:0;padding:0;color:#fff}.grid h4{text-align:center;color:#000;padding:0;margin-bottom:4px;margin-top:4px}.grid figure .box{box-sizing:content-box}.list-view0.grid figure .box,.list-view1.grid figure .box,.list-view2.grid figure .box{max-width:100%;display:block;position:relative;overflow:hidden;z-index:1}.list-view0.grid figure .box h4.ellipsis,.list-view1.grid figure .box h4.ellipsis,.list-view2.grid figure .box h4.ellipsis{height:18px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.list-view0.grid figure .box h4,.list-view1.grid figure .box h4,.list-view2.grid figure .box h4{z-index:1}.list-view0.grid figure .box h4 a,.list-view1.grid figure .box h4 a,.list-view2.grid figure .box h4 a{z-index:1}.list-view0.grid .selected,.list-view1.grid .selected,.list-view2.grid .selected{-webkit-box-shadow:0 0 10px 5px rgba(0,0,0,0.25);box-shadow:0 0 10px 5px rgba(0,0,0,0.25)}.no-touch .list-view0 figure .box{z-index:1;-webkit-transition:-webkit-transform .3s;-moz-transition:-moz-transform .3s;transition:transform .3s}.ui-state-highlight{border:1px solid #f00}.no-touch .list-view0 figure:hover .box,.no-touch .list-view0 figure.cs-hover .box{-webkit-box-shadow:0 0 4px 0 rgba(1,1,1,0.5);box-shadow:0 0 4px 0 rgba(1,1,1,0.5);-webkit-transform:translateY(-26px);-moz-transform:translateY(-26px);-ms-transform:translateY(-26px);transform:translateY(-26px)}.list-view0 figure:hover .box.no-effect,.list-view0 figure.cs-hover .box.no-effect,.no-effect{-webkit-box-shadow:none;box-shadow:none;-webkit-transform:none;-moz-transform:none;-ms-transform:none;transform:none}.list-view0 .img-precontainer-mini{display:none;background:none}a,a:hover{color:#000;text-decoration:none}.back-directory .img-precontainer,.back-directory .img-precontainer-mini,.back-directory .box{background:none}form{margin:0;padding:0}.modal-body form,.modal-body input{margin:0}.modal-header h3{font-weight:300;font-size:20px}.list-view1.sorter-container{display:block}.list-view0.sorter-container,.list-view2.sorter-container{display:none}.list-view0.grid .img-precontainer .img-container img{max-width:122px !important;max-height:91px !important}.list-view0.grid .img-precontainer .img-container img.icon{width:122px;margin-top:0}.list-view0.grid .img-precontainer .filetype{position:absolute;top:0;width:120px;text-align:center;color:#fff;font-size:13px;line-height:22px}.list-view0.grid .cover{background:url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIwLjI1Ii8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMC4yNSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);background:-moz-linear-gradient(top, rgba(255,255,255,0.25) 0, rgba(255,255,255,0.25) 100%);background:-webkit-gradient(linear, left top, left bottom, color-stop(0, rgba(255,255,255,0.25)), color-stop(100%, rgba(255,255,255,0.25)));background:-webkit-linear-gradient(top, rgba(255,255,255,0.25) 0, rgba(255,255,255,0.25) 100%);background:-o-linear-gradient(top, rgba(255,255,255,0.25) 0, rgba(255,255,255,0.25) 100%);background:-ms-linear-gradient(top, rgba(255,255,255,0.25) 0, rgba(255,255,255,0.25) 100%);background:linear-gradient(to bottom, rgba(255,255,255,0.25) 0, rgba(255,255,255,0.25) 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#40ffffff', endColorstr='#40ffffff', GradientType=0);width:122px;position:absolute;top:22px;right:0;height:69px}.list-view0.grid .box{background:#fff}.list-view0.grid .directory{background:#ddd}.list-view0.grid figure.back-directory .directory{background:#bbb}.list-view0.grid figcaption{background:#fff}.list-view1.grid li,.list-view2.grid li{margin:0}.list-view1.grid li.back figure.back-directory,.list-view2.grid li.back figure.back-directory{height:34px}.list-view1.grid li:nth-child(odd) figure,.list-view2.grid li:nth-child(odd) figure{background:#f9f9f9}.list-view1.grid li:nth-child(odd) figure.directory,.list-view2.grid li:nth-child(odd) figure.directory{background:#eaeaea}.list-view1.grid li figure,.list-view2.grid li figure{border-bottom:1px solid #ccc;background:#fff}.list-view1.grid li figure.back-directory,.list-view2.grid li figure.back-directory{background:#bbb}.list-view1.grid li figure.back-directory .box,.list-view2.grid li figure.back-directory .box{background:none}.list-view1.grid li figure.directory,.list-view2.grid li figure.directory{background:#efefef}.list-view1.grid li figure.directory box,.list-view2.grid li figure.directory box{padding:0;min-height:10px}.list-view1.grid li figure .box,.list-view2.grid li figure .box{margin-left:50px;-webkit-transition:none;-moz-transition:none;transition:none}.list-view1.grid li figure .box h4,.list-view2.grid li figure .box h4{padding-top:1px;font-size:13px;text-align:left}.list-view1.grid .img-precontainer-mini,.list-view2.grid .img-precontainer-mini{display:block;position:absolute;width:45px;height:34px;overflow:hidden;text-align:center}.list-view1.grid .img-precontainer-mini img,.list-view2.grid .img-precontainer-mini img{height:34px}.list-view1.grid .img-precontainer-mini .filetype,.list-view2.grid .img-precontainer-mini .filetype{position:absolute;top:5px;text-align:center;left:5px;padding:1px 2px;font-size:13px;line-height:22px;width:34px;height:24px;color:#fff;background:#333}.list-view1.grid .cover,.list-view2.grid .cover{display:none}.list-view1.grid .img-container-mini,.list-view2.grid .img-container-mini{width:45px;height:34px;border:none;overflow:hidden;display:table-cell;text-align:center;vertical-align:middle;margin:auto}.list-view1.grid .img-precontainer-mini.original-thumb,.list-view2.grid .img-precontainer-mini.original-thumb{padding:0}.list-view1.grid .img-precontainer-mini.original-thumb img,.list-view2.grid .img-precontainer-mini.original-thumb img{width:auto;margin:0;height:34px}.list-view1.grid .img-precontainer-mini.original-thumb img.original,.list-view2.grid .img-precontainer-mini.original-thumb img.original{width:auto;height:auto}.list-view1.grid .img-precontainer,.list-view2.grid .img-precontainer{display:none}.list-view1.grid figcaption,.list-view2.grid figcaption{background:none;width:120px;position:absolute;right:0;top:0;z-index:1;bottom:0;-webkit-box-shadow:none;box-shadow:none;text-align:right}.list-view1.grid .selected,.list-view2.grid .selected{-webkit-box-shadow:0 0 3px 2px rgba(0,0,0,0.2);box-shadow:0 0 3px 2px rgba(0,0,0,0.2)}.list-view1.grid .img-dimension,.list-view1.grid .file-date,.list-view1.grid .file-size,.list-view1.grid .file-extension{overflow:hidden;display:block;position:absolute;top:0;z-index:1;-webkit-box-shadow:none;box-shadow:none;text-align:left;margin-top:7px}.list-view1.grid .img-dimension{width:65px;right:120px}.list-view1.grid .file-date{width:70px;right:185px}.list-view1.grid .file-size{width:55px;right:255px}.list-view1.grid .file-extension{width:40px;right:310px}.list-view1.grid figure .box{padding-right:352px}.list-view2.grid figure .box{padding-right:115px}@media (max-width:610px){.list-view1.grid figure .box{padding-right:312px}.list-view1.grid figure .file-extension{display:none}.sorter-container .file-extension{display:none}}@media (max-width:565px){.list-view1.grid figure .box{padding-right:257px}.list-view1.grid figure .file-size{display:none}.sorter-container .file-size{display:none}}@media (max-width:495px){.list-view1.grid figure .box{padding-right:187px}.list-view1.grid figure .file-date{display:none}.sorter-container .file-date{display:none}}@media (max-width:430px){.list-view1.grid figure .box{padding-right:115px}.list-view1.grid figure .img-dimension{display:none}.sorter-container .img-dimension{display:none}.breadcrumb{margin-left:0;margin-right:0}}.list-view2.grid .img-precontainer-mini .filetype.pdf,.list-view1.grid .img-precontainer-mini .filetype.pdf{background:#cb0011}.list-view2.grid .img-precontainer-mini .filetype.css,.list-view1.grid .img-precontainer-mini .filetype.css{background:#d10698}.list-view2.grid .img-precontainer-mini .filetype.ai,.list-view1.grid .img-precontainer-mini .filetype.ai{background:#d6772f}.list-view2.grid .img-precontainer-mini .filetype.psd,.list-view1.grid .img-precontainer-mini .filetype.psd{background:#0960a4}.list-view2.grid .img-precontainer-mini .filetype.html,.list-view1.grid .img-precontainer-mini .filetype.html,.list-view2.grid .img-precontainer-mini .filetype.xhtml,.list-view1.grid .img-precontainer-mini .filetype.xhtml{background:#035bc4}.list-view2.grid .img-precontainer-mini .filetype.fla,.list-view1.grid .img-precontainer-mini .filetype.fla,.list-view2.grid .img-precontainer-mini .filetype.flv,.list-view1.grid .img-precontainer-mini .filetype.flv{background:#cf302e}.list-view2.grid .img-precontainer-mini .filetype.ppt,.list-view1.grid .img-precontainer-mini .filetype.ppt,.list-view2.grid .img-precontainer-mini .filetype.pptx,.list-view1.grid .img-precontainer-mini .filetype.pptx{background:#da5b00}.list-view2.grid .img-precontainer-mini .filetype.xls,.list-view1.grid .img-precontainer-mini .filetype.xls,.list-view2.grid .img-precontainer-mini .filetype.xlsx,.list-view1.grid .img-precontainer-mini .filetype.xlsx,.list-view2.grid .img-precontainer-mini .filetype.css,.list-view1.grid .img-precontainer-mini .filetype.css{background:#1a712c}.list-view2.grid .img-precontainer-mini .filetype.rts,.list-view1.grid .img-precontainer-mini .filetype.rts,.list-view2.grid .img-precontainer-mini .filetype.doc,.list-view1.grid .img-precontainer-mini .filetype.doc,.list-view2.grid .img-precontainer-mini .filetype.docx,.list-view1.grid .img-precontainer-mini .filetype.docx{background:#002093}.list-view2.grid .img-precontainer-mini .filetype.rar,.list-view1.grid .img-precontainer-mini .filetype.rar,.list-view2.grid .img-precontainer-mini .filetype.zip,.list-view1.grid .img-precontainer-mini .filetype.zip,.list-view2.grid .img-precontainer-mini .filetype.gzip,.list-view1.grid .img-precontainer-mini .filetype.gzip{background:#fe9221}.list-view2.grid .img-precontainer-mini .filetype.mp4,.list-view1.grid .img-precontainer-mini .filetype.mp4,.list-view2.grid .img-precontainer-mini .filetype.mpeg,.list-view1.grid .img-precontainer-mini .filetype.mpeg,.list-view2.grid .img-precontainer-mini .filetype.mov,.list-view1.grid .img-precontainer-mini .filetype.mov,.list-view2.grid .img-precontainer-mini .filetype.avi,.list-view1.grid .img-precontainer-mini .filetype.avi,.list-view2.grid .img-precontainer-mini .filetype.mpg,.list-view1.grid .img-precontainer-mini .filetype.mpg,.list-view2.grid .img-precontainer-mini .filetype.wma,.list-view1.grid .img-precontainer-mini .filetype.wma,.list-view2.grid .img-precontainer-mini .filetype.webm,.list-view1.grid .img-precontainer-mini .filetype.webm{background:#31231e}.list-view2.grid .img-precontainer-mini .filetype.mp3,.list-view1.grid .img-precontainer-mini .filetype.mp3,.list-view2.grid .img-precontainer-mini .filetype.m4a,.list-view1.grid .img-precontainer-mini .filetype.m4a,.list-view2.grid .img-precontainer-mini .filetype.ac3,.list-view1.grid .img-precontainer-mini .filetype.ac3,.list-view2.grid .img-precontainer-mini .filetype.aiff,.list-view1.grid .img-precontainer-mini .filetype.aiff,.list-view2.grid .img-precontainer-mini .filetype.mid,.list-view1.grid .img-precontainer-mini .filetype.mid,.list-view2.grid .img-precontainer-mini .filetype.ogg,.list-view1.grid .img-precontainer-mini .filetype.ogg,.list-view2.grid .img-precontainer-mini .filetype.wav,.list-view1.grid .img-precontainer-mini .filetype.wav{background:#9f008b}.list-view2.grid .img-precontainer-mini .filetype.odt,.list-view1.grid .img-precontainer-mini .filetype.odt,.list-view2.grid .img-precontainer-mini .filetype.ots,.list-view1.grid .img-precontainer-mini .filetype.ots,.list-view2.grid .img-precontainer-mini .filetype.ott,.list-view1.grid .img-precontainer-mini .filetype.ott,.list-view2.grid .img-precontainer-mini .filetype.odb,.list-view1.grid .img-precontainer-mini .filetype.odb,.list-view2.grid .img-precontainer-mini .filetype.odg,.list-view1.grid .img-precontainer-mini .filetype.odg,.list-view2.grid .img-precontainer-mini .filetype.otp,.list-view1.grid .img-precontainer-mini .filetype.otp,.list-view2.grid .img-precontainer-mini .filetype.otg,.list-view1.grid .img-precontainer-mini .filetype.otg,.list-view2.grid .img-precontainer-mini .filetype.odf,.list-view1.grid .img-precontainer-mini .filetype.odf,.list-view2.grid .img-precontainer-mini .filetype.ods,.list-view1.grid .img-precontainer-mini .filetype.ods,.list-view2.grid .img-precontainer-mini .filetype.odp,.list-view1.grid .img-precontainer-mini .filetype.odp{background:#367bbe}.list-view2.grid .img-precontainer-mini .filetype.jpg,.list-view1.grid .img-precontainer-mini .filetype.jpg,.list-view2.grid .img-precontainer-mini .filetype.jpeg,.list-view1.grid .img-precontainer-mini .filetype.jpeg,.list-view2.grid .img-precontainer-mini .filetype.png,.list-view1.grid .img-precontainer-mini .filetype.png,.list-view2.grid .img-precontainer-mini .filetype.bmp,.list-view1.grid .img-precontainer-mini .filetype.bmp,.list-view2.grid .img-precontainer-mini .filetype.gif,.list-view1.grid .img-precontainer-mini .filetype.gif,.list-view2.grid .img-precontainer-mini .filetype.tiff,.list-view1.grid .img-precontainer-mini .filetype.tiff,.list-view2.grid .img-precontainer-mini .filetype.svg,.list-view1.grid .img-precontainer-mini .filetype.svg{background:#cfa554}.list-view2.grid .img-precontainer-mini .filetype.txt,.list-view1.grid .img-precontainer-mini .filetype.txt,.list-view2.grid .img-precontainer-mini .filetype.sql,.list-view1.grid .img-precontainer-mini .filetype.sql,.list-view2.grid .img-precontainer-mini .filetype.xml,.list-view1.grid .img-precontainer-mini .filetype.xml,.list-view2.grid .img-precontainer-mini .filetype.log,.list-view1.grid .img-precontainer-mini .filetype.log,.list-view2.grid .img-precontainer-mini .filetype.iso,.list-view1.grid .img-precontainer-mini .filetype.iso,.list-view2.grid .img-precontainer-mini .filetype.dmg,.list-view1.grid .img-precontainer-mini .filetype.dmg{background:#cacaca}.list-view2.grid .img-precontainer-mini .filetype.ade,.list-view1.grid .img-precontainer-mini .filetype.ade,.list-view2.grid .img-precontainer-mini .filetype.adp,.list-view1.grid .img-precontainer-mini .filetype.adp,.list-view2.grid .img-precontainer-mini .filetype.mdb,.list-view1.grid .img-precontainer-mini .filetype.mdb,.list-view2.grid .img-precontainer-mini .filetype.accdb,.list-view1.grid .img-precontainer-mini .filetype.accdb{background:#b61c19} \ No newline at end of file diff --git a/local/modules/Tinymce/Resources/js/tinymce/plugins/filemanager/css/style.less b/local/modules/Tinymce/Resources/js/tinymce/filemanager/css/style.less similarity index 86% rename from local/modules/Tinymce/Resources/js/tinymce/plugins/filemanager/css/style.less rename to local/modules/Tinymce/Resources/js/tinymce/filemanager/css/style.less index d75f4276d..74d25b12f 100644 --- a/local/modules/Tinymce/Resources/js/tinymce/plugins/filemanager/css/style.less +++ b/local/modules/Tinymce/Resources/js/tinymce/filemanager/css/style.less @@ -5,7 +5,8 @@ body, html { body{ padding-top: 32px; font-weight:200; - background:#eeeeee; + background:#ececec; + overflow: -moz-scrollbars-vertical; } #qLpercentage{ @@ -33,10 +34,31 @@ body{ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#667a7a7a', endColorstr='#667a7a7a',GradientType=0 ); /* IE6-8 */ z-index:200; - margin-left: 10px; + margin:0px; overflow: hidden; } + +[class^="rficon-"],[class*=" rficon-"] { + display:inline-block; + width:16px; + height:16px; + margin-top:1px; + *margin-right:.3em; + line-height:16px; + vertical-align:text-top; + background-position: 0 0; + background-repeat:no-repeat +} + +.rficon-clipboard-apply { + background-image:url(../img/clipboard_apply.png); +} + +.rficon-clipboard-clear { + background-image:url(../img/clipboard_clear.png); +} + .btn{ -webkit-border-radius: 0px; border-radius: 0px; @@ -154,7 +176,7 @@ input#filter-input{ .qq-uploader .span9{margin-left:14px !important;width:690px !important;} .space10{ clear:both; height:10px; } -h4{ font-size:11px; font-weight:200; margin: 0px; text-align: center; padding: 0px; margin-top:6px; line-height: 18px; } +h4{ font-size:12px; font-weight:200; margin: 0px; text-align: center; padding: 0px; margin-top:6px; line-height: 18px; } h3{ font-size:14px; font-weight:200;} .boxes{ border:1px solid #CCCCCC; word-wrap: break-word; background:white; -webkit-box-shadow: 1px 1px 2px 0px rgba(0, 0, 0, 0.2);box-shadow: 1px 1px 2px 0px rgba(0, 0, 0, 0.2); min-height:115px; @@ -400,14 +422,20 @@ ul.sorting.dropdown-menu>li>a{ .navbar .navbar-inner{ padding-bottom: 4px; } + .filters{ + div.span3.half,div.half.span6{ + float:none; + width:100%; + + } + } .container-fluid{ margin:0px !important; padding: 0px; } #qLbar{ - position: absolute; - top:8px !important; + height:50px !important; } } @media(min-width:400px) and (max-width:839px){ @@ -437,9 +465,11 @@ ul.sorting.dropdown-menu>li>a{ .grid li { display: inline-block; - width: 126px; + width: 124px; + border:none; margin: 4px; - padding: 2px; + margin-bottom:8px; + padding: 0px; vertical-align: top; } @@ -465,26 +495,26 @@ ul.sorting.dropdown-menu>li>a{ padding-top: 8px; color: white; height: 30px; - width: 118px; - margin-left:2px; - margin-right: 2px; + width: 122px; + margin-left:0px; + margin-right: 0px; position: absolute; top: auto; bottom: 0; -webkit-box-shadow: inset 0px 0px 8px 0px rgba(41, 41, 41, 0.5); box-shadow: inset 0px 0px 8px 0px rgba(41, 41, 41, 0.5); + + a{ + margin: 0px; + padding: 3px; + } + h3 { + margin: 0; + padding: 0; + color: #fff; + } } - -.grid figcaption a{ - margin: 0px; - padding: 3px; -} - -.grid figcaption h3 { - margin: 0; - padding: 0; - color: #fff; -} + .grid h4{ text-align: center; @@ -528,8 +558,10 @@ ul.sorting.dropdown-menu>li>a{ } .selected{ - -webkit-box-shadow: 0px 0px 10px 5px rgba(0, 0, 0, 0.6); - box-shadow: 0px 0px 10px 5px rgba(0, 0, 0, 0.6); + -webkit-box-shadow: 0px 0px 10px 5px rgba(0, 0, 0, 0.25); + box-shadow: 0px 0px 10px 5px rgba(0, 0, 0, 0.25); + + //border: 1px solid #777777; } } @@ -539,7 +571,9 @@ ul.sorting.dropdown-menu>li>a{ -moz-transition: -moz-transform 0.3s; transition: transform 0.3s; } - +.ui-state-highlight{ + border:1px solid red; +} .no-touch .list-view0 figure:hover .box, .no-touch .list-view0 figure.cs-hover .box { @@ -564,6 +598,7 @@ ul.sorting.dropdown-menu>li>a{ .list-view0 .img-precontainer-mini{ display: none; + background: none; } a,a:hover{ color:black; @@ -601,49 +636,44 @@ form{ .list-view0.grid{ .img-precontainer{ .img-container{ + img{ - max-width:122px !important; max-height:91px !important; } img.icon{ width: 122px; - border:1px solid #cccccc; margin-top:0px; } } .filetype{ position:absolute; - top:1px; - right:1px; - padding:2px 3px; + top:0px; + width:120px; + text-align:center; color:white; - font-size: 16px; - line-height: 18px; - /* IE9 SVG, needs conditional override of 'filter' to 'none' */ -background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjYiLz4KICAgIDxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIgc3RvcC1vcGFjaXR5PSIwLjYiLz4KICA8L2xpbmVhckdyYWRpZW50PgogIDxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZ3JhZC11Y2dnLWdlbmVyYXRlZCkiIC8+Cjwvc3ZnPg==); -background: -moz-linear-gradient(top, rgba(0,0,0,0.6) 0%, rgba(0,0,0,0.6) 100%); /* FF3.6+ */ -background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(0,0,0,0.6)), color-stop(100%,rgba(0,0,0,0.6))); /* Chrome,Safari4+ */ -background: -webkit-linear-gradient(top, rgba(0,0,0,0.6) 0%,rgba(0,0,0,0.6) 100%); /* Chrome10+,Safari5.1+ */ -background: -o-linear-gradient(top, rgba(0,0,0,0.6) 0%,rgba(0,0,0,0.6) 100%); /* Opera 11.10+ */ -background: -ms-linear-gradient(top, rgba(0,0,0,0.6) 0%,rgba(0,0,0,0.6) 100%); /* IE10+ */ -background: linear-gradient(to bottom, rgba(0,0,0,0.6) 0%,rgba(0,0,0,0.6) 100%); /* W3C */ -filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#99000000', endColorstr='#99000000',GradientType=0 ); /* IE6-8 */ - border-bottom: 1px solid #111111; - border-left: 1px solid #111111; - -webkit-border-radius: 0px 0px 0px 6px; - border-radius: 0px 0px 0px 6px; + font-size: 13px; + line-height: 22px; + } } .cover{ - -webkit-box-shadow: inset 0px 0px 25px 0px rgba(0, 0, 0, 0.3); - - box-shadow: inset 0px 0px 25px 0px rgba(0, 0, 0, 0.3); +/* IE9 SVG, needs conditional override of 'filter' to 'none' */ +background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIgc3RvcC1vcGFjaXR5PSIwLjI1Ii8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMC4yNSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+); +background: -moz-linear-gradient(top, rgba(255,255,255,0.25) 0%, rgba(255,255,255,0.25) 100%); /* FF3.6+ */ +background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,255,255,0.25)), color-stop(100%,rgba(255,255,255,0.25))); /* Chrome,Safari4+ */ +background: -webkit-linear-gradient(top, rgba(255,255,255,0.25) 0%,rgba(255,255,255,0.25) 100%); /* Chrome10+,Safari5.1+ */ +background: -o-linear-gradient(top, rgba(255,255,255,0.25) 0%,rgba(255,255,255,0.25) 100%); /* Opera 11.10+ */ +background: -ms-linear-gradient(top, rgba(255,255,255,0.25) 0%,rgba(255,255,255,0.25) 100%); /* IE10+ */ +background: linear-gradient(to bottom, rgba(255,255,255,0.25) 0%,rgba(255,255,255,0.25) 100%); /* W3C */ +filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#40ffffff', endColorstr='#40ffffff',GradientType=0 ); /* IE6-8 */ + + width: 122px; position:absolute; - top:0px; + top:22px; right:0px; - height: 91px; + height: 69px; } .box{ background: white; @@ -656,6 +686,10 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#99000000', e background: #bbbbbb; } } + + figcaption{ + background:#ffffff; + } } .list-view1.grid , .list-view2.grid { @@ -667,8 +701,8 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#99000000', e } } } - li:nth-child(odd) figure {background: #f6f6f6; } - li:nth-child(odd) figure.directory {background: #d2d2d2; } + li:nth-child(odd) figure {background: #f9f9f9; } + li:nth-child(odd) figure.directory {background: #eaeaea; } li figure{ border-bottom: 1px solid #cccccc; @@ -680,7 +714,7 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#99000000', e } } &.directory{ - background: #dddddd; + background: #efefef; box{ padding: 0px; min-height: 10px; @@ -710,26 +744,20 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#99000000', e } .filetype{ position:absolute; - top:0px; + top:5px; text-align: center; - left:0px; + left:5px; padding:1px 2px; - font-size: 14px; - line-height: 32px; - width:45px; - height: 34px; + font-size: 13px; + line-height: 22px; + width:34px; + height: 24px; color:white; - background: #333333; + background: #333333; } } .cover{ - position:absolute; - top:0; - left:0; - width: 45px; - height: 34px; - -webkit-box-shadow: inset 0px 0px 10px 0px rgba(0, 0, 0, 0.4); - box-shadow: inset 0px 0px 10px 0px rgba(0, 0, 0, 0.4); + display: none; } .img-container-mini{ width: 45px; @@ -762,6 +790,7 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#99000000', e } figcaption{ + background:none; width: 120px; position: absolute; right: 0px; @@ -774,8 +803,8 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#99000000', e } .selected{ - -webkit-box-shadow: 0px 0px 3px 2px rgba(0, 0, 0, 0.6); - box-shadow: 0px 0px 3px 2px rgba(0, 0, 0, 0.6); + -webkit-box-shadow: 0px 0px 3px 2px rgba(0, 0, 0, 0.2); + box-shadow: 0px 0px 3px 2px rgba(0, 0, 0, 0.2); } } diff --git a/local/modules/Tinymce/Resources/js/tinymce/plugins/filemanager/dialog.php b/local/modules/Tinymce/Resources/js/tinymce/filemanager/dialog.php similarity index 56% rename from local/modules/Tinymce/Resources/js/tinymce/plugins/filemanager/dialog.php rename to local/modules/Tinymce/Resources/js/tinymce/filemanager/dialog.php index ff60db411..ad48ddf9e 100644 --- a/local/modules/Tinymce/Resources/js/tinymce/plugins/filemanager/dialog.php +++ b/local/modules/Tinymce/Resources/js/tinymce/filemanager/dialog.php @@ -1,8 +1,20 @@ console.log('The ".$lang." language file is not readable! Falling back...');"; + } } - +// add lang file to session for easy include +$_SESSION['RF']['language_file'] = $language_file; require_once $language_file; if(!isset($_GET['type'])) $_GET['type']=0; if(!isset($_GET['field_id'])) $_GET['field_id']=''; +$field_id=isset($_GET['field_id']) ? fix_get_params($_GET['field_id']) : ''; +$type_param=fix_get_params($_GET['type']); + $get_params = http_build_query(array( - 'type' => $_GET['type'], + 'type' => $type_param, 'lang' => $lang, 'popup' => $popup, - 'field_id' => isset($_GET['field_id']) ? $_GET['field_id'] : '', + 'field_id' => $field_id, + 'akey' => (isset($_GET['akey']) && $_GET['akey'] != '' ? $_GET['akey'] : 'key'), 'fldr' => '' )); ?> @@ -135,14 +158,53 @@ $get_params = http_build_query(array( + Responsive FileManager - - - - + + + + + console.log("Error: Spritemap not found!");'; + // exit(); + } + } + ?> + @@ -152,7 +214,7 @@ $get_params = http_build_query(array( height: 100%; } - + - + + + + + + + @@ -242,64 +319,77 @@ $get_params = http_build_query(array( + + - + " /> - + " /> - - + + + + + + + + + + + + + + + " /> - +
-
+
-
- -
- - -
- :
- - - - - - - - - -
-
+
+ +
+ + +
+ :
+ + + + + + + + + + +
- -
-
-
- -
-
-
- + +
+
+
+
+ +
- +
@@ -308,15 +398,14 @@ $get_params = http_build_query(array( $class_ext = ''; $src = ''; - -$dir = opendir($current_path.$subfolder.$subdir); + if ($_GET['type']==1) $apply = 'apply_img'; elseif($_GET['type']==2) $apply = 'apply_link'; elseif($_GET['type']==0 && $_GET['field_id']=='') $apply = 'apply_none'; elseif($_GET['type']==3) $apply = 'apply_video'; else $apply = 'apply'; -$files = scandir($current_path.$subfolder.$subdir); +$files = scandir($current_path.$rfm_subfolder.$subdir); $n_files=count($files); //php sorting @@ -326,13 +415,13 @@ $prev_folder=array(); foreach($files as $k=>$file){ if($file==".") $current_folder=array('file'=>$file); elseif($file=="..") $prev_folder=array('file'=>$file); - elseif(is_dir($current_path.$subfolder.$subdir.$file)){ - $date=filemtime($current_path.$subfolder.$subdir. $file); - $size=foldersize($current_path.$subfolder.$subdir. $file); + elseif(is_dir($current_path.$rfm_subfolder.$subdir.$file)){ + $date=filemtime($current_path.$rfm_subfolder.$subdir. $file); + $size=foldersize($current_path.$rfm_subfolder.$subdir. $file); $file_ext=lang_Type_dir; $sorted[$k]=array('file'=>$file,'date'=>$date,'size'=>$size,'extension'=>$file_ext); }else{ - $file_path=$current_path.$subfolder.$subdir.$file; + $file_path=$current_path.$rfm_subfolder.$subdir.$file; $date=filemtime($file_path); $size=filesize($file_path); $file_ext = substr(strrchr($file,'.'),1); @@ -377,7 +466,7 @@ if($descending){ $files=array_merge(array($prev_folder),array($current_folder),$sorted); ?> - +