diff --git a/.gitignore b/.gitignore index 93fd01120..1d9c5857f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ /output_*/ /source/dist/ /vendor/ -/.phpunit.result.cache +/*.cache diff --git a/app/SculpinKernel.php b/app/SculpinKernel.php index 090ba84e1..a947bebad 100644 --- a/app/SculpinKernel.php +++ b/app/SculpinKernel.php @@ -2,6 +2,8 @@ use App\Schedule\SculpinScheduleBundle; use App\Speakers\SculpinSpeakersBundle; +use App\Sponsors\SculpinSponsorsBundle; +use Opdavies\Sculpin\Bundle\TwigMarkdownBundle\SculpinTwigMarkdownBundle; use Sculpin\Bundle\SculpinBundle\HttpKernel\AbstractKernel; class SculpinKernel extends AbstractKernel @@ -11,6 +13,8 @@ class SculpinKernel extends AbstractKernel return [ SculpinScheduleBundle::class, SculpinSpeakersBundle::class, + SculpinSponsorsBundle::class, + SculpinTwigMarkdownBundle::class, ]; } -} \ No newline at end of file +} diff --git a/app/config/sculpin_site.yml b/app/config/sculpin_site.yml index aa5371d36..050c5e1ff 100644 --- a/app/config/sculpin_site.yml +++ b/app/config/sculpin_site.yml @@ -73,6 +73,46 @@ tickets: available: true url: '%eventbrite.url%' +sponsorship_levels: + - gold + - silver + - bronze + +sponsors: + gold: + - name: Acquia + description: | + We provide the world’s most ambitious brands with technology that allows them to embrace innovation and create customer moments that matter. At Acquia, we believe in the power of community — giving our customers the freedom to build tomorrow on their terms. + + Acquia is helping some of the world’s leading brands succeed, including Twitter, Mercedes Benz, Warner Music Group, and Stanford University. More than 4,000 organizations are using Acquia’s solutions for content, community and commerce. + logo: acquia.png + url: https://www.acquia.com + confirmed: true + + - name: Microserve + description: ~ + logo: microserve.png + url: https://microserve.io + confirmed: true + + - name: Proctor + Stevenson + description: ~ + logo: proctors.jpg + url: https://proctors.co.uk + confirmed: true + + silver: + - name: Drupalize.me + logo: drupalize-me.png + url: https://drupalize.me + confirmed: false + + bronze: + - name: Manifesto + logo: tpx-manifesto.svg + url: https://manifesto.co.uk + confirmed: true + twitter: url: https://twitter.com/drupalcampbris user: DrupalCampBris diff --git a/composer.json b/composer.json index 4d96241e2..16192d15d 100644 --- a/composer.json +++ b/composer.json @@ -12,6 +12,7 @@ "require": { "php": "^7.1", "josephlavin/tap": "^1.0", + "opdavies/sculpin-twig-markdown-bundle": "^0.1.1", "sculpin/sculpin": "^3", "tightenco/collect": "^5.8" }, @@ -34,12 +35,14 @@ "autoload": { "psr-4": { "App\\Speakers\\": "src/Speakers/src", - "App\\Schedule\\": "src/Schedule/src" + "App\\Schedule\\": "src/Schedule/src", + "App\\Sponsors\\": "src/Sponsors/src" } }, "autoload-dev": { "psr-4": { - "App\\Tests\\Speakers\\": "src/Speakers/tests" + "App\\Tests\\Speakers\\": "src/Speakers/tests", + "App\\Tests\\Sponsors\\": "src/Sponsors/tests" } }, "config": { diff --git a/composer.lock b/composer.lock index eba090f5c..8898842ff 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "9778a3f48980cbd2767f204f6c02b650", + "content-hash": "4ee50eae7effe12398906b86d306461f", "packages": [ { "name": "dflydev/ant-path-matcher", @@ -584,6 +584,50 @@ ], "time": "2019-01-26T17:03:58+00:00" }, + { + "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": "psr/container", "version": "1.0.0", diff --git a/phpunit.xml.dist b/phpunit.xml.dist index e6879d18b..682c9630e 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -9,6 +9,7 @@ src/Speakers/tests + src/Sponsors/tests - + \ No newline at end of file diff --git a/resources/css/components/markup.css b/resources/css/components/markup.css new file mode 100644 index 000000000..6951b5170 --- /dev/null +++ b/resources/css/components/markup.css @@ -0,0 +1,7 @@ +.markup { + @apply leading-relaxed; + + p:first-child { + @apply mt-0 + } +} diff --git a/source/_includes/nav.html.twig b/source/_includes/nav.html.twig index 67c40c1ce..1d80e0cfd 100644 --- a/source/_includes/nav.html.twig +++ b/source/_includes/nav.html.twig @@ -23,6 +23,12 @@ active: page.url == '/schedule' or page.layout == 'session', enabled: true, }, + { + title: 'Sponsors', + href: '/sponsors', + active: page.url == '/sponsors', + enabled: true, + }, { title: 'Sponsor us', href: '/sponsor-us', @@ -30,7 +36,6 @@ enabled: now|date('U') < site['date'], } ] %} -