##// END OF EJS Templates
jro_apps » redmine
RSS
Merged r14995 from trunk to 3.1-stable (#21456)...
Toshi MARUYAMA -
r14619:d003a67a3ad4
parent child
Show More
Side by Side Unified
Context file:
r14619:d003a67a3ad4 Loading diff...:
Show file before | Show file after | Hide comments
@@ -125,11 +125,11
125 </ul>
125 </ul>
126
126
127 <ul>
127 <ul>
128 <li>Forums:
128 <li>论坛：
129 <ul>
129 <ul>
130 <li><strong>forum#1</strong> (link to forum with id 1</li>
130 <li><strong>forum#1</strong> (链接至id为2的论坛)</li>
131 <li><strong>forum:Support</strong> (link to forum named Support)</li>
131 <li><strong>forum:Support</strong> (链接至名称为"Support"的论坛)</li>
132 <li><strong>forum:"Technical Support"</strong> (use double quotes if forum name contains spaces)</li>
132 <li><strong>forum:"Technical Support"</strong> (论坛名称包含空格时使用双引号表示)</li>
133 </ul></li>
133 </ul></li>
134 </ul>
134 </ul>
135
135
@@ -145,16 +145,16
145 <ul>
145 <ul>
146 <li><strong>project#3</strong> (链接至id为3的项目)</li>
146 <li><strong>project#3</strong> (链接至id为3的项目)</li>
147 <li><strong>project:someproject</strong> (链接至名称为"someproject"的项目)</li>
147 <li><strong>project:someproject</strong> (链接至名称为"someproject"的项目)</li>
148 <li><strong>project:"Some Project"</strong> (use double quotes for project name containing spaces)</li>
148 <li><strong>project:"Some Project"</strong> (项目名称包含空格时，使用双引号来表示)</li>
149 </ul></li>
149 </ul></li>
150 </ul>
150 </ul>
151
151
152 <ul>
152 <ul>
153 <li>News:
153 <li>新闻:
154 <ul>
154 <ul>
155 <li><strong>news#2</strong> (link to news item with id 2)</li>
155 <li><strong>news#2</strong> (链接至id为1的新闻)</li>
156 <li><strong>news:Greetings</strong> (link to news item named "Greetings")</li>
156 <li><strong>news:Greetings</strong> (链接至名称为"Greetings"的新闻)</li>
157 <li><strong>news:"First Release"</strong> (use double quotes if news item name contains spaces)</li>
157 <li><strong>news:"First Release"</strong> (新闻名称包含空格时，使用双引号来表示)</li>
158 </ul></li>
158 </ul></li>
159 </ul>
159 </ul>
160
160
Show file before | Show file after | Hide comments
@@ -37,9 +37,9 table.sample th, table.sample td { border: solid 1px #bbb; padding: 4px; height:
37 </pre>
37 </pre>
38 </td></tr>
38 </td></tr>
39
39
40 <tr><th colspan="3">Lists</th></tr>
40 <tr><th colspan="3">列表</th></tr>
41 <tr><th><img src="../../images/jstoolbar/bt_ul.png" style="border: 1px solid #bbb;" alt="Unordered list" /></th><td>* Item 1<br />** Sub<br />* Item 2</td><td><ul><li>Item 1<ul><li>Sub</li></ul></li><li>Item 2</li></ul></td></tr>
41 <tr><th><img src="../../images/jstoolbar/bt_ul.png" style="border: 1px solid #bbb;" alt="不排序列表" /></th><td>* 列表项 1<br />** Sub<br />* 列表项 2</td><td><ul><li>列表项 1<ul><li>子项</li></ul></li><li>列表项 2</li></ul></td></tr>
42 <tr><th><img src="../../images/jstoolbar/bt_ol.png" style="border: 1px solid #bbb;" alt="Ordered list" /></th><td># Item 1<br />## Sub<br /># Item 2</td><td><ol><li>Item 1<ol><li>Sub</li></ol></li><li>Item 2</li></ol></td></tr>
42 <tr><th><img src="../../images/jstoolbar/bt_ol.png" style="border: 1px solid #bbb;" alt="排序列表" /></th><td># 列表项 1<br />## Sub<br /># 列表项 2</td><td><ol><li>列表项 1<ol><li>子项</li></ol></li><li>列表项 2</li></ol></td></tr>
43
43
44 <tr><th colspan="3">标题</th></tr>
44 <tr><th colspan="3">标题</th></tr>
45 <tr><th><img src="../../images/jstoolbar/bt_h1.png" style="border: 1px solid #bbb;" alt="标题 1" /></th><td>h1. 标题 1</td><td><h1>标题 1</h1></td></tr>
45 <tr><th><img src="../../images/jstoolbar/bt_h1.png" style="border: 1px solid #bbb;" alt="标题 1" /></th><td>h1. 标题 1</td><td><h1>标题 1</h1></td></tr>
@@ -57,11 +57,11 table.sample th, table.sample td { border: solid 1px #bbb; padding: 4px; height:
57 <tr><th></th><td>commit:f30e13e43</td><td>提交: <a href="#">f30e13e4</a></td></tr>
57 <tr><th></th><td>commit:f30e13e43</td><td>提交: <a href="#">f30e13e4</a></td></tr>
58 <tr><th></th><td>source:some/file</td><td>代码：<a href="#">source:some/file</a></td></tr>
58 <tr><th></th><td>source:some/file</td><td>代码：<a href="#">source:some/file</a></td></tr>
59
59
60 <tr><th colspan="3">Inline images</th></tr>
60 <tr><th colspan="3">内嵌图片</th></tr>
61 <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>
61 <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>
62 <tr><th></th><td>!<em>attached_image</em>!</td><td></td></tr>
62 <tr><th></th><td>!<em>attached_image</em>!</td><td></td></tr>
63
63
64 <tr><th colspan="3">Tables</th></tr>
64 <tr><th colspan="3">表格</th></tr>
65 <tr>
65 <tr>
66 <th></th>
66 <th></th>
67 <td>|_. A |_. B |_. C |<br />| A | B | C |<br />|/2. row span | B | C |<br />|\2. col span |</td>
67 <td>|_. A |_. B |_. C |<br />| A | B | C |<br />|/2. row span | B | C |<br />|\2. col span |</td>
@@ -70,8 +70,8 table.sample th, table.sample td { border: solid 1px #bbb; padding: 4px; height:
70 <tbody>
70 <tbody>
71 <th>A</th><th>B</th><th>C</th>
71 <th>A</th><th>B</th><th>C</th>
72 <tr><td>A</td><td>B</td><td>C</td></tr>
72 <tr><td>A</td><td>B</td><td>C</td></tr>
73 <tr><td rowspan="2">row span</td><td>B</td><td>C</td></tr>
73 <tr><td rowspan="2">行合并</td><td>B</td><td>C</td></tr>
74 <tr><td colspan="2">col span</td></tr>
74 <tr><td colspan="2">列合并</td></tr>
75 </tbody>
75 </tbody>
76 </table>
76 </table>
77 </td>
77 </td>
General Comments 0
You need to be logged in to leave comments. Login now