diff --git a/composer.json b/composer.json index 508e0fb..9e49af1 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,6 @@ "laravel/framework": "5.3.*", "radic/blade-extensions": "~6.2", "erusev/parsedown": "~1.5", - "gwnobots/laravel-head": "dev-master", "spatie/laravel-newsletter": "^2.2", "intervention/image": "^2.3", "maatwebsite/excel": "^2.1" diff --git a/composer.lock b/composer.lock index d6976bc..45b4ac5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "db26e12651a51366eb143f11e1ffc9d7", - "content-hash": "1ce31c55537d6245dd49b05260b0591b", + "hash": "68a43a1a113ee2e7c16315b6c81d13b2", + "content-hash": "c5ae019c9fbd719d3382cd546dd41491", "packages": [ { "name": "anahkiasen/underscore-php", @@ -415,54 +415,6 @@ ], "time": "2016-06-24 23:00:38" }, - { - "name": "gwnobots/laravel-head", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/gwnobots/laravel-head.git", - "reference": "f222ad345c3863a51fdaec41882e43db8977b23a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/gwnobots/laravel-head/zipball/f222ad345c3863a51fdaec41882e43db8977b23a", - "reference": "f222ad345c3863a51fdaec41882e43db8977b23a", - "shasum": "" - }, - "require": { - "illuminate/support": "4.2.*|~5.0", - "php": ">=5.3.0" - }, - "type": "library", - "autoload": { - "psr-0": { - "Gwnobots\\LaravelHead\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Gwen Nobots", - "email": "gwen@nobots.fr" - } - ], - "description": "Customize and automate head section of your layouts for Laravel", - "keywords": [ - "HTML5", - "analytics", - "facebook", - "laravel", - "layout", - "meta", - "scripts", - "stylesheets", - "twitter" - ], - "time": "2016-09-20 14:03:04" - }, { "name": "intervention/image", "version": "2.3.8", @@ -672,16 +624,16 @@ }, { "name": "laravel/framework", - "version": "v5.3.10", + "version": "v5.3.18", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "6febb0ee61999cde3bc7b2963c8903032bb22691" + "reference": "9bee167d173857c25966c19afdaa66f127ca6784" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/6febb0ee61999cde3bc7b2963c8903032bb22691", - "reference": "6febb0ee61999cde3bc7b2963c8903032bb22691", + "url": "https://api.github.com/repos/laravel/framework/zipball/9bee167d173857c25966c19afdaa66f127ca6784", + "reference": "9bee167d173857c25966c19afdaa66f127ca6784", "shasum": "" }, "require": { @@ -796,7 +748,7 @@ "framework", "laravel" ], - "time": "2016-09-20 13:46:16" + "time": "2016-10-08 01:51:20" }, { "name": "laravelcollective/html", @@ -854,16 +806,16 @@ }, { "name": "league/flysystem", - "version": "1.0.27", + "version": "1.0.28", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "50e2045ed70a7e75a5e30bc3662904f3b67af8a9" + "reference": "a9663643ff2d16d7f66ed1e0d3212c5491bc9044" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/50e2045ed70a7e75a5e30bc3662904f3b67af8a9", - "reference": "50e2045ed70a7e75a5e30bc3662904f3b67af8a9", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a9663643ff2d16d7f66ed1e0d3212c5491bc9044", + "reference": "a9663643ff2d16d7f66ed1e0d3212c5491bc9044", "shasum": "" }, "require": { @@ -933,7 +885,7 @@ "sftp", "storage" ], - "time": "2016-08-10 08:55:11" + "time": "2016-10-07 12:20:37" }, { "name": "maatwebsite/excel", @@ -1484,16 +1436,16 @@ }, { "name": "psr/log", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "5277094ed527a1c4477177d102fe4c53551953e0" + "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/5277094ed527a1c4477177d102fe4c53551953e0", - "reference": "5277094ed527a1c4477177d102fe4c53551953e0", + "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", "shasum": "" }, "require": { @@ -1527,7 +1479,7 @@ "psr", "psr-3" ], - "time": "2016-09-19 16:02:08" + "time": "2016-10-10 12:19:37" }, { "name": "psy/psysh", @@ -1671,16 +1623,16 @@ }, { "name": "ramsey/uuid", - "version": "3.5.0", + "version": "3.5.1", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "a6d15c8618ea3951fd54d34e326b68d3d0bc0786" + "reference": "a07797b986671b0dc823885a81d5e3516b931599" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/a6d15c8618ea3951fd54d34e326b68d3d0bc0786", - "reference": "a6d15c8618ea3951fd54d34e326b68d3d0bc0786", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/a07797b986671b0dc823885a81d5e3516b931599", + "reference": "a07797b986671b0dc823885a81d5e3516b931599", "shasum": "" }, "require": { @@ -1747,7 +1699,7 @@ "identifier", "uuid" ], - "time": "2016-08-02 18:39:32" + "time": "2016-10-02 15:51:17" }, { "name": "sebwite/support", @@ -1915,20 +1867,21 @@ }, { "name": "symfony/console", - "version": "v3.1.4", + "version": "v3.1.5", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "8ea494c34f0f772c3954b5fbe00bffc5a435e563" + "reference": "6cb0872fb57b38b3b09ff213c21ed693956b9eb0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/8ea494c34f0f772c3954b5fbe00bffc5a435e563", - "reference": "8ea494c34f0f772c3954b5fbe00bffc5a435e563", + "url": "https://api.github.com/repos/symfony/console/zipball/6cb0872fb57b38b3b09ff213c21ed693956b9eb0", + "reference": "6cb0872fb57b38b3b09ff213c21ed693956b9eb0", "shasum": "" }, "require": { "php": ">=5.5.9", + "symfony/debug": "~2.8|~3.0", "symfony/polyfill-mbstring": "~1.0" }, "require-dev": { @@ -1971,20 +1924,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2016-08-19 06:48:39" + "time": "2016-09-28 00:11:12" }, { "name": "symfony/css-selector", - "version": "v3.1.4", + "version": "v3.1.5", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "2851e1932d77ce727776154d659b232d061e816a" + "reference": "ca809c64072e0fe61c1c7fb3c76cdc32265042ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/2851e1932d77ce727776154d659b232d061e816a", - "reference": "2851e1932d77ce727776154d659b232d061e816a", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/ca809c64072e0fe61c1c7fb3c76cdc32265042ac", + "reference": "ca809c64072e0fe61c1c7fb3c76cdc32265042ac", "shasum": "" }, "require": { @@ -2024,20 +1977,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2016-06-29 05:41:56" + "time": "2016-09-06 11:02:40" }, { "name": "symfony/debug", - "version": "v3.1.4", + "version": "v3.1.5", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "34f6ac18c2974ca5fce68adf419ee7d15def6f11" + "reference": "e2b3f74a67fc928adc3c1b9027f73e1bc01190a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/34f6ac18c2974ca5fce68adf419ee7d15def6f11", - "reference": "34f6ac18c2974ca5fce68adf419ee7d15def6f11", + "url": "https://api.github.com/repos/symfony/debug/zipball/e2b3f74a67fc928adc3c1b9027f73e1bc01190a8", + "reference": "e2b3f74a67fc928adc3c1b9027f73e1bc01190a8", "shasum": "" }, "require": { @@ -2081,11 +2034,11 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2016-08-23 13:39:15" + "time": "2016-09-06 11:02:40" }, { "name": "symfony/event-dispatcher", - "version": "v3.1.4", + "version": "v3.1.5", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", @@ -2145,16 +2098,16 @@ }, { "name": "symfony/filesystem", - "version": "v3.1.4", + "version": "v3.1.5", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "bb29adceb552d202b6416ede373529338136e84f" + "reference": "682fd8fdb3135fdf05fc496a01579ccf6c85c0e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/bb29adceb552d202b6416ede373529338136e84f", - "reference": "bb29adceb552d202b6416ede373529338136e84f", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/682fd8fdb3135fdf05fc496a01579ccf6c85c0e5", + "reference": "682fd8fdb3135fdf05fc496a01579ccf6c85c0e5", "shasum": "" }, "require": { @@ -2190,20 +2143,20 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2016-07-20 05:44:26" + "time": "2016-09-14 00:18:46" }, { "name": "symfony/finder", - "version": "v3.1.4", + "version": "v3.1.5", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "e568ef1784f447a0e54dcb6f6de30b9747b0f577" + "reference": "205b5ffbb518a98ba2ae60a52656c4a31ab00c6f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/e568ef1784f447a0e54dcb6f6de30b9747b0f577", - "reference": "e568ef1784f447a0e54dcb6f6de30b9747b0f577", + "url": "https://api.github.com/repos/symfony/finder/zipball/205b5ffbb518a98ba2ae60a52656c4a31ab00c6f", + "reference": "205b5ffbb518a98ba2ae60a52656c4a31ab00c6f", "shasum": "" }, "require": { @@ -2239,20 +2192,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2016-08-26 12:04:02" + "time": "2016-09-28 00:11:12" }, { "name": "symfony/http-foundation", - "version": "v3.1.4", + "version": "v3.1.5", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "63592e00fd90632b57ee50220a1ddb29b6bf3bb4" + "reference": "5114f1becca9f29e3af94374f1689c83c1aa3d97" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/63592e00fd90632b57ee50220a1ddb29b6bf3bb4", - "reference": "63592e00fd90632b57ee50220a1ddb29b6bf3bb4", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/5114f1becca9f29e3af94374f1689c83c1aa3d97", + "reference": "5114f1becca9f29e3af94374f1689c83c1aa3d97", "shasum": "" }, "require": { @@ -2292,20 +2245,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2016-08-22 12:11:19" + "time": "2016-09-21 20:55:10" }, { "name": "symfony/http-kernel", - "version": "v3.1.4", + "version": "v3.1.5", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "aeda215d6b01f119508c090d2a09ebb5b0bc61f3" + "reference": "dc339d6eebadfa6e39c52868b4d4a715eff13c69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/aeda215d6b01f119508c090d2a09ebb5b0bc61f3", - "reference": "aeda215d6b01f119508c090d2a09ebb5b0bc61f3", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/dc339d6eebadfa6e39c52868b4d4a715eff13c69", + "reference": "dc339d6eebadfa6e39c52868b4d4a715eff13c69", "shasum": "" }, "require": { @@ -2374,11 +2327,11 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2016-09-03 15:28:24" + "time": "2016-10-03 19:01:06" }, { "name": "symfony/options-resolver", - "version": "v3.1.4", + "version": "v3.1.5", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", @@ -2599,16 +2552,16 @@ }, { "name": "symfony/process", - "version": "v3.1.4", + "version": "v3.1.5", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "e64e93041c80e77197ace5ab9385dedb5a143697" + "reference": "66de154ae86b1a07001da9fbffd620206e4faf94" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/e64e93041c80e77197ace5ab9385dedb5a143697", - "reference": "e64e93041c80e77197ace5ab9385dedb5a143697", + "url": "https://api.github.com/repos/symfony/process/zipball/66de154ae86b1a07001da9fbffd620206e4faf94", + "reference": "66de154ae86b1a07001da9fbffd620206e4faf94", "shasum": "" }, "require": { @@ -2644,11 +2597,11 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2016-08-16 14:58:24" + "time": "2016-09-29 14:13:09" }, { "name": "symfony/routing", - "version": "v3.1.4", + "version": "v3.1.5", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", @@ -2723,16 +2676,16 @@ }, { "name": "symfony/translation", - "version": "v3.1.4", + "version": "v3.1.5", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "a35edc277513c9bc0f063ca174c36b346f974528" + "reference": "93013a18d272e59dab8e67f583155b78c68947eb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/a35edc277513c9bc0f063ca174c36b346f974528", - "reference": "a35edc277513c9bc0f063ca174c36b346f974528", + "url": "https://api.github.com/repos/symfony/translation/zipball/93013a18d272e59dab8e67f583155b78c68947eb", + "reference": "93013a18d272e59dab8e67f583155b78c68947eb", "shasum": "" }, "require": { @@ -2783,20 +2736,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2016-08-05 08:37:39" + "time": "2016-09-06 11:02:40" }, { "name": "symfony/var-dumper", - "version": "v3.1.4", + "version": "v3.1.5", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "62ee73706c421654a4c840028954510277f7dfc8" + "reference": "70bfe927b86ba9999aeebd829715b0bb2cd39a10" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/62ee73706c421654a4c840028954510277f7dfc8", - "reference": "62ee73706c421654a4c840028954510277f7dfc8", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/70bfe927b86ba9999aeebd829715b0bb2cd39a10", + "reference": "70bfe927b86ba9999aeebd829715b0bb2cd39a10", "shasum": "" }, "require": { @@ -2846,7 +2799,7 @@ "debug", "dump" ], - "time": "2016-08-31 09:05:42" + "time": "2016-09-29 14:13:09" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -3257,16 +3210,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "3.1.0", + "version": "3.1.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "9270140b940ff02e58ec577c237274e92cd40cdd" + "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9270140b940ff02e58ec577c237274e92cd40cdd", - "reference": "9270140b940ff02e58ec577c237274e92cd40cdd", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e", + "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e", "shasum": "" }, "require": { @@ -3298,7 +3251,7 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2016-06-10 09:48:41" + "time": "2016-09-30 07:12:33" }, { "name": "phpdocumentor/type-resolver", @@ -3655,16 +3608,16 @@ }, { "name": "phpunit/phpunit", - "version": "5.5.5", + "version": "5.6.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "a57126dc681b08289fef6ac96a48e30656f84350" + "reference": "60c32c5b5e79c2248001efa2560f831da11cc2d7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a57126dc681b08289fef6ac96a48e30656f84350", - "reference": "a57126dc681b08289fef6ac96a48e30656f84350", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/60c32c5b5e79c2248001efa2560f831da11cc2d7", + "reference": "60c32c5b5e79c2248001efa2560f831da11cc2d7", "shasum": "" }, "require": { @@ -3698,7 +3651,6 @@ "ext-pdo": "*" }, "suggest": { - "ext-tidy": "*", "ext-xdebug": "*", "phpunit/php-invoker": "~1.1" }, @@ -3708,7 +3660,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "5.5.x-dev" + "dev-master": "5.6.x-dev" } }, "autoload": { @@ -3734,20 +3686,20 @@ "testing", "xunit" ], - "time": "2016-09-21 14:40:13" + "time": "2016-10-07 13:03:26" }, { "name": "phpunit/phpunit-mock-objects", - "version": "3.2.7", + "version": "3.4.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "546898a2c0c356ef2891b39dd7d07f5d82c8ed0a" + "reference": "238d7a2723bce689c79eeac9c7d5e1d623bb9dc2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/546898a2c0c356ef2891b39dd7d07f5d82c8ed0a", - "reference": "546898a2c0c356ef2891b39dd7d07f5d82c8ed0a", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/238d7a2723bce689c79eeac9c7d5e1d623bb9dc2", + "reference": "238d7a2723bce689c79eeac9c7d5e1d623bb9dc2", "shasum": "" }, "require": { @@ -3793,7 +3745,7 @@ "mock", "xunit" ], - "time": "2016-09-06 16:07:45" + "time": "2016-10-09 07:01:45" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -4310,7 +4262,7 @@ }, { "name": "symfony/dom-crawler", - "version": "v3.1.4", + "version": "v3.1.5", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", @@ -4366,16 +4318,16 @@ }, { "name": "symfony/yaml", - "version": "v3.1.4", + "version": "v3.1.5", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "f291ed25eb1435bddbe8a96caaef16469c2a092d" + "reference": "368b9738d4033c8b93454cb0dbd45d305135a6d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/f291ed25eb1435bddbe8a96caaef16469c2a092d", - "reference": "f291ed25eb1435bddbe8a96caaef16469c2a092d", + "url": "https://api.github.com/repos/symfony/yaml/zipball/368b9738d4033c8b93454cb0dbd45d305135a6d3", + "reference": "368b9738d4033c8b93454cb0dbd45d305135a6d3", "shasum": "" }, "require": { @@ -4411,7 +4363,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2016-09-02 02:12:52" + "time": "2016-09-25 08:27:07" }, { "name": "webmozart/assert", @@ -4466,9 +4418,7 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "gwnobots/laravel-head": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": { diff --git a/config/app.php b/config/app.php index 06a30f5..da8cbdb 100644 --- a/config/app.php +++ b/config/app.php @@ -182,7 +182,6 @@ return [ * Custom Service Providers... */ Radic\BladeExtensions\BladeExtensionsServiceProvider::class, - Gwnobots\LaravelHead\LaravelHeadServiceProvider::class, Spatie\Newsletter\NewsletterServiceProvider::class, Intervention\Image\ImageServiceProvider::class, Maatwebsite\Excel\ExcelServiceProvider::class, diff --git a/config/laravel-head.php b/config/laravel-head.php deleted file mode 100644 index 906d104..0000000 --- a/config/laravel-head.php +++ /dev/null @@ -1,240 +0,0 @@ - tag. - | - */ - - 'charset' => 'utf-8', - - /* - |-------------------------------------------------------------------------- - | Title - |-------------------------------------------------------------------------- - | - | Settings for tag. You can define the default name of your site, - | that will fill the <title> tag if no other title is defined. You can also - | choose to automatically add the sitename at a defined title in the <title> - | tag for each page of your site. Define a separator to be displayed between - | the sitename and the title, and if the title should be displayed first, like - | <title>Title - Sitename, or not (Sitename - Title). - | - */ - - 'title' => array( - - 'sitename' => env('SITE_NAME', ''), - - 'show_sitename' => true, - - 'separator' => ' - ', - - 'first' => true, - - ), - - /* - |-------------------------------------------------------------------------- - | Description - |-------------------------------------------------------------------------- - | - | Define a default description to fill the tag if - | no other description has been defined. - | - */ - - 'description' => env('SITE_DESC', ''), - - /* - |-------------------------------------------------------------------------- - | Favicon - |-------------------------------------------------------------------------- - | - | Define a default favicon if no other is defined. Set favicon's name and - | path relative to public path, without extension. For example, 'favicon' - | will render (if files exist): - | - | - | - | - | - */ - - 'favicon' => 'favicon', - - /* - |-------------------------------------------------------------------------- - | Internet Explorer Compatibility - |-------------------------------------------------------------------------- - | - | Set to true to automatically display two commonly used utilities to force - | IE compatibility. - | - | ie_edge: - | - | - | html5_shiv: - | - | - */ - - 'ie_edge' => true, - - 'html5_shiv' => false, - - /* - |-------------------------------------------------------------------------- - | Responsive utility for viewport - |-------------------------------------------------------------------------- - | - | Set to true to automatically display a commonly used meta tag for - | responsive design: - | - | - | - */ - - 'responsive' => false, - - /* - |-------------------------------------------------------------------------- - | Facebook's Open Graph - |-------------------------------------------------------------------------- - | - | Set to true to automatically display a bunch of meta tags for Facebook's - | Open Graph Protocol, and define default values. No blank tag will be - | displayed. 'Image' is file's name with extension and path relative to - | public path. No og:image will be displayed if file does not exist. - | - */ - - 'facebook' => array( - - 'active' => false, - - 'page_id' => '', - - 'app_id' => '', - - 'admins' => '', - - 'image' => '', - - ), - - /* - |-------------------------------------------------------------------------- - | Twitter Card - |-------------------------------------------------------------------------- - | - | Set to true to automatically display a bunch of meta tags for Twitter - | Card, and define default values. No blank tag will be displayed. 'Image' - | is file's name with extension and path relative to public path. No - | og:image will be displayed if file does not exist. - | - */ - - 'twitter' => array( - - 'active' => false, - - 'image' => '', - - 'site' => '', - - 'creator' => '', - - ), - - /* - |-------------------------------------------------------------------------- - | Assets: .css and .js files - |-------------------------------------------------------------------------- - | - | Set paths to .css and .js files, and url's for external resources. Default - | ones are already defined for recent versions of jQuery and Twitter's - | Bootsrap. The name of cdn's should be the same as the one defined - | manually with the addCss() and addScript() methods. - | - */ - - 'assets' => array( - - 'paths' => array( - - 'css' => '', - - 'js' => '', - - ), - - 'cdn' => array(), - - ), - - /* - |-------------------------------------------------------------------------- - | Google's Universal Analytics - |-------------------------------------------------------------------------- - | - | Set to true to automatically display Google's new Universal Analytics - | script at the end of the section. Set also your product id like - | 'UA-XXXX-Y'. - | - | The script will never be displayed if not in production mode. - | - | You can also override default script, for example if you have custom methods, - | or for a script of another service provider. Paste it without tag. - | - */ - - 'analytics' => array( - - 'active' => false, - - 'id' => '', - - 'script' => '', - - ), - - /* - |-------------------------------------------------------------------------- - | Custom layouts - |-------------------------------------------------------------------------- - | - | Here you can override any settings for a particular layout. Add an array - | named as your layout and fill it with values you want to override. - | - | You can add as many layouts as you like. A blank value will be considered - | as not null. You just need to add the settings you want to override, not - | the entire default array: if a config value does not appear in the - | custom array, default values defined previously will be used. - | - | You need to respect path structure if your layouts are in a particular - | directory. - | - | Ex: (for a layout called custom.php or custom.blade.php in views/layouts) - | - | 'layouts' => array( - | - | 'custom' => array( - | - | 'charset' => 'ISO-8859-1', - | - | ), - | - | ), - | - */ - -); diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php index 09c7bbe..b94bebf 100644 --- a/resources/views/layouts/base.blade.php +++ b/resources/views/layouts/base.blade.php @@ -1,8 +1,34 @@ - {!! Head::render() !!} - + @set('page_title', (isset($title) ? $title . ' - ' : '') . env('SITE_NAME')) + {{ $page_title }} + + + + + + + + + + + + + + + + + + + + + + + + + + @yield('page-includes') @if(Config::get('app.debug')) diff --git a/resources/views/layouts/dashboard.blade.php b/resources/views/layouts/dashboard.blade.php index 93d9d6e..2bd500e 100644 --- a/resources/views/layouts/dashboard.blade.php +++ b/resources/views/layouts/dashboard.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.base') +@extends('layouts.base', [ 'title' => 'Dashboard' ]) @section('page-includes') diff --git a/resources/views/layouts/error.blade.php b/resources/views/layouts/error.blade.php index 73e6b12..90d85a6 100644 --- a/resources/views/layouts/error.blade.php +++ b/resources/views/layouts/error.blade.php @@ -35,6 +35,7 @@ } +
diff --git a/resources/views/website/contact.blade.php b/resources/views/website/contact.blade.php index 8aa40f0..27594cd 100644 --- a/resources/views/website/contact.blade.php +++ b/resources/views/website/contact.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.public') +@extends('layouts.public', [ 'title' => 'Contact' ]) @section('content')
@@ -16,7 +16,6 @@ - diff --git a/resources/views/website/index.blade.php b/resources/views/website/index.blade.php index 4c1cfa7..3f040af 100644 --- a/resources/views/website/index.blade.php +++ b/resources/views/website/index.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.public') +@extends('layouts.public', [ 'title' => 'Home' ]) @section('content')
diff --git a/routes/web.php b/routes/web.php index 552aa28..4a25861 100644 --- a/routes/web.php +++ b/routes/web.php @@ -7,12 +7,10 @@ */ Route::get('/', function() { - Head::setTitle('Home'); return view('website.index'); }); Route::get('/contact', function() { - Head::setTitle('Contact'); return view('website.contact'); });