[TikiWiki-commits] [Git][tikiwiki/tiki][master] [ENH] Review and update inline documentation and toolbar items for TOAST UI
Benoit Grégoire (@benoitg) via TikiWiki-cvs <[email protected]>
| Newsgroups | gmane.comp.cms.tiki.cvs |
|---|---|
| Message-ID | <68c842c486a94_2c1f2e2b042d4@gitlab-sidekiq-low-urgency-cpu-bound-v2-679dd6fdf9-7h4h8.mail> |
Benoit Grégoire pushed to branch master at Tiki Wiki CMS Groupware / Tiki
Commits:
f52499b2 by Henock at 2025-09-15T16:37:50+00:00
[ENH] Review and update inline documentation and toolbar items for TOAST UI
---
* [ENH] Review and update inline documentation and toolbar items for TOAST UI, Tiki Markdown, and Summernote editors
See merge request tikiwiki/tiki!8553
- - - - -
2 changed files:
- templates/tiki-edit_help_markdown.tpl
- templates/tiki-edit_help_markdown_wysiwyg.tpl
Changes:
=====================================
templates/tiki-edit_help_markdown.tpl
=====================================
@@ -12,50 +12,72 @@
<table class="table table-condensed table-hover">
<tr>
<td>
- {icon name='bold'} <strong>{tr}Bold text{/tr}</strong> __{tr}text{/tr}__
+ {icon name='bold'}
+ <strong>{tr}Bold text{/tr}</strong>
+ <code>**{tr}text{/tr}**</code> {tr}or{/tr} <code>__{tr}text{/tr}__</code>
</td>
- </tr>
- <tr>
+ </tr>
+ <tr>
<td>
- {icon name='italic'} <strong>{tr}Italic text{/tr}</strong> _{tr}text{/tr}_
+ {icon name='italic'}
+ <strong>{tr}Italic text{/tr}</strong>
+ <code>*{tr}text{/tr}*</code> {tr}or{/tr} <code>_{tr}text{/tr}_</code>
</td>
- </tr>
- <tr>
+ </tr>
+ <tr>
<td>
- {icon name='strikethrough'} <strong>{tr}Deleted text{/tr}</strong> {tr}2 dashes{/tr} "-". --{tr}text{/tr}--
+ {icon name='strikethrough'}
+ <strong>{tr}Deleted text{/tr}</strong>
+ <code>~~{tr}text{/tr}~~</code>
</td>
</tr>
<tr>
<td>
- {icon name='h1'} <strong>{tr}Headings{/tr}</strong> <br/> #heading1, ##heading2, ###heading3
+ {icon name='h1'}
+ <strong>{tr}Headings{/tr}</strong> <br/>
+ <code># Heading 1</code>, <code>## Heading 2</code>, <code>### Heading 3</code>
</td>
- </tr>
- <tr>
+ </tr>
+ <tr>
<td>
- {icon name='horizontal-rule'} <strong>{tr}Horizontal rule{/tr}</strong> -<em></em>-<em></em>-<em></em>-
+ {icon name='horizontal-rule'}
+ <strong>{tr}Horizontal rule{/tr}</strong>
+ <code>---</code> {tr}or{/tr} <code>***</code>
</td>
- </tr>
- <tr>
+ </tr>
+ <tr>
<td>
- {icon name='link-external'} <strong>{tr}External links{/tr}</strong> [text](url)
+ {icon name='link-external'}
+ <strong>{tr}External links{/tr}</strong>
+ <code>[text](url)</code>
</td>
</tr>
<tr>
<td>
- {icon name='list'} {icon name='list-numbered'} <strong>{tr}Lists{/tr}</strong> <br> * {tr}for bullet lists,{/tr} 1., 2., 3. etc {tr}for numbered lists,{/tr}
+ {icon name='list'} {icon name='list-numbered'}
+ <strong>{tr}Lists{/tr}</strong>
+ <br>
+ <code>*</code> {tr}or{/tr} <code>-</code> {tr}for bullet lists,{/tr}<br>
+ <code>1.</code>, <code>2.</code>, <code>3.</code> etc. {tr}for numbered lists,{/tr}
</td>
</tr>
<tr>
<td>
- {icon name='table'} <strong>{tr}Tables{/tr}</strong> <br/>
- | {tr}row{/tr}1-{tr}col{/tr}1 | {tr}row{/tr}1-{tr}col{/tr}2 | {tr}row{/tr}1-{tr}col{/tr}3<br>
- | ----- | ----- | ----- |<br>
+ {icon name='table'}
+ <strong>{tr}Tables{/tr}</strong>
+ <br/>
+ <code>
+ | {tr}row{/tr}1-{tr}col{/tr}1 | {tr}row{/tr}1-{tr}col{/tr}2 | {tr}row{/tr}1-{tr}col{/tr}3 |<br>
+ | --------- | --------- | --------- |<br>
| {tr}row{/tr}2-{tr}col{/tr}1 | {tr}row{/tr}2-{tr}col{/tr}2 | {tr}row{/tr}2-{tr}col{/tr}3 |
+ </code>
</td>
</tr>
<tr>
<td>
- <strong>{tr}Monospace font{/tr}</strong> `{tr}Code sample{/tr}`
+ {icon name='code'}
+ <strong>{tr}Monospace font{/tr}</strong>
+ <code>`{tr}Code sample{/tr}`</code>
</td>
</tr>
</table>
=====================================
templates/tiki-edit_help_markdown_wysiwyg.tpl
=====================================
@@ -12,50 +12,72 @@
<table class="table table-condensed table-hover">
<tr>
<td>
- {icon name='bold'} <strong>{tr}Bold text{/tr}</strong> __{tr}text{/tr}__
+ {icon name='bold'}
+ <strong>{tr}Bold text{/tr}</strong>
+ <code>**{tr}text{/tr}**</code> {tr}or{/tr} <code>__{tr}text{/tr}__</code>
</td>
- </tr>
- <tr>
+ </tr>
+ <tr>
<td>
- {icon name='italic'} <strong>{tr}Italic text{/tr}</strong> _{tr}text{/tr}_
+ {icon name='italic'}
+ <strong>{tr}Italic text{/tr}</strong>
+ <code>*{tr}text{/tr}*</code> {tr}or{/tr} <code>_{tr}text{/tr}_</code>
</td>
- </tr>
- <tr>
+ </tr>
+ <tr>
<td>
- {icon name='strikethrough'} <strong>{tr}Deleted text{/tr}</strong> {tr}2 dashes{/tr} "-". --{tr}text{/tr}--
+ {icon name='strikethrough'}
+ <strong>{tr}Deleted text{/tr}</strong>
+ <code>~~{tr}text{/tr}~~</code>
</td>
</tr>
<tr>
<td>
- {icon name='h1'} <strong>{tr}Headings{/tr}</strong> <br/> #heading1, ##heading2, ###heading3
+ {icon name='h1'}
+ <strong>{tr}Headings{/tr}</strong> <br/>
+ <code># Heading 1</code>, <code>## Heading 2</code>, <code>### Heading 3</code>
</td>
- </tr>
- <tr>
+ </tr>
+ <tr>
<td>
- {icon name='horizontal-rule'} <strong>{tr}Horizontal rule{/tr}</strong> -<em></em>-<em></em>-<em></em>-
+ {icon name='horizontal-rule'}
+ <strong>{tr}Horizontal rule{/tr}</strong>
+ <code>---</code> {tr}or{/tr} <code>***</code>
</td>
- </tr>
- <tr>
+ </tr>
+ <tr>
<td>
- {icon name='link-external'} <strong>{tr}External links{/tr}</strong> [text](url)
+ {icon name='link-external'}
+ <strong>{tr}External links{/tr}</strong>
+ <code>[text](url)</code>
</td>
</tr>
<tr>
<td>
- {icon name='list'} {icon name='list-numbered'} <strong>{tr}Lists{/tr}</strong> <br> * {tr}for bullet lists,{/tr} 1., 2., 3. etc {tr}for numbered lists,{/tr}
+ {icon name='list'} {icon name='list-numbered'}
+ <strong>{tr}Lists{/tr}</strong>
+ <br>
+ <code>*</code> {tr}or{/tr} <code>-</code> {tr}for bullet lists,{/tr}<br>
+ <code>1.</code>, <code>2.</code>, <code>3.</code> etc. {tr}for numbered lists,{/tr}
</td>
</tr>
<tr>
<td>
- {icon name='table'} <strong>{tr}Tables{/tr}</strong> <br/>
- | {tr}row{/tr}1-{tr}col{/tr}1 | {tr}row{/tr}1-{tr}col{/tr}2 | {tr}row{/tr}1-{tr}col{/tr}3<br>
- | ----- | ----- | ----- |<br>
+ {icon name='table'}
+ <strong>{tr}Tables{/tr}</strong>
+ <br/>
+ <code>
+ | {tr}row{/tr}1-{tr}col{/tr}1 | {tr}row{/tr}1-{tr}col{/tr}2 | {tr}row{/tr}1-{tr}col{/tr}3 |<br>
+ | --------- | --------- | --------- |<br>
| {tr}row{/tr}2-{tr}col{/tr}1 | {tr}row{/tr}2-{tr}col{/tr}2 | {tr}row{/tr}2-{tr}col{/tr}3 |
+ </code>
</td>
</tr>
<tr>
<td>
- <strong>{tr}Monospace font{/tr}</strong> `{tr}Code sample{/tr}`
+ {icon name='code'}
+ <strong>{tr}Monospace font{/tr}</strong>
+ <code>`{tr}Code sample{/tr}`</code>
</td>
</tr>
</table>
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/f52499b258afdf126b4c7f899935f64962ecfe96
--
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/f52499b258afdf126b4c7f899935f64962ecfe96
You're receiving this email because of your account on gitlab.com.
_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs