diff --git a/composer.json b/composer.json index 92f9725..b416487 100644 --- a/composer.json +++ b/composer.json @@ -1,8 +1,9 @@ { "require": { - "simplesamlphp/simplesamlphp": "~1" + "simplesamlphp/simplesamlphp": "~1", + "erusev/parsedown": "^1.7" }, "require-dev": { "ext-pdo_sqlite": "*" } -} \ No newline at end of file +} diff --git a/composer.lock b/composer.lock index bbbcf5c..02e2358 100644 --- a/composer.lock +++ b/composer.lock @@ -1,11 +1,57 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "eff76bfaa958c3f30a87781731812450", + "content-hash": "892031a2c857679ab79c60de03fccc25", "packages": [ + { + "name": "erusev/parsedown", + "version": "1.7.1", + "source": { + "type": "git", + "url": "https://github.com/erusev/parsedown.git", + "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/erusev/parsedown/zipball/92e9c27ba0e74b8b028b111d1b6f956a15c01fc1", + "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35" + }, + "type": "library", + "autoload": { + "psr-0": { + "Parsedown": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Emanuil Rusev", + "email": "hello@erusev.com", + "homepage": "http://erusev.com" + } + ], + "description": "Parser for Markdown.", + "homepage": "http://parsedown.org", + "keywords": [ + "markdown", + "parser" + ], + "time": "2018-03-08T01:11:30+00:00" + }, { "name": "gettext/gettext", "version": "v3.6.1", diff --git a/src/pvv/side/social/brettspillevent.php b/src/pvv/side/social/brettspillevent.php index 41137b5..7f0266d 100644 --- a/src/pvv/side/social/brettspillevent.php +++ b/src/pvv/side/social/brettspillevent.php @@ -33,30 +33,28 @@ class BrettspillEvent extends Event { public function getDescription() { return [ - '
Er du en hardcore brettspillentusiast eller en nybegynner som har så vidt spilt ludo?' . "\n" . - 'Da er vår brettspillkveld noe for deg!' . "\n" . + 'Er du en hardcore brettspillentusiast eller en nybegynner som har så vidt spilt ludo?'. + 'Da er vår brettspillkveld noe for deg!' . 'Vi tar ut et par spill fra vårt samling of spiller så mye vi orker. Kom innom!', - - '
Vår samling', - - '
* Vi har flere ekspansjoner til spillet', - '
** Vi har flere varianter av spillet', - '
Beskrivelse
+Beskrivelse (markdown)
diff --git a/www/admin/aktiviteter/index.php b/www/admin/aktiviteter/index.php index e2a17b5..89ad1e5 100644 --- a/www/admin/aktiviteter/index.php +++ b/www/admin/aktiviteter/index.php @@ -95,7 +95,10 @@ $events = array_values(array_filter(= $event->getStart()->format("(Y-m-d H:i:s)") . " - " . $event->getStop()->format("(Y-m-d H:i:s)"); ?>
-= implode($event->getDescription(), "
"); ?>
Ikke nødvendig
Innhold
+Innhold (markdown)
Tittel
= '' ?>Beskrivelse
+Beskrivelse (markdown)
-