From 61e55f145ba5469b2a3cc8dd82f7a5638936d7bd Mon Sep 17 00:00:00 2001 From: Polonkai Gergely Date: Mon, 17 Sep 2012 15:12:40 +0200 Subject: [PATCH 01/20] Now removing code chunks from the RSS feed. --- .../Resources/views/Blog/feed.xml.twig | 2 +- .../FrontBundle/Twig/CodeChunk.php | 35 +++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) 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/Twig/CodeChunk.php b/src/GergelyPolonkai/FrontBundle/Twig/CodeChunk.php index bf65df0..162c272 100644 --- a/src/GergelyPolonkai/FrontBundle/Twig/CodeChunk.php +++ b/src/GergelyPolonkai/FrontBundle/Twig/CodeChunk.php @@ -46,6 +46,7 @@ class CodeChunk extends \Twig_Extension { return array( 'insert_code_chunks' => new \Twig_Filter_Method($this, 'insertCodeChunks', array('is_safe' => array('html'))), + 'remove_code_chunks' => new \Twig_Filter_Method($this, 'removeCodeChunks', array('is_safe' => array('html'))), ); } @@ -106,6 +107,40 @@ class CodeChunk extends \Twig_Extension return $string; } + public function removeCodeChunks($string) + { + $m = array(); + $chunkRepo = $this->doctrine->getRepository('GergelyPolonkaiFrontBundle:CodeChunk'); + + while ( + preg_match( + '/\\[\\$ code:([^:]+):([^ ]+) \\$\\]/i', + $string, $m, PREG_OFFSET_CAPTURE) + ) { + $start = $m[0][1]; + $fullTag = $m[0][0]; + $len = strlen($fullTag); + $replacement = ''; + + $string = substr_replace($string, $replacement, $start, $len); + } + + while ( + preg_match( + '/\\[\\$ code:([^:]+):(.+?) \\$\\]/is', + $string, $m, PREG_OFFSET_CAPTURE) + ) { + $start = $m[0][1]; + $fullTag = $m[0][0]; + $len = strlen($fullTag); + $replacement = ''; + + $string = substr_replace($string, $replacement, $start, $len); + } + + return $string; + } + public function getName() { return "code_chunk"; From 04da58137a6e6a60db9ea0c3e52efe7182057366 Mon Sep 17 00:00:00 2001 From: Gergely POLONKAI Date: Sat, 6 Oct 2012 12:01:31 +0200 Subject: [PATCH 02/20] Moved to Symfony 2.1 stable (dev) --- .gitignore | 1 - composer.json | 5 +- composer.lock | 1212 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1213 insertions(+), 5 deletions(-) create mode 100644 composer.lock diff --git a/.gitignore b/.gitignore index 8fdafe1..2b38de6 100644 --- a/.gitignore +++ b/.gitignore @@ -13,7 +13,6 @@ web/bundles/* app/config/parameters.ini # Composer related files -composer.lock vendor/composer/installed.json # Assetic-generated .js and .css files diff --git a/composer.json b/composer.json index f6a569a..d453570 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,7 @@ "repositories": [ { "type": "vcs", - "url": "https://github.com/w00d5t0ck/IoTcpdfBundle" + "url": "https://github.com/gergelypolonkai/IoTcpdfBundle" } ], "require": { @@ -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 new file mode 100644 index 0000000..cbb9e00 --- /dev/null +++ b/composer.lock @@ -0,0 +1,1212 @@ +{ + "hash": "871ca732d39c832f0b78012cc83cec2e", + "packages": [ + { + "name": "doctrine/common", + "version": "2.3.x-dev", + "source": { + "type": "git", + "url": "https://github.com/doctrine/common", + "reference": "bb0aebbf234db52df476a2b473d434745b34221c" + }, + "dist": { + "type": "zip", + "url": "https://github.com/doctrine/common/zipball/bb0aebbf234db52df476a2b473d434745b34221c", + "reference": "bb0aebbf234db52df476a2b473d434745b34221c", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "time": "1348120518", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Doctrine\\Common": "lib/" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com", + "homepage": "http://www.jwage.com/" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com", + "homepage": "http://www.instaclick.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "https://github.com/schmittjoh", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Common Library for Doctrine projects", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "collections", + "spl", + "eventmanager", + "annotations", + "persistence" + ] + }, + { + "name": "doctrine/dbal", + "version": "2.3.x-dev", + "source": { + "type": "git", + "url": "https://github.com/doctrine/dbal", + "reference": "e00ce93926c37d7cab0368694715ff913804780c" + }, + "dist": { + "type": "zip", + "url": "https://github.com/doctrine/dbal/zipball/e00ce93926c37d7cab0368694715ff913804780c", + "reference": "e00ce93926c37d7cab0368694715ff913804780c", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "doctrine/common": "2.3.*" + }, + "time": "1349466076", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Doctrine\\DBAL": "lib/" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com", + "homepage": "http://www.jwage.com/" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com", + "homepage": "http://www.instaclick.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + } + ], + "description": "Database Abstraction Layer", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "database", + "persistence", + "dbal", + "queryobject" + ] + }, + { + "name": "doctrine/doctrine-bundle", + "version": "dev-master", + "target-dir": "Doctrine/Bundle/DoctrineBundle", + "source": { + "type": "git", + "url": "git://github.com/doctrine/DoctrineBundle.git", + "reference": "e69a6fd75fa3979e35b7004e6da6e9aea3765997" + }, + "dist": { + "type": "zip", + "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" + }, + "require-dev": { + "doctrine/orm": ">=2.2,<2.4-dev", + "symfony/yaml": ">=2.1,<2.3-dev", + "symfony/validator": ">=2.1,<2.3-dev" + }, + "suggest": { + "doctrine/orm": "The Doctrine ORM integration is optional in the bundle." + }, + "time": "1349273376", + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Doctrine\\Bundle\\DoctrineBundle": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + } + ], + "description": "Symfony DoctrineBundle", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "database", + "orm", + "persistence", + "dbal" + ] + }, + { + "name": "doctrine/orm", + "version": "2.3.x-dev", + "source": { + "type": "git", + "url": "git://github.com/doctrine/doctrine2.git", + "reference": "564ec1ee2a6a439312ee9105a2a076af7c992e5b" + }, + "dist": { + "type": "zip", + "url": "https://github.com/doctrine/doctrine2/zipball/564ec1ee2a6a439312ee9105a2a076af7c992e5b", + "reference": "564ec1ee2a6a439312ee9105a2a076af7c992e5b", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "ext-pdo": "*", + "symfony/console": "2.*", + "doctrine/dbal": "2.3.*" + }, + "suggest": { + "symfony/yaml": "If you want to use YAML Metadata Mapping Driver" + }, + "time": "1349472005", + "bin": [ + "bin/doctrine", + "bin/doctrine.php" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Doctrine\\ORM": "lib/" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com", + "homepage": "http://www.jwage.com/" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com", + "homepage": "http://www.instaclick.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + } + ], + "description": "Object-Relational-Mapper for PHP", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "database", + "orm" + ] + }, + { + "name": "jms/aop-bundle", + "version": "1.0.0", + "target-dir": "JMS/AopBundle", + "source": { + "type": "git", + "url": "https://github.com/schmittjoh/JMSAopBundle", + "reference": "1.0.0" + }, + "dist": { + "type": "zip", + "url": "https://github.com/schmittjoh/JMSAopBundle/zipball/1.0.0", + "reference": "1.0.0", + "shasum": "" + }, + "require": { + "symfony/framework-bundle": "2.*", + "jms/cg": "1.0.0" + }, + "time": "2012-01-02 20:50:26", + "type": "symfony-bundle", + "installation-source": "dist", + "autoload": { + "psr-0": { + "JMS\\AopBundle": "" + } + }, + "license": [ + "Apache" + ], + "authors": [ + { + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "https://github.com/schmittjoh", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Adds AOP capabilities to Symfony2", + "keywords": [ + "annotations", + "aop" + ] + }, + { + "name": "jms/cg", + "version": "1.0.0", + "source": { + "type": "git", + "url": "git://github.com/schmittjoh/cg-library.git", + "reference": "1.0.0" + }, + "dist": { + "type": "zip", + "url": "https://github.com/schmittjoh/cg-library/zipball/1.0.0", + "reference": "1.0.0", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "time": "2012-01-02 20:40:52", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-0": { + "CG\\": "src/" + } + }, + "license": [ + "Apache" + ], + "authors": [ + { + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "https://github.com/schmittjoh", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Toolset for generating PHP code", + "keywords": [ + "code generation" + ] + }, + { + "name": "jms/di-extra-bundle", + "version": "1.1.x-dev", + "target-dir": "JMS/DiExtraBundle", + "source": { + "type": "git", + "url": "https://github.com/schmittjoh/JMSDiExtraBundle", + "reference": "1.1.1" + }, + "dist": { + "type": "zip", + "url": "https://github.com/schmittjoh/JMSDiExtraBundle/zipball/1.1.1", + "reference": "1.1.1", + "shasum": "" + }, + "require": { + "symfony/framework-bundle": "2.1.*", + "jms/aop-bundle": "1.0.*", + "jms/metadata": "1.1.*", + "symfony/process": "2.1.*", + "symfony/finder": "2.1.*" + }, + "require-dev": { + "jms/security-extra-bundle": "1.*", + "symfony/validator": "*", + "symfony/form": "*", + "symfony/class-loader": "*", + "symfony/yaml": "*", + "symfony/browser-kit": "*", + "symfony/security-bundle": "*", + "symfony/twig-bundle": "*", + "sensio/framework-extra-bundle": "*", + "doctrine/doctrine-bundle": "*", + "doctrine/orm": "*" + }, + "time": "1348217792", + "type": "symfony-bundle", + "installation-source": "source", + "autoload": { + "psr-0": { + "JMS\\DiExtraBundle": "" + } + }, + "license": [ + "Apache" + ], + "authors": [ + { + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "https://github.com/schmittjoh", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Allows to configure dependency injection using annotations", + "homepage": "http://jmsyst.com/bundles/JMSDiExtraBundle", + "keywords": [ + "dependency injection", + "annotations" + ] + }, + { + "name": "jms/metadata", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/schmittjoh/metadata", + "reference": "1.1.1" + }, + "dist": { + "type": "zip", + "url": "https://github.com/schmittjoh/metadata/zipball/1.1.1", + "reference": "1.1.1", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "time": "2012-01-02 21:32:49", + "type": "library", + "installation-source": "dist", + "autoload": { + "psr-0": { + "Metadata\\": "src/" + } + }, + "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", + "version": "1.2.x-dev", + "target-dir": "JMS/SecurityExtraBundle", + "source": { + "type": "git", + "url": "https://github.com/schmittjoh/JMSSecurityExtraBundle", + "reference": "9ab6aceda50fc7a2b07d741ba4b3f0695508afcb" + }, + "dist": { + "type": "zip", + "url": "https://github.com/schmittjoh/JMSSecurityExtraBundle/zipball/9ab6aceda50fc7a2b07d741ba4b3f0695508afcb", + "reference": "9ab6aceda50fc7a2b07d741ba4b3f0695508afcb", + "shasum": "" + }, + "require": { + "symfony/framework-bundle": "2.1.*", + "symfony/security-bundle": "*", + "jms/metadata": "1.1.*", + "jms/aop-bundle": "1.0.*", + "jms/di-extra-bundle": "1.1.*" + }, + "require-dev": { + "sensio/framework-extra-bundle": "*", + "symfony/class-loader": "*", + "symfony/yaml": "*", + "symfony/browser-kit": "*", + "symfony/finder": "*", + "symfony/css-selector": "*", + "symfony/process": "*", + "doctrine/doctrine-bundle": "*", + "symfony/twig-bundle": "*", + "doctrine/orm": "*", + "symfony/form": "*", + "symfony/validator": "*" + }, + "time": "1346947943", + "type": "symfony-bundle", + "installation-source": "source", + "autoload": { + "psr-0": { + "JMS\\SecurityExtraBundle": "" + } + }, + "license": [ + "Apache2" + ], + "authors": [ + { + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com", + "homepage": "https://github.com/schmittjoh", + "role": "Developer of wrapped JMSSerializerBundle" + } + ], + "description": "Enhances the Symfony2 Security Component by adding several new features", + "homepage": "http://jmsyst.com/bundles/JMSSecurityExtraBundle", + "keywords": [ + "annotations", + "authorization", + "security", + "secure", + "expression" + ] + }, + { + "name": "kriswallsmith/assetic", + "version": "dev-master", + "source": { + "type": "git", + "url": "http://github.com/kriswallsmith/assetic.git", + "reference": "e22c5e07e672bb0cf43127e97e9368b53abf4aa8" + }, + "dist": { + "type": "zip", + "url": "https://github.com/kriswallsmith/assetic/zipball/e22c5e07e672bb0cf43127e97e9368b53abf4aa8", + "reference": "e22c5e07e672bb0cf43127e97e9368b53abf4aa8", + "shasum": "" + }, + "require": { + "symfony/process": ">=2.1.0,<2.3-dev", + "php": ">=5.3.1" + }, + "require-dev": { + "twig/twig": ">=1.6.0,<2.0", + "leafo/lessphp": "*", + "leafo/scssphp": "*", + "ptachoire/cssembed": "*", + "leafo/scssphp-compass": "*" + }, + "suggest": { + "twig/twig": "Assetic provides the integration with the Twig templating engine", + "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler", + "leafo/scssphp": "Assetic provides the integration with the scssphp SCSS compiler", + "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": "1349004759", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Assetic": "src/" + }, + "files": [ + "src/functions.php" + ] + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kris Wallsmith", + "email": "kris.wallsmith@gmail.com", + "homepage": "http://kriswallsmith.net/" + } + ], + "description": "Asset Management for PHP", + "homepage": "https://github.com/kriswallsmith/assetic", + "keywords": [ + "assets", + "compression", + "minification" + ] + }, + { + "name": "monolog/monolog", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/Seldaek/monolog", + "reference": "09b3a80cfaf3e323e348a5e817afeee98d5e6b48" + }, + "dist": { + "type": "zip", + "url": "https://github.com/Seldaek/monolog/zipball/09b3a80cfaf3e323e348a5e817afeee98d5e6b48", + "reference": "09b3a80cfaf3e323e348a5e817afeee98d5e6b48", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "mlehner/gelf-php": "1.0.*" + }, + "suggest": { + "mlehner/gelf-php": "Allow sending log messages to a GrayLog2 server", + "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", + "ext-mongo": "Allow sending log messages to a MongoDB server" + }, + "time": "1347983448", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Monolog": "src/" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be", + "role": "Developer" + } + ], + "description": "Logging for PHP 5.3", + "homepage": "http://github.com/Seldaek/monolog", + "keywords": [ + "log", + "logging" + ] + }, + { + "name": "sensio/distribution-bundle", + "version": "2.1.x-dev", + "target-dir": "Sensio/Bundle/DistributionBundle", + "source": { + "type": "git", + "url": "https://github.com/sensio/SensioDistributionBundle", + "reference": "v2.1.1" + }, + "dist": { + "type": "zip", + "url": "https://github.com/sensio/SensioDistributionBundle/zipball/v2.1.1", + "reference": "v2.1.1", + "shasum": "" + }, + "require": { + "symfony/framework-bundle": "2.1.*" + }, + "time": "1347340208", + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "2.1.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Sensio\\Bundle\\DistributionBundle": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "The base bundle for the Symfony Distributions", + "keywords": [ + "distribution", + "configuration" + ] + }, + { + "name": "sensio/framework-extra-bundle", + "version": "2.1.x-dev", + "target-dir": "Sensio/Bundle/FrameworkExtraBundle", + "source": { + "type": "git", + "url": "https://github.com/sensio/SensioFrameworkExtraBundle", + "reference": "bf2ea090d602e02b975d1bf1d8ffca8f02ef8bdb" + }, + "dist": { + "type": "zip", + "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": "1349361259", + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "2.1.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Sensio\\Bundle\\FrameworkExtraBundle": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "This bundle provides a way to configure your controllers with annotations", + "keywords": [ + "annotations", + "controllers" + ] + }, + { + "name": "sensio/generator-bundle", + "version": "2.1.x-dev", + "target-dir": "Sensio/Bundle/GeneratorBundle", + "source": { + "type": "git", + "url": "https://github.com/sensio/SensioGeneratorBundle", + "reference": "3a65c9bf7d31aecacffc15a48f5eb2ece3615ef0" + }, + "dist": { + "type": "zip", + "url": "https://github.com/sensio/SensioGeneratorBundle/zipball/3a65c9bf7d31aecacffc15a48f5eb2ece3615ef0", + "reference": "3a65c9bf7d31aecacffc15a48f5eb2ece3615ef0", + "shasum": "" + }, + "require": { + "symfony/framework-bundle": "2.1.*", + "symfony/console": "2.1.*" + }, + "require-dev": { + "symfony/doctrine-bridge": "2.1.*", + "doctrine/orm": ">=2.1,<2.4-dev", + "twig/twig": ">=1.8,<2.0-dev" + }, + "time": "1348030981", + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "2.1.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Sensio\\Bundle\\GeneratorBundle": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "This bundle generates code for you" + }, + { + "name": "swiftmailer/swiftmailer", + "version": "dev-master", + "source": { + "type": "git", + "url": "git://github.com/swiftmailer/swiftmailer.git", + "reference": "22731e907f5ca288c9bfde6b54f3611ace0a6c39" + }, + "dist": { + "type": "zip", + "url": "https://github.com/swiftmailer/swiftmailer/zipball/22731e907f5ca288c9bfde6b54f3611ace0a6c39", + "reference": "22731e907f5ca288c9bfde6b54f3611ace0a6c39", + "shasum": "" + }, + "require": { + "php": ">=5.2.4" + }, + "time": "1349196829", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.2-dev" + } + }, + "installation-source": "source", + "autoload": { + "files": [ + "lib/swift_required.php" + ] + }, + "license": [ + "LGPL" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Chris Corbyn" + } + ], + "description": "Swiftmailer, free feature-rich PHP mailer", + "homepage": "http://swiftmailer.org", + "keywords": [ + "mail", + "mailer" + ] + }, + { + "name": "symfony/assetic-bundle", + "version": "dev-master", + "target-dir": "Symfony/Bundle/AsseticBundle", + "source": { + "type": "git", + "url": "https://github.com/symfony/AsseticBundle", + "reference": "5ebcf72d9b2d7028ca8c9b71b464ccc81d4795d2" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony/AsseticBundle/zipball/5ebcf72d9b2d7028ca8c9b71b464ccc81d4795d2", + "reference": "5ebcf72d9b2d7028ca8c9b71b464ccc81d4795d2", + "shasum": "" + }, + "require": { + "php": ">=5.3.0", + "kriswallsmith/assetic": "1.1.*", + "symfony/framework-bundle": ">=2.1.0,<2.3-dev" + }, + "require-dev": { + "symfony/twig-bundle": ">=2.1.0,<2.3-dev", + "symfony/console": ">=2.1.0,<2.3-dev", + "symfony/class-loader": ">=2.1.0,<2.3-dev", + "symfony/yaml": ">=2.1.0,<2.3-dev", + "symfony/form": ">=2.1.0,<2.3-dev", + "symfony/dom-crawler": ">=2.1.0,<2.3-dev", + "symfony/css-selector": ">=2.1.0,<2.3-dev" + }, + "suggest": { + "symfony/twig-bundle": ">=2.1.0,<2.3-dev" + }, + "time": "1348938560", + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "2.1.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Symfony\\Bundle\\AsseticBundle": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kris Wallsmith", + "email": "kris.wallsmith@gmail.com", + "homepage": "http://kriswallsmith.net/" + } + ], + "description": "Integrates Assetic into Symfony2", + "homepage": "https://github.com/symfony/AsseticBundle", + "keywords": [ + "assets", + "compression", + "minification" + ] + }, + { + "name": "symfony/monolog-bundle", + "version": "dev-master", + "target-dir": "Symfony/Bundle/MonologBundle", + "source": { + "type": "git", + "url": "https://github.com/symfony/MonologBundle", + "reference": "51517152a608926ee6b40ed8cfbba1a708f0a14f" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony/MonologBundle/zipball/51517152a608926ee6b40ed8cfbba1a708f0a14f", + "reference": "51517152a608926ee6b40ed8cfbba1a708f0a14f", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "monolog/monolog": "1.*", + "symfony/monolog-bridge": ">=2.1.0,<2.3-dev", + "symfony/dependency-injection": ">=2.1.0,<2.3-dev", + "symfony/config": ">=2.1.0,<2.3-dev" + }, + "require-dev": { + "symfony/yaml": ">=2.1.0,<2.3-dev", + "symfony/config": ">=2.1.0,<2.3-dev" + }, + "time": "1348137624", + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "2.1.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Symfony\\Bundle\\MonologBundle": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony MonologBundle", + "homepage": "http://symfony.com" + }, + { + "name": "symfony/swiftmailer-bundle", + "version": "dev-master", + "target-dir": "Symfony/Bundle/SwiftmailerBundle", + "source": { + "type": "git", + "url": "https://github.com/symfony/SwiftmailerBundle", + "reference": "e055faf5d7279f3c01ffd58f1548e0fc524b71d1" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony/SwiftmailerBundle/zipball/e055faf5d7279f3c01ffd58f1548e0fc524b71d1", + "reference": "e055faf5d7279f3c01ffd58f1548e0fc524b71d1", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "swiftmailer/swiftmailer": ">=4.2.0,<4.3-dev", + "symfony/swiftmailer-bridge": ">=2.1.0,<2.3-dev" + }, + "require-dev": { + "symfony/dependency-injection": ">=2.1.0,<2.3-dev", + "symfony/http-kernel": ">=2.1.0,<2.3-dev", + "symfony/config": ">=2.1.0,<2.3-dev", + "symfony/yaml": ">=2.1.0,<2.3-dev" + }, + "time": "1348137776", + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Symfony\\Bundle\\SwiftmailerBundle": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "Symfony SwiftmailerBundle", + "homepage": "http://symfony.com" + }, + { + "name": "symfony/symfony", + "version": "2.1.x-dev", + "source": { + "type": "git", + "url": "git://github.com/symfony/symfony.git", + "reference": "8062031a0a5143086f2ff864925dada9614f2ead" + }, + "dist": { + "type": "zip", + "url": "https://github.com/symfony/symfony/zipball/8062031a0a5143086f2ff864925dada9614f2ead", + "reference": "8062031a0a5143086f2ff864925dada9614f2ead", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "doctrine/common": ">2.2,<2.4-dev", + "twig/twig": ">=1.9.1,<2.0-dev" + }, + "replace": { + "symfony/doctrine-bridge": "self.version", + "symfony/monolog-bridge": "self.version", + "symfony/propel1-bridge": "self.version", + "symfony/swiftmailer-bridge": "self.version", + "symfony/twig-bridge": "self.version", + "symfony/framework-bundle": "self.version", + "symfony/security-bundle": "self.version", + "symfony/twig-bundle": "self.version", + "symfony/web-profiler-bundle": "self.version", + "symfony/browser-kit": "self.version", + "symfony/class-loader": "self.version", + "symfony/config": "self.version", + "symfony/console": "self.version", + "symfony/css-selector": "self.version", + "symfony/dependency-injection": "self.version", + "symfony/dom-crawler": "self.version", + "symfony/event-dispatcher": "self.version", + "symfony/filesystem": "self.version", + "symfony/finder": "self.version", + "symfony/form": "self.version", + "symfony/http-foundation": "self.version", + "symfony/http-kernel": "self.version", + "symfony/locale": "self.version", + "symfony/options-resolver": "self.version", + "symfony/process": "self.version", + "symfony/routing": "self.version", + "symfony/security": "self.version", + "symfony/serializer": "self.version", + "symfony/templating": "self.version", + "symfony/translation": "self.version", + "symfony/validator": "self.version", + "symfony/yaml": "self.version" + }, + "require-dev": { + "doctrine/dbal": ">=2.2,<2.4-dev", + "doctrine/orm": ">=2.2.3,<2.4-dev", + "doctrine/data-fixtures": "1.0.*", + "propel/propel1": "dev-master", + "monolog/monolog": "dev-master" + }, + "time": "1349381694", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.1-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Symfony": "src/", + "SessionHandlerInterface": "src/Symfony/Component/HttpFoundation/Resources/stubs" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + } + ], + "description": "The Symfony PHP framework", + "homepage": "http://symfony.com", + "keywords": [ + "framework" + ] + }, + { + "name": "twig/extensions", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/fabpot/Twig-extensions", + "reference": "f904575642b1213db69b4a98f08397e722ba1cae" + }, + "dist": { + "type": "zip", + "url": "https://github.com/fabpot/Twig-extensions/zipball/f904575642b1213db69b4a98f08397e722ba1cae", + "reference": "f904575642b1213db69b4a98f08397e722ba1cae", + "shasum": "" + }, + "require": { + "twig/twig": "1.*" + }, + "time": "1346770278", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Twig_Extensions_": "lib/" + } + }, + "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", + "version": "dev-master", + "source": { + "type": "git", + "url": "git://github.com/fabpot/Twig.git", + "reference": "5d7baaf767ec3b8f6599738e7c98bde6c25cf7c1" + }, + "dist": { + "type": "zip", + "url": "https://github.com/fabpot/Twig/zipball/5d7baaf767ec3b8f6599738e7c98bde6c25cf7c1", + "reference": "5d7baaf767ec3b8f6599738e7c98bde6c25cf7c1", + "shasum": "" + }, + "require": { + "php": ">=5.2.4" + }, + "time": "1349508092", + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.10-dev" + } + }, + "installation-source": "source", + "autoload": { + "psr-0": { + "Twig_": "lib/" + } + }, + "license": [ + "BSD-3" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Armin Ronacher", + "email": "armin.ronacher@active-4.com" + } + ], + "description": "Twig, the flexible, fast, and secure template language for PHP", + "homepage": "http://twig.sensiolabs.org", + "keywords": [ + "templating" + ] + } + ], + "packages-dev": null, + "aliases": [ + + ], + "minimum-stability": "dev", + "stability-flags": [ + + ] +} From 6a01dc5d975196f595c601bf27b33205e65f6364 Mon Sep 17 00:00:00 2001 From: Gergely POLONKAI Date: Sat, 6 Oct 2012 13:22:24 +0200 Subject: [PATCH 03/20] Renamed newBlogPost to editBlogPost --- src/GergelyPolonkai/FrontBundle/Controller/AdminController.php | 2 +- .../Admin/{newBlogPost.html.twig => editBlogPost.html.twig} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/GergelyPolonkai/FrontBundle/Resources/views/Admin/{newBlogPost.html.twig => editBlogPost.html.twig} (100%) diff --git a/src/GergelyPolonkai/FrontBundle/Controller/AdminController.php b/src/GergelyPolonkai/FrontBundle/Controller/AdminController.php index 59c86d7..f18e9b1 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); 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 From 9281d8dab1d2d548f98acefa3d8cea476cb39e40 Mon Sep 17 00:00:00 2001 From: Gergely POLONKAI Date: Sat, 6 Oct 2012 13:22:46 +0200 Subject: [PATCH 04/20] Bug fix - tagManager was not available during post update. --- src/GergelyPolonkai/FrontBundle/Controller/AdminController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GergelyPolonkai/FrontBundle/Controller/AdminController.php b/src/GergelyPolonkai/FrontBundle/Controller/AdminController.php index f18e9b1..b7ba07c 100644 --- a/src/GergelyPolonkai/FrontBundle/Controller/AdminController.php +++ b/src/GergelyPolonkai/FrontBundle/Controller/AdminController.php @@ -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); From dea174d0908372adcae4aefe312ce447f2f9f4ba Mon Sep 17 00:00:00 2001 From: Gergely POLONKAI Date: Sat, 6 Oct 2012 13:23:24 +0200 Subject: [PATCH 05/20] Added a very basic Tag Cloud --- .../views/Default/front_base.html.twig | 7 +++ .../FrontBundle/Twig/TagCloud.php | 50 +++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 src/GergelyPolonkai/FrontBundle/Twig/TagCloud.php 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 059820e..b2893ce 100644 --- a/src/GergelyPolonkai/FrontBundle/Resources/views/Default/front_base.html.twig +++ b/src/GergelyPolonkai/FrontBundle/Resources/views/Default/front_base.html.twig @@ -34,6 +34,13 @@
+{% if tagCloud|length > 0 %} +
+{% for cloudItem in tagCloud %} + {{ cloudItem.name }} +{% endfor %} +
+{% endif %}
-
-
+
{% if tagCloud|length > 0 %} -
+
{% for cloudItem in tagCloud %} - {{ cloudItem.name }}{% if not loop.last %} | {% endif %} + {{ cloudItem.name }}{% if not loop.last %} | {% endif %} {% endfor %} -
+
{% endif %} - + +
{% block content %}{% endblock content %}
diff --git a/src/GergelyPolonkai/FrontBundle/Twig/CurrentMenu.php b/src/GergelyPolonkai/FrontBundle/Twig/CurrentMenu.php new file mode 100644 index 0000000..ffff079 --- /dev/null +++ b/src/GergelyPolonkai/FrontBundle/Twig/CurrentMenu.php @@ -0,0 +1,55 @@ +container = $container; + } + + public function getGlobals() + { + $controller = $this->container->get('request')->get('_controller'); + $route = $this->container->get('request')->get('_route'); + + $currentMenu = 'none'; + if (preg_match('/BlogController/', $controller)) { + $currentMenu = 'blog'; + } elseif (preg_match('/_homepage$/', $route)) { + $currentMenu = 'blog'; + } elseif (preg_match('/_resume$/', $route)) { + $currentMenu = 'resume'; + } elseif (preg_match('/_about$/', $route)) { + $currentMenu = 'about'; + } + return array( + 'currentMenu' => $currentMenu, + ); + } + public function getName() + { + return 'gergelypolonkaifront_currentmenu'; + } +} From 24156952bad30f912e2b3bd53c5e28187899a89d Mon Sep 17 00:00:00 2001 From: Polonkai Gergely Date: Sat, 6 Oct 2012 19:34:49 +0200 Subject: [PATCH 13/20] Added disclaimer link to d4untless.com --- .../FrontBundle/Resources/views/Default/disclaimer.html.twig | 1 + 1 file changed, 1 insertion(+) 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 %} From 318162d7f59f42b1e36eaad0746fc8db877ee96f Mon Sep 17 00:00:00 2001 From: Gergely POLONKAI Date: Tue, 9 Oct 2012 22:51:46 +0200 Subject: [PATCH 14/20] Added Google Webmaster Tools verification page --- .../FrontBundle/Controller/DefaultController.php | 9 +++++++++ .../views/Default/webmasterTools.html.twig.twig | 1 + 2 files changed, 10 insertions(+) create mode 100644 src/GergelyPolonkai/FrontBundle/Resources/views/Default/webmasterTools.html.twig.twig 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/Resources/views/Default/webmasterTools.html.twig.twig b/src/GergelyPolonkai/FrontBundle/Resources/views/Default/webmasterTools.html.twig.twig new file mode 100644 index 0000000..ee38dd6 --- /dev/null +++ b/src/GergelyPolonkai/FrontBundle/Resources/views/Default/webmasterTools.html.twig.twig @@ -0,0 +1 @@ +google-site-verification: google150e54bda5f96d97.html \ No newline at end of file From 408af646f2c05392b96441737bd4557081a18bf9 Mon Sep 17 00:00:00 2001 From: Polonkai Gergely Date: Tue, 9 Oct 2012 22:52:43 +0200 Subject: [PATCH 15/20] Fixed wrong filename --- .../{webmasterTools.html.twig.twig => webmasterTools.html.twig} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/GergelyPolonkai/FrontBundle/Resources/views/Default/{webmasterTools.html.twig.twig => webmasterTools.html.twig} (100%) diff --git a/src/GergelyPolonkai/FrontBundle/Resources/views/Default/webmasterTools.html.twig.twig b/src/GergelyPolonkai/FrontBundle/Resources/views/Default/webmasterTools.html.twig similarity index 100% rename from src/GergelyPolonkai/FrontBundle/Resources/views/Default/webmasterTools.html.twig.twig rename to src/GergelyPolonkai/FrontBundle/Resources/views/Default/webmasterTools.html.twig From 7556d0922ac1b703278a928b91408fd53879ef1a Mon Sep 17 00:00:00 2001 From: Polonkai Gergely Date: Wed, 28 Nov 2012 11:45:18 +0100 Subject: [PATCH 16/20] Added device-width --- .../FrontBundle/Resources/views/Default/front_base.html.twig | 1 + 1 file changed, 1 insertion(+) 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 30e9fb6..01ad97e 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' %} From 17897dc7e2ed84e644e362d93a24a7bdae95245f Mon Sep 17 00:00:00 2001 From: Gergely POLONKAI Date: Wed, 28 Nov 2012 11:48:40 +0100 Subject: [PATCH 17/20] Removed unneeded base.html.twig --- app/Resources/views/base.html.twig | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 app/Resources/views/base.html.twig 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 %} - - From 46dbf874cb2f9ec18516fc957550109bdc444cb5 Mon Sep 17 00:00:00 2001 From: Gergely POLONKAI Date: Wed, 28 Nov 2012 11:48:57 +0100 Subject: [PATCH 18/20] Redesigned menu and tag-cloud. --- .../Resources/public/css/front.css | 26 +++++++++++++++--- .../Resources/public/images/tagcloud.png | Bin 0 -> 1387 bytes .../views/Default/front_base.html.twig | 23 ++++++++++------ 3 files changed, 37 insertions(+), 12 deletions(-) create mode 100644 src/GergelyPolonkai/FrontBundle/Resources/public/images/tagcloud.png diff --git a/src/GergelyPolonkai/FrontBundle/Resources/public/css/front.css b/src/GergelyPolonkai/FrontBundle/Resources/public/css/front.css index c13deac..91c9f62 100644 --- a/src/GergelyPolonkai/FrontBundle/Resources/public/css/front.css +++ b/src/GergelyPolonkai/FrontBundle/Resources/public/css/front.css @@ -71,21 +71,28 @@ body { } #menu { - background-color: #b5b5b5; + background-color: #f18137; height: 39px; + margin-top: 15px; +} + +#tagcloud-button { + float: left; + padding-top: 2px; + padding-left: 6px; + cursor: pointer; } #menu ul { margin: 8px; padding: 0; list-style-type: none; - text-align: right; - vertical-align: middle; + float: right; } #menu ul li { float: right; - margin-top: 10px; + margin-top: 1px; margin-bottom: 10px; margin-left: 1em; height: 30px; @@ -186,6 +193,17 @@ dd p { 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; 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 0000000000000000000000000000000000000000..a58e4e941e31d18b49bf81d075dcda3828431783 GIT binary patch literal 1387 zcmV-x1(f=UP)J z``+)}bI;c^q#%;k09C+IpaggwSPKZ40{#KofS-U4W6T^YO(eZ5sYy~$(wO4Qti5Jf z(if6euM~(}Nk2%MkTj#@Wm3{3Nj0w;WV58dBu#7SGAZeMNw2*M5T~Rk)?}7TCMC5= za-` z-@qzXo=gHwz|mOgQO1J*yR6NwM9Bp{1Zrblun?wrId)}cW@btH1VG1PouP#=Yk`y_ z^Tfmib#--|Jb5zib?48Yr?$41d-v|8a+@6B%V>(M1^;J(IUqBc)yK!jxpe6gO-)S% zgF%XliV`^)0)YU5KmeD^g~#Jz)22CFWLT+x{d8=1HuLe3hJL&A~q`bTwuh&aSNy%bvJq?rrfq34m3aA4L;;l3?GD1T` z16QwJB@_zHkFQ&|jw45oP+3`t!{La#Gd(>$_V_#={=i1#HEFIyWJc=ewbNB9D>g(&dapMM(=Eofl2bGnT96EG}_3PIs^In2R(pW0BOE?@R5D4J+`(KLW zWo2cYK7Bgo+$&eEaPHi>h_Sr9JofM3&w&F6$j?uylp4$eez6H$Qugu84EFBb%gviN zxp3jayn7uP8Hqdh@#Du4ZvEiFgH%;jk&}~?>X8cr*Rp_9!25~3Sv*g)d-rb2%gecS z>lXF(^)H!UG$|}BY1PaW;v_N2M->^)ejC1DjW_kXJh2l zi$NUPTh<^V%BgTDs+noJXLN!g*K0$>ZU*?vJQ1KzQTYo6^Vych|m tY$ZEkUqT

-{% if tagCloud|length > 0 %} -
-{% for cloudItem in tagCloud %} - {{ cloudItem.name }}{% if not loop.last %} | {% endif %} -{% endfor %} -
-{% endif %} +{% if tagCloud|length > 0 %} +
+{% for cloudItem in tagCloud %} + {{ cloudItem.name }}{% if not loop.last %} | {% endif %} +{% endfor %} +
+{% endif %}
{% block content %}{% endblock content %}
@@ -59,7 +60,13 @@ From 3661720320eb161f52ea4b938258344b259ebe89 Mon Sep 17 00:00:00 2001 From: Polonkai Gergely Date: Sun, 16 Dec 2012 04:20:13 +0100 Subject: [PATCH 19/20] Fixed Google+ link --- .../FrontBundle/Resources/views/Default/front_base.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8985c21..153eb58 100644 --- a/src/GergelyPolonkai/FrontBundle/Resources/views/Default/front_base.html.twig +++ b/src/GergelyPolonkai/FrontBundle/Resources/views/Default/front_base.html.twig @@ -24,7 +24,7 @@ LinkedIn profile Skype Facebook profile - Google+ profile + Google+ profile Google Talk Twitter Tumblr From 25e32ae53130da967672ef6fb723038283f022b1 Mon Sep 17 00:00:00 2001 From: Polonkai Gergely Date: Sun, 16 Dec 2012 04:22:35 +0100 Subject: [PATCH 20/20] Fixed Google+ link - again -.- --- .../FrontBundle/Resources/views/Default/front_base.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 153eb58..a378d8d 100644 --- a/src/GergelyPolonkai/FrontBundle/Resources/views/Default/front_base.html.twig +++ b/src/GergelyPolonkai/FrontBundle/Resources/views/Default/front_base.html.twig @@ -24,7 +24,7 @@ LinkedIn profile Skype Facebook profile - Google+ profile + Google+ profile Google Talk Twitter Tumblr