[TikiWiki-commits] [Git][tikiwiki/tiki][29.x] [BP][UPD] Editor help menu: update markdown help menu information with missing...

Boss Ibrahim Mussa Gregoire pushed to branch 29.x at Tiki Wiki CMS Groupware / Tiki


Commits:
6d4e6ff9 by Boss Ibrahim Mussa Gregoire at 2026-03-27T11:01:17+01:00
[BP][UPD] Editor help menu: update markdown help menu information with missing supported markdown syntax
---
* [FIX] Editor help menu: update markdown typo, and correct broken html code
---
* [FIX] Markdown help: update markdown typo, and broken code html

See merge request tikiwiki/tiki!9575

* [UPD] Editor help menu: update markdown help menu information with missing supported markdown syntax
---
* [UPD] Editor help: update markdown help information.

* [REM] Editor help: remove markdown wysiwyg help file.

See merge request tikiwiki/tiki!9511

See merge request tikiwiki/tiki!9574

- - - - -


4 changed files:

- lang/fr/language.php
- lib/core/Services/Edit/Controller.php
- templates/tiki-edit_help_markdown.tpl
- templates/tiki-edit_help_markdown_wysiwyg.tpl


Changes:

=====================================
lang/fr/language.php
=====================================
@@ -1507,7 +1507,7 @@ $lang_current = array(
 "Inline editor update" => "Mise à jour de l'éditeur en ligne",
 "Preview" => "Aperçu",
 // "Wiki Syntax Help" => "Wiki Syntax Help",
-// "Mardown Syntax Help" => "Mardown Syntax Help",
+"Markdown Syntax Help" => "Aide sur la syntaxe Markdown",
 "Plugins" => "Plugiciels",
 // "Spreadsheet Help" => "Spreadsheet Help",
 // "Edit Help" => "Edit Help",


=====================================
lib/core/Services/Edit/Controller.php
=====================================
@@ -267,22 +267,14 @@ $(window).on("load", function(){
             ];
         }
 
-        if ($input->markdown->int()) {
+        if ($input->markdown_wysiwyg->int() || $input->markdown->int()) {
             $help_sections[] = [
                 'id' => 'wiki-help',
-                'title' => tr('Mardown Syntax Help'),
+                'title' => tr('Markdown Syntax Help'),
                 'content' => $smarty->fetch('tiki-edit_help_markdown.tpl'),
             ];
         }
 
-        if ($input->markdown_wysiwyg->int()) {
-            $help_sections[] = [
-                'id' => 'wiki-help',
-                'title' => tr('Mardown Syntax Help'),
-                'content' => $smarty->fetch('tiki-edit_help_markdown_wysiwyg.tpl'),
-            ];
-        }
-
         if ($input->plugins->int()) {
             $areaId = $input->areaId->word();
             $wikilib = TikiLib::lib('wiki');


=====================================
templates/tiki-edit_help_markdown.tpl
=====================================
@@ -1,61 +1,120 @@
 {if $prefs.feature_help eq 'y'}
     {remarksbox type="info" title="{tr}More information{/tr}"}
+    {if $prefs.feature_wysiwyg eq 'y' && $prefs.wysiwyg_optional eq 'y'}
+        <a href="{$prefs.helpurl}Markdown-WYSIWYG-Page-Editor" target="tikihelp" class="tikihelp alert-link" title="{tr}Wiki Page Editor:{/tr} {tr}More help on editing wiki pages{/tr}">
+            {tr}Markdown WYSIWYG Page Editor{/tr}
+        </a>
+    {else}
         <a href="{$prefs.helpurl}Wiki-Page-Editor" target="tikihelp" class="tikihelp alert-link" title="{tr}Wiki Page Editor:{/tr} {tr}More help on editing wiki pages{/tr}">
             {tr}Wiki Page Editor{/tr}
         </a>
-        {tr}and{/tr}
+    {/if}
+    {tr}and{/tr}
         <a href="{$prefs.helpurl}Markdown-syntax" target="tikihelp" class="tikihelp alert-link" title="{tr}Wiki Syntax:{/tr} {tr}The syntax system used for creating pages in Tiki{/tr}">
             {tr}Markdown Syntax{/tr}
         </a>
+        <a href="{$prefs.helpurl}Converting-from-Tiki-syntax-to-Markdown" target="tikihelp" class="tikihelp alert-link" title="{tr}Wiki Syntax:{/tr} {tr}Converting from Tiki-syntax to Markdown{/tr}">
+            {tr}Markdown Syntax{/tr}
+        </a>
     {/remarksbox}
 {/if}
 <table class="table table-condensed table-hover">
     <tr>
         <td>
-            {icon name='bold'} <strong>{tr}Bold text{/tr}</strong> &nbsp;&nbsp;&nbsp; __{tr}text{/tr}__
+            {icon name='bold'}
+            <strong>{tr}Bold text{/tr}</strong><br>
+            <code>**{tr}text{/tr}**</code> {tr}or{/tr} <code>__{tr}text{/tr}__</code>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            {icon name='italic'}
+            <strong>{tr}Italic text{/tr}</strong><br>
+            <code>*{tr}text{/tr}*</code> {tr}or{/tr} <code>_{tr}text{/tr}_</code>
         </td>
     </tr>
     <tr>
         <td>
-            {icon name='italic'} <strong>{tr}Italic text{/tr}</strong> &nbsp;&nbsp;&nbsp; _{tr}text{/tr}_
+            {icon name='strikethrough'}
+            <strong>{tr}Deleted text{/tr}</strong><br>
+            <code>~~{tr}text{/tr}~~</code>
         </td>
     </tr>
     <tr>
         <td>
-            {icon name='strikethrough'} <strong>{tr}Deleted text{/tr}</strong> &nbsp;&nbsp;&nbsp; {tr}2 dashes{/tr} "-". &nbsp;&nbsp;&nbsp; --{tr}text{/tr}--
+            {icon name='h1'}
+            <strong>{tr}Headings{/tr}</strong><br>
+            <code># Heading 1</code>, <code>## Heading 2</code>, <code>### Heading 3</code>
         </td>
     </tr>
     <tr>
         <td>
-            {icon name='h1'} <strong>{tr}Headings{/tr}</strong> <br/> #heading1, ##heading2, ###heading3
+            {icon name='horizontal-rule'}
+            <strong>{tr}Horizontal rule{/tr}</strong><br>
+            <code>---</code> {tr}or{/tr} <code>***</code>
         </td>
     </tr>
     <tr>
         <td>
-            {icon name='horizontal-rule'} <strong>{tr}Horizontal rule{/tr}</strong> &nbsp;&nbsp;&nbsp; -<em></em>-<em></em>-<em></em>-
+            {icon name='link-external'}
+            <strong>{tr}External links{/tr}</strong> <br>
+            <code>[text](url)</code>
         </td>
     </tr>
     <tr>
         <td>
-            {icon name='link-external'} <strong>{tr}External links{/tr}</strong> &nbsp;&nbsp;&nbsp;  [text](url)
+            {icon name='image'}
+            <strong>{tr}Image{/tr}</strong><br>
+            <code>![alt ext](image.jpg)</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>
+            {tr}for bullet lists{/tr}<br>
+            <code>*</code> {tr}or{/tr} <code>-</code> <br>
+            {tr}for numbered lists{/tr}<br>
+            <code>1. First<br> 2. Second<br>3. Third</code><br>
+            {tr}Lists task{/tr}<br>
+            <code>- [x] Write the press release <br>- [ ] Update the website<br>- [ ] Contact the media</code>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            {icon name='list'}
+            <strong>{tr}Blockquotes{/tr}</strong><br>
+            <code> This is a blockquote.<br> It can span multiple lines.</code>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            {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>
-            {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>
-            | {tr}row{/tr}2-{tr}col{/tr}1 | {tr}row{/tr}2-{tr}col{/tr}2 | {tr}row{/tr}2-{tr}col{/tr}3 |
+            {icon name='superscript'}
+            <strong>{tr}Footnote{/tr}</strong><br>
+            <code>Here's a sentence with a footnote. [^1]</code><br>
+            <code>[^1]: This is the footnote.</code>
         </td>
     </tr>
     <tr>
         <td>
-            <strong>{tr}Monospace font{/tr}</strong> &nbsp;&nbsp;&nbsp; `{tr}Code sample{/tr}`
+            {icon name='code'}
+            <strong>{tr}Code{/tr}</strong><br>
+            {tr}Simple Code{/tr}<br>
+            <code>`Code sample`</code><br>
+            {tr}For code Block{/tr}</> <br>
+            <code>```php<br>echo "Hello, World!";<br>```</code>
         </td>
     </tr>
 </table>


=====================================
templates/tiki-edit_help_markdown_wysiwyg.tpl
=====================================
@@ -1,61 +0,0 @@
-{if $prefs.feature_help eq 'y'}
-    {remarksbox type="info"}
-    {tr}More information:{/tr} <a href="{$prefs.helpurl}Markdown-WYSIWYG-Page-Editor" target="tikihelp" class="tikihelp alert-link" title="{tr}Wiki Page Editor:{/tr} {tr}More help on editing wiki pages{/tr}">
-            {tr}Markdown WYSIWYG Page Editor{/tr}
-        </a>
-        {tr}and{/tr}
-        <a href="{$prefs.helpurl}Markdown-syntax" target="tikihelp" class="tikihelp alert-link" title="{tr}Wiki Syntax:{/tr} {tr}The syntax system used for creating pages in Tiki{/tr}">
-            {tr}Markdown Syntax{/tr}
-        </a>
-    {/remarksbox}
-{/if}
-<table class="table table-condensed table-hover">
-    <tr>
-        <td>
-            {icon name='bold'} <strong>{tr}Bold text{/tr}</strong> &nbsp;&nbsp;&nbsp; __{tr}text{/tr}__
-        </td>
-    </tr>
-    <tr>
-        <td>
-            {icon name='italic'} <strong>{tr}Italic text{/tr}</strong> &nbsp;&nbsp;&nbsp; _{tr}text{/tr}_
-        </td>
-    </tr>
-    <tr>
-        <td>
-            {icon name='strikethrough'} <strong>{tr}Deleted text{/tr}</strong> &nbsp;&nbsp;&nbsp; {tr}2 dashes{/tr} "-". &nbsp;&nbsp;&nbsp; --{tr}text{/tr}--
-        </td>
-    </tr>
-    <tr>
-        <td>
-            {icon name='h1'} <strong>{tr}Headings{/tr}</strong> <br/> #heading1, ##heading2, ###heading3
-        </td>
-    </tr>
-    <tr>
-        <td>
-            {icon name='horizontal-rule'} <strong>{tr}Horizontal rule{/tr}</strong> &nbsp;&nbsp;&nbsp; -<em></em>-<em></em>-<em></em>-
-        </td>
-    </tr>
-    <tr>
-        <td>
-            {icon name='link-external'} <strong>{tr}External links{/tr}</strong> &nbsp;&nbsp;&nbsp;  [text](url)
-        </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}
-        </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>
-            | {tr}row{/tr}2-{tr}col{/tr}1 | {tr}row{/tr}2-{tr}col{/tr}2 | {tr}row{/tr}2-{tr}col{/tr}3 |
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <strong>{tr}Monospace font{/tr}</strong> &nbsp;&nbsp;&nbsp; `{tr}Code sample{/tr}`
-        </td>
-    </tr>
-</table>



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/6d4e6ff979aa78bcd2a2d2dadf27d2c4117cd716

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/6d4e6ff979aa78bcd2a2d2dadf27d2c4117cd716
You're receiving this email because of your account on gitlab.com. Manage all notifications: https://gitlab.com/-/profile/notifications | Help: https://gitlab.com/help

_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs