summaryrefslogtreecommitdiffstats
path: root/public/help/sr-yu
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2014-12-14 20:34:54 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2014-12-14 20:34:54 +0000
commitfe838c57ff30b93f119bd97e76d650136c12089b (patch)
treefe094557be6dea5c4ee3e971494317d1df3be6e2 /public/help/sr-yu
parent90e16a35c5d85d8f3aed31ffe040bddfab2c9109 (diff)
downloadredmine-fe838c57ff30b93f119bd97e76d650136c12089b.tar.gz
redmine-fe838c57ff30b93f119bd97e76d650136c12089b.zip
Adds table reference to textile help (#12734).
Patch by Matt Wiseley. git-svn-id: http://svn.redmine.org/redmine/trunk@13762 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'public/help/sr-yu')
-rw-r--r--public/help/sr-yu/wiki_syntax.html6
1 files changed, 6 insertions, 0 deletions
diff --git a/public/help/sr-yu/wiki_syntax.html b/public/help/sr-yu/wiki_syntax.html
index aa645cc6e..fe2f24be9 100644
--- a/public/help/sr-yu/wiki_syntax.html
+++ b/public/help/sr-yu/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,10 @@ 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><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>