diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig deleted file mode 100644 index bafd28d..0000000 --- a/app/Resources/views/base.html.twig +++ /dev/null @@ -1,13 +0,0 @@ - - - - - {% block title %}Welcome!{% endblock %} - {% block stylesheets %}{% endblock %} - - - - {% block body %}{% endblock %} - {% block javascripts %}{% endblock %} - - diff --git a/composer.json b/composer.json index 38f8822..d453570 100644 --- a/composer.json +++ b/composer.json @@ -45,9 +45,6 @@ "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile" ] }, - "config": { - "bin-dir": "bin" - }, "minimum-stability": "dev", "extra": { "symfony-app-dir": "app", diff --git a/composer.lock b/composer.lock index f3d52de..223fc35 100644 --- a/composer.lock +++ b/composer.lock @@ -1,5 +1,5 @@ { - "hash": "f2d463d8eec362b2d17108a5989172b9", + "hash": "24c1ca205ff02cf57382f6c099d64465", "packages": [ { "name": "doctrine/common", @@ -11,14 +11,14 @@ }, "dist": { "type": "zip", - "url": "https://github.com/doctrine/common/archive/bb0aebbf234db52df476a2b473d434745b34221c.zip", + "url": "https://github.com/doctrine/common/zipball/bb0aebbf234db52df476a2b473d434745b34221c", "reference": "bb0aebbf234db52df476a2b473d434745b34221c", "shasum": "" }, "require": { "php": ">=5.3.2" }, - "time": "2012-09-20 05:55:18", + "time": "1348120518", "type": "library", "extra": { "branch-alias": { @@ -31,7 +31,6 @@ "Doctrine\\Common": "lib/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -55,9 +54,9 @@ "email": "kontakt@beberlei.de" }, { - "name": "Johannes Schmitt", + "name": "Johannes M. Schmitt", "email": "schmittjoh@gmail.com", - "homepage": "http://jmsyst.com", + "homepage": "https://github.com/schmittjoh", "role": "Developer of wrapped JMSSerializerBundle" } ], @@ -77,19 +76,19 @@ "source": { "type": "git", "url": "https://github.com/doctrine/dbal", - "reference": "f63af1948a609a96b8ea1c1302c7cdf2f9f51468" + "reference": "219d96a1592e9e23087eb6861b4f8233d06c6463" }, "dist": { "type": "zip", - "url": "https://github.com/doctrine/dbal/archive/f63af1948a609a96b8ea1c1302c7cdf2f9f51468.zip", - "reference": "f63af1948a609a96b8ea1c1302c7cdf2f9f51468", + "url": "https://github.com/doctrine/dbal/zipball/219d96a1592e9e23087eb6861b4f8233d06c6463", + "reference": "219d96a1592e9e23087eb6861b4f8233d06c6463", "shasum": "" }, "require": { "php": ">=5.3.2", "doctrine/common": "2.3.*" }, - "time": "2012-12-04 21:06:56", + "time": "1349518912", "type": "library", "extra": { "branch-alias": { @@ -102,7 +101,6 @@ "Doctrine\\DBAL": "lib/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -142,20 +140,19 @@ "source": { "type": "git", "url": "git://github.com/doctrine/DoctrineBundle.git", - "reference": "2991d0dfa58a5583d9231c490750e29c45b0a6e9" + "reference": "e69a6fd75fa3979e35b7004e6da6e9aea3765997" }, "dist": { "type": "zip", - "url": "https://github.com/doctrine/DoctrineBundle/archive/2991d0dfa58a5583d9231c490750e29c45b0a6e9.zip", - "reference": "2991d0dfa58a5583d9231c490750e29c45b0a6e9", + "url": "https://github.com/doctrine/DoctrineBundle/zipball/e69a6fd75fa3979e35b7004e6da6e9aea3765997", + "reference": "e69a6fd75fa3979e35b7004e6da6e9aea3765997", "shasum": "" }, "require": { "php": ">=5.3.2", "doctrine/dbal": ">=2.2,<2.4-dev", "symfony/framework-bundle": ">=2.1,<2.3-dev", - "symfony/doctrine-bridge": ">=2.1,<2.3-dev", - "jdorn/sql-formatter": ">=1.1,<2.0" + "symfony/doctrine-bridge": ">=2.1,<2.3-dev" }, "require-dev": { "doctrine/orm": ">=2.2,<2.4-dev", @@ -165,7 +162,7 @@ "suggest": { "doctrine/orm": "The Doctrine ORM integration is optional in the bundle." }, - "time": "2012-12-11 09:53:45", + "time": "1349273376", "type": "symfony-bundle", "extra": { "branch-alias": { @@ -178,7 +175,6 @@ "Doctrine\\Bundle\\DoctrineBundle": "" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -212,53 +208,27 @@ "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineMigrationsBundle.git", - "reference": "e494aceebe05200c3f5e7b54c9facf2cf0b2099c" + "reference": "3792aa78445773387754c6853bbd7f4dcb31f486" }, "dist": { "type": "zip", - "url": "https://github.com/doctrine/DoctrineMigrationsBundle/archive/e494aceebe05200c3f5e7b54c9facf2cf0b2099c.zip", - "reference": "e494aceebe05200c3f5e7b54c9facf2cf0b2099c", + "url": "https://github.com/doctrine/DoctrineMigrationsBundle/zipball/3792aa78445773387754c6853bbd7f4dcb31f486", + "reference": "3792aa78445773387754c6853bbd7f4dcb31f486", "shasum": "" }, "require": { "php": ">=5.3.2", - "doctrine/migrations": "*", - "symfony/framework-bundle": ">=2.1.0,<2.3-dev", - "doctrine/doctrine-bundle": "1.0.*" + "symfony/symfony": ">=2.0", + "doctrine/migrations": "*" }, - "time": "2012-10-18 12:04:30", + "time": "1341472972", "type": "symfony-bundle", "installation-source": "source", "autoload": { "psr-0": { "Doctrine\\Bundle\\MigrationsBundle": "" } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, - { - "name": "Doctrine Project", - "homepage": "http://www.doctrine-project.org" - } - ], - "description": "Symfony DoctrineMigrationsBundle", - "homepage": "http://www.doctrine-project.org", - "keywords": [ - "dbal", - "migrations", - "schema" - ] + } }, { "name": "doctrine/migrations", @@ -266,12 +236,12 @@ "source": { "type": "git", "url": "https://github.com/doctrine/migrations", - "reference": "c1d875ce7d092dd1bc7508c3867b5c6b97431e43" + "reference": "b38ddb190ec78d389b2c2de838b2a4d646ad1ce2" }, "dist": { "type": "zip", - "url": "https://github.com/doctrine/migrations/archive/c1d875ce7d092dd1bc7508c3867b5c6b97431e43.zip", - "reference": "c1d875ce7d092dd1bc7508c3867b5c6b97431e43", + "url": "https://github.com/doctrine/migrations/zipball/b38ddb190ec78d389b2c2de838b2a4d646ad1ce2", + "reference": "b38ddb190ec78d389b2c2de838b2a4d646ad1ce2", "shasum": "" }, "require": { @@ -285,7 +255,7 @@ "suggest": { "symfony/console": "to run the migration from the console" }, - "time": "2012-10-19 10:37:24", + "time": "1349435713", "type": "library", "installation-source": "source", "autoload": { @@ -293,7 +263,6 @@ "Doctrine\\DBAL\\Migrations": "lib" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "LGPL" ], @@ -321,12 +290,12 @@ "source": { "type": "git", "url": "git://github.com/doctrine/doctrine2.git", - "reference": "59aef2ca950ab30c72dbbd77f9ae446551751e58" + "reference": "564ec1ee2a6a439312ee9105a2a076af7c992e5b" }, "dist": { "type": "zip", - "url": "https://github.com/doctrine/doctrine2/archive/59aef2ca950ab30c72dbbd77f9ae446551751e58.zip", - "reference": "59aef2ca950ab30c72dbbd77f9ae446551751e58", + "url": "https://github.com/doctrine/doctrine2/zipball/564ec1ee2a6a439312ee9105a2a076af7c992e5b", + "reference": "564ec1ee2a6a439312ee9105a2a076af7c992e5b", "shasum": "" }, "require": { @@ -338,7 +307,7 @@ "suggest": { "symfony/yaml": "If you want to use YAML Metadata Mapping Driver" }, - "time": "2012-12-04 22:04:25", + "time": "1349472005", "bin": [ "bin/doctrine", "bin/doctrine.php" @@ -355,7 +324,6 @@ "Doctrine\\ORM": "lib/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -396,14 +364,14 @@ }, "dist": { "type": "zip", - "url": "https://github.com/javiereguiluz/geshi/archive/6f5f9c621936faf90d92f355967604fe07f7a60f.zip", + "url": "https://github.com/javiereguiluz/geshi/zipball/6f5f9c621936faf90d92f355967604fe07f7a60f", "reference": "6f5f9c621936faf90d92f355967604fe07f7a60f", "shasum": "" }, "require": { "php": ">4.3.0" }, - "time": "2012-09-28 10:33:45", + "time": "1348828425", "type": "library", "installation-source": "source", "autoload": { @@ -411,7 +379,6 @@ "./" ] }, - "notification-url": "https://packagist.org/downloads/", "license": [ "GPL-2.0" ], @@ -444,7 +411,7 @@ }, "dist": { "type": "zip", - "url": "https://github.com/egeloen/IvoryCKEditorBundle/archive/21270e029fe424ba7f748746e6aeace3a11f9943.zip", + "url": "https://github.com/egeloen/IvoryCKEditorBundle/zipball/21270e029fe424ba7f748746e6aeace3a11f9943", "reference": "21270e029fe424ba7f748746e6aeace3a11f9943", "shasum": "" }, @@ -452,28 +419,14 @@ "php": ">=5.3.0", "symfony/framework-bundle": "2.*" }, - "time": "2012-09-03 20:15:22", + "time": "1346703322", "type": "symfony-bundle", "installation-source": "source", "autoload": { "psr-0": { "Ivory\\CKEditorBundle": "" } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Eric GELOEN", - "email": "geloen.eric@gmail.com" - } - ], - "description": "Provides a CKEditor integration for your Symfony2 Project.", - "keywords": [ - "CKEditor" - ] + } }, { "name": "fpn/doctrine-extensions-taggable", @@ -485,14 +438,14 @@ }, "dist": { "type": "zip", - "url": "https://github.com/FabienPennequin/DoctrineExtensions-Taggable/archive/ee7245fc7c3012ea1b1ed932f62ca258b39d8bea.zip", + "url": "https://github.com/FabienPennequin/DoctrineExtensions-Taggable/zipball/ee7245fc7c3012ea1b1ed932f62ca258b39d8bea", "reference": "ee7245fc7c3012ea1b1ed932f62ca258b39d8bea", "shasum": "" }, "require": { "doctrine/orm": ">=2.0" }, - "time": "2012-09-20 19:58:42", + "time": "1348171122", "type": "library", "installation-source": "source", "autoload": { @@ -500,7 +453,6 @@ "DoctrineExtensions": "lib/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -527,7 +479,7 @@ }, "dist": { "type": "zip", - "url": "https://github.com/FabienPennequin/FPNTagBundle/archive/7fa1408d2a57120e8d9da8a95fb7d2ad3223c5e3.zip", + "url": "https://github.com/FabienPennequin/FPNTagBundle/zipball/7fa1408d2a57120e8d9da8a95fb7d2ad3223c5e3", "reference": "7fa1408d2a57120e8d9da8a95fb7d2ad3223c5e3", "shasum": "" }, @@ -535,7 +487,7 @@ "fpn/doctrine-extensions-taggable": "*", "symfony/framework-bundle": ">=2.0" }, - "time": "2012-09-20 19:59:26", + "time": "1348171166", "type": "symfony-bundle", "installation-source": "source", "autoload": { @@ -543,7 +495,6 @@ "FPN\\TagBundle": "" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -565,31 +516,23 @@ "source": { "type": "git", "url": "git://github.com/l3pp4rd/DoctrineExtensions.git", - "reference": "7e8be80e1f856e79f97830d0ba34be0a4b45a85c" + "reference": "0add69ccb0cb22e3216c30166805ae27615cb8f0" }, "dist": { "type": "zip", - "url": "https://github.com/l3pp4rd/DoctrineExtensions/archive/7e8be80e1f856e79f97830d0ba34be0a4b45a85c.zip", - "reference": "7e8be80e1f856e79f97830d0ba34be0a4b45a85c", + "url": "https://github.com/l3pp4rd/DoctrineExtensions/zipball/0add69ccb0cb22e3216c30166805ae27615cb8f0", + "reference": "0add69ccb0cb22e3216c30166805ae27615cb8f0", "shasum": "" }, "require": { "php": ">=5.3.2", "doctrine/common": ">=2.2,<2.5-dev" }, - "require-dev": { - "doctrine/mongodb": ">=1.0.0-BETA1", - "doctrine/mongodb-odm": ">=1.0.0-BETA6", - "doctrine/orm": ">=2.2", - "doctrine/dbal": ">=2.2" - }, "suggest": { - "doctrine/mongodb": ">=1.0.0-BETA1", - "doctrine/mongodb-odm": ">=1.0.0-BETA6", - "doctrine/orm": ">=2.2", - "doctrine/dbal": ">=2.2" + "doctrine/orm": ">=2.1", + "doctrine/mongodb-odm": "*" }, - "time": "2012-12-14 06:31:24", + "time": "1349375111", "type": "library", "extra": { "branch-alias": { @@ -602,14 +545,13 @@ "Gedmo": "lib/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ { "name": "Gediminas Morkevicius", - "email": "gediminas.morkevicius@gmail.com" + "email": "gediminas.morkevicius@gmail" } ], "description": "Doctrine2 behavioral extensions", @@ -634,12 +576,12 @@ "target-dir": "Io/TcpdfBundle", "source": { "type": "git", - "url": "https://github.com/gergelypolonkai/IoTcpdfBundle", + "url": "http://github.com/w00d5t0ck/IoTcpdfBundle", "reference": "7cc9aed4839b2896de34ff3ea1155be1a1e4708c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/gergelypolonkai/IoTcpdfBundle/zipball/7cc9aed4839b2896de34ff3ea1155be1a1e4708c", + "url": "https://github.com/w00d5t0ck/IoTcpdfBundle/zipball/7cc9aed4839b2896de34ff3ea1155be1a1e4708c", "reference": "7cc9aed4839b2896de34ff3ea1155be1a1e4708c", "shasum": "" }, @@ -648,7 +590,7 @@ "symfony/framework-bundle": "2.1.*", "tcpdf/tcpdf": ">=5.9.162" }, - "time": "2012-08-03 14:01:18", + "time": "1344002478", "type": "symfony-bundle", "installation-source": "source", "autoload": { @@ -675,57 +617,9 @@ "pdf" ], "support": { - "source": "https://github.com/gergelypolonkai/IoTcpdfBundle/tree/master" + "source": "https://github.com/w00d5t0ck/IoTcpdfBundle/tree/master" } }, - { - "name": "jdorn/sql-formatter", - "version": "dev-master", - "source": { - "type": "git", - "url": "git://github.com/jdorn/sql-formatter.git", - "reference": "0461ab0ff16e096b8c51f085349f38ed5f2ea241" - }, - "dist": { - "type": "zip", - "url": "https://github.com/jdorn/sql-formatter/archive/0461ab0ff16e096b8c51f085349f38ed5f2ea241.zip", - "reference": "0461ab0ff16e096b8c51f085349f38ed5f2ea241", - "shasum": "" - }, - "require": { - "php": ">=5.2.4" - }, - "time": "2012-11-17 22:31:58", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2.x-dev" - } - }, - "installation-source": "source", - "autoload": { - "classmap": [ - "lib" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "LGPL" - ], - "authors": [ - { - "name": "Jeremy Dorn", - "email": "jeremy@jeremydorn.com", - "homepage": "http://jeremydorn.com/" - } - ], - "description": "a PHP SQL highlighting library", - "homepage": "https://github.com/jdorn/sql-formatter/", - "keywords": [ - "sql", - "highlight" - ] - }, { "name": "jms/aop-bundle", "version": "1.0.0", @@ -745,31 +639,14 @@ "symfony/framework-bundle": "2.*", "jms/cg": "1.0.0" }, - "time": "2012-01-02 12:50:26", + "time": "2012-01-02 15:50:26", "type": "symfony-bundle", "installation-source": "dist", "autoload": { "psr-0": { "JMS\\AopBundle": "" } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache" - ], - "authors": [ - { - "name": "Johannes M. Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "http://jmsyst.com", - "role": "Developer of wrapped JMSSerializerBundle" - } - ], - "description": "Adds AOP capabilities to Symfony2", - "keywords": [ - "annotations", - "aop" - ] + } }, { "name": "jms/cg", @@ -788,30 +665,14 @@ "require": { "php": ">=5.3.0" }, - "time": "2012-01-02 12:40:52", + "time": "2012-01-02 15:40:52", "type": "library", "installation-source": "dist", "autoload": { "psr-0": { "CG\\": "src/" } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache" - ], - "authors": [ - { - "name": "Johannes M. Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "http://jmsyst.com", - "role": "Developer of wrapped JMSSerializerBundle" - } - ], - "description": "Toolset for generating PHP code", - "keywords": [ - "code generation" - ] + } }, { "name": "jms/di-extra-bundle", @@ -824,7 +685,7 @@ }, "dist": { "type": "zip", - "url": "https://github.com/schmittjoh/JMSDiExtraBundle/archive/1.1.1.zip", + "url": "https://github.com/schmittjoh/JMSDiExtraBundle/zipball/1.1.1", "reference": "1.1.1", "shasum": "" }, @@ -848,7 +709,7 @@ "doctrine/doctrine-bundle": "*", "doctrine/orm": "*" }, - "time": "2012-09-21 08:56:32", + "time": "1348217792", "type": "symfony-bundle", "installation-source": "source", "autoload": { @@ -856,7 +717,6 @@ "JMS\\DiExtraBundle": "" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "Apache" ], @@ -864,7 +724,7 @@ { "name": "Johannes M. Schmitt", "email": "schmittjoh@gmail.com", - "homepage": "http://jmsyst.com", + "homepage": "https://github.com/schmittjoh", "role": "Developer of wrapped JMSSerializerBundle" } ], @@ -892,33 +752,14 @@ "require": { "php": ">=5.3.0" }, - "time": "2012-01-02 13:32:49", + "time": "2012-01-02 16:32:49", "type": "library", "installation-source": "dist", "autoload": { "psr-0": { "Metadata\\": "src/" } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache" - ], - "authors": [ - { - "name": "Johannes M. Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "https://github.com/schmittjoh", - "role": "Developer of wrapped JMSSerializerBundle" - } - ], - "description": "Class/method/property metadata management in PHP", - "keywords": [ - "annotations", - "yaml", - "xml", - "metadata" - ] + } }, { "name": "jms/security-extra-bundle", @@ -931,7 +772,7 @@ }, "dist": { "type": "zip", - "url": "https://github.com/schmittjoh/JMSSecurityExtraBundle/archive/9ab6aceda50fc7a2b07d741ba4b3f0695508afcb.zip", + "url": "https://github.com/schmittjoh/JMSSecurityExtraBundle/zipball/9ab6aceda50fc7a2b07d741ba4b3f0695508afcb", "reference": "9ab6aceda50fc7a2b07d741ba4b3f0695508afcb", "shasum": "" }, @@ -956,7 +797,7 @@ "symfony/form": "*", "symfony/validator": "*" }, - "time": "2012-09-06 16:12:23", + "time": "1346947943", "type": "symfony-bundle", "installation-source": "source", "autoload": { @@ -964,7 +805,6 @@ "JMS\\SecurityExtraBundle": "" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "Apache2" ], @@ -992,12 +832,12 @@ "source": { "type": "git", "url": "http://github.com/kriswallsmith/assetic.git", - "reference": "8ca1861fbed58e2c6ffcca5c0a1726c40a10a77c" + "reference": "e22c5e07e672bb0cf43127e97e9368b53abf4aa8" }, "dist": { "type": "zip", - "url": "https://github.com/kriswallsmith/assetic/archive/8ca1861fbed58e2c6ffcca5c0a1726c40a10a77c.zip", - "reference": "8ca1861fbed58e2c6ffcca5c0a1726c40a10a77c", + "url": "https://github.com/kriswallsmith/assetic/zipball/e22c5e07e672bb0cf43127e97e9368b53abf4aa8", + "reference": "e22c5e07e672bb0cf43127e97e9368b53abf4aa8", "shasum": "" }, "require": { @@ -1018,7 +858,7 @@ "ptachoire/cssembed": "Assetic provides the integration with phpcssembed to embed data uris", "leafo/scssphp-compass": "Assetic provides the integration with the SCSS compass plugin" }, - "time": "2012-12-14 18:31:26", + "time": "1349004759", "type": "library", "extra": { "branch-alias": { @@ -1034,7 +874,6 @@ "src/functions.php" ] }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1059,12 +898,12 @@ "source": { "type": "git", "url": "https://github.com/Seldaek/monolog", - "reference": "0df12342ef6c5efc748b27bb9ef92e1c95631058" + "reference": "09b3a80cfaf3e323e348a5e817afeee98d5e6b48" }, "dist": { "type": "zip", - "url": "https://github.com/Seldaek/monolog/archive/0df12342ef6c5efc748b27bb9ef92e1c95631058.zip", - "reference": "0df12342ef6c5efc748b27bb9ef92e1c95631058", + "url": "https://github.com/Seldaek/monolog/zipball/09b3a80cfaf3e323e348a5e817afeee98d5e6b48", + "reference": "09b3a80cfaf3e323e348a5e817afeee98d5e6b48", "shasum": "" }, "require": { @@ -1078,7 +917,7 @@ "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", "ext-mongo": "Allow sending log messages to a MongoDB server" }, - "time": "2012-12-14 11:27:44", + "time": "1347983448", "type": "library", "extra": { "branch-alias": { @@ -1091,7 +930,6 @@ "Monolog": "src/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1117,18 +955,18 @@ "source": { "type": "git", "url": "https://github.com/sensio/SensioDistributionBundle", - "reference": "v2.1.4" + "reference": "v2.1.1" }, "dist": { "type": "zip", - "url": "https://github.com/sensio/SensioDistributionBundle/archive/v2.1.4.zip", - "reference": "v2.1.4", + "url": "https://github.com/sensio/SensioDistributionBundle/zipball/v2.1.1", + "reference": "v2.1.1", "shasum": "" }, "require": { "symfony/framework-bundle": "2.1.*" }, - "time": "2012-11-19 11:18:52", + "time": "1347340208", "type": "symfony-bundle", "extra": { "branch-alias": { @@ -1141,7 +979,6 @@ "Sensio\\Bundle\\DistributionBundle": "" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1164,19 +1001,19 @@ "source": { "type": "git", "url": "https://github.com/sensio/SensioFrameworkExtraBundle", - "reference": "v2.1.4" + "reference": "bf2ea090d602e02b975d1bf1d8ffca8f02ef8bdb" }, "dist": { "type": "zip", - "url": "https://github.com/sensio/SensioFrameworkExtraBundle/archive/v2.1.4.zip", - "reference": "v2.1.4", + "url": "https://github.com/sensio/SensioFrameworkExtraBundle/zipball/bf2ea090d602e02b975d1bf1d8ffca8f02ef8bdb", + "reference": "bf2ea090d602e02b975d1bf1d8ffca8f02ef8bdb", "shasum": "" }, "require": { "symfony/framework-bundle": "2.1.*", "doctrine/common": ">=2.1,<2.4-dev" }, - "time": "2012-10-17 04:38:27", + "time": "1349361259", "type": "symfony-bundle", "extra": { "branch-alias": { @@ -1189,7 +1026,6 @@ "Sensio\\Bundle\\FrameworkExtraBundle": "" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1207,33 +1043,36 @@ }, { "name": "sensio/generator-bundle", - "version": "2.1.x-dev", + "version": "dev-master", "target-dir": "Sensio/Bundle/GeneratorBundle", "source": { "type": "git", "url": "https://github.com/sensio/SensioGeneratorBundle", - "reference": "v2.1.4" + "reference": "f5bda1014f5f124a0fd881644664493e36a09ad0" }, "dist": { "type": "zip", - "url": "https://github.com/sensio/SensioGeneratorBundle/archive/v2.1.4.zip", - "reference": "v2.1.4", + "url": "https://github.com/sensio/SensioGeneratorBundle/zipball/f5bda1014f5f124a0fd881644664493e36a09ad0", + "reference": "f5bda1014f5f124a0fd881644664493e36a09ad0", "shasum": "" }, "require": { - "symfony/framework-bundle": "2.1.*", - "symfony/console": "2.1.*" + "symfony/framework-bundle": "2.2.*", + "symfony/console": "2.2.*" }, "require-dev": { - "symfony/doctrine-bridge": "2.1.*", "doctrine/orm": ">=2.1,<2.4-dev", - "twig/twig": ">=1.8,<2.0-dev" + "twig/twig": ">=1.8,<2.0-dev", + "symfony/doctrine-bridge": "2.2.*" }, - "time": "2012-11-19 16:10:57", + "suggest": { + "doctrine/doctrine-bundle": "to generate entities and their crud controller" + }, + "time": "1348070473", "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.1.x-dev" + "dev-master": "2.2.x-dev" } }, "installation-source": "source", @@ -1242,7 +1081,6 @@ "Sensio\\Bundle\\GeneratorBundle": "" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1261,24 +1099,24 @@ "source": { "type": "git", "url": "https://github.com/stof/StofDoctrineExtensionsBundle", - "reference": "4a17550d8b101c5aafc56c9950149aa189b8402d" + "reference": "773b37310ca244570032541be3c8ab27b814a83f" }, "dist": { "type": "zip", - "url": "https://github.com/stof/StofDoctrineExtensionsBundle/archive/4a17550d8b101c5aafc56c9950149aa189b8402d.zip", - "reference": "4a17550d8b101c5aafc56c9950149aa189b8402d", + "url": "https://github.com/stof/StofDoctrineExtensionsBundle/zipball/773b37310ca244570032541be3c8ab27b814a83f", + "reference": "773b37310ca244570032541be3c8ab27b814a83f", "shasum": "" }, "require": { "php": ">=5.3.2", - "symfony/framework-bundle": ">=2.1,<2.3-dev", - "gedmo/doctrine-extensions": "2.3.*" + "symfony/framework-bundle": "2.1.*", + "gedmo/doctrine-extensions": ">=2.3-dev" }, "suggest": { "doctrine/doctrine-bundle": "*", "doctrine/mongodb-odm-bundle": "2.1.*" }, - "time": "2012-12-13 17:58:07", + "time": "1349111035", "type": "symfony-bundle", "extra": { "branch-alias": { @@ -1291,7 +1129,6 @@ "Stof\\DoctrineExtensionsBundle": "" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1319,35 +1156,34 @@ }, { "name": "swiftmailer/swiftmailer", - "version": "v4.2.2", + "version": "dev-master", "source": { "type": "git", "url": "git://github.com/swiftmailer/swiftmailer.git", - "reference": "v4.2.2" + "reference": "22731e907f5ca288c9bfde6b54f3611ace0a6c39" }, "dist": { "type": "zip", - "url": "https://github.com/swiftmailer/swiftmailer/zipball/v4.2.2", - "reference": "v4.2.2", + "url": "https://github.com/swiftmailer/swiftmailer/zipball/22731e907f5ca288c9bfde6b54f3611ace0a6c39", + "reference": "22731e907f5ca288c9bfde6b54f3611ace0a6c39", "shasum": "" }, "require": { "php": ">=5.2.4" }, - "time": "2012-10-25 01:30:40", + "time": "1349196829", "type": "library", "extra": { "branch-alias": { "dev-master": "4.2-dev" } }, - "installation-source": "dist", + "installation-source": "source", "autoload": { "files": [ "lib/swift_required.php" ] }, - "notification-url": "https://packagist.org/downloads/", "license": [ "LGPL" ], @@ -1374,12 +1210,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/AsseticBundle", - "reference": "bd91880b53f86689f6638c9a28b8cc17792896e2" + "reference": "5ebcf72d9b2d7028ca8c9b71b464ccc81d4795d2" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/AsseticBundle/archive/bd91880b53f86689f6638c9a28b8cc17792896e2.zip", - "reference": "bd91880b53f86689f6638c9a28b8cc17792896e2", + "url": "https://github.com/symfony/AsseticBundle/zipball/5ebcf72d9b2d7028ca8c9b71b464ccc81d4795d2", + "reference": "5ebcf72d9b2d7028ca8c9b71b464ccc81d4795d2", "shasum": "" }, "require": { @@ -1399,7 +1235,7 @@ "suggest": { "symfony/twig-bundle": ">=2.1.0,<2.3-dev" }, - "time": "2012-12-14 18:38:42", + "time": "1348938560", "type": "symfony-bundle", "extra": { "branch-alias": { @@ -1412,7 +1248,6 @@ "Symfony\\Bundle\\AsseticBundle": "" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1442,7 +1277,7 @@ }, "dist": { "type": "zip", - "url": "https://github.com/symfony/MonologBundle/archive/51517152a608926ee6b40ed8cfbba1a708f0a14f.zip", + "url": "https://github.com/symfony/MonologBundle/zipball/51517152a608926ee6b40ed8cfbba1a708f0a14f", "reference": "51517152a608926ee6b40ed8cfbba1a708f0a14f", "shasum": "" }, @@ -1457,7 +1292,7 @@ "symfony/yaml": ">=2.1.0,<2.3-dev", "symfony/config": ">=2.1.0,<2.3-dev" }, - "time": "2012-09-20 10:40:24", + "time": "1348137624", "type": "symfony-bundle", "extra": { "branch-alias": { @@ -1470,7 +1305,6 @@ "Symfony\\Bundle\\MonologBundle": "" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1494,12 +1328,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/SwiftmailerBundle", - "reference": "2393ba6d4f1b544349123e24a16bbc749bef9e55" + "reference": "e055faf5d7279f3c01ffd58f1548e0fc524b71d1" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/SwiftmailerBundle/archive/2393ba6d4f1b544349123e24a16bbc749bef9e55.zip", - "reference": "2393ba6d4f1b544349123e24a16bbc749bef9e55", + "url": "https://github.com/symfony/SwiftmailerBundle/zipball/e055faf5d7279f3c01ffd58f1548e0fc524b71d1", + "reference": "e055faf5d7279f3c01ffd58f1548e0fc524b71d1", "shasum": "" }, "require": { @@ -1513,7 +1347,7 @@ "symfony/config": ">=2.1.0,<2.3-dev", "symfony/yaml": ">=2.1.0,<2.3-dev" }, - "time": "2012-10-17 04:18:11", + "time": "1348137776", "type": "symfony-bundle", "extra": { "branch-alias": { @@ -1526,7 +1360,6 @@ "Symfony\\Bundle\\SwiftmailerBundle": "" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1549,12 +1382,12 @@ "source": { "type": "git", "url": "git://github.com/symfony/symfony.git", - "reference": "ab64da5671ec161ab73aba07fc011bc8de56ae41" + "reference": "8062031a0a5143086f2ff864925dada9614f2ead" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/symfony/archive/ab64da5671ec161ab73aba07fc011bc8de56ae41.zip", - "reference": "ab64da5671ec161ab73aba07fc011bc8de56ae41", + "url": "https://github.com/symfony/symfony/zipball/8062031a0a5143086f2ff864925dada9614f2ead", + "reference": "8062031a0a5143086f2ff864925dada9614f2ead", "shasum": "" }, "require": { @@ -1601,10 +1434,15 @@ "doctrine/orm": ">=2.2.3,<2.4-dev", "doctrine/data-fixtures": "1.0.*", "propel/propel1": "dev-master", - "monolog/monolog": "1.*" + "monolog/monolog": "dev-master" }, - "time": "2012-12-15 17:28:15", + "time": "1349381694", "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" + } + }, "installation-source": "source", "autoload": { "psr-0": { @@ -1612,7 +1450,6 @@ "SessionHandlerInterface": "src/Symfony/Component/HttpFoundation/Resources/stubs" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -1640,10 +1477,16 @@ "url": "git://tcpdf.git.sourceforge.net/gitroot/tcpdf/tcpdf", "reference": "f2aa41dd8252ad6321bad88776889b75b127a60c" }, + "dist": { + "type": "zip", + "url": "https://github.com/tcpdf/tcpdf/zipball/5.9.176", + "reference": "5.9.176", + "shasum": "" + }, "require": { "php": ">=5.3.0" }, - "time": "2012-09-25 18:17:00", + "time": "1348597020", "type": "library", "installation-source": "source", "autoload": { @@ -1665,7 +1508,6 @@ "unicode_data.php" ] }, - "notification-url": "https://packagist.org/downloads/", "license": [ "LGPLv3" ], @@ -1694,18 +1536,18 @@ "source": { "type": "git", "url": "https://github.com/fabpot/Twig-extensions", - "reference": "d1990ffaca93302709d1306d50ae153adb169f49" + "reference": "f904575642b1213db69b4a98f08397e722ba1cae" }, "dist": { "type": "zip", - "url": "https://github.com/fabpot/Twig-extensions/archive/d1990ffaca93302709d1306d50ae153adb169f49.zip", - "reference": "d1990ffaca93302709d1306d50ae153adb169f49", + "url": "https://github.com/fabpot/Twig-extensions/zipball/f904575642b1213db69b4a98f08397e722ba1cae", + "reference": "f904575642b1213db69b4a98f08397e722ba1cae", "shasum": "" }, "require": { "twig/twig": "1.*" }, - "time": "2012-12-15 09:26:10", + "time": "1346770278", "type": "library", "extra": { "branch-alias": { @@ -1717,24 +1559,7 @@ "psr-0": { "Twig_Extensions_": "lib/" } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "Common additional features for Twig that do not directly belong in core", - "homepage": "https://github.com/fabpot/Twig-extensions", - "keywords": [ - "debug", - "i18n", - "text" - ] + } }, { "name": "twig/twig", @@ -1742,22 +1567,22 @@ "source": { "type": "git", "url": "git://github.com/fabpot/Twig.git", - "reference": "2757f482c679aa00bb8c7fdfcb337f2bb922fa5a" + "reference": "5d7baaf767ec3b8f6599738e7c98bde6c25cf7c1" }, "dist": { "type": "zip", - "url": "https://github.com/fabpot/Twig/archive/2757f482c679aa00bb8c7fdfcb337f2bb922fa5a.zip", - "reference": "2757f482c679aa00bb8c7fdfcb337f2bb922fa5a", + "url": "https://github.com/fabpot/Twig/zipball/5d7baaf767ec3b8f6599738e7c98bde6c25cf7c1", + "reference": "5d7baaf767ec3b8f6599738e7c98bde6c25cf7c1", "shasum": "" }, "require": { "php": ">=5.2.4" }, - "time": "2012-12-11 14:30:16", + "time": "1349508092", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-master": "1.10-dev" } }, "installation-source": "source", @@ -1766,7 +1591,6 @@ "Twig_": "lib/" } }, - "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3" ], diff --git a/src/GergelyPolonkai/FrontBundle/Controller/AdminController.php b/src/GergelyPolonkai/FrontBundle/Controller/AdminController.php index 59c86d7..b7ba07c 100644 --- a/src/GergelyPolonkai/FrontBundle/Controller/AdminController.php +++ b/src/GergelyPolonkai/FrontBundle/Controller/AdminController.php @@ -55,7 +55,7 @@ class AdminController extends Controller * @Route("/blog/post/{id}", name="GergelyPolonkaiFrontBundle_adminEditBlogPost", defaults={"id": null}) * @Template */ - public function newBlogPostAction($id = null) + public function editBlogPostAction($id = null) { if (is_numeric($id)) { $post = $this->getDoctrine()->getRepository('GergelyPolonkaiFrontBundle:Post')->findOneById($id); @@ -73,8 +73,8 @@ class AdminController extends Controller if ($request->getMethod() === 'POST') { $form->bind($request); if ($form->isValid()) { + $tagManager = $this->get('fpn_tag.tag_manager'); if (($tags = $form->get('tags')->getData()) != '') { - $tagManager = $this->get('fpn_tag.tag_manager'); $tagNames = $tagManager->splitTagNames($tags); $tagList = $tagManager->loadOrCreateTags($tagNames); $tagManager->addTags($tagList, $post); diff --git a/src/GergelyPolonkai/FrontBundle/Controller/BlogController.php b/src/GergelyPolonkai/FrontBundle/Controller/BlogController.php index 18114d4..988d4d0 100644 --- a/src/GergelyPolonkai/FrontBundle/Controller/BlogController.php +++ b/src/GergelyPolonkai/FrontBundle/Controller/BlogController.php @@ -4,9 +4,11 @@ namespace GergelyPolonkai\FrontBundle\Controller; use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; +use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; use Doctrine\ORM\Tools\Pagination\Paginator; use GergelyPolonkai\FrontBundle\Entity\Post; +use GergelyPolonkai\FrontBundle\Entity\Tag; /** * Description of BlogController @@ -17,6 +19,9 @@ use GergelyPolonkai\FrontBundle\Entity\Post; */ class BlogController extends Controller { + // TODO: Make this a config parameter + private $postsPerPage = 10; + /** * @Route("/", name="GergelyPolonkaiFrontBundle_blogListing") * @Route("/page/{cPage}", name="GergelyPolonkaiFrontBundle_blogListingPage", requirements={"cPage": "\d+"}) @@ -24,16 +29,14 @@ class BlogController extends Controller */ public function listAction($cPage = 1) { - // TODO: Make this a config parameter - $postsPerPage = 10; --$cPage; $query = $this ->getDoctrine() ->getEntityManager() ->createQuery("SELECT p FROM GergelyPolonkaiFrontBundle:Post p WHERE p.draft = FALSE ORDER BY p.createdAt DESC") - ->setFirstResult($cPage * $postsPerPage) - ->setMaxResults($postsPerPage); + ->setFirstResult($cPage * $this->postsPerPage) + ->setMaxResults($this->postsPerPage); $paginator = new Paginator($query, $fetchJoinCollection = true); $tagManager = $this->get('fpn_tag.tag_manager'); @@ -42,13 +45,13 @@ class BlogController extends Controller } $count = $paginator->count(); - $pageCount = ceil($count / $postsPerPage); + $pageCount = ceil($count / $this->postsPerPage); return array( 'cpage' => $cPage, 'count' => $pageCount, 'posts' => $paginator, - 'perPage' => $postsPerPage, + 'perPage' => $this->postsPerPage, ); } @@ -93,4 +96,43 @@ class BlogController extends Controller 'posts' => $posts, ); } + + /** + * @Route("/tag/{name}/", name="GergelyPolonkaiFrontBundle_blogTagList") + * @Route("/tag/{name}/page/{cPage}", name="GergelyPolonkaiFrontBundle_blogTagListingPage", requirements={"cPage": "\d+"}) + * @Template("GergelyPolonkaiFrontBundle:Blog:list.html.twig") + * @ParamConverter("tag") + */ + public function tagListAction(Tag $tag, $cPage = 1) + { + $tagRepository = $this->getDoctrine()->getRepository('GergelyPolonkaiFrontBundle:Tag'); + + $ids = $tagRepository->getResourceIdsForTag('gergelypolonkaifront_post', $tag->getName()); + + --$cPage; + + $query = $this + ->getDoctrine() + ->getEntityManager() + ->createQuery("SELECT p FROM GergelyPolonkaiFrontBundle:Post p WHERE p.draft = FALSE AND p.id IN (:idList) ORDER BY p.createdAt DESC") + ->setParameter('idList', $ids) + ->setFirstResult($cPage * $this->postsPerPage) + ->setMaxResults($this->postsPerPage); + + $paginator = new Paginator($query, $fetchJoinCollection = true); + $tagManager = $this->get('fpn_tag.tag_manager'); + foreach ($paginator as $post) { + $tagManager->loadTagging($post); + } + + $count = $paginator->count(); + $pageCount = ceil($count / $this->postsPerPage); + + return array( + 'cpage' => $cPage, + 'count' => $pageCount, + 'posts' => $paginator, + 'perPage' => $this->postsPerPage, + ); + } } diff --git a/src/GergelyPolonkai/FrontBundle/Controller/DefaultController.php b/src/GergelyPolonkai/FrontBundle/Controller/DefaultController.php index f0d8bb1..fa1bed5 100644 --- a/src/GergelyPolonkai/FrontBundle/Controller/DefaultController.php +++ b/src/GergelyPolonkai/FrontBundle/Controller/DefaultController.php @@ -94,4 +94,13 @@ class DefaultController extends Controller 'code_chunk' => $codeChunk, ); } + + /** + * @Route("/google150e54bda5f96d97.html") + * @Template + */ + public function webmasterToolsAction() + { + return array(); + } } diff --git a/src/GergelyPolonkai/FrontBundle/Entity/Tag.php b/src/GergelyPolonkai/FrontBundle/Entity/Tag.php index ee307ca..0e9e19e 100644 --- a/src/GergelyPolonkai/FrontBundle/Entity/Tag.php +++ b/src/GergelyPolonkai/FrontBundle/Entity/Tag.php @@ -9,7 +9,7 @@ use FPN\TagBundle\Entity\Tag as BaseTag; * * @author polesz * - * @ORM\Entity + * @ORM\Entity(repositoryClass="DoctrineExtensions\Taggable\Entity\TagRepository") * @ORM\Table(name="tags") */ class Tag extends BaseTag diff --git a/src/GergelyPolonkai/FrontBundle/Resources/public/css/front.css b/src/GergelyPolonkai/FrontBundle/Resources/public/css/front.css index d8226bc..91c9f62 100644 --- a/src/GergelyPolonkai/FrontBundle/Resources/public/css/front.css +++ b/src/GergelyPolonkai/FrontBundle/Resources/public/css/front.css @@ -71,18 +71,44 @@ body { } #menu { + background-color: #f18137; + height: 39px; + margin-top: 15px; +} + +#tagcloud-button { + float: left; + padding-top: 2px; + padding-left: 6px; + cursor: pointer; } #menu ul { - margin: 0; + margin: 8px; padding: 0; list-style-type: none; - text-align: right; + float: right; } #menu ul li { - display: inline; + float: right; + margin-top: 1px; + margin-bottom: 10px; margin-left: 1em; + height: 30px; +} + +#menu ul li.active { + background-image: url('../images/arrow-up.png'); + background-repeat: no-repeat; + background-position: center bottom; +} + +#menu ul li a { + color: white; + font-weight: bold; + text-decoration: none; + font-size: 12px; } #content { @@ -165,4 +191,49 @@ dd p { #more-posts { margin-top: 1em; text-align: right; +} + +#tag-cloud { + position: absolute; + width: 600px; + padding: 8px; + border: 1px solid black; + background-color: #303030; + margin-left: 5px; + margin-top: 2px; + display: none; +} + +#tag-cloud a { + color: #b3b3b3; + text-decoration: none; + padding: 8px; +} + +#tag-cloud .size0 { + font-size: 80%; +} + +#tag-cloud .size1 { + font-size: 90%; +} + +#tag-cloud .size2 { + font-size: 100%; +} + +#tag-cloud .size3 { + font-size: 110%; +} + +#tag-cloud .size4 { + font-size: 130%; +} + +#tag-cloud .size5 { + font-size: 150%; +} + +.clear { + clear: both; } \ No newline at end of file diff --git a/src/GergelyPolonkai/FrontBundle/Resources/public/images/arrow-up.png b/src/GergelyPolonkai/FrontBundle/Resources/public/images/arrow-up.png new file mode 100644 index 0000000..7341693 Binary files /dev/null and b/src/GergelyPolonkai/FrontBundle/Resources/public/images/arrow-up.png differ diff --git a/src/GergelyPolonkai/FrontBundle/Resources/public/images/tagcloud.png b/src/GergelyPolonkai/FrontBundle/Resources/public/images/tagcloud.png new file mode 100644 index 0000000..a58e4e9 Binary files /dev/null and b/src/GergelyPolonkai/FrontBundle/Resources/public/images/tagcloud.png differ diff --git a/src/GergelyPolonkai/FrontBundle/Resources/views/Admin/newBlogPost.html.twig b/src/GergelyPolonkai/FrontBundle/Resources/views/Admin/editBlogPost.html.twig similarity index 100% rename from src/GergelyPolonkai/FrontBundle/Resources/views/Admin/newBlogPost.html.twig rename to src/GergelyPolonkai/FrontBundle/Resources/views/Admin/editBlogPost.html.twig diff --git a/src/GergelyPolonkai/FrontBundle/Resources/views/Blog/feed.xml.twig b/src/GergelyPolonkai/FrontBundle/Resources/views/Blog/feed.xml.twig index f407ec3..ae35fc1 100644 --- a/src/GergelyPolonkai/FrontBundle/Resources/views/Blog/feed.xml.twig +++ b/src/GergelyPolonkai/FrontBundle/Resources/views/Blog/feed.xml.twig @@ -19,7 +19,7 @@ {{ app.request.scheme }}://{{app.request.host }}{{ path('GergelyPolonkaiFrontBundle_blogViewPost', {year: post.createdAt|date('Y'), month: post.createdAt|date('m'), day: post.createdAt|date('d'), slug: post.slug }) }} {{ app.request.scheme }}://{{app.request.host }}{{ path('GergelyPolonkaiFrontBundle_blogViewPost', {year: post.createdAt|date('Y'), month: post.createdAt|date('m'), day: post.createdAt|date('d'), slug: post.slug }) }}#comments {{ post.createdAt|date('r') }} - + {{ app.request.scheme }}://{{app.request.host }}{{ path('GergelyPolonkaiFrontBundle_blogViewPost', {year: post.createdAt|date('Y'), month: post.createdAt|date('m'), day: post.createdAt|date('d'), slug: post.slug }) }} {# diff --git a/src/GergelyPolonkai/FrontBundle/Resources/views/Blog/list.html.twig b/src/GergelyPolonkai/FrontBundle/Resources/views/Blog/list.html.twig index da9c0d1..d17da7b 100644 --- a/src/GergelyPolonkai/FrontBundle/Resources/views/Blog/list.html.twig +++ b/src/GergelyPolonkai/FrontBundle/Resources/views/Blog/list.html.twig @@ -26,6 +26,9 @@ {% block content %} {{ block('paginator') }} +{% if posts|length == 0 %} +No posts found. +{% endif %} {% for post in posts %} {% include 'GergelyPolonkaiFrontBundle:Blog:postViewer.html.twig' with {'post': post, 'title_links': true} %} {% endfor %} diff --git a/src/GergelyPolonkai/FrontBundle/Resources/views/Blog/postViewer.html.twig b/src/GergelyPolonkai/FrontBundle/Resources/views/Blog/postViewer.html.twig index 096c8d2..6eb5933 100644 --- a/src/GergelyPolonkai/FrontBundle/Resources/views/Blog/postViewer.html.twig +++ b/src/GergelyPolonkai/FrontBundle/Resources/views/Blog/postViewer.html.twig @@ -5,7 +5,7 @@ {% if post.tags|length > 0 %}

Tags: {% for tag in post.tags %} - {{ tag.name }} + {{ tag.name }} {% endfor %}

{% endif %} diff --git a/src/GergelyPolonkai/FrontBundle/Resources/views/Default/disclaimer.html.twig b/src/GergelyPolonkai/FrontBundle/Resources/views/Default/disclaimer.html.twig index 19ebea5..1641c84 100644 --- a/src/GergelyPolonkai/FrontBundle/Resources/views/Default/disclaimer.html.twig +++ b/src/GergelyPolonkai/FrontBundle/Resources/views/Default/disclaimer.html.twig @@ -4,4 +4,5 @@

Disclaimer

The articles and thoughts on this site all originate from me, unless otherwise stated. Please use them with this statement in your mind. If you use anything, please put a backlink on your site to the given article(s) or the main page.

The social media icons on the right are from komodomedia.com komodomedia.com.

+

Some design ideas, like the arrows under the menu items are from a friend, Judit Pásti. {% endblock content %} diff --git a/src/GergelyPolonkai/FrontBundle/Resources/views/Default/front_base.html.twig b/src/GergelyPolonkai/FrontBundle/Resources/views/Default/front_base.html.twig index 4ea2eb5..71806d7 100644 --- a/src/GergelyPolonkai/FrontBundle/Resources/views/Default/front_base.html.twig +++ b/src/GergelyPolonkai/FrontBundle/Resources/views/Default/front_base.html.twig @@ -2,6 +2,7 @@ + Gergely Polonkai{% block title %}{% endblock %} {% stylesheets 'bundles/gergelypolonkaifront/css/*' filter='cssrewrite' output='css/gergelypolonkaiweb.css' %} @@ -23,7 +24,7 @@ LinkedIn profile Skype Facebook profile - Google+ profile + Google+ profile Google Talk Twitter Tumblr @@ -32,15 +33,24 @@ RSS Feed +

+ +{% if tagCloud|length > 0 %} +
+{% for cloudItem in tagCloud %} + {{ cloudItem.name }}{% if not loop.last %} | {% endif %} +{% endfor %} +
+{% endif %}
-
- {% block content %}{% endblock content %}
@@ -53,20 +63,26 @@ Fork me on GitHub