sbrl-github/Pepperminty-Wiki
sbrl-github/Pepperminty-Wiki
1
0
Fork 0
mirror of https://github.com/sbrl/Pepperminty-Wiki.git synced 2024-11-25 17:23:00 +00:00
Code Activity

Fix #73. Also put some image captions in their place.

Browse source
This commit is contained in:
Starbeamrainbowlabs 2016-06-03 09:32:26 +01:00
parent 57bfb8468e
commit 8332cd955d
4 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build/index.php
View file

@ -329,6 +329,8 @@ input[type=button], input[type=submit] { cursor: pointer; }
.image-controls li { display: inline-block; margin: 5px; padding: 5px; } .image-controls li { display: inline-block; margin: 5px; padding: 5px; }
.link-display { margin-left: 0.5rem; } .link-display { margin-left: 0.5rem; }
figure { display: inline-block; }
figure > :first-child { display: block; }
figcaption { text-align: center; } figcaption { text-align: center; }
.printable { padding: 2rem; } .printable { padding: 2rem; }
@ -4781,8 +4783,10 @@ class PeppermintParsedown extends ParsedownExtra
$imageSize = $this->parseSizeSpec($param1); $imageSize = $this->parseSizeSpec($param1);
} }
if($param2 !== false && strtolower(trim($param2)) == "caption") if($param1 !== false && strtolower(trim($param1)) == "caption")
$imageCaption = true; $imageCaption = true;
if($param2 !== false && strtolower(trim($param2)) == "caption")
$imageCaption = true;
if($param3 !== false && strtolower(trim($param3)) == "caption") if($param3 !== false && strtolower(trim($param3)) == "caption")
$imageCaption = true; $imageCaption = true;

2
module_index.json
View file

@ -203,7 +203,7 @@
"author": "Emanuil Rusev & Starbeamrainbowlabs", "author": "Emanuil Rusev & Starbeamrainbowlabs",
"description": "An upgraded (now default!) parser based on Emanuil Rusev's Parsedown Extra PHP library (https:\/\/github.com\/erusev\/parsedown-extra), which is licensed MIT. Please be careful, as this module adds some weight to your installation, and also *requires* write access to the disk on first load.", "description": "An upgraded (now default!) parser based on Emanuil Rusev's Parsedown Extra PHP library (https:\/\/github.com\/erusev\/parsedown-extra), which is licensed MIT. Please be careful, as this module adds some weight to your installation, and also *requires* write access to the disk on first load.",
"id": "parser-parsedown", "id": "parser-parsedown",
"lastupdate": 1464608102, "lastupdate": 1464942369,
"optional": false "optional": false
} }
] ]

4
modules/parser-parsedown.php
View file

@ -387,8 +387,10 @@ class PeppermintParsedown extends ParsedownExtra
$imageSize = $this->parseSizeSpec($param1); $imageSize = $this->parseSizeSpec($param1);
} }
if($param2 !== false && strtolower(trim($param2)) == "caption") if($param1 !== false && strtolower(trim($param1)) == "caption")
$imageCaption = true; $imageCaption = true;
if($param2 !== false && strtolower(trim($param2)) == "caption")
$imageCaption = true;
if($param3 !== false && strtolower(trim($param3)) == "caption") if($param3 !== false && strtolower(trim($param3)) == "caption")
$imageCaption = true; $imageCaption = true;

2
settings.fragment.php
View file

@ -326,6 +326,8 @@ input[type=button], input[type=submit] { cursor: pointer; }
.image-controls li { display: inline-block; margin: 5px; padding: 5px; } .image-controls li { display: inline-block; margin: 5px; padding: 5px; }
.link-display { margin-left: 0.5rem; } .link-display { margin-left: 0.5rem; }
figure { display: inline-block; }
figure > :first-child { display: block; }
figcaption { text-align: center; } figcaption { text-align: center; }
.printable { padding: 2rem; } .printable { padding: 2rem; }