From 50d720b640a90018cde4e19d09eb1fa3cc87c7bc Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 31 May 2015 15:51:49 +0300 Subject: [PATCH] Updated composer and fixed former config --- composer.lock | 179 +++++++-------- config/former.php | 212 ++++++++++++++---- config/former/Nude.php | 14 -- config/former/TwitterBootstrap.php | 14 -- config/former/TwitterBootstrap3.php | 26 --- config/former/ZurbFoundation.php | 35 --- config/former/ZurbFoundation4.php | 36 --- config/packages/anahkiasen/former/Nude.php | 14 -- .../anahkiasen/former/TwitterBootstrap.php | 14 -- .../anahkiasen/former/TwitterBootstrap3.php | 26 --- .../anahkiasen/former/ZurbFoundation.php | 35 --- .../anahkiasen/former/ZurbFoundation4.php | 36 --- config/packages/anahkiasen/former/config.php | 59 ----- 13 files changed, 250 insertions(+), 450 deletions(-) delete mode 100644 config/former/Nude.php delete mode 100644 config/former/TwitterBootstrap.php delete mode 100644 config/former/TwitterBootstrap3.php delete mode 100644 config/former/ZurbFoundation.php delete mode 100644 config/former/ZurbFoundation4.php delete mode 100644 config/packages/anahkiasen/former/Nude.php delete mode 100644 config/packages/anahkiasen/former/TwitterBootstrap.php delete mode 100644 config/packages/anahkiasen/former/TwitterBootstrap3.php delete mode 100644 config/packages/anahkiasen/former/ZurbFoundation.php delete mode 100644 config/packages/anahkiasen/former/ZurbFoundation4.php delete mode 100644 config/packages/anahkiasen/former/config.php diff --git a/composer.lock b/composer.lock index 7752c4a5b476..1883e4d54cc9 100644 --- a/composer.lock +++ b/composer.lock @@ -1809,16 +1809,16 @@ }, { "name": "laravel/framework", - "version": "v5.0.31", + "version": "v5.0.32", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "db0a7400465df159ba8c6eaa954f97f50bc19687" + "reference": "85f12207cf45cc288e9e6b9b5d184aad5f08e2ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/db0a7400465df159ba8c6eaa954f97f50bc19687", - "reference": "db0a7400465df159ba8c6eaa954f97f50bc19687", + "url": "https://api.github.com/repos/laravel/framework/zipball/85f12207cf45cc288e9e6b9b5d184aad5f08e2ca", + "reference": "85f12207cf45cc288e9e6b9b5d184aad5f08e2ca", "shasum": "" }, "require": { @@ -1931,7 +1931,7 @@ "framework", "laravel" ], - "time": "2015-05-11 22:15:00" + "time": "2015-05-29 18:56:49" }, { "name": "laravelcollective/html", @@ -4536,21 +4536,20 @@ }, { "name": "symfony/class-loader", - "version": "v2.6.8", - "target-dir": "Symfony/Component/ClassLoader", + "version": "v2.7.0", "source": { "type": "git", "url": "https://github.com/symfony/ClassLoader.git", - "reference": "abf5632a31402ae6ac19cd00683faf603046440a" + "reference": "fa19598cb708b92d983b34aae313f57c217f9386" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/abf5632a31402ae6ac19cd00683faf603046440a", - "reference": "abf5632a31402ae6ac19cd00683faf603046440a", + "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/fa19598cb708b92d983b34aae313f57c217f9386", + "reference": "fa19598cb708b92d983b34aae313f57c217f9386", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.3.9" }, "require-dev": { "symfony/finder": "~2.0,>=2.0.5", @@ -4559,11 +4558,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev" + "dev-master": "2.7-dev" } }, "autoload": { - "psr-0": { + "psr-4": { "Symfony\\Component\\ClassLoader\\": "" } }, @@ -4583,21 +4582,21 @@ ], "description": "Symfony ClassLoader Component", "homepage": "https://symfony.com", - "time": "2015-05-15 13:32:45" + "time": "2015-05-15 13:33:16" }, { "name": "symfony/console", - "version": "v2.6.8", + "version": "v2.6.9", "target-dir": "Symfony/Component/Console", "source": { "type": "git", "url": "https://github.com/symfony/Console.git", - "reference": "2343f6d8026306bd330e0c987e4c102483c213e7" + "reference": "b5ec0c11a204718f2b656357f5505a8e578f30dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Console/zipball/2343f6d8026306bd330e0c987e4c102483c213e7", - "reference": "2343f6d8026306bd330e0c987e4c102483c213e7", + "url": "https://api.github.com/repos/symfony/Console/zipball/b5ec0c11a204718f2b656357f5505a8e578f30dd", + "reference": "b5ec0c11a204718f2b656357f5505a8e578f30dd", "shasum": "" }, "require": { @@ -4641,11 +4640,11 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2015-05-22 14:53:08" + "time": "2015-05-29 14:42:58" }, { "name": "symfony/debug", - "version": "v2.6.8", + "version": "v2.6.9", "target-dir": "Symfony/Component/Debug", "source": { "type": "git", @@ -4706,21 +4705,20 @@ }, { "name": "symfony/event-dispatcher", - "version": "v2.6.8", - "target-dir": "Symfony/Component/EventDispatcher", + "version": "v2.7.0", "source": { "type": "git", "url": "https://github.com/symfony/EventDispatcher.git", - "reference": "672593bc4b0043a0acf91903bb75a1c82d8f2e02" + "reference": "687039686d0e923429ba6e958d0baa920cd5d458" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/672593bc4b0043a0acf91903bb75a1c82d8f2e02", - "reference": "672593bc4b0043a0acf91903bb75a1c82d8f2e02", + "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/687039686d0e923429ba6e958d0baa920cd5d458", + "reference": "687039686d0e923429ba6e958d0baa920cd5d458", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.3.9" }, "require-dev": { "psr/log": "~1.0", @@ -4737,11 +4735,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev" + "dev-master": "2.7-dev" } }, "autoload": { - "psr-0": { + "psr-4": { "Symfony\\Component\\EventDispatcher\\": "" } }, @@ -4761,25 +4759,24 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2015-05-02 15:18:45" + "time": "2015-05-02 15:21:08" }, { "name": "symfony/filesystem", - "version": "v2.6.8", - "target-dir": "Symfony/Component/Filesystem", + "version": "v2.7.0", "source": { "type": "git", "url": "https://github.com/symfony/Filesystem.git", - "reference": "1f8429f72a5bfa58b33fd96824bea146fc4b3f49" + "reference": "ae4551fd6d4d4f51f2e7390fbc902fbd67f3b7ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Filesystem/zipball/1f8429f72a5bfa58b33fd96824bea146fc4b3f49", - "reference": "1f8429f72a5bfa58b33fd96824bea146fc4b3f49", + "url": "https://api.github.com/repos/symfony/Filesystem/zipball/ae4551fd6d4d4f51f2e7390fbc902fbd67f3b7ba", + "reference": "ae4551fd6d4d4f51f2e7390fbc902fbd67f3b7ba", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.3.9" }, "require-dev": { "symfony/phpunit-bridge": "~2.7" @@ -4787,11 +4784,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev" + "dev-master": "2.7-dev" } }, "autoload": { - "psr-0": { + "psr-4": { "Symfony\\Component\\Filesystem\\": "" } }, @@ -4811,11 +4808,11 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2015-05-15 13:32:45" + "time": "2015-05-15 13:33:16" }, { "name": "symfony/finder", - "version": "v2.6.8", + "version": "v2.6.9", "target-dir": "Symfony/Component/Finder", "source": { "type": "git", @@ -4865,7 +4862,7 @@ }, { "name": "symfony/http-foundation", - "version": "v2.6.8", + "version": "v2.6.9", "target-dir": "Symfony/Component/HttpFoundation", "source": { "type": "git", @@ -4919,17 +4916,17 @@ }, { "name": "symfony/http-kernel", - "version": "v2.6.8", + "version": "v2.6.9", "target-dir": "Symfony/Component/HttpKernel", "source": { "type": "git", "url": "https://github.com/symfony/HttpKernel.git", - "reference": "a9a6f595941fce8dddd64f4e9bf47747cf1515fc" + "reference": "7c883eb1a5d8b52b1fa6d4134b82304c6bb7007f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/a9a6f595941fce8dddd64f4e9bf47747cf1515fc", - "reference": "a9a6f595941fce8dddd64f4e9bf47747cf1515fc", + "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/7c883eb1a5d8b52b1fa6d4134b82304c6bb7007f", + "reference": "7c883eb1a5d8b52b1fa6d4134b82304c6bb7007f", "shasum": "" }, "require": { @@ -4993,11 +4990,11 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2015-05-27 00:17:10" + "time": "2015-05-29 22:55:07" }, { "name": "symfony/process", - "version": "v2.6.8", + "version": "v2.6.9", "target-dir": "Symfony/Component/Process", "source": { "type": "git", @@ -5047,7 +5044,7 @@ }, { "name": "symfony/routing", - "version": "v2.6.8", + "version": "v2.6.9", "target-dir": "Symfony/Component/Routing", "source": { "type": "git", @@ -5116,7 +5113,7 @@ }, { "name": "symfony/security-core", - "version": "v2.6.8", + "version": "v2.6.9", "target-dir": "Symfony/Component/Security/Core", "source": { "type": "git", @@ -5180,17 +5177,17 @@ }, { "name": "symfony/translation", - "version": "v2.6.8", + "version": "v2.6.9", "target-dir": "Symfony/Component/Translation", "source": { "type": "git", "url": "https://github.com/symfony/Translation.git", - "reference": "d030b3d8d9699795dbf8c59e915ef879007a4483" + "reference": "89cdf3c43bc24c85dd8173dfcf5a979a95e5bd9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Translation/zipball/d030b3d8d9699795dbf8c59e915ef879007a4483", - "reference": "d030b3d8d9699795dbf8c59e915ef879007a4483", + "url": "https://api.github.com/repos/symfony/Translation/zipball/89cdf3c43bc24c85dd8173dfcf5a979a95e5bd9c", + "reference": "89cdf3c43bc24c85dd8173dfcf5a979a95e5bd9c", "shasum": "" }, "require": { @@ -5235,11 +5232,11 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2015-05-22 14:37:51" + "time": "2015-05-29 14:42:58" }, { "name": "symfony/var-dumper", - "version": "v2.6.8", + "version": "v2.6.9", "target-dir": "Symfony/Component/VarDumper", "source": { "type": "git", @@ -5350,16 +5347,16 @@ }, { "name": "vlucas/phpdotenv", - "version": "v1.1.0", + "version": "v1.1.1", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "732d2adb7d916c9593b9d58c3b0d9ebefead07aa" + "reference": "0cac554ce06277e33ddf9f0b7ade4b8bbf2af3fa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/732d2adb7d916c9593b9d58c3b0d9ebefead07aa", - "reference": "732d2adb7d916c9593b9d58c3b0d9ebefead07aa", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/0cac554ce06277e33ddf9f0b7ade4b8bbf2af3fa", + "reference": "0cac554ce06277e33ddf9f0b7ade4b8bbf2af3fa", "shasum": "" }, "require": { @@ -5369,11 +5366,6 @@ "phpunit/phpunit": "~4.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, "autoload": { "psr-0": { "Dotenv": "src/" @@ -5397,7 +5389,7 @@ "env", "environment" ], - "time": "2014-12-05 15:19:21" + "time": "2015-05-30 15:59:26" }, { "name": "webpatser/laravel-countries", @@ -5617,16 +5609,16 @@ }, { "name": "phpspec/phpspec", - "version": "2.2.0", + "version": "2.2.1", "source": { "type": "git", "url": "https://github.com/phpspec/phpspec.git", - "reference": "9727d75919a00455433e867565bc022f0b985a39" + "reference": "e9a40577323e67f1de2e214abf32976a0352d8f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/phpspec/zipball/9727d75919a00455433e867565bc022f0b985a39", - "reference": "9727d75919a00455433e867565bc022f0b985a39", + "url": "https://api.github.com/repos/phpspec/phpspec/zipball/e9a40577323e67f1de2e214abf32976a0352d8f8", + "reference": "e9a40577323e67f1de2e214abf32976a0352d8f8", "shasum": "" }, "require": { @@ -5691,7 +5683,7 @@ "testing", "tests" ], - "time": "2015-04-18 16:22:51" + "time": "2015-05-30 15:21:40" }, { "name": "phpspec/prophecy", @@ -5755,16 +5747,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "2.0.17", + "version": "2.1.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "c4e8e7725e351184a76544634855b8a9c405a6e3" + "reference": "60991776b3994cd8297b861e8ddc7f9c9500dedc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c4e8e7725e351184a76544634855b8a9c405a6e3", - "reference": "c4e8e7725e351184a76544634855b8a9c405a6e3", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/60991776b3994cd8297b861e8ddc7f9c9500dedc", + "reference": "60991776b3994cd8297b861e8ddc7f9c9500dedc", "shasum": "" }, "require": { @@ -5787,7 +5779,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "2.1.x-dev" } }, "autoload": { @@ -5813,7 +5805,7 @@ "testing", "xunit" ], - "time": "2015-05-25 05:11:59" + "time": "2015-05-31 03:14:06" }, { "name": "phpunit/php-file-iterator", @@ -6001,16 +5993,16 @@ }, { "name": "phpunit/phpunit", - "version": "4.6.8", + "version": "4.6.9", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "a6cd74b523ef7bad7a23a94e4045d72968e8165b" + "reference": "816d12536a7a032adc3b68737f82cfbbf98b79c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a6cd74b523ef7bad7a23a94e4045d72968e8165b", - "reference": "a6cd74b523ef7bad7a23a94e4045d72968e8165b", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/816d12536a7a032adc3b68737f82cfbbf98b79c1", + "reference": "816d12536a7a032adc3b68737f82cfbbf98b79c1", "shasum": "" }, "require": { @@ -6069,20 +6061,20 @@ "testing", "xunit" ], - "time": "2015-05-28 09:54:11" + "time": "2015-05-29 06:00:03" }, { "name": "phpunit/phpunit-mock-objects", - "version": "2.3.2", + "version": "2.3.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "787e06820578ca103b21e323e27f0e2eb0712ae5" + "reference": "253c005852591fd547fc18cd5b7b43a1ec82d8f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/787e06820578ca103b21e323e27f0e2eb0712ae5", - "reference": "787e06820578ca103b21e323e27f0e2eb0712ae5", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/253c005852591fd547fc18cd5b7b43a1ec82d8f7", + "reference": "253c005852591fd547fc18cd5b7b43a1ec82d8f7", "shasum": "" }, "require": { @@ -6124,7 +6116,7 @@ "mock", "xunit" ], - "time": "2015-05-28 09:50:37" + "time": "2015-05-29 05:19:18" }, { "name": "sebastian/comparator", @@ -6499,21 +6491,20 @@ }, { "name": "symfony/yaml", - "version": "v2.6.8", - "target-dir": "Symfony/Component/Yaml", + "version": "v2.7.0", "source": { "type": "git", "url": "https://github.com/symfony/Yaml.git", - "reference": "f157ab074e453ecd4c0fa775f721f6e67a99d9e2" + "reference": "4a29a5248aed4fb45f626a7bbbd330291492f5c3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Yaml/zipball/f157ab074e453ecd4c0fa775f721f6e67a99d9e2", - "reference": "f157ab074e453ecd4c0fa775f721f6e67a99d9e2", + "url": "https://api.github.com/repos/symfony/Yaml/zipball/4a29a5248aed4fb45f626a7bbbd330291492f5c3", + "reference": "4a29a5248aed4fb45f626a7bbbd330291492f5c3", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.3.9" }, "require-dev": { "symfony/phpunit-bridge": "~2.7" @@ -6521,11 +6512,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev" + "dev-master": "2.7-dev" } }, "autoload": { - "psr-0": { + "psr-4": { "Symfony\\Component\\Yaml\\": "" } }, @@ -6545,7 +6536,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2015-05-02 15:18:45" + "time": "2015-05-02 15:21:08" } ], "aliases": [], diff --git a/config/former.php b/config/former.php index 3c30b7ad2871..81fb68839084 100644 --- a/config/former.php +++ b/config/former.php @@ -1,66 +1,184 @@ true, + // Whether labels should be automatically computed from name + 'automatic_label' => true, - // The default form type - 'default_form_type' => 'horizontal', + // The default form type + 'default_form_type' => 'horizontal', - // The framework to be used by Former - 'framework' => 'TwitterBootstrap3', + // Validation + //////////////////////////////////////////////////////////////////// - // Validation - //////////////////////////////////////////////////////////////////// + // Whether Former should fetch errors from Session + 'fetch_errors' => true, - // Whether Former should fetch errors from Session - 'fetch_errors' => true, + // Whether Former should try to apply Validator rules as attributes + 'live_validation' => true, - // Whether Former should try to apply Validator rules as attributes - 'live_validation' => true, + // Whether Former should automatically fetch error messages and + // display them next to the matching fields + 'error_messages' => true, - // Whether Former should automatically fetch error messages and - // display them next to the matching fields - 'error_messages' => true, + // Checkables + //////////////////////////////////////////////////////////////////// - // Checkables - //////////////////////////////////////////////////////////////////// + // Whether checkboxes should always be present in the POST data, + // no matter if you checked them or not + 'push_checkboxes' => false, - // Whether checkboxes should always be present in the POST data, - // no matter if you checked them or not - 'push_checkboxes' => false, + // The value a checkbox will have in the POST array if unchecked + 'unchecked_value' => 0, - // The value a checkbox will have in the POST array if unchecked - 'unchecked_value' => 0, + // Required fields + //////////////////////////////////////////////////////////////////// - // Required fields - //////////////////////////////////////////////////////////////////// + // The class to be added to required fields + 'required_class' => 'required', - // The class to be added to required fields - 'required_class' => 'required', + // A facultative text to append to the labels of required fields + 'required_text' => '*', - // A facultative text to append to the labels of required fields - 'required_text' => '*', + // Translations + //////////////////////////////////////////////////////////////////// - // Translations - //////////////////////////////////////////////////////////////////// + // Where Former should look for translations + 'translate_from' => 'validation.attributes', - // Where Former should look for translations - 'translate_from' => 'texts', + // Whether text that comes out of the translated + // should be capitalized (ex: email => Email) automatically + 'capitalize_translations' => true, - // Whether text that comes out of the translated - // should be capitalized (ex: email => Email) automatically - 'capitalize_translations' => true, + // An array of attributes to automatically translate + 'translatable' => array( + 'help', + 'inlineHelp', + 'blockHelp', + 'placeholder', + 'data_placeholder', + 'label', + ), - // An array of attributes to automatically translate - 'translatable' => array( - 'help', - 'inlineHelp', - 'blockHelp', - 'placeholder', - 'data_placeholder', - 'label', - ), -); + // Framework + //////////////////////////////////////////////////////////////////// + + // The framework to be used by Former + 'framework' => 'TwitterBootstrap3', + + 'TwitterBootstrap3' => array( + + // Map Former-supported viewports to Bootstrap 3 equivalents + 'viewports' => array( + 'large' => 'lg', + 'medium' => 'md', + 'small' => 'sm', + 'mini' => 'xs', + ), + // Width of labels for horizontal forms expressed as viewport => grid columns + 'labelWidths' => array( + 'large' => 4, + 'small' => 4, + ), + // HTML markup and classes used by Bootstrap 3 for icons + 'icon' => array( + 'tag' => 'span', + 'set' => 'glyphicon', + 'prefix' => 'glyphicon', + ), + + ), + + 'Nude' => array( // No-framework markup + 'icon' => array( + 'tag' => 'i', + 'set' => null, + 'prefix' => 'icon', + ), + ), + + 'TwitterBootstrap' => array( // Twitter Bootstrap version 2 + 'icon' => array( + 'tag' => 'i', + 'set' => null, + 'prefix' => 'icon', + ), + ), + + 'ZurbFoundation5' => array( + // Map Former-supported viewports to Foundation 5 equivalents + 'viewports' => array( + 'large' => 'large', + 'medium' => null, + 'small' => 'small', + 'mini' => null, + ), + // Width of labels for horizontal forms expressed as viewport => grid columns + 'labelWidths' => array( + 'small' => 3, + ), + // Classes to be applied to wrapped labels in horizontal forms + 'wrappedLabelClasses' => array('right', 'inline'), + // HTML markup and classes used by Foundation 5 for icons + 'icon' => array( + 'tag' => 'i', + 'set' => null, + 'prefix' => 'fi', + ), + // CSS for inline validation errors + 'error_classes' => array('class' => 'error'), + ), + + 'ZurbFoundation4' => array( + // Foundation 4 also has an experimental "medium" breakpoint + // explained at http://foundation.zurb.com/docs/components/grid.html + 'viewports' => array( + 'large' => 'large', + 'medium' => null, + 'small' => 'small', + 'mini' => null, + ), + // Width of labels for horizontal forms expressed as viewport => grid columns + 'labelWidths' => array( + 'small' => 3, + ), + // Classes to be applied to wrapped labels in horizontal forms + 'wrappedLabelClasses' => array('right', 'inline'), + // HTML markup and classes used by Foundation 4 for icons + 'icon' => array( + 'tag' => 'i', + 'set' => 'general', + 'prefix' => 'foundicon', + ), + // CSS for inline validation errors + 'error_classes' => array('class' => 'alert-box radius warning'), + ), + + 'ZurbFoundation' => array( // Foundation 3 + 'viewports' => array( + 'large' => '', + 'medium' => null, + 'small' => 'mobile-', + 'mini' => null, + ), + // Width of labels for horizontal forms expressed as viewport => grid columns + 'labelWidths' => array( + 'large' => 2, + 'small' => 4, + ), + // Classes to be applied to wrapped labels in horizontal forms + 'wrappedLabelClasses' => array('right', 'inline'), + // HTML markup and classes used by Foundation 3 for icons + 'icon' => array( + 'tag' => 'i', + 'set' => null, + 'prefix' => 'fi', + ), + // CSS for inline validation errors + // should work for Zurb 2 and 3 + 'error_classes' => array('class' => 'alert-box alert error'), + ), + + +); \ No newline at end of file diff --git a/config/former/Nude.php b/config/former/Nude.php deleted file mode 100644 index 18f5239b82d0..000000000000 --- a/config/former/Nude.php +++ /dev/null @@ -1,14 +0,0 @@ - array( - - 'tag' => 'i', - 'set' => null, - 'prefix' => 'icon', - - ), - -); \ No newline at end of file diff --git a/config/former/TwitterBootstrap.php b/config/former/TwitterBootstrap.php deleted file mode 100644 index dfac6d7bc77e..000000000000 --- a/config/former/TwitterBootstrap.php +++ /dev/null @@ -1,14 +0,0 @@ - array( - - 'tag' => 'i', - 'set' => null, - 'prefix' => 'icon', - - ), - -); \ No newline at end of file diff --git a/config/former/TwitterBootstrap3.php b/config/former/TwitterBootstrap3.php deleted file mode 100644 index fad6b7882c89..000000000000 --- a/config/former/TwitterBootstrap3.php +++ /dev/null @@ -1,26 +0,0 @@ - array( - 'large' => 'lg', - 'medium' => 'md', - 'small' => 'sm', - 'mini' => 'xs', - ), - - // Width of labels for horizontal forms expressed as viewport => grid columns - 'labelWidths' => array( - 'large' => 4, - 'small' => 4, - ), - - // HTML markup and classes used by Bootstrap 3 for icons - 'icon' => array( - 'tag' => 'span', - 'set' => 'glyphicon', - 'prefix' => 'glyphicon', - ), - -); \ No newline at end of file diff --git a/config/former/ZurbFoundation.php b/config/former/ZurbFoundation.php deleted file mode 100644 index 9223978736d5..000000000000 --- a/config/former/ZurbFoundation.php +++ /dev/null @@ -1,35 +0,0 @@ - array( - - 'large' => '', - 'medium' => null, - 'small' => 'mobile-', - 'mini' => null, - - ), - - // Width of labels for horizontal forms expressed as viewport => grid columns - 'labelWidths' => array( - - 'large' => 2, - 'small' => 4, - - ), - - // Classes to be applied to wrapped labels in horizontal forms - 'wrappedLabelClasses' => array('right','inline'), - - // HTML markup and classes used by Foundation 3 for icons - 'icon' => array( - - 'tag' => 'i', - 'set' => null, - 'prefix' => 'fi', - - ), - -); \ No newline at end of file diff --git a/config/former/ZurbFoundation4.php b/config/former/ZurbFoundation4.php deleted file mode 100644 index 4f55a44f9c40..000000000000 --- a/config/former/ZurbFoundation4.php +++ /dev/null @@ -1,36 +0,0 @@ - array( - - 'large' => 'large', - 'medium' => null, - 'small' => 'small', - 'mini' => null, - - ), - - // Width of labels for horizontal forms expressed as viewport => grid columns - 'labelWidths' => array( - - 'small' => 3, - - ), - - // Classes to be applied to wrapped labels in horizontal forms - 'wrappedLabelClasses' => array('right','inline'), - - // HTML markup and classes used by Foundation 4 for icons - 'icon' => array( - - 'tag' => 'i', - 'set' => 'general', - 'prefix' => 'foundicon', - - ), - -); \ No newline at end of file diff --git a/config/packages/anahkiasen/former/Nude.php b/config/packages/anahkiasen/former/Nude.php deleted file mode 100644 index 18f5239b82d0..000000000000 --- a/config/packages/anahkiasen/former/Nude.php +++ /dev/null @@ -1,14 +0,0 @@ - array( - - 'tag' => 'i', - 'set' => null, - 'prefix' => 'icon', - - ), - -); \ No newline at end of file diff --git a/config/packages/anahkiasen/former/TwitterBootstrap.php b/config/packages/anahkiasen/former/TwitterBootstrap.php deleted file mode 100644 index dfac6d7bc77e..000000000000 --- a/config/packages/anahkiasen/former/TwitterBootstrap.php +++ /dev/null @@ -1,14 +0,0 @@ - array( - - 'tag' => 'i', - 'set' => null, - 'prefix' => 'icon', - - ), - -); \ No newline at end of file diff --git a/config/packages/anahkiasen/former/TwitterBootstrap3.php b/config/packages/anahkiasen/former/TwitterBootstrap3.php deleted file mode 100644 index fad6b7882c89..000000000000 --- a/config/packages/anahkiasen/former/TwitterBootstrap3.php +++ /dev/null @@ -1,26 +0,0 @@ - array( - 'large' => 'lg', - 'medium' => 'md', - 'small' => 'sm', - 'mini' => 'xs', - ), - - // Width of labels for horizontal forms expressed as viewport => grid columns - 'labelWidths' => array( - 'large' => 4, - 'small' => 4, - ), - - // HTML markup and classes used by Bootstrap 3 for icons - 'icon' => array( - 'tag' => 'span', - 'set' => 'glyphicon', - 'prefix' => 'glyphicon', - ), - -); \ No newline at end of file diff --git a/config/packages/anahkiasen/former/ZurbFoundation.php b/config/packages/anahkiasen/former/ZurbFoundation.php deleted file mode 100644 index 9223978736d5..000000000000 --- a/config/packages/anahkiasen/former/ZurbFoundation.php +++ /dev/null @@ -1,35 +0,0 @@ - array( - - 'large' => '', - 'medium' => null, - 'small' => 'mobile-', - 'mini' => null, - - ), - - // Width of labels for horizontal forms expressed as viewport => grid columns - 'labelWidths' => array( - - 'large' => 2, - 'small' => 4, - - ), - - // Classes to be applied to wrapped labels in horizontal forms - 'wrappedLabelClasses' => array('right','inline'), - - // HTML markup and classes used by Foundation 3 for icons - 'icon' => array( - - 'tag' => 'i', - 'set' => null, - 'prefix' => 'fi', - - ), - -); \ No newline at end of file diff --git a/config/packages/anahkiasen/former/ZurbFoundation4.php b/config/packages/anahkiasen/former/ZurbFoundation4.php deleted file mode 100644 index 4f55a44f9c40..000000000000 --- a/config/packages/anahkiasen/former/ZurbFoundation4.php +++ /dev/null @@ -1,36 +0,0 @@ - array( - - 'large' => 'large', - 'medium' => null, - 'small' => 'small', - 'mini' => null, - - ), - - // Width of labels for horizontal forms expressed as viewport => grid columns - 'labelWidths' => array( - - 'small' => 3, - - ), - - // Classes to be applied to wrapped labels in horizontal forms - 'wrappedLabelClasses' => array('right','inline'), - - // HTML markup and classes used by Foundation 4 for icons - 'icon' => array( - - 'tag' => 'i', - 'set' => 'general', - 'prefix' => 'foundicon', - - ), - -); \ No newline at end of file diff --git a/config/packages/anahkiasen/former/config.php b/config/packages/anahkiasen/former/config.php deleted file mode 100644 index 327019638f9d..000000000000 --- a/config/packages/anahkiasen/former/config.php +++ /dev/null @@ -1,59 +0,0 @@ - true, - - // The default form type - 'default_form_type' => 'horizontal', - - // The framework to be used by Former - 'framework' => 'TwitterBootstrap3', - - // Validation - //////////////////////////////////////////////////////////////////// - - // Whether Former should fetch errors from Session - 'fetch_errors' => true, - - // Whether Former should try to apply Validator rules as attributes - 'live_validation' => true, - - // Whether Former should automatically fetch error messages and - // display them next to the matching fields - 'error_messages' => true, - - // Checkables - //////////////////////////////////////////////////////////////////// - - // Whether checkboxes should always be present in the POST data, - // no matter if you checked them or not - 'push_checkboxes' => false, - - // The value a checkbox will have in the POST array if unchecked - 'unchecked_value' => 0, - - // Required fields - //////////////////////////////////////////////////////////////////// - - // The class to be added to required fields - 'required_class' => 'required', - - // A facultative text to append to the labels of required fields - 'required_text' => '', //'*', - - // Translations - //////////////////////////////////////////////////////////////////// - - // Where Former should look for translations - 'translate_from' => 'texts', - - // An array of attributes to automatically translate - 'translatable' => array( - 'help', 'inlineHelp', 'blockHelp', - 'placeholder', 'data_placeholder', - 'label' - ), -);