summaryrefslogtreecommitdiffstats
path: root/public/help/zh/wiki_syntax.html
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2015-01-03 14:59:01 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2015-01-03 14:59:01 +0000
commite817ea15f95a897a23d25e0ad365a00e5d88050a (patch)
tree2187eb609d8a7fbaf78c4b1da5b14f40310dab42 /public/help/zh/wiki_syntax.html
parenta3ea25ad347cce75fe2c440f45e7da0802b158e7 (diff)
downloadredmine-e817ea15f95a897a23d25e0ad365a00e5d88050a.tar.gz
redmine-e817ea15f95a897a23d25e0ad365a00e5d88050a.zip
Adds table reference to textile help (#12734).
Patch by Matt Wiseley. git-svn-id: http://svn.redmine.org/redmine/trunk@13825 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'public/help/zh/wiki_syntax.html')
-rw-r--r--public/help/zh/wiki_syntax.html19
1 files changed, 19 insertions, 0 deletions
diff --git a/public/help/zh/wiki_syntax.html b/public/help/zh/wiki_syntax.html
index aa645cc6e..95ecd7c12 100644
--- a/public/help/zh/wiki_syntax.html
+++ b/public/help/zh/wiki_syntax.html
@@ -14,6 +14,8 @@ table td h1 { font-size: 1.8em; text-align: left; }
table td h2 { font-size: 1.4em; text-align: left; }
table td h3 { font-size: 1.2em; text-align: left; }
+table.sample { border-collapse: collapse; border-spacing: 0; margin: 4px; }
+table.sample th, table.sample td { border: solid 1px #bbb; padding: 4px; height: 1em; }
</style>
</head>
<body>
@@ -58,6 +60,23 @@ table td h3 { font-size: 1.2em; text-align: left; }
<tr><th colspan="3">Inline images</th></tr>
<tr><th><img src="../../images/jstoolbar/bt_img.png" style="border: 1px solid #bbb;" alt="Image" /></th><td>!<em>image_url</em>!</td><td></td></tr>
<tr><th></th><td>!<em>attached_image</em>!</td><td></td></tr>
+
+<tr><th colspan="3">Tables</th></tr>
+<tr>
+ <th></th>
+ <td>|_. A |_. B |_. C |<br />| A | B | C |<br />|/2. row span | B | C |<br />|\2. col span |</td>
+ <td>
+ <table class="sample">
+ <tbody>
+ <th>A</th><th>B</th><th>C</th>
+ <tr><td>A</td><td>B</td><td>C</td></tr>
+ <tr><td rowspan="2">row span</td><td>B</td><td>C</td></tr>
+ <tr><td colspan="2">col span</td></tr>
+ </tbody>
+ </table>
+ </td>
+</tr>
+
</table>
<p><a href="wiki_syntax_detailed.html" onclick="window.open('wiki_syntax_detailed.html', '', ''); return false;">More Information</a></p>