From d64f8c63549945e0910aeebd480be3d0eb6b9b7e Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sat, 18 Mar 2017 10:45:21 +0000 Subject: [PATCH] Update markdown filter --- app/SculpinKernel.php | 4 +- composer.json | 1 + composer.lock | 46 +++++++++++++++++++- source/_partials/experience/description.twig | 2 +- source/experience.twig | 42 ++++++++++-------- 5 files changed, 75 insertions(+), 20 deletions(-) diff --git a/app/SculpinKernel.php b/app/SculpinKernel.php index dcda74e0..6825ff24 100644 --- a/app/SculpinKernel.php +++ b/app/SculpinKernel.php @@ -2,6 +2,7 @@ use Opdavies\Sculpin\Bundle\ContentGeneratorBundle\SculpinContentGeneratorBundle; use Opdavies\Sculpin\Bundle\GistEmbedBundle\SculpinGistEmbedBundle; +use Opdavies\Sculpin\Bundle\TwigMarkdownBundle\SculpinTwigMarkdownBundle; use Opdavies\Sculpin\Bundle\TwigSortByFieldBundle\SculpinTwigSortByFieldBundle; use Sculpin\Bundle\SculpinBundle\HttpKernel\AbstractKernel; use Tsphethean\Sculpin\Bundle\RelatedPostsBundle\SculpinRelatedPostsBundle; @@ -20,7 +21,8 @@ class SculpinKernel extends AbstractKernel SculpinContentGeneratorBundle::class, SculpinGistEmbedBundle::class, SculpinRelatedPostsBundle::class, - SculpinTwigSortByFieldBundle::class, + SculpinTwigMarkdownBundle::class, + SculpinTwigSortByFieldBundle::class ]; } } diff --git a/composer.json b/composer.json index 157271ea..e5433a45 100644 --- a/composer.json +++ b/composer.json @@ -12,6 +12,7 @@ "dflydev/embedded-composer": "^1.0@dev", "opdavies/sculpin-content-generator-bundle": "@stable", "opdavies/sculpin-gist-embed-bundle": "dev-master", + "opdavies/sculpin-twig-markdown-bundle": "^0.1", "opdavies/sculpin-twig-sort-by-field-bundle": "dev-master", "sculpin/sculpin": "^2.1@dev", "tsphethean/sculpin-related-posts-bundle": "~0.1.0" diff --git a/composer.lock b/composer.lock index 68c31a73..59ba5fc4 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "23b35e60c5c1518a04da384491bdb09f", + "content-hash": "0da413eebfc584e5625555c79d2d44cf", "packages": [ { "name": "behat/behat", @@ -1798,6 +1798,50 @@ ], "time": "2016-04-05 19:57:22" }, + { + "name": "opdavies/sculpin-twig-markdown-bundle", + "version": "0.1.1", + "source": { + "type": "git", + "url": "https://github.com/opdavies/sculpin-twig-markdown-bundle.git", + "reference": "8927ec4707eada3ad9ca8817eb9daeb1d91ae50b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/opdavies/sculpin-twig-markdown-bundle/zipball/8927ec4707eada3ad9ca8817eb9daeb1d91ae50b", + "reference": "8927ec4707eada3ad9ca8817eb9daeb1d91ae50b", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "suggest": { + "sculpin/sculpin": "@stable" + }, + "type": "library", + "autoload": { + "psr-4": { + "Opdavies\\Sculpin\\Bundle\\TwigMarkdownBundle\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Oliver Davies", + "email": "oliver@oliverdavies.uk", + "homepage": "https://www.oliverdavies.uk" + } + ], + "keywords": [ + "markdown", + "sculpin", + "twig" + ], + "time": "2017-03-18T10:39:19+00:00" + }, { "name": "opdavies/sculpin-twig-sort-by-field-bundle", "version": "dev-master", diff --git a/source/_partials/experience/description.twig b/source/_partials/experience/description.twig index 4342b243..30459c7a 100644 --- a/source/_partials/experience/description.twig +++ b/source/_partials/experience/description.twig @@ -1,3 +1,3 @@
- {{ experience.description|raw }} + {{ experience.description|markdown }}
diff --git a/source/experience.twig b/source/experience.twig index d640e985..8e1b2353 100644 --- a/source/experience.twig +++ b/source/experience.twig @@ -16,8 +16,9 @@ experiences: end: ~ featured: true description: | -

Working on Drupal and Symfony development, maintenance and support projects in my spare time.

-

Administration of Debian, Ubuntu and CentOS servers, and configuration using Puppet, or more recently, Ansible.

+ Working on Drupal and Symfony development, maintenance and support projects in my spare time. + + Administration of Debian, Ubuntu and CentOS servers, and configuration using Puppet, or more recently, Ansible. - company: appnovation location: Cardiff, Wales @@ -25,8 +26,9 @@ experiences: start: May 2016 end: March 2017 description: | -

Drupal 7 and 8 site building, custom module development and theming.

-

Part of various pre-sales teams, including the company’s first UK Drupal 8 project and first FTSE 100 client.

+ Drupal 7 and 8 site building, custom module development and theming. + + Part of various pre-sales teams, including the company’s first UK Drupal 8 project and first FTSE 100 client. - company: cti role: Lead Drupal Developer @@ -34,9 +36,11 @@ experiences: start: November 2015 end: May 2016 description: | -

Working on various Drupal 7 projects for clients including Greater London Authority (http://www.london.gov.uk), British Land and British Council, as well as various retainer contracts.

-

Working on internal Drupal 8 learning initiatives, focussing on custom module development and data migration.

-

Initial development of a CLI application for generating new and auditing existing codebases to ensure consistency across projects. This uses various Symfony components - mainly the Console and Filesystem components.

+ Working on various Drupal 7 projects for clients including Greater London Authority (http://www.london.gov.uk), British Land and British Council, as well as various retainer contracts. + + Working on internal Drupal 8 learning initiatives, focussing on custom module development and data migration. + + Initial development of a CLI application for generating new and auditing existing codebases to ensure consistency across projects. This uses various Symfony components - mainly the Console and Filesystem components. - company: microserve location: Bristol, England @@ -44,9 +48,11 @@ experiences: start: July 2015 end: November 2015 description: | -

Full-stack Drupal development, focussing on data migration.

-

Lead Developer of the road.cc rebuild project onto Drupal 7, including working with non-Drupal PHP applications and utilising of Symfony components, and interacting with Drupal via REST.

-

Community and contribution advocate.

+ Full-stack Drupal development, focussing on data migration. + + Lead Developer of the [road.cc](http://road.cc) rebuild project onto Drupal 7, including working with non-Drupal PHP applications and utilising of Symfony components, and interacting with Drupal via REST. + + Community and contribution advocate. - company: drupal_association role: Drupal.org Developer @@ -54,8 +60,9 @@ experiences: start: 2014 end: July 2015 description: | -

Maintaining and improving Drupal.org - the home of the Drupal community.

-

Speaking at user groups and DrupalCamps to promote the Drupal Association.

+ Maintaining and improving Drupal.org - the home of the Drupal community. + + Speaking at user groups and DrupalCamps to promote the Drupal Association. - company: precedent location: Cardiff, Wales @@ -63,7 +70,7 @@ experiences: start: 2013 end: 2014 description: | -

Drupal 7 website development, including site building, theming, module development, data migration and server configuration.

+ Drupal 7 website development, including site building, theming, module development, data migration and server configuration. - company: nomensa location: Bristol, England @@ -71,8 +78,9 @@ experiences: start: 2012 end: 2013 description: | -

Drupal 7 website development and Linux server administration.

-

I originally started as a contractor, and later took a staff role.

+ Drupal 7 website development and Linux server administration. + + I originally started as a contractor, and later took a staff role. - company: proctors location: Bristol, England @@ -80,7 +88,7 @@ experiences: start: 2011 end: 2012 description: | -

Website development, mainly with Drupal and PHP, including the agency’s first Drupal 7 project.

+ Website development, mainly with Drupal and PHP, including the agency’s first Drupal 7 project. - company: horse_country location: Cwmbran, Wales @@ -88,7 +96,7 @@ experiences: start: 2010 end: 2011 description: | -

Maintaining and adding new features to the Horse & Country TV website (Drupal 6).

+ Maintaining and adding new features to the Horse & Country TV website (Drupal 6). use: [posts] ---

Experience