Comment: | Add markdown support (with TOC) |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
2965992701412ff1910e95c0723ef4fe |
User & Date: | bohwaz on 2021-05-20 03:31:54 |
Other Links: | manifest | tags |
2021-05-20
| ||
04:15 | Add support for Skriv extensions inside Markdown to manage images and files check-in: e26abf675c user: bohwaz tags: trunk | |
03:31 | Add markdown support (with TOC) check-in: 2965992701 user: bohwaz tags: trunk | |
2021-05-19
| ||
19:11 | Change IRC server check-in: 47c163e9c7 user: bohwaz tags: trunk | |
2021-05-02
| ||
12:18 | Add markdown support, start of implementing web blocks check-in: 9773a33ba4 user: bohwaz tags: dev | |
Modified src/Makefile from [b82ecb0834] to [c52b2382ef].
︙ | ︙ | |||
8 9 10 11 12 13 14 15 16 17 18 19 20 21 | wget ${KD2_FILE} -O ${TMP_KD2}/kd2.zip rm -rf "include/lib/KD2" unzip "${TMP_KD2}/kd2.zip" -d include/lib rm -rf ${TMP_KD2} dev-server: php -S localhost:8082 -t www www/_route.php test: find . -name '*.php' -print0 | xargs -0 -n1 php -l > /dev/null phpstan: | > > > | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | wget ${KD2_FILE} -O ${TMP_KD2}/kd2.zip rm -rf "include/lib/KD2" unzip "${TMP_KD2}/kd2.zip" -d include/lib rm -rf ${TMP_KD2} wget -O "include/lib/Parsedown.php" "https://raw.githubusercontent.com/erusev/parsedown/1.7.x/Parsedown.php" wget -O "include/lib/ParsedownExtra.php" "https://raw.githubusercontent.com/erusev/parsedown-extra/0.8.x/ParsedownExtra.php" dev-server: php -S localhost:8082 -t www www/_route.php test: find . -name '*.php' -print0 | xargs -0 -n1 php -l > /dev/null phpstan: |
︙ | ︙ |
Modified src/include/lib/Garradin/Entities/Files/File.php from [cfc7cdd122] to [18ff5efb3f].
︙ | ︙ | |||
10 11 12 13 14 15 16 17 18 19 20 21 22 23 | use Garradin\Plugin; use Garradin\UserException; use Garradin\ValidationException; use Garradin\Membres\Session; use Garradin\Static_Cache; use Garradin\Utils; use Garradin\Entities\Web\Page; use Garradin\Files\Files; use const Garradin\{WWW_URL, ENABLE_XSENDFILE}; /** * This is a virtual entity, it cannot be saved to a SQL table | > | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | use Garradin\Plugin; use Garradin\UserException; use Garradin\ValidationException; use Garradin\Membres\Session; use Garradin\Static_Cache; use Garradin\Utils; use Garradin\Entities\Web\Page; use Garradin\Web\Render\Render; use Garradin\Files\Files; use const Garradin\{WWW_URL, ENABLE_XSENDFILE}; /** * This is a virtual entity, it cannot be saved to a SQL table |
︙ | ︙ | |||
697 698 699 700 701 702 703 704 705 706 707 708 709 | { return Files::callStorage('fetch', $this); } public function render(array $options = []) { $type = $this->customType(); /* if (substr($this->name, -strlen(self::FILE_EXT_HTML)) == self::FILE_EXT_HTML) { return \Garradin\Web\Render\HTML::render($this, null, $options); }*/ if ($type == self::FILE_EXT_SKRIV) { | > > | | > > > | | > > > | 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 | { return Files::callStorage('fetch', $this); } public function render(array $options = []) { $type = $this->customType(); $content = $this->fetch(); /* if (substr($this->name, -strlen(self::FILE_EXT_HTML)) == self::FILE_EXT_HTML) { return \Garradin\Web\Render\HTML::render($this, null, $options); }*/ if ($type == self::FILE_EXT_SKRIV) { $format = Render::FORMAT_SKRIV; } else if ($type == self::FILE_EXT_ENCRYPTED) { $format = Render::FORMAT_ENCRYPTED; } else if ($type == self::FILE_EXT_MARKDOWN) { $format = Render::FORMAT_MARKDOWN; } else if (substr($this->mime, 0, 5) == 'text/') { return sprintf('<pre>%s</pre>', htmlspecialchars($this->fetch())); } else { throw new \LogicException('Cannot render file of this type'); } return Render::render($format, $this, $this->fetch(), $options); } public function checkReadAccess(?Session $session): bool { // Web pages and config files are always public if ($this->isPublic()) { return true; |
︙ | ︙ |
Modified src/include/lib/Garradin/Entities/Web/Page.php from [c5b7261d79] to [a7ec198f09].
1 2 3 4 5 6 7 8 9 10 | <?php namespace Garradin\Entities\Web; use Garradin\DB; use Garradin\Entity; use Garradin\UserException; use Garradin\Utils; use Garradin\Entities\Files\File; use Garradin\Files\Files; | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | <?php namespace Garradin\Entities\Web; use Garradin\DB; use Garradin\Entity; use Garradin\UserException; use Garradin\Utils; use Garradin\Entities\Files\File; use Garradin\Files\Files; use Garradin\Web\Render\Render; use KD2\DB\EntityManager as EM; use const Garradin\WWW_URL; class Page extends Entity { |
︙ | ︙ | |||
45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 | 'published' => 'DateTime', 'modified' => 'DateTime', 'content' => 'string', ]; const FORMAT_SKRIV = 'skriv'; const FORMAT_ENCRYPTED = 'skriv/encrypted'; const FORMATS_LIST = [ self::FORMAT_SKRIV => 'SkrivML', self::FORMAT_ENCRYPTED => 'Chiffré', ]; const STATUS_ONLINE = 'online'; const STATUS_DRAFT = 'draft'; const STATUS_LIST = [ | > > | 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 | 'published' => 'DateTime', 'modified' => 'DateTime', 'content' => 'string', ]; const FORMAT_SKRIV = 'skriv'; const FORMAT_ENCRYPTED = 'skriv/encrypted'; const FORMAT_MARKDOWN = 'markdown'; const FORMATS_LIST = [ self::FORMAT_SKRIV => 'SkrivML', self::FORMAT_MARKDOWN => 'MarkDown', self::FORMAT_ENCRYPTED => 'Chiffré', ]; const STATUS_ONLINE = 'online'; const STATUS_DRAFT = 'draft'; const STATUS_LIST = [ |
︙ | ︙ | |||
133 134 135 136 137 138 139 | } public function render(array $options = []): string { if (!$this->file()) { throw new \LogicException('File does not exist: ' . $this->file_path); } | < < | < < < | < | | 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 | } public function render(array $options = []): string { if (!$this->file()) { throw new \LogicException('File does not exist: ' . $this->file_path); } return Render::render($this->format, $this->file(), $this->content, $options); } public function preview(string $content): string { return Render::render($this->format, $this->file(), $content, ['prefix' => '#']); } public function filepath(bool $stored = true): string { return $stored && isset($this->file_path) ? $this->file_path : File::CONTEXT_WEB . '/' . $this->path . '/' . $this->_name; } |
︙ | ︙ |
Added src/include/lib/Garradin/Web/Render/AttachmentAwareTrait.php version [c57a7ae779].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 | <?php namespace Garradin\Web\Render; use Garradin\Utils; use Garradin\Entities\Files\File; use const Garradin\{WWW_URL, ADMIN_URL}; trait AttachmentAwareTrait { protected $current_path; protected $context; protected $link_prefix; protected $link_suffix; protected function resolveAttachment(string $uri) { $prefix = $this->current_path; $pos = strpos($uri, '/'); // "Image.jpg" if ($pos === false) { return WWW_URL . $prefix . '/' . $uri; } // "bla/Image.jpg" outside of web context elseif ($this->context !== File::CONTEXT_WEB && $pos !== 0) { return WWW_URL . $this->context . '/' . $uri; } // "bla/Image.jpg" in web context or absolute link, eg. "/transactions/2442/42.jpg" else { return WWW_URL . ltrim($uri, '/'); } } protected function resolveLink(string $uri) { $first = substr($uri, 0, 1); if ($first == '/' || $first == '!') { return Utils::getLocalURL($uri); } if (strpos(Utils::basename($uri), '.') === false) { $uri .= $this->link_suffix; } return $this->link_prefix . $uri; } public function isRelativeTo(File $file) { $this->current_path = Utils::dirname($file->path); $this->context = strtok($this->current_path, '/'); $this->link_suffix = ''; if ($this->context === File::CONTEXT_WEB) { $this->link_prefix = WWW_URL . '/'; $this->current_path = Utils::basename(Utils::dirname($file->path)); } else { $this->link_prefix = $options['prefix'] ?? sprintf(ADMIN_URL . 'common/files/preview.php?p=%s/', $this->context); $this->link_suffix = '.skriv'; } } } |
Added src/include/lib/Garradin/Web/Render/Blocks.php version [7866908ee6].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 | <?php namespace Garradin\Web\Render; use Garradin\Entities\Files\File; use Garradin\Squelette_Filtres; use Garradin\Plugin; use Garradin\Utils; use Garradin\Files\Files; use Garradin\UserTemplate\CommonModifiers; use Parsedown; use Parsedown_Extra; use const Garradin\{ADMIN_URL, WWW_URL}; /* display: grid; grid-template-columns: repeat(auto-fit, minmax(100px, 1fr)); grid-gap: 10px; */ class Blocks { static protected $parsedown; protected $_stack = []; public function render(?File $file, ?string $content = null, array $options = []): string { $str = $content ?? $file->fetch(); $out = '<div class="web-blocks">'; // Skip page metadata strtok($str, "\n\n----\n\n"); while ($block = strtok("\n\n----\n\n")) { $out .= $this->block($block); } if ($block = strtok('')) { $out .= $this->block($block); } strtok('', ''); // Free memory foreach ($this->_stack as $type) { $out .= '</article></section>'; } $out .= '</div>'; return $out; } protected function block(string $block): string { $header = strtok($block, "\n\n"); $content = strtok(''); strtok('', ''); // Free memory $out = ''; $content = trim($content, "\n"); $class = sprintf('web-block-%s', $type); switch ($type) { case 'columns': if (array_pop($this->_stack)) { $out .= '</article></section>'; } $out .= '<section class="web-columns">'; return $out; case 'column': if (array_pop($this->_stack)) { $out .= '</article>'; } $out .= '<article class="web-column">'; $this->_stack[] = 'column'; return $out; case 'code': return sprintf('<pre class="%s">%s</pre>', $class, htmlspecialchars($content)); case 'markdown': $md = new Markdown; return sprintf('<div class="web-content %s">%s</div>', $class, $md->render($content)); case 'skriv': $skriv = new Skriv; return sprintf('<div class="web-content %s">%s</div>', $class, $skriv->render($content)); case 'image': return sprintf('<div class="%s">%s</div>', $this->image($content)); case 'gallery': return sprintf('<div class="%s">%s</div>', $this->gallery($content)); case 'heading': return sprintf('<h2 class="%s">%s</h2>', $class, htmlspecialchars($content)); case 'quote': return sprintf('<blockquote class="%s"><p>%s</p></blockquote>', $class, nl2br(htmlspecialchars($content))); case 'video': return sprintf('<iframe class="%s" src="%s" frameborder="0" allow="accelerometer; encrypted-media; gyroscope" allowfullscreen></iframe>', $class, htmlspecialchars($content)); default: throw new \LogicException('Unknown type: ' . $type); } } } |
Modified src/include/lib/Garradin/Web/Render/EncryptedSkriv.php from [8b803e3b49] to [d0d2a69554].
1 2 3 4 5 6 7 8 9 10 | <?php namespace Garradin\Web\Render; use Garradin\Entities\Files\File; use Garradin\Template; use const Garradin\ADMIN_URL; class EncryptedSkriv { | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | <?php namespace Garradin\Web\Render; use Garradin\Entities\Files\File; use Garradin\Template; use const Garradin\ADMIN_URL; class EncryptedSkriv { public function render(File $file, ?string $content = null): string { $tpl = Template::getInstance(); $content = $content ?? $file->fetch(); $tpl->assign('admin_url', ADMIN_URL); $tpl->assign(compact('file', 'content')); return $tpl->fetch('common/files/_file_render_encrypted.tpl'); } } |
Added src/include/lib/Garradin/Web/Render/Markdown.php version [da302a81c5].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 | <?php namespace Garradin\Web\Render; use Garradin\Entities\Files\File; use Garradin\Plugin; use Garradin\Utils; use Garradin\Files\Files; use Garradin\UserTemplate\CommonModifiers; use Parsedown; use ParsedownExtra; use ParsedownToc; use const Garradin\{ADMIN_URL, WWW_URL}; class Markdown { use AttachmentAwareTrait; static protected $parsedown; public function render(?File $file, ?string $content = null, array $options = []): string { if (!self::$parsedown) { self::$parsedown = new ParsedownToc; self::$parsedown->setBreaksEnabled(true); self::$parsedown->setUrlsLinked(true); self::$parsedown->setSafeMode(true); } if ($file) { $this->isRelativeTo($file); } $str = $content ?? $file->fetch(); $str = preg_replace_callback('/\(#file:([^\]\h]+)\)/', function ($match) { return sprintf('(%s)', $this->resolveAttachment($match[1])); }, $str); $str = self::$parsedown->text($str); $str = CommonModifiers::typo($str); $str = preg_replace_callback(';<a href="((?!https?://|\w+:|#).+)">;i', function ($matches) { var_dump($matches); return sprintf('<a href="%s" target="_parent">', $this->resolveLink($matches[1])); }, $str); return sprintf('<div class="web-content">%s</div>', $str); } } |
Added src/include/lib/Garradin/Web/Render/Render.php version [c543986709].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | <?php namespace Garradin\Web\Render; use Garradin\Entities\Files\File; class Render { const FORMAT_SKRIV = 'skriv'; const FORMAT_ENCRYPTED = 'skriv/encrypted'; const FORMAT_MARKDOWN = 'markdown'; static public function render(string $format, File $file, string $content = null, array $options = []) { if ($format == self::FORMAT_SKRIV) { $r = new Skriv; } else if ($format == self::FORMAT_ENCRYPTED) { $r = new EncryptedSkriv; } else if ($format == self::FORMAT_MARKDOWN) { $r = new Markdown; } else { throw new \LogicException('Invalid format: ' . $format); } return $r->render($file, $content, $options); } } |
Modified src/include/lib/Garradin/Web/Render/Skriv.php from [0996e6e8e0] to [4fb5fbc98a].
1 2 3 4 5 6 | <?php namespace Garradin\Web\Render; use Garradin\Entities\Files\File; | < < < | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | | < < < | < < < < < < < < | | | | | | | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 | <?php namespace Garradin\Web\Render; use Garradin\Entities\Files\File; use Garradin\Plugin; use Garradin\UserTemplate\CommonModifiers; use KD2\SkrivLite; use const Garradin\{ADMIN_URL, WWW_URL}; class Skriv { use AttachmentAwareTrait; static protected $skriv; public function render(?File $file, ?string $content = null, array $options = []): string { if (!self::$skriv) { self::$skriv = new \KD2\SkrivLite; self::$skriv->registerExtension('file', [$this, 'SkrivFile']); self::$skriv->registerExtension('image', [$this, 'SkrivImage']); // Enregistrer d'autres extensions éventuellement Plugin::fireSignal('skriv.init', ['skriv' => self::$skriv]); } $skriv =& self::$skriv; if ($file) { $this->isRelativeTo($file); } $str = $content ?? $file->fetch(); $str = preg_replace_callback('/#file:\[([^\]\h]+)\]/', function ($match) { return $this->resolveAttachment($match[1]); }, $str); $str = $skriv->render($str); $str = CommonModifiers::typo($str); $str = preg_replace_callback(';<a href="((?!https?://|\w+:).+)">;i', function ($matches) { return sprintf('<a href="%s" target="_parent">', $this->resolveLink($matches[1])); }, $str); return sprintf('<div class="web-content">%s</div>', $str); } /** * Callback utilisé pour l'extension <<file>> dans le wiki-texte * @param array $args Arguments passés à l'extension * @param string $content Contenu éventuel (en mode bloc) * @param SkrivLite $skriv Objet SkrivLite */ public function SkrivFile(array $args, ?string $content, SkrivLite $skriv): string { $name = $args[0] ?? null; $caption = $args[1] ?? null; if (!$name || !$this->current_path) { return $skriv->parseError('/!\ Tag file : aucun nom de fichier indiqué.'); } if (empty($caption)) { $caption = $name; } $url = $this->resolveAttachment($name); $ext = substr($name, strrpos($name, '.')+1); return sprintf( '<aside class="file" data-type="%s"><a href="%s" class="internal-file">%s</a> <small>(%s)</small></aside>', htmlspecialchars($ext), htmlspecialchars($url), htmlspecialchars($caption), htmlspecialchars(strtoupper($ext)) ); } /** * Callback utilisé pour l'extension <<image>> dans le wiki-texte * @param array $args Arguments passés à l'extension * @param string $content Contenu éventuel (en mode bloc) * @param SkrivLite $skriv Objet SkrivLite */ public function SkrivImage(array $args, ?string $content, SkrivLite $skriv): string { static $align_values = ['left', 'right', 'center']; $name = $args[0] ?? null; $align = $args[1] ?? null; $caption = $args[2] ?? null; if (!$name || !$this->current_path) { return $skriv->parseError('/!\ Tag image : aucun nom de fichier indiqué.'); } $url = $this->resolveAttachment($name); $thumb_url = sprintf('%s?%dpx', $url, $align == 'center' ? 500 : 200); $out = sprintf('<a href="%s" class="internal-image" target="_image"><img src="%s" alt="%s" loading="lazy" /></a>', htmlspecialchars($url), htmlspecialchars($thumb_url), htmlspecialchars($caption ?? $name) ); |
︙ | ︙ |
Added src/include/lib/ParsedownToc.php version [b610c1ea7e].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 | <?php if (class_exists('ParsedownExtra')) { class DynamicParent extends \ParsedownExtra { public function __construct() { parent::__construct(); } } } else { class DynamicParent extends \Parsedown { public function __construct() { // } } } class ParsedownToC extends DynamicParent { /** * ------------------------------------------------------------------------ * Constants. * ------------------------------------------------------------------------ */ const VERSION = '1.3'; const VERSION_PARSEDOWN_REQUIRED = '1.7'; const TAG_TOC_DEFAULT = '[toc]'; const ID_ATTRIBUTE_DEFAULT = 'toc'; protected $default_params = array( 'selectors' => ['h1', 'h2', 'h3', 'h4', 'h5', 'h6'], 'delimiter' => '-', 'limit' => null, 'lowercase' => true, 'replacements' => null, 'transliterate' => false, 'urlencode' => false, 'blacklist' => [], ); /** * Version requirement check. */ public function __construct(array $params = null) { if (version_compare(\Parsedown::version, self::VERSION_PARSEDOWN_REQUIRED) < 0) { $msg_error = 'Version Error.' . PHP_EOL; $msg_error .= ' ParsedownToc requires a later version of Parsedown.' . PHP_EOL; $msg_error .= ' - Current version : ' . \Parsedown::version . PHP_EOL; $msg_error .= ' - Required version: ' . self::VERSION_PARSEDOWN_REQUIRED .' and later'. PHP_EOL; throw new Exception($msg_error); } parent::__construct(); if (!empty($params)) { $this->options = array_merge($this->default_params, $params); } else { $this->options = $this->default_params; } } /** * ------------------------------------------------------------------------ * Methods (in ABC order) * ------------------------------------------------------------------------ */ /** * Heading process. * Creates heading block element and stores to the ToC list. It overrides * the parent method: \Parsedown::blockHeader() and returns $Block array if * the $Line is a heading element. * * @param array $Line Array that Parsedown detected as a block type element. * @return void|array Array of Heading Block. */ protected function blockHeader($Line) { // Use parent blockHeader method to process the $Line to $Block $Block = DynamicParent::blockHeader($Line); if (!empty($Block)) { // Get the text of the heading // @bohwaz 2021-05-20 see https://github.com/BenjaminHoegh/parsedownToc/issues/2 $text = $Block['element']['text']; // Get the heading level. Levels are h1, h2, ..., h6 $level = $Block['element']['name']; // Get the anchor of the heading to link from the ToC list $id = isset($Block['element']['attributes']['id']) ? $Block['element']['attributes']['id'] : $this->createAnchorID($text); // Set attributes to head tags $Block['element']['attributes']['id'] = $id; // Check if level are defined as a selector if (in_array($level, $this->options['selectors'])) { // Add/stores the heading element info to the ToC list $this->setContentsList(array( 'text' => $text, 'id' => $id, 'level' => $level )); } return $Block; } } /** * Heading process. * Creates heading block element and stores to the ToC list. It overrides * the parent method: \Parsedown::blockSetextHeader() and returns $Block array if * the $Line is a heading element. * * @param array $Line Array that Parsedown detected as a block type element. * @return void|array Array of Heading Block. */ protected function blockSetextHeader($Line, array $Block = null) { // Use parent blockHeader method to process the $Line to $Block $Block = DynamicParent::blockSetextHeader($Line, $Block); if (!empty($Block)) { // Get the text of the heading if (isset($Block['element']['handler']['argument'])) { $text = $Block['element']['handler']['argument']; } // Get the heading level. Levels are h1, h2, ..., h6 $level = $Block['element']['name']; // Get the anchor of the heading to link from the ToC list $id = isset($Block['element']['attributes']['id']) ? $Block['element']['attributes']['id'] : $this->createAnchorID($text); // Set attributes to head tags $Block['element']['attributes']['id'] = $id; // Check if level are defined as a selector if (in_array($level, $this->options['selectors'])) { // Add/stores the heading element info to the ToC list $this->setContentsList(array( 'text' => $text, 'id' => $id, 'level' => $level )); } return $Block; } } /** * Parses the given markdown string to an HTML string but it leaves the ToC * tag as is. It's an alias of the parent method "\DynamicParent::text()". * * @param string $text Markdown string to be parsed. * @return string Parsed HTML string. */ public function body($text) : string { $text = $this->encodeTagToHash($text); // Escapes ToC tag temporary $html = DynamicParent::text($text); // Parses the markdown text $html = $this->decodeTagFromHash($html); // Unescape the ToC tag return $html; } /** * Returns the parsed ToC. * * @param string $type_return Type of the return format. "html" or "json". * @return string HTML/JSON string of ToC. */ public function contentsList($type_return = 'html') { if ('html' === strtolower($type_return)) { $result = ''; if (! empty($this->contentsListString)) { // Parses the ToC list in markdown to HTML $result = $this->body($this->contentsListString); } return $result; } if ('json' === strtolower($type_return)) { return json_encode($this->contentsListArray); } // Forces to return ToC as "html" error_log( 'Unknown return type given while parsing ToC.' . ' At: ' . __FUNCTION__ . '() ' . ' in Line:' . __LINE__ . ' (Using default type)' ); return $this->contentsList('html'); } /** * Generates an anchor text that are link-able even the heading is not in * ASCII. * * @param string $text * @return string */ protected function createAnchorID($str) : string { // Make sure string is in UTF-8 and strip invalid UTF-8 characters $str = mb_convert_encoding((string)$str, 'UTF-8', mb_list_encodings()); if($this->options['urlencode']) { // Check AnchorID is unique $str = $this->incrementAnchorId($str); return urlencode($str); } $char_map = array( // Latin 'À' => 'A', 'Á' => 'A', 'Â' => 'A', 'Ã' => 'A', 'Ä' => 'A', 'Å' => 'AA', 'Æ' => 'AE', 'Ç' => 'C', 'È' => 'E', 'É' => 'E', 'Ê' => 'E', 'Ë' => 'E', 'Ì' => 'I', 'Í' => 'I', 'Î' => 'I', 'Ï' => 'I', 'Ð' => 'D', 'Ñ' => 'N', 'Ò' => 'O', 'Ó' => 'O', 'Ô' => 'O', 'Õ' => 'O', 'Ö' => 'O', 'Ő' => 'O', 'Ø' => 'OE', 'Ù' => 'U', 'Ú' => 'U', 'Û' => 'U', 'Ü' => 'U', 'Ű' => 'U', 'Ý' => 'Y', 'Þ' => 'TH', 'ß' => 'ss', 'à' => 'a', 'á' => 'a', 'â' => 'a', 'ã' => 'a', 'ä' => 'a', 'å' => 'aa', 'æ' => 'ae', 'ç' => 'c', 'è' => 'e', 'é' => 'e', 'ê' => 'e', 'ë' => 'e', 'ì' => 'i', 'í' => 'i', 'î' => 'i', 'ï' => 'i', 'ð' => 'd', 'ñ' => 'n', 'ò' => 'o', 'ó' => 'o', 'ô' => 'o', 'õ' => 'o', 'ö' => 'o', 'ő' => 'o', 'ø' => 'oe', 'ù' => 'u', 'ú' => 'u', 'û' => 'u', 'ü' => 'u', 'ű' => 'u', 'ý' => 'y', 'þ' => 'th', 'ÿ' => 'y', // Latin symbols '©' => '(c)','®' => '(r)','™' => '(tm)', // Greek 'Α' => 'A', 'Β' => 'B', 'Γ' => 'G', 'Δ' => 'D', 'Ε' => 'E', 'Ζ' => 'Z', 'Η' => 'H', 'Θ' => '8', 'Ι' => 'I', 'Κ' => 'K', 'Λ' => 'L', 'Μ' => 'M', 'Ν' => 'N', 'Ξ' => '3', 'Ο' => 'O', 'Π' => 'P', 'Ρ' => 'R', 'Σ' => 'S', 'Τ' => 'T', 'Υ' => 'Y', 'Φ' => 'F', 'Χ' => 'X', 'Ψ' => 'PS', 'Ω' => 'W', 'Ά' => 'A', 'Έ' => 'E', 'Ί' => 'I', 'Ό' => 'O', 'Ύ' => 'Y', 'Ή' => 'H', 'Ώ' => 'W', 'Ϊ' => 'I', 'Ϋ' => 'Y', 'α' => 'a', 'β' => 'b', 'γ' => 'g', 'δ' => 'd', 'ε' => 'e', 'ζ' => 'z', 'η' => 'h', 'θ' => '8', 'ι' => 'i', 'κ' => 'k', 'λ' => 'l', 'μ' => 'm', 'ν' => 'n', 'ξ' => '3', 'ο' => 'o', 'π' => 'p', 'ρ' => 'r', 'σ' => 's', 'τ' => 't', 'υ' => 'y', 'φ' => 'f', 'χ' => 'x', 'ψ' => 'ps', 'ω' => 'w', 'ά' => 'a', 'έ' => 'e', 'ί' => 'i', 'ό' => 'o', 'ύ' => 'y', 'ή' => 'h', 'ώ' => 'w', 'ς' => 's', 'ϊ' => 'i', 'ΰ' => 'y', 'ϋ' => 'y', 'ΐ' => 'i', // Turkish 'Ş' => 'S', 'İ' => 'I', 'Ç' => 'C', 'Ü' => 'U', 'Ö' => 'O', 'Ğ' => 'G', 'ş' => 's', 'ı' => 'i', 'ç' => 'c', 'ü' => 'u', 'ö' => 'o', 'ğ' => 'g', // Russian 'А' => 'A', 'Б' => 'B', 'В' => 'V', 'Г' => 'G', 'Д' => 'D', 'Е' => 'E', 'Ё' => 'Yo', 'Ж' => 'Zh', 'З' => 'Z', 'И' => 'I', 'Й' => 'J', 'К' => 'K', 'Л' => 'L', 'М' => 'M', 'Н' => 'N', 'О' => 'O', 'П' => 'P', 'Р' => 'R', 'С' => 'S', 'Т' => 'T', 'У' => 'U', 'Ф' => 'F', 'Х' => 'H', 'Ц' => 'C', 'Ч' => 'Ch', 'Ш' => 'Sh', 'Щ' => 'Sh', 'Ъ' => '', 'Ы' => 'Y', 'Ь' => '', 'Э' => 'E', 'Ю' => 'Yu', 'Я' => 'Ya', 'а' => 'a', 'б' => 'b', 'в' => 'v', 'г' => 'g', 'д' => 'd', 'е' => 'e', 'ё' => 'yo', 'ж' => 'zh', 'з' => 'z', 'и' => 'i', 'й' => 'j', 'к' => 'k', 'л' => 'l', 'м' => 'm', 'н' => 'n', 'о' => 'o', 'п' => 'p', 'р' => 'r', 'с' => 's', 'т' => 't', 'у' => 'u', 'ф' => 'f', 'х' => 'h', 'ц' => 'c', 'ч' => 'ch', 'ш' => 'sh', 'щ' => 'sh', 'ъ' => '', 'ы' => 'y', 'ь' => '', 'э' => 'e', 'ю' => 'yu', 'я' => 'ya', // Ukrainian 'Є' => 'Ye', 'І' => 'I', 'Ї' => 'Yi', 'Ґ' => 'G', 'є' => 'ye', 'і' => 'i', 'ї' => 'yi', 'ґ' => 'g', // Czech 'Č' => 'C', 'Ď' => 'D', 'Ě' => 'E', 'Ň' => 'N', 'Ř' => 'R', 'Š' => 'S', 'Ť' => 'T', 'Ů' => 'U', 'Ž' => 'Z', 'č' => 'c', 'ď' => 'd', 'ě' => 'e', 'ň' => 'n', 'ř' => 'r', 'š' => 's', 'ť' => 't', 'ů' => 'u', 'ž' => 'z', // Polish 'Ą' => 'A', 'Ć' => 'C', 'Ę' => 'e', 'Ł' => 'L', 'Ń' => 'N', 'Ó' => 'o', 'Ś' => 'S', 'Ź' => 'Z', 'Ż' => 'Z', 'ą' => 'a', 'ć' => 'c', 'ę' => 'e', 'ł' => 'l', 'ń' => 'n', 'ó' => 'o', 'ś' => 's', 'ź' => 'z', 'ż' => 'z', // Latvian 'Ā' => 'A', 'Č' => 'C', 'Ē' => 'E', 'Ģ' => 'G', 'Ī' => 'i', 'Ķ' => 'k', 'Ļ' => 'L', 'Ņ' => 'N', 'Š' => 'S', 'Ū' => 'u', 'Ž' => 'Z', 'ā' => 'a', 'č' => 'c', 'ē' => 'e', 'ģ' => 'g', 'ī' => 'i', 'ķ' => 'k', 'ļ' => 'l', 'ņ' => 'n', 'š' => 's', 'ū' => 'u', 'ž' => 'z' ); // Make custom replacements if(!empty($this->options['replacements'])) { $str = preg_replace(array_keys($this->options['replacements']), $this->options['replacements'], $str); } // Transliterate characters to ASCII if ($this->options['transliterate']) { $str = str_replace(array_keys($char_map), $char_map, $str); } // Replace non-alphanumeric characters with our delimiter $str = preg_replace('/[^\p{L}\p{Nd}]+/u', $this->options['delimiter'], $str); // Remove duplicate delimiters $str = preg_replace('/(' . preg_quote($this->options['delimiter'], '/') . '){2,}/', '$1', $str); // Truncate slug to max. characters $str = mb_substr($str, 0, ($this->options['limit'] ? $this->options['limit'] : mb_strlen($str, 'UTF-8')), 'UTF-8'); // Remove delimiter from ends $str = trim($str, $this->options['delimiter']); $str = $this->options['lowercase'] ? mb_strtolower($str, 'UTF-8') : $str; $str = $this->incrementAnchorId($str); return $str; } /** * Decodes the hashed ToC tag to an original tag and replaces. * * This is used to avoid parsing user defined ToC tag which includes "_" in * their tag such as "[[_toc_]]". Unless it will be parsed as: * "<p>[[<em>TOC</em>]]</p>" * * @param string $text * @return string */ protected function decodeTagFromHash($text) { $salt = $this->getSalt(); $tag_origin = $this->getTagToC(); $tag_hashed = hash('sha256', $salt . $tag_origin); if (strpos($text, $tag_hashed) === false) { return $text; } return str_replace($tag_hashed, $tag_origin, $text); } /** * Encodes the ToC tag to a hashed tag and replace. * * This is used to avoid parsing user defined ToC tag which includes "_" in * their tag such as "[[_toc_]]". Unless it will be parsed as: * "<p>[[<em>TOC</em>]]</p>" * * @param string $text * @return string */ protected function encodeTagToHash($text) { $salt = $this->getSalt(); $tag_origin = $this->getTagToC(); if (strpos($text, $tag_origin) === false) { return $text; } $tag_hashed = hash('sha256', $salt . $tag_origin); return str_replace($tag_origin, $tag_hashed, $text); } /** * Get only the text from a markdown string. * It parses to HTML once then trims the tags to get the text. * * @param string $text Markdown text. * @return string */ protected function fetchText($text) { return trim(strip_tags($this->line($text))); } /** * Gets the ID attribute of the ToC for HTML tags. * * @return string */ protected function getIdAttributeToC() { if (isset($this->id_toc) && ! empty($this->id_toc)) { return $this->id_toc; } return self::ID_ATTRIBUTE_DEFAULT; } /** * Unique string to use as a salt value. * * @return string */ protected function getSalt() { static $salt; if (isset($salt)) { return $salt; } $salt = hash('md5', time()); return $salt; } /** * Gets the markdown tag for ToC. * * @return string */ protected function getTagToC() { if (isset($this->tag_toc) && ! empty($this->tag_toc)) { return $this->tag_toc; } return self::TAG_TOC_DEFAULT; } /** * Set/stores the heading block to ToC list in a string and array format. * * @param array $Content Heading info such as "level","id" and "text". * @return void */ protected function setContentsList(array $Content) { // Stores as an array $this->setContentsListAsArray($Content); // Stores as string in markdown list format. $this->setContentsListAsString($Content); } /** * Sets/stores the heading block info as an array. * * @param array $Content * @return void */ protected function setContentsListAsArray(array $Content) { $this->contentsListArray[] = $Content; } protected $contentsListArray = array(); /** * Sets/stores the heading block info as a list in markdown format. * * @param array $Content Heading info such as "level","id" and "text". * @return void */ protected function setContentsListAsString(array $Content) { $text = $this->fetchText($Content['text']); $id = $Content['id']; $level = (integer) trim($Content['level'], 'h'); $link = "[${text}](#${id})"; if ($this->firstHeadLevel === 0) { $this->firstHeadLevel = $level; } $cutIndent = $this->firstHeadLevel - 1; if ($cutIndent > $level) { $level = 1; } else { $level = $level - $cutIndent; } $indent = str_repeat(' ', $level); // Stores in markdown list format as below: // - [Header1](#Header1) // - [Header2-1](#Header2-1) // - [Header3](#Header3) // - [Header2-2](#Header2-2) // ... $this->contentsListString .= "${indent}- ${link}" . PHP_EOL; } protected $contentsListString = ''; protected $firstHeadLevel = 0; /** * Sets the user defined ToC markdown tag. * * @param string $tag * @return void */ public function setTagToc($tag) { $tag = trim($tag); if (self::escape($tag) === $tag) { // Set ToC tag if it's safe $this->tag_toc = $tag; } else { // Do nothing but log error_log( 'Malformed ToC user tag given.' . ' At: ' . __FUNCTION__ . '() ' . ' in Line:' . __LINE__ . ' (Using default ToC tag)' ); } } protected $tag_toc = ''; /** * Parses markdown string to HTML and also the "[toc]" tag as well. * It overrides the parent method: \Parsedown::text(). * * @param string $text * @return void */ public function text($text) { // Parses the markdown text except the ToC tag. This also searches // the list of contents and available to get from "contentsList()" // method. $html = $this->body($text); $tag_origin = $this->getTagToC(); if (strpos($text, $tag_origin) === false) { return $html; } $toc_data = $this->contentsList(); $toc_id = $this->getIdAttributeToC(); $needle = '<p>' . $tag_origin . '</p>'; $replace = "<div id=\"${toc_id}\">${toc_data}</div>"; return str_replace($needle, $replace, $html); } protected $isBlacklistInitialized = false; protected $anchorDuplicates = []; /** * Add blacklisted ids to anchor list */ protected function initBlacklist() { if ($this->isBlacklistInitialized) return; if (!empty($this->options['blacklist']) && is_array($this->options['blacklist'])) { foreach ($this->options['blacklist'] as $v) { if (is_string($v)) $this->anchorDuplicates[$v] = 0; } } $this->isBlacklistInitialized = true; } /** * Collect and count anchors in use to prevent duplicated ids. Return string * with incremental, numeric suffix. Also init optional blacklist of ids. * * @param string $str * @return string */ protected function incrementAnchorId($str) { // add blacklist to list of used anchors if (!$this->isBlacklistInitialized) $this->initBlacklist(); $this->anchorDuplicates[$str] = !isset($this->anchorDuplicates[$str]) ? 0 : ++$this->anchorDuplicates[$str]; $newStr = $str; if ($count = $this->anchorDuplicates[$str]) { $newStr .= "-{$count}"; // increment until conversion doesn't produce new duplicates anymore if (isset($this->anchorDuplicates[$newStr])) { $newStr = $this->incrementAnchorId($str); } else { $this->anchorDuplicates[$newStr] = 0; } } return $newStr; } } |
Modified src/templates/common/files/_file_render_encrypted.tpl from [b283e35b3f] to [8602ee5447].
1 2 3 4 5 6 7 8 | <noscript> <div class="error"> Vous dever activer javascript pour pouvoir déchiffrer cette page. </div> </noscript> <script type="text/javascript" src="{$admin_url}static/scripts/wiki-encryption.js"></script> <div id="wikiEncryptedMessage"> <p class="block alert">Cette page est chiffrée. | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 | <noscript> <div class="error"> Vous dever activer javascript pour pouvoir déchiffrer cette page. </div> </noscript> <script type="text/javascript" src="{$admin_url}static/scripts/wiki-encryption.js"></script> <div id="wikiEncryptedMessage"> <p class="block alert">Cette page est chiffrée. <input type="button" onclick="return pleaseDecrypt();" value="Entrer le mot de passe" /> </p> </div> <div class="web-content" style="display: none;" id="wikiEncryptedContent"> {$content} </div> |
Modified src/templates/web/edit.tpl from [a716c2cf03] to [7bab37eec3].
︙ | ︙ | |||
15 16 17 18 19 20 21 22 23 24 25 26 | {input type="text" name="title" source=$page required=true label="Titre"} {input type="text" name="uri" default=$page.uri required=true label="Adresse unique URI" help="Utilisée pour désigner l'adresse de la page sur le site. Ne peut comporter que des lettres, des chiffres, des tirets et des tirets bas." pattern="[A-Za-z0-9_-]+"} {input type="list" name="parent" label="Catégorie" default=$parent target="web/_selector.php?current=%s"|args:$page.path required=true} {input type="datetime" name="date" label="Date" required=true default=$page.published} <dt>Statut</dt> {input type="radio" name="status" value=$page::STATUS_ONLINE label="En ligne" source=$page} {input type="radio" name="status" value=$page::STATUS_DRAFT label="Brouillon" source=$page help="ne sera pas visible sur le site"} </dl> </fieldset> <fieldset class="wikiEncrypt"> <dl> | > < < < < | | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 | {input type="text" name="title" source=$page required=true label="Titre"} {input type="text" name="uri" default=$page.uri required=true label="Adresse unique URI" help="Utilisée pour désigner l'adresse de la page sur le site. Ne peut comporter que des lettres, des chiffres, des tirets et des tirets bas." pattern="[A-Za-z0-9_-]+"} {input type="list" name="parent" label="Catégorie" default=$parent target="web/_selector.php?current=%s"|args:$page.path required=true} {input type="datetime" name="date" label="Date" required=true default=$page.published} <dt>Statut</dt> {input type="radio" name="status" value=$page::STATUS_ONLINE label="En ligne" source=$page} {input type="radio" name="status" value=$page::STATUS_DRAFT label="Brouillon" source=$page help="ne sera pas visible sur le site"} {input type="select" name="format" options=$formats source=$page label="Format"} </dl> </fieldset> <fieldset class="wikiEncrypt"> <dl> <noscript> <dd>Nécessite JavaScript activé pour fonctionner !</dd> </noscript> <dd>Mot de passe : <i id="encryptPasswordDisplay" title="Chiffrement désactivé">désactivé</i></dd> <dd class="help">Le mot de passe n'est ni transmis ni enregistré, il n'est pas possible de retrouver le contenu si vous perdez le mot de passe.</dd> </dl> </fieldset> <fieldset class="wikiText"> <div class="textEditor"> {input type="textarea" name="content" cols="70" rows="35" default=$new_content data-attachments=1 data-savebtn=2 data-preview-url="!common/files/_preview.php?w=%s"|local_url|args:$page.path data-format="#f_format"} </div> </fieldset> <p class="submit"> {csrf_field key=$csrf_key} <input type="hidden" name="editing_started" value="{$editing_started}" /> {button type="submit" name="save" label="Enregistrer et fermer" shape="upload" class="main"} </p> </form> {include file="admin/_foot.tpl"} |
Modified src/www/admin/common/files/_preview.php from [cc05638664] to [35c5f4da82].
1 2 3 4 5 6 | <?php namespace Garradin; use Garradin\Files\Files; use Garradin\Entities\Files\File; | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 | <?php namespace Garradin; use Garradin\Files\Files; use Garradin\Entities\Files\File; use Garradin\Web\Render\Render; use Garradin\Web\Web; require_once __DIR__ . '/../../_inc.php'; $page = null; if ($path = qg('f')) { |
︙ | ︙ | |||
29 30 31 32 33 34 35 | } else { throw new UserException('Fichier inconnu'); } $prefix = $page ? 'web/page.php?uri=' : 'common/files/_preview.php?p=' . File::CONTEXT_DOCUMENTS . '/'; | | | 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | } else { throw new UserException('Fichier inconnu'); } $prefix = $page ? 'web/page.php?uri=' : 'common/files/_preview.php?p=' . File::CONTEXT_DOCUMENTS . '/'; $content = Render::render(f('format'), $file, f('content'), ['prefix' => ADMIN_URL . $prefix]); $tpl->assign(compact('file', 'content')); $tpl->assign('custom_css', ['!web/css.php']); $tpl->display('common/files/_preview.tpl'); |
Added src/www/admin/static/scripts/web_editor.js version [882b005b1b].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 | (function () { const TYPES = ['code', ]; window.WebEditor = class { constructor(textarea) { this.textarea = textarea; this.parse(textarea.value) this.editor = } build() { } parse(text) { var blocks = text.split("\n\n----\n\n"); this.blocks = []; for (var i = 0; i < blocks.length; i++) { let block = blocks[i]; if ((i % 1) == 0) { this.blocks.push(this.parseMeta(block)); } else { this.blocks[this.blocks.length - 1].content = block.trim("\r\n"); } } } parseMeta(text) { var lines = text.split("\n"); var meta = {}; for (var i = 0; i < lines.length; i++) { var line = lines[i].split(':', 2); if (line.length != 2) { continue; } meta[line[0].trim().toLowerCase()] = line[1].trim(); } return meta; } } })(); |
Modified src/www/admin/static/scripts/wiki-encryption.js from [7a2e88e445] to [f41b9dc8c7].
︙ | ︙ | |||
82 83 84 85 86 87 88 | // nl2br content = content.replace(/\r/g, '').replace(/\n/g, '<br />'); return content; } | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | > > > > > > > > > > > > > > > > > > > | < < | < < < < > > > > > > > > > | < | | | < > | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | > > > > > > > > | > > > > > | 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 | // nl2br content = content.replace(/\r/g, '').replace(/\n/g, '<br />'); return content; } let edit = document.getElementById('f_content') ? true : false; let disableEncryption = (reset) => { if (reset) { document.getElementById('f_content').value = ''; document.getElementById('f_format').selectedIndex = 0; } document.getElementById('f_content').disabled = false; encryptPassword = null; }; let enableEncryption = (form, do_decrypt) => { document.getElementById('f_content').disabled = true; String.prototype.repeat = function(num) { return new Array(num + 1).join(this); }; load_aes(function () { askPassword(); document.getElementById('f_content').disabled = false; if (do_decrypt) { decrypt(); } var hidden = true; var d = document.getElementById('encryptPasswordDisplay'); d.innerHTML = '•'.repeat(encryptPassword.length); d.title = 'Cliquer pour voir le mot de passe'; d.onclick = function () { if (hidden) { this.innerHTML = encryptPassword; this.title = 'Cliquer pour cacher le mot de passe.'; } else { this.innerHTML = '•'.repeat(encryptPassword.length); this.title = 'Cliquer pour voir le mot de passe'; } hidden = !hidden; }; form.onsubmit = function () { if (typeof GibberishAES == 'undefined') { alert("Le chargement de la bibliothèque AES n'est pas terminé.\nLe chiffrement est impossible pour le moment, recommencez dans quelques instants ou désactivez le chiffrement."); return false; } if (!encryptPassword) { return; } var content = document.getElementById('f_content'); content.value = GibberishAES.enc(content.value, encryptPassword); content.readOnly = true; return true; }; }); }; let askPassword = () => { load_aes(); encryptPassword = window.prompt('Mot de passe ?'); if (!encryptPassword) { encryptPassword = null; if (edit) { if (window.confirm("Aucun mot de passe entré.\nDésactiver le chiffrement et effacer le contenu ?")) { disableEncryption(true); } } return; } iteration = 0; }; window.pleaseDecrypt = () => { askPassword(); decrypt(); }; var decrypt = function () { if (!encryptPassword) { return; } if (typeof GibberishAES == 'undefined') { if (iteration >= 10) { iteration = 0; encryptPassword = null; window.alert("Impossible de charger la bibliothèque AES, empêchant le déchiffrement de la page.\nAttendez quelques instants avant de recommencer ou rechargez la page."); return; } iteration++; window.setTimeout(decrypt, 500); return; } if (edit) { var content = document.getElementById('f_content'); } else { var content = document.getElementById('wikiEncryptedContent'); } var wikiContent = content.value || content.innerText; wikiContent = wikiContent.replace(/\s+/g, ''); try { wikiContent = GibberishAES.dec(wikiContent, encryptPassword); } catch (e) { encryptPassword = null; window.alert('Impossible de déchiffrer. Mauvais mot de passe ?'); if (edit) { // Redemander le mot de passe askPassword(); decrypt(); } return false; } if (!edit) { content.style.display = 'block'; document.getElementById('wikiEncryptedMessage').style.display = 'none'; content.innerHTML = formatContent(wikiContent); } else { content.value = wikiContent; } }; document.addEventListener('DOMContentLoaded', () => { if (e = document.getElementById('f_format')) { edit = true; if (e.value == "skriv/encrypted") { enableEncryption(e.form, true); } e.addEventListener('change', () => { if (e.value == 'skriv/encrypted') { enableEncryption(e.form); } else if (encryptPassword) { disableEncryption(false); } }) } }); } ()); |
Modified src/www/admin/static/scripts/wiki_editor.js from [8d430d7dbe] to [c9ab486754].
︙ | ︙ | |||
27 28 29 30 31 32 33 | var t = new textEditor('f_content'); t.parent = t.textarea.parentNode; var config = { fullscreen: t.textarea.getAttribute('data-fullscreen') == 1, attachments: t.textarea.getAttribute('data-attachments') == 1, savebtn: t.textarea.getAttribute('data-savebtn'), | | > | 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | var t = new textEditor('f_content'); t.parent = t.textarea.parentNode; var config = { fullscreen: t.textarea.getAttribute('data-fullscreen') == 1, attachments: t.textarea.getAttribute('data-attachments') == 1, savebtn: t.textarea.getAttribute('data-savebtn'), preview_url: t.textarea.getAttribute('data-preview-url'), format: t.textarea.getAttribute('data-format') }; // Cancel Escape to close.value if (window.parent && window.parent.g.dialog) { // Always fullscreen in dialogs config.fullscreen = true; |
︙ | ︙ | |||
68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 | var openPreview = function () { openIFrame(''); var form = document.createElement('form'); form.appendChild(t.textarea.cloneNode(true)); form.firstChild.value = t.textarea.value; form.target = 'editorFrame'; form.action = config.preview_url; form.style.display = 'none'; form.method = 'post'; document.body.appendChild(form); form.submit(); return true; }; var openSyntaxHelp = function () { | > > > > > > | | > < > > > > | > > > > > | | | | | | > | 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 | var openPreview = function () { openIFrame(''); var form = document.createElement('form'); form.appendChild(t.textarea.cloneNode(true)); form.firstChild.value = t.textarea.value; let f = document.createElement('input'); f.type = 'hidden'; f.name = 'format'; f.value = config.format; form.appendChild(f); form.target = 'editorFrame'; form.action = config.preview_url; form.style.display = 'none'; form.method = 'post'; document.body.appendChild(form); form.submit(); return true; }; var openSyntaxHelp = function () { let url = config.format == 'markdown' ? '_syntax_markdown.html' : '_syntax_skriv.html'; url = g.admin_url + 'web/' + url; openIFrame(url); }; var openFileInsert = function () { let args = new URLSearchParams(window.location.search); var wiki_id = args.get('p'); g.openFrameDialog(g.admin_url + 'web/_attach.php?_dialog&p=' + wiki_id); }; window.te_insertFile = function (file) { if (config.format == 'markdown') { var tag = '[' + file + '](#file:' + file + ')'; } else { var tag = '<<file|'+file+'>>'; } t.insertAtPosition(t.getSelection().start, tag); g.closeDialog(); }; window.te_insertImage = function (file, position, caption) { if (config.format == 'markdown') { var tag = '![' + caption + '](#file:' + file + '?500px)'; } else { var tag = '<<image|' + file; if (position) tag += '|' + position; if (caption) tag += '|' + caption; tag += '>>'; } t.insertAtPosition(t.getSelection().start, tag); g.closeDialog(); }; var EscapeEvent = function (e) { |
︙ | ︙ | |||
186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 | } btn.className = 'icn-btn ' +name; btn.onclick = function () { action.call(); return false; }; toolbar.appendChild(btn); return btn; }; var wrapTags = function (left, right) { t.wrapSelection(t.getSelection(), left, right); return true; }; let insertURL = function () { | > > > > > > > > > > > > > > > > > | | > | > > > > > > > > | 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 | } btn.className = 'icn-btn ' +name; btn.onclick = function () { action.call(); return false; }; toolbar.appendChild(btn); return btn; }; let applyHeader = () => { wrapTags(config.format == 'markdown' ? '## ' : '== ', ''); }; let applyBold = () => { wrapTags('**', '**'); }; let applyItalic = () => { if (config.format == 'markdown') { wrapTags("_", "_"); } else { wrapTags("''", "''"); } }; var wrapTags = function (left, right) { t.wrapSelection(t.getSelection(), left, right); return true; }; let insertURL = function () { let url = window.prompt('Adresse URL ?'); if (!url) { return true; } if (config.format == 'markdown') { wrapTags("[", "](" + url + ')'); } else { wrapTags("[[", "|" + url + ']]'); } }; let save = function () { const data = new URLSearchParams(); for (const pair of new FormData(t.textarea.form)) { data.append(pair[0], pair[1]); |
︙ | ︙ | |||
221 222 223 224 225 226 227 | } showSaved(); t.textarea.defaultValue = t.textarea.value; }).catch(e => t.textarea.form.querySelector('[type=submit]').click() ); return true; }; | > | | | | > | | | | | | | | | | | | | | | | | | > > > > > > > > > > > > > > > > > > > | | | | | 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 | } showSaved(); t.textarea.defaultValue = t.textarea.value; }).catch(e => t.textarea.form.querySelector('[type=submit]').click() ); return true; }; let createToolbar = () => { appendButton('title', "Titre", applyHeader ); appendButton('bold', 'Gras', applyBold ); appendButton('italic', "Italique", applyItalic ); appendButton('link', "Lien", insertURL); appendButton('ext preview', '👁', openPreview, 'Prévisualiser'); appendButton('ext help', '❓', openSyntaxHelp, 'Aide sur la syntaxe'); if (config.attachments) { appendButton('file', "📎 Fichiers", openFileInsert, 'Insérer fichier / image'); t.shortcuts.push({ctrl: true, shift: true, key: 'i', callback: openFileInsert}); } if (!config.fullscreen) { appendButton('ext fullscreen', 'Plein écran', toggleFullscreen, 'Plein écran'); } if (config.savebtn == 1) { appendButton('ext save', 'Enregistrer', save, 'Enregistrer'); } else if (config.savebtn == 2) { appendButton('ext save', '⇑', save, 'Enregistrer sans fermer'); } appendButton('ext close', 'Fermer', closeIFrame); t.parent.insertBefore(toolbar, t.parent.firstChild); } let toggleFormat = (format) => { config.format = format; g.toggle('.wikiEncrypt', format == 'skriv/encrypted'); }; if (config.format.substr(0, 1) == '#') { let s = document.querySelector(config.format); s.onchange = () => { toggleFormat(s.value); }; toggleFormat(s.value); } else { toggleFormat(config.format); } createToolbar(); t.shortcuts.push({key: 'F11', callback: toggleFullscreen}); t.shortcuts.push({ctrl: true, key: 'b', callback: applyBold }); t.shortcuts.push({ctrl: true, key: 'g', callback: applyBold }); t.shortcuts.push({ctrl: true, key: 'i', callback: applyItalic }); t.shortcuts.push({ctrl: true, key: 't', callback: applyHeader }); t.shortcuts.push({ctrl: true, key: 'l', callback: insertURL}); t.shortcuts.push({ctrl: true, key: 's', callback: save}); t.shortcuts.push({ctrl: true, shift: true, key: 'p', callback: openPreview}); t.shortcuts.push({key: 'F1', callback: openSyntaxHelp}); }); }()); |
Added src/www/admin/web/_syntax_markdown.html version [a461d06388].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 | <!DOCTYPE html> <html> <head> <meta charset="utf-8" /> <title>Syntaxe SkrivML</title> <style type="text/css"> body, form, p, div, hr, fieldset, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6 { margin: 0; padding: 0; } h1 { font-size: 2em; } h2 { font-size: 1.5em; } h3 { font-size: 1.2em; } h4 { font-size: 1em; } h5 { font-size: 0.9em; } h6 { font-size: 0.8em; } article, aside, figure, footer, header, hgroup, menu, nav, section { display: block; } body { font-family: "Trebuchet MS", Arial, Helvetica, Sans-serif; padding: .8em; } pre, samp { display: block; background: #ccc; color: #000; border-radius: .5em; padding: .4em; } code { background: #ccc; padding: .2em; } samp { background: #999; font-family: "Trebuchet MS", Arial, Helvetica, Sans-serif; } p, header, article { margin: .8em 0; clear: both; } h1, h2, h3, h4, samp, pre { margin: .4em 0; } ul, ol { margin-left: 1.5em; } table { border-collapse: collapse; } table td, table th { border: 1px solid #666; padding: .3em; } a { color: blue; text-decoration: underline; cursor: pointer; } </style> </head> <body> <section> <h1>Raccourcis clavier</h1> <table> <tbody> <tr> <th><kbd>Ctrl</kbd> + <kbd>G</kbd></th> <td>Mettre en gras</td> </tr> <tr> <th><kbd>Ctrl</kbd> + <kbd>I</kbd></th> <td>Mettre en italique</td> </tr> <tr> <th><kbd>Ctrl</kbd> + <kbd>T</kbd></th> <td>Mettre en titre</td> </tr> <tr> <th><kbd>Ctrl</kbd> + <kbd>L</kbd></th> <td>Mettre en lien</td> </tr> <tr> <th><kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>I</kbd></th> <td>Insérer un fichier ou image</td> </tr> <tr> <th><kbd>Ctrl</kbd> + <kbd>P</kbd></th> <td>Prévisualiser</td> </tr> <tr> <th><kbd>Ctrl</kbd> + <kbd>S</kbd></th> <td>Enregistrer</td> </tr> <tr> <th><kbd>Echap</kbd></th> <td>Fermer l'aide, la prévisualisation ou l'insertion de fichier</td> </tr> <tr> <th><kbd>F11</kbd></th> <td>Activer ou désactiver l'édition plein écran</td> </tr> <tr> <th><kbd>F1</kbd></th> <td>Afficher l'aide</td> </tr> </tbody> </table> </section> <section> <div class="web-content"><h1>La syntaxe markdown</h1> <p>Pour formater votre texte vous avez la possibilité d'utiliser la barre d'outils située au-dessus de la zone de texte, ou vous pouvez utiliser la syntaxe markdown.</p> <h2>Styles de texte</h2> <p>Vous pouvez utiliser <code>_</code> ou <code>*</code> autour d'un mot pour le mettre en italique. Mettez-en deux pour le mettre en gras.</p> <ul> <li><code>_italique_</code> s'affiche ainsi : <em>italique</em></li> <li><code>**gras**</code> s'affiche ainsi : <strong>gras</strong></li> <li><code>**_gras-italique_**</code> s'affiche ainsi : <strong><em>gras-italique</em></strong></li> <li><code>~~barré~~</code> s'affiche ainsi : <del>barré</del></li> </ul> <h2>Blocs de code</h2> <p>Créez un bloc de code en indentant chaque ligne avec quatre espaces, ou en mettant trois accents graves sur la ligne au dessus et en dessous de votre code.<br> Exemple :</p> <p><code>```<br />bloc de code<br />```</code></p> <p>s'affiche ainsi :</p> <pre>bloc de code</pre> <h2>Liens</h2> <p>Créez un lien intégré en mettant le texte désiré entre crochets et le lien associé entre parenthèses.</p> <p><code>Je connais un super gestionnaire [d'association](https://garradin.eu/) !</code></p> <p>s'affichera :</p> <p>Je connais un super gestionnaire <a href="https://garradin.eu/">d'association</a> !</p> <h2>Images</h2> <p>Utilisez une image en ligne en copiant son adresse (finissant par <code>.jpg</code>, <code>.png</code>, <code>.gif</code> etc…) avec un texte alternatif entre crochets (qui sera affiché si l'image n'apparaît pas) et le lien entre parenthèses.</p> <pre>![Logo Garradin](https://fossil.kd2.org/garradin/logo)</pre> <p>donnera :</p> <p><img src="https://fossil.kd2.org/garradin/logo" alt="Logo Garradin"></p> <h2>Citation</h2> <p>Les citations se font avec le signe <code>></code> :</p> <pre>> Ah je ris de me voir si belle !</pre> <blockquote> <p>Ah je ris de me voir si belle !</p> </blockquote> <h2>Listes</h2> <p>Vous pouvez créer des listes avec les caractères <code>*</code> et <code>-</code> pour des listes non ordonnées ou avec des nombres pour des listes ordonnées.</p> <p>Une liste non ordonnée :</p> <pre>* une élément * un autre * un sous élément * un autre sous élément * un dernier élément</pre> <ul> <li>une élément</li> <li>un autre <ul> <li>un sous élément</li> <li>un autre sous élément</li> </ul></li> <li>un dernier élément</li> </ul> <p>Une liste ordonnée :</p> <pre>1. élément un 2. élément deux</pre> <ol> <li>élément un</li> <li>élément deux</li> </ol> <h2>Titres</h2> <p>Pour faire un titre, vous devez mettre un <code>#</code> devant la ligne. Pour faire un titre plus petit, ajoutez un <code>#</code> (jusque 6) :</p> <pre># Un grand titre ## Un titre un peu moins grand ### Un titre encore moins grand</pre> <p>Vous pouvez également souligner le texte en utilisant <code>===</code> ou <code>---</code> pour créer des titres.</p> <pre>Un grand titre =============</pre> <h2>Tableaux</h2> <p>Pour créer un tableau vous devez placer une ligne de tirets (<code>-</code>) sous la ligne d'entête et séparer les colonnes avec des <code>|</code>. Vous pouvez aussi préciser l'alignement en utilisant des <code>:</code>. :</p> <pre>| Aligné à gauche | Centré | Aligné à droite | | :--------------- |:---------------:| -----:| | Aligné à gauche | ce texte | Aligné à droite | | Aligné à gauche | est | Aligné à droite | | Aligné à gauche | centré | Aligné à droite |</pre> <table> <thead> <tr> <th style="text-align : left;">Aligné à gauche</th> <th style="text-align : center;">Centré</th> <th style="text-align : right;">Aligné à droite</th> </tr> </thead> <tbody> <tr> <td style="text-align : left;">Aligné à gauche</td> <td style="text-align : center;">ce texte</td> <td style="text-align : right;">Aligné à droite</td> </tr> <tr> <td style="text-align : left;">Aligné à gauche</td> <td style="text-align : center;">est</td> <td style="text-align : right;">Aligné à droite</td> </tr> <tr> <td style="text-align : left;">Aligné à gauche</td> <td style="text-align : center;">centré</td> <td style="text-align : right;">Aligné à droite</td> </tr> </tbody> </table></div> </section> </body> </html> |
Name change from src/www/admin/web/_syntaxe.html to src/www/admin/web/_syntax_skriv.html.
︙ | ︙ |
Modified src/www/admin/web/edit.php from [735f5d3003] to [d2da8ff862].
︙ | ︙ | |||
51 52 53 54 55 56 57 | $parent = $page->parent ? [$page->parent => Web::get($page->parent)->title] : ['' => 'Racine du site']; $encrypted = f('encrypted') || $page->format == Page::FORMAT_ENCRYPTED; $old_content = f('content'); $new_content = $page->content; | > > | | 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 | $parent = $page->parent ? [$page->parent => Web::get($page->parent)->title] : ['' => 'Racine du site']; $encrypted = f('encrypted') || $page->format == Page::FORMAT_ENCRYPTED; $old_content = f('content'); $new_content = $page->content; $formats = $page::FORMATS_LIST; $tpl->assign(compact('page', 'parent', 'editing_started', 'encrypted', 'csrf_key', 'old_content', 'new_content', 'show_diff', 'formats')); $tpl->assign('custom_js', ['wiki_editor.js', 'wiki-encryption.js']); $tpl->assign('custom_css', ['wiki.css']); $tpl->display('web/edit.tpl'); |
Modified src/www/skel-dist/content.css from [38f956b17f] to [31c1cecc6c].
1 | .web-content p, .web-content h1, .web-content h2, .web-content h3, .web-content h4, .web-content h5, .web-content h6, | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 | .web-content p, .web-content h1, .web-content h2, .web-content h3, .web-content h4, .web-content h5, .web-content h6, .web-content ul, .web-content ol, .web-content table, .web-content blockquote, .web-content pre { margin: .8em 0; } .web-content ul, .web-content ol, .web-content dd { margin-left: 2em; } .web-content ul { list-style-type: disc; } .web-content ol { list-style-type: decimal; } .web-content blockquote::before { content: "”"; color: #999; display: block; position: absolute; font-style: italic; font-size: 3rem; line-height: 2rem; margin-left: -3rem; } .web-content blockquote { font-size: 1.1em; padding-left: 3rem; margin: 1rem 0; } .web-content table { border-collapse: collapse; } .web-content table th, .web-content table td { border: 1px solid #999; padding: .5rem; text-align: center; } .web-content table th { background: #eee; font-weight: bold; } .web-content #toc { border: 1px solid rgba(0, 0, 0, 0.2); background: rgba(0, 0, 0, 0.1); padding: .3rem; width: max-content; } .web-content #toc ul { list-style: none; counter-reset: item; margin: .5rem 0 .5rem .5rem; } .web-content #toc ul li:before { content: counters(item, ".") " "; counter-increment: item; color: #666; } .web-content aside.file { margin: 1em; } .web-content aside.file small { opacity: 0.7; |
︙ | ︙ |