Author: vmassol
Date: 2008-02-20 17:20:01 +0100 (Wed, 20 Feb 2008)
New Revision: 7881
Added:
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/XWikiSyntax
Modified:
xwiki-platform/xwiki-applications/trunk/panels/src/main/resources/Panels/SyntaxHelp
Log:
XE-197: Include the XWiki Syntax page in the default wiki rather than link to
the live xwiki.org web site
XAPANELS-44: Make SyntaxHelp Panel use the XWiki.XWikiSyntax page if it exists
Modified:
xwiki-platform/xwiki-applications/trunk/panels/src/main/resources/Panels/SyntaxHelp
===================================================================
---
xwiki-platform/xwiki-applications/trunk/panels/src/main/resources/Panels/SyntaxHelp
2008-02-20 16:17:52 UTC (rev 7880)
+++
xwiki-platform/xwiki-applications/trunk/panels/src/main/resources/Panels/SyntaxHelp
2008-02-20 16:20:01 UTC (rev 7881)
@@ -12,8 +12,8 @@
<customClass></customClass>
<contentAuthor>XWiki.Admin</contentAuthor>
<creationDate>1153995199000</creationDate>
-<date>1197027095000</date>
-<contentUpdateDate>1197027095000</contentUpdateDate>
+<date>1203523463000</date>
+<contentUpdateDate>1203523463000</contentUpdateDate>
<version>1.1</version>
<title>XWiki syntax help</title>
<template></template>
@@ -25,7 +25,7 @@
<filename>img.png</filename>
<filesize>959</filesize>
<author>XWiki.superadmin</author>
-<date>1197027095000</date>
+<date>1203518471000</date>
<version>1.1</version>
<comment></comment>
<content>iVBORw0KGgoAAAANSUhEUgAAADQAAAA0CAAAAADgE0Q3AAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAACxMAAAsTAQCanBgAAAAHdElNRQfWBxcOEy+3/bdlAAADUElEQVRIx52WTW/cVBSG32tfezxJZiaT0EwnCkVKgVZI3cFAVYkFLEFCKoI/wz9Bgh/ApqqEWLQLFmUHAtJKqKIqMKhSJ50R+aCTTHzPey4L2/PVIru9C8u6Po/f83XtYzxefAUvwcACAMZPjrXc1gfJVm0VgPHA+HCQGmOMKcfQ6jYypeO/jQ1tWAGCng1sHRY4ehzYuBbUwzIojb1nOkmMBf5xNonW46iCUhoxPY3WLPBvEK826lFQAUq8xhawgNrE1muBqZJsFwVQWMAE8Vq0xIxv7a+rjhN38Z3Ezu3HQORgPO6G7VYSLjD9Gx92SJK8e//z15KFF3qJAgBmOZz+d5+ec8455+TSe18/mCw8NEAAPFvXGx9Z55yIiHPr79/suwq9d+fd0ImIc86JuFbrx5EvhwY7LndORCS9uPfo7HkNu7goQiWZXWhOn5wmpZB3M4JK6kTKleAKHVGSozAMKkCS6YiSSh4mjbiyUu4b03qjVpq98eMs3yLihCKj+lpUqvRzV0hRKkmlsjV8epaUKR2tO+co4kQoItJ1fx2Vutc9dCJ5F4mI7FPKO2JrNI+IjNrbjVLovP81s6aIk8HoaXc7KYXsZ40D5hhl8OjC5XNhKWQ2r0ym7k2423urgfLixu2sGZTKk/obVzq2AgRkZVKqnq502hZVoFcPEyU9VVVXl3vo//4aTVJIISmTqBaiktKBcapUVVXWrKkGfdNkjmhkjDcVoOGXJioYjf54uL1iyqDht7+3QdUsD/TRzb2Pdxc/lzAe9+xGM9/t//bLSQuFilIzsvN275VZaC6ag/o//MkVy4Iorqr0Pn7zg0tJsAyN7txn02R29My8o5+iCC/0crkCSm/3NyLmZizc0iIyVQAIbOdarxMUUP2r8wHpqXO+Kf0UmZ7BcOuLTbjIAsDDDQinxpr7VUQ2d2w5fLBZpHzsnV8MfuagLhx1OZjWSZpHupjnWUyLVdxJ84Y1uPa6kJSsRUmhZvdcZnD1kxyqAX6XuX1mKxSKyDNML/sVGo/RsN38CXv76mflVFX1y8jOVVwHXBgYj5NR1EqC732+FF7hvX/OTHd91ns4OV4tn3Gm+QsNjAcwUSSm2vBhYTIlAGk1xmQzinmZcfQ/40v+ffqYGLoAAAAASUVORK5CYII=</content>
@@ -107,7 +107,13 @@
</property>
<property>
<content>#largepanelheader("XWiki Syntax Help")
-$msg.get("helponsyntax") <a
href="http://platform.xwiki.org/xwiki/bin/view/Main/XWikiSyntax?xpage=plain";
onclick="openHelp(); return false;"><span
class="nobr">$msg.get("xwikisyntax")</span></a>
+#set ($syntaxDoc = $xwiki.getDocument("XWiki.XWikiSyntax"))
+#if ($syntaxDoc.isNew())
+ #set ($url =
"http://platform.xwiki.org/xwiki/bin/view/Main/XWikiSyntax?xpage=print";)
+#else
+ #set ($url = $xwiki.getURL("XWiki.XWikiSyntax", "view", "xpage=print"))
+#end
+$msg.get("helponsyntax") <a href="$url" onclick="openURL('$url', '_blank');
return false;"><span
class="nobr">$msg.get("xwikisyntax")</span></a>
#panelfooter()</content>
</property>
<property>
Added:
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/XWikiSyntax
===================================================================
---
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/XWikiSyntax
(rev 0)
+++
xwiki-products/xwiki-enterprise/trunk/wiki/src/main/resources/XWiki/XWikiSyntax
2008-02-20 16:20:01 UTC (rev 7881)
@@ -0,0 +1,696 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<xwikidoc>
+<web>XWiki</web>
+<name>XWikiSyntax</name>
+<language></language>
+<defaultLanguage>en</defaultLanguage>
+<translation>0</translation>
+<parent></parent>
+<creator>XWiki.Admin</creator>
+<author>XWiki.Admin</author>
+<customClass></customClass>
+<contentAuthor>XWiki.Admin</contentAuthor>
+<creationDate>1203507376000</creationDate>
+<date>1203508137000</date>
+<contentUpdateDate>1203508137000</contentUpdateDate>
+<version>1.1</version>
+<title></title>
+<template></template>
+<defaultTemplate></defaultTemplate>
+<validationScript></validationScript>
+<comment></comment>
+<minorEdit>false</minorEdit>
+<attachment>
+<filename>img.png</filename>
+<filesize>959</filesize>
+<author>XWiki.Admin</author>
+<date>1203507880000</date>
+<version>1.1</version>
+<comment></comment>
+<content>iVBORw0KGgoAAAANSUhEUgAAADQAAAA0CAAAAADgE0Q3AAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAACxMAAAsTAQCanBgAAAAHdElNRQfWBxcOEy+3/bdlAAADUElEQVRIx52WTW/cVBSG32tfezxJZiaT0EwnCkVKgVZI3cFAVYkFLEFCKoI/wz9Bgh/ApqqEWLQLFmUHAtJKqKIqMKhSJ50R+aCTTHzPey4L2/PVIru9C8u6Po/f83XtYzxefAUvwcACAMZPjrXc1gfJVm0VgPHA+HCQGmOMKcfQ6jYypeO/jQ1tWAGCng1sHRY4ehzYuBbUwzIojb1nOkmMBf5xNonW46iCUhoxPY3WLPBvEK826lFQAUq8xhawgNrE1muBqZJsFwVQWMAE8Vq0xIxv7a+rjhN38Z3Ezu3HQORgPO6G7VYSLjD9Gx92SJK8e//z15KFF3qJAgBmOZz+d5+ec8455+TSe18/mCw8NEAAPFvXGx9Z55yIiHPr79/suwq9d+fd0ImIc86JuFbrx5EvhwY7LndORCS9uPfo7HkNu7goQiWZXWhOn5wmpZB3M4JK6kTKleAKHVGSozAMKkCS6YiSSh4mjbiyUu4b03qjVpq98eMs3yLihCKj+lpUqvRzV0hRKkmlsjV8epaUKR2tO+co4kQoItJ1fx2Vutc9dCJ5F4mI7FPKO2JrNI+IjNrbjVLovP81s6aIk8HoaXc7KYXsZ40D5hhl8OjC5XNhKWQ2r0ym7k2423urgfLixu2sGZTKk/obVzq2AgRkZVKqnq502hZVoFcPEyU9VVVXl3vo//4aTVJIISmTqBaiktKBcapUVVXWrKkGfdNkjmhkjDcVoOGXJioYjf54uL1iyqDht7+3QdUsD/TRzb2Pdxc/lzAe9+xGM9/t//bLSQuFilIzsvN275VZaC6ag/o//MkVy4Iorqr0Pn7zg0tJsAyN7txn02R29My8o5+iCC/0crkCSm/3NyLmZizc0iIyVQAIbOdarxMUUP2r8wHpqXO+Kf0UmZ7BcOuLTbjIAsDDDQinxpr7VUQ2d2w5fLBZpHzsnV8MfuagLhx1OZjWSZpHupjnWUyLVdxJ84Y1uPa6kJSsRUmhZvdcZnD1kxyqAX6XuX1mKxSKyDNML/sVGo/RsN38CXv76mflVFX1y8jOVVwHXBgYj5NR1EqC732+FF7hvX/OTHd91ns4OV4tn3Gm+QsNjAcwUSSm2vBhYTIlAGk1xmQzinmZcfQ/40v+ffqYGLoAAAAASUVORK5CYII=</content>
+</attachment>
+<object>
+<class>
+<name>XWiki.TagClass</name>
+<customClass></customClass>
+<customMapping></customMapping>
+<defaultViewSheet></defaultViewSheet>
+<defaultEditSheet></defaultEditSheet>
+<defaultWeb></defaultWeb>
+<nameField></nameField>
+<validationScript></validationScript>
+<tags>
+<cache>0</cache>
+<displayType>input</displayType>
+<multiSelect>1</multiSelect>
+<name>tags</name>
+<number>1</number>
+<prettyName>Tags</prettyName>
+<relationalStorage>1</relationalStorage>
+<separator> </separator>
+<separators> ,|</separators>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<values></values>
+<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+</tags>
+</class>
+<name>XWiki.XWikiSyntax</name>
+<number>0</number>
+<className>XWiki.TagClass</className>
+<property>
+<tags/>
+</property>
+</object>
+<content>1 XWiki Syntax
+
+* [Titles>#HTitles]
+* [Paragraphs>#HParagraphs]
+* [Lists>#HLists]
+** [Bulleted Lists>#HBulletedLists]
+** [Numbered Lists>#HNumberedLists]
+** [Definition Lists>#HDefinitionLists]
+* [Text Styles>#HTextStyles]
+* [Horizontal Line>#HHorizontalLine]
+* [Links>#HLinks]
+** [Internal Links>#HInternalLinks]
+** [External Links>#HExternalLinks]
+* [Tables>#HTables]
+* [Images>#HImages]
+* [Escaping Text>#HEscapingText]
+** [Escaping a single character>#HEscapingasinglecharacter]
+** [Escaping wiki syntax rendering>#HEscapingwikisyntaxrendering]
+** [Escaping everything>#HEscapingeverything]
+* [Boxes>#HBoxes]
+* [Other macros>#HOtherMacros]
+
+In addition to these special wiki syntaxes XWiki allows any HTML to be
inserted in a page so if there no wiki syntax for what you wish to achieve,
consider using HTML.
+
+1.1 Titles
+
+{pre}
+<table class="wiki-table" border="1" cellspacing="0" cellpadding="2"
width="80%">
+ <tr>
+ <th>Example</th>
+ <th>Result</th>
+ </tr>
+ <tr>
+ <td>
+<pre>
+1 Title 1
+1.1 Title 2
+1.1.1 Title 3
+1.1.1.1 Title 4
+1.1.1.1.1 Title 5
+1.1.1.1.1.1 Title 6
+</pre>
+ </td>
+ <td>
+ <h2 class="heading-1"><span id="HTitle1">Title
1</span></h2><p class="paragraph"/>
+ <h3 class="heading-1-1"><span id="HTitle2">Title
2</span></h3><p class="paragraph"/>
+ <h4 class="heading-1-1-1"><span id="HTitle3">Title
3</span></h4><p class="paragraph"/>
+ <h5 class="heading-1-1-1-1"><span id="HTitle4">Title
4</span></h5><p class="paragraph"/>
+ <h6 class="heading-1-1-1-1-1"><span id="HTitle5">Title
5</span></h6><p class="paragraph"/>
+ <h6 class="heading-1-1-1-1-1-1"><span id="HTitle6">Title
6</span></h6><p class="paragraph"/>
+ </td>
+ </tr>
+</table>
+{/pre}
+
+1.1 Paragraphs
+
+{pre}
+<table class="wiki-table" border="1" cellspacing="0" cellpadding="2"
width="80%">
+ <tr>
+ <th>Example</th>
+ <th>Result</th>
+ </tr>
+ <tr>
+ <td>
+<pre>
+Here is a paragraph.
+This text continues the same paragraph.
+
+This paragraph is a new one.
+
+This paragraph is another new one.
+
+This paragraph is displayed\\
+on two lines.
+</pre>
+ </td>
+ <td>
+Here is a paragraph.
+This text continues the same paragraph.<p class="paragraph"/>This
paragraph is a new one.<p class="paragraph"/>This paragraph is another
new one.<p class="paragraph"/>
+This paragraph is displayed<br/>on two lines.
+ </td>
+ </tr>
+</table>
+{/pre}
+
+1.1 Lists
+
+1.1.1 Bulleted Lists
+
+{pre}
+<table class="wiki-table" border="1" cellspacing="0" cellpadding="2"
width="80%">
+ <tr>
+ <th>Example</th>
+ <th>Result</th>
+ </tr>
+ <tr>
+ <td>
+<pre>
+* Item 1
+** Item 2
+*** Item 3
+* Item 4
+</pre>
+ </td>
+ <td>
+ <ul class="star">
+ <li>Item 1
+ <ul class="star">
+ <li>Item 2
+ <ul class="star">
+ <li>Item 3</li>
+ </ul>
+ </li>
+ </ul>
+ </li>
+ <li>Item 4</li>
+ </ul>
+ </td>
+ </tr>
+</table>
+{/pre}
+
+1.1.1 Numbered Lists
+
+{pre}
+<table class="wiki-table" border="1" cellspacing="0" cellpadding="2"
width="80%">
+ <tr>
+ <th>Example</th>
+ <th>Result</th>
+ </tr>
+ <tr>
+ <td>
+<pre>
+1. Item 1
+11. Item 2
+111. Item 3
+1. Item 4
+
+1. Item 1
+1*. Item 2
+1*. Item 3
+1. Item 4
+
+a. Alphabetical enumerated list
+a. Alphabetical enumerated list
+
+A. Uppercase alphabetical enumerated list
+A. Uppercase alphabetical enumerated list
+
+i. Roman enumerated list
+i. Roman enumerated list
+
+I. Uppercase roman enumerated list
+I. Uppercase roman enumerated list
+
+g. Greek enumerated list
+g. Greek enumerated list
+
+h. Hirigana (jap.) enumerated list
+h. Hirigana (jap.) enumerated list
+
+k. Katakana (jap.) enumerated list
+k. Katakana (jap.) enumerated list
+</pre>
+ </td>
+ <td>
+ <ol>
+ <li>Item 1
+ <ol>
+ <li>Item 2
+ <ol>
+ <li>Item 3</li>
+ </ol>
+ </li>
+ </ol>
+ </li>
+ <li>Item 4</li>
+ </ol>
+
+ <ol>
+ <li>Item 1
+ <ul class="star">
+ <li>Item 2</li>
+ <li>Item 3</li>
+ </ul>
+ </li>
+ <li>Item 4</li>
+ </ol>
+
+ <ol class="alpha">
+ <li>Alphabetical enumerated list</li>
+ <li>Alphabetical enumerated list</li>
+ </ol>
+
+ <ol class="ALPHA">
+ <li>Uppercase alphabetical enumerated list</li>
+ <li>Uppercase alphabetical enumerated list</li>
+ </ol>
+
+ <ol class="roman">
+ <li>Roman enumerated list</li>
+ <li>Roman enumerated list</li>
+ </ol>
+
+ <ol class="ROMAN">
+ <li>Uppercase roman enumerated list</li>
+ <li>Uppercase roman enumerated list</li>
+ </ol>
+
+ <ol class="greek">
+ <li>Greek enumerated list</li>
+ <li>Greek enumerated list</li>
+ </ol>
+
+ <ol class="hiragana">
+ <li>Hirigana (jap.) enumerated list</li>
+ <li>Hirigana (jap.) enumerated list</li>
+ </ol>
+
+ <ol class="katakana">
+ <li>Katakana (jap.) enumerated list</li>
+ <li>Katakana (jap.) enumerated list</li>
+ </ol>
+
+ </td>
+ </tr>
+</table>
+{/pre}
+
+1.1.1 Definition Lists
+
+{pre}
+<table class="wiki-table" border="1" cellspacing="0" cellpadding="2"
width="80%">
+ <tr>
+ <th>Example</th>
+ <th>Result</th>
+ </tr>
+ <tr>
+ <td>
+<pre>
+&lt;dl&gt;
+ &lt;dt&gt;Term&lt;/dt&gt;
+ &lt;dd&gt;Definition&lt;/dd&gt;
+&lt;/dl&gt;
+</pre>
+ </td>
+ <td>
+ <dl>
+ <dt>Term</dt>
+ <dd>Definition</dd>
+ </dl>
+ </td>
+ </tr>
+</table>
+{/pre}
+
+1.1 Text Styles
+
+{pre}
+<table class="wiki-table" border="1" cellspacing="0" cellpadding="2"
width="80%">
+ <tr>
+ <th>Example</th>
+ <th>Result</th>
+ </tr>
+ <tr>
+ <td>
+<pre>
+a *bold* word
+
+an __underlined__ word
+
+~~text in italics~~
+
+--striked text--
+
+&lt;tt&gt;text in monospace font&lt;/tt&gt;
+
+Text in a &lt;sup&gt;superscript&lt;/sup&gt; format
+
+Text in a &lt;sub&gt;subscript&lt;/sub&gt; format
+
+{quote:http://www.xwiki.org}
+Here is some text with a quote
+{quote}
+</pre>
+ </td>
+ <td>
+ a <strong class="strong">bold</strong> word<p
class="paragraph"/>
+ an <span class="underline">underlined</span> word<p
class="paragraph"/>
+ <em class="italic">text in italics</em><p
class="paragraph"/>
+ <del class="strike">striked text</del><p
class="paragraph"/>
+ <tt>text in monospace font</tt><p class="paragraph"/>
+ Text in a <sup>superscript</sup> format<p
class="paragraph"/>
+ Text in a <sub>subscript</sub> format<p
class="paragraph"/>
+ <blockquote class="quote">
+ Here is some text with a quote
+ <a href="http://www.xwiki.org">Source</a>
+ </blockquote><p class="paragraph"/>
+ </td>
+ </tr>
+</table>
+{/pre}
+
+1.1 Horizontal Line
+
+{pre}
+<table class="wiki-table" border="1" cellspacing="0" cellpadding="2"
width="80%">
+ <tr>
+ <th>Example</th>
+ <th>Result</th>
+ </tr>
+ <tr>
+ <td>
+<pre>
+----
+</pre>
+ </td>
+ <td>
+ <hr class="line"/>
+ </td>
+ </tr>
+</table>
+{/pre}
+
+1.1 Links
+
+The full format of a link is
{code}(alias[|>])(link)(@interWikiAlias)([|>]target){code}
+* <tt>alias</tt>: An optional string which will be displayed to
the user as the link name when rendered. Example: "My Page".
+* <tt>link</tt>: The full link reference using the following
syntax: {code}(virtualWikiAlias:)(space.)(reference)(?queryString)(#anchor)
{code}
+* Note that either the <tt>link</tt> or the
<tt>alias</tt> must be specified.
+** <tt>virtualWikiAlias</tt>: An optional string containing the
name of a virtual wiki. The link will point to a page inside that virtual wiki.
Example: "mywiki".
+** <tt>space</tt>: An optional Wiki Space name. If not space is
specified the current space is used. Example: "Main".
+** <tt>reference</tt>: The link reference. This can be either a
URI in the form <tt>protocol:path</tt> (example:
"http://xwiki.org";, "mailto:[EMAIL PROTECTED]") or a wiki page name (example:
"WebHome").
+** <tt>queryString</tt>: An optional query string for specifying
parameters that will be used in the rendered URL. Example:
"mydata1=5&mydata2=Hello".
+** <tt>anchor</tt>: An optional anchor name pointing to an anchor
defined in the referenced link. Note that in XWiki anchors are automatically
created for titles. Example: "TableOfContentAnchor".
+* <tt>interWikiAlias</tt>: An optional [Inter
Wiki>http://en.wikipedia.org/wiki/InterWiki] alias as defined in the
InterWiki Map (see the [Admin
Guide>http://platform.xwiki.org/xwiki/bin/view/AdminGuide/]). Example:
"wikipedia"
+* <tt>target</tt>: An optional string corresponding to the HTML
<tt>target</tt> attribute for a HTML <tt>a</tt> link
element. This element is used when rendering the link. It defaults to opening
the link in the current page. Examples: "_self", "_blank"
+
+1.1.1 Internal Links
+
+{pre}
+<table class="wiki-table" border="1" cellspacing="0" cellpadding="2"
width="80%">
+ <tr>
+ <th>Example</th>
+ <th>Result</th>
+ </tr>
+ <tr>
+ <td>
+<pre>
+[WebHome] (uses current space)
+[home>WebHome] (uses current space)
+[Main.WebHome]
+[home|Main.WebHome]
+[home>Main.WebHome>_blank]
+</pre>
+ </td>
+ <td>
+ <span class="wikilink"><a
href="/xwiki/bin/view/UserGuide/">Web Home</a></span> (uses
current space)<br/>
+ <span class="wikilink"><a
href="/xwiki/bin/view/UserGuide/">home</a></span> (uses current
space)<br/>
+ <span class="wikilink"><a href="/xwiki/bin/view/Main/">Web
Home</a></span><br/>
+ <span class="wikilink"><a
href="/xwiki/bin/view/Main/">home</a></span><br/>
+ <span class="wikilink"><a target="_blank"
href="/xwiki/bin/view/Main/">home</a></span>
+ </td>
+ </tr>
+</table>
+{/pre}
+
+1.1.1 External Links
+
+{pre}
+<table class="wiki-table" border="1" cellspacing="0" cellpadding="2"
width="80%">
+ <tr>
+ <th>Example</th>
+ <th>Result</th>
+ </tr>
+ <tr>
+ <td>
+<pre>
+http://www.xwiki.org
+[http://www.xwiki.org]
+[XWiki>http://www.xwiki.org]
+</pre>
+ </td>
+ <td>
+ <span class="nobr"><a
href="http://www.xwiki.org">http://www.xwiki.org</a></span><br/>
+ <span class="wikiexternallink"><a
href="http://www.xwiki.org">&#104;ttp://www.xwiki.org</a></span><br/>
+ <span class="wikiexternallink"><a
href="http://www.xwiki.org">XWiki</a></span>
+ </td>
+ </tr>
+</table>
+{/pre}
+
+1.1 Tables
+
+The syntax for tables allows to easily create content in table format. It even
allows to make some simple calculations on the content!
+
+{pre}
+<table class="wiki-table" border="1" cellspacing="0" cellpadding="2"
width="80%">
+ <tr>
+ <th>Example</th>
+ <th>Result</th>
+ </tr>
+ <tr>
+ <td>
+<pre>
+{table}
+Title 1 | Title 2
+Word 1 | Word 2
+{table}
+
+{table}
+Category | Sales (K?)
+Category 1 | 100
+Category 2 | 50
+Category 3 | 50
+Total | =sum(B2:B4)
+{table}
+</pre>
+ </td>
+ <td>
+ <table class="wiki-table" cellpadding="0" cellspacing="0"
border="0">
+ <tr>
+ <th>Title 1</th>
+ <th>Title 2</th>
+ </tr>
+ <tr class="table-odd">
+ <td>Word 1</td>
+ <td>Word 2</td>
+ </tr>
+ </table>
+ <table class="wiki-table" cellpadding="0" cellspacing="0"
border="0">
+ <tr>
+ <th>Category</th>
+ <th>Sales (K?)</th>
+ </tr>
+ <tr class="table-odd">
+ <td>Category 1</td>
+ <td>100</td>
+ </tr>
+ <tr class="table-even">
+ <td>Category 2</td>
+ <td>50</td>
+ </tr>
+ <tr class="table-odd">
+ <td>Category 3</td>
+ <td>50</td>
+ </tr>
+ <tr class="table-even">
+ <td>Total</td>
+ <td>200</td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</table>
+{/pre}
+
+1.1 Images
+
+The <tt>\{image\}</tt> macro is used to display attachments as
images. Check the [Image macro reference
guide>http://code.xwiki.org/xwiki/bin/view/Macros/ImageMacro] for all
options.
+
+{pre}
+<table class="wiki-table" border="1" cellspacing="0" cellpadding="2"
width="80%">
+ <tr>
+ <th>Example</th>
+ <th>Result</th>
+ </tr>
+ <tr>
+ <td>
+<pre>
+{image:img.png}
+
+{image:img.png|30}
+
+{image:img.png| |20}
+
+{image:img.png|30|20}
+</pre>
+ </td>
+ <td>
+ <img src="$xwiki.getAttachmentURL($doc.fullName, "img.png")"
alt="img.png" title="img.png"/><p class="paragraph"/>
+ <img src="$xwiki.getAttachmentURL($doc.fullName, "img.png")"
height="30" alt="img.png" title="img.png"/><p class="paragraph"/>
+ <img src="$xwiki.getAttachmentURL($doc.fullName, "img.png")"
width="20" alt="img.png" title="img.png"/><p class="paragraph"/>
+ <img src="$xwiki.getAttachmentURL($doc.fullName, "img.png")"
height="30" width="20" alt="img.png" title="img.png"/>
+ </td>
+ </tr>
+</table>
+{/pre}
+
+1.1 Escaping Text
+
+1.1.1 Escaping a single character
+
+{pre}
+<table class="wiki-table" border="1" cellspacing="0" cellpadding="2"
width="80%">
+ <tr>
+ <th>Example</th>
+ <th>Result</th>
+ </tr>
+ <tr>
+ <td>
+<pre>
+This is not a \[link\]
+\#set (\$var = "something")
+</pre>
+ </td>
+ <td>
+ This is not a &#91;link&#93;<br />
+ \#set (\$var = &#34;something&#34;)
+ </td>
+ </tr>
+</table>
+{/pre}
+
+1.1.1 Escaping wiki syntax rendering
+
+The <tt>{&#112;re}{/&#112;re}</tt> macro prevents wiki
syntax and Radeox macro rendering but preserves HTML rendering and preserces
execution of Groovy/Velocity scripts.
+
+{pre}
+<table class="wiki-table" border="1" cellspacing="0" cellpadding="2"
width="80%">
+ <tr>
+ <th>Example</th>
+ <th>Result</th>
+ </tr>
+ <tr>
+ <td>
+<pre>
+{&#112;re}
+No *bold rendering* in wiki syntax.
+{/&#112;re}
+</pre>
+ </td>
+ <td>
+ No *bold rendering* in wiki syntax.
+ </td>
+ </tr>
+</table>
+{/pre}
+
+1.1.1 Escaping everything
+
+The <tt>\{code\}\{code\}</tt> macro prevents wiki syntax
rendering, HTML rendering and Groovy/Velocity rendering. Check the [Code macro
reference guide>http://code.xwiki.org/xwiki/bin/view/Macros/CodeMacro] for
all options.
+
+{pre}
+<table class="wiki-table" border="1" cellspacing="0" cellpadding="2"
width="80%">
+ <tr>
+ <th>Example</th>
+ <th>Result</th>
+ </tr>
+ <tr>
+ <td>
+<pre>
+{code}
+No &lt;strong&gt;bold rendering&lt;/strong&gt; in HTML.
+No *bold rendering in* wiki syntax.
+{code}
+</pre>
+ </td>
+ <td>
+ <div class="code">
+<pre>No &#60;strong&#62;bold rendering&#60;/strong&#62;
in HTML.
+No &#42;bold rendering in&#42; wiki syntax.</pre>
+ </div>
+ </td>
+ </tr>
+</table>
+{/pre}
+
+1.1 Boxes
+
+Boxes are a nice way to improve on the visual presentation and highlight
important elements. The reference documentation for the macros shown below can
be found here:
+* [Info Macro>http://code.xwiki.org/xwiki/bin/view/Macros/InfoMacro]
+* [Warning Macro>http://code.xwiki.org/xwiki/bin/view/Macros/WarningMacro]
+* [Error Macro>http://code.xwiki.org/xwiki/bin/view/Macros/ErrorMacro]
+* [Floating Box
Macro>http://code.xwiki.org/xwiki/bin/view/Macros/FloatingBoxMacro]
+* [Style Macro>http://code.xwiki.org/xwiki/bin/view/Macros/StyleMacro]
+
+{pre}
+<table class="wiki-table" border="1" cellspacing="0" cellpadding="2"
width="80%">
+ <tr>
+ <th>Example</th>
+ <th>Result</th>
+ </tr>
+ <tr>
+ <td>
+<pre>
+\#info("This is an information panel")
+
+\#warning("This is a warning panel")
+
+\#error("This is an error panel")
+
+\#startfloatingbox()
+Some content in a floating box
+\#endfloatingbox()
+This is a floating box displayed on the right.
+
+\#floatingbox("Some content in a floating box")
+This is also a floating box displayed on the right.
+
+{style:type=div|border=1px solid
red|background-color=grey|width=300px|height=300px|color=red}
+This is some content...
+{style}
+</pre>
+ </td>
+ <td>
+ <div class="infomessage">This is an information panel</div>
+ <div class="warningmessage"><span
class="messagetype">Warning: </span>This is a warning panel</div>
+ <div class="errormessage"><span class="messagetype">Error:
</span>This is an error panel</div>
+ <br /><br />
+ <fieldset class="floatinginfobox">
+ Some content in a floating box
+ </fieldset>
+ This is a floating box displayed on the right.<p
class="paragraph"/>
+ <fieldset class="floatinginfobox">Some content in a floating
box</fieldset>
+ This is also a floating box displayed on the right.<p
class="paragraph"/>
+ <div style="color:white; background-color:grey; width:150px;
height:50px; border:1px solid black; " >
+ This is some content&#8230;
+ </div>
+ </td>
+ </tr>
+</table>
+{/pre}
+
+1.1 Other Macros
+
+*XWiki boasts a [lot of other very useful
macros>http://code.xwiki.org/xwiki/bin/view/Macros/WebHome]*.
+
+#info("Make sure to check also our [Code
Zone>http://code.xwiki.org/xwiki/bin/view/Main/WebHome] as we also have
[Plugins>http://code.xwiki.org/xwiki/bin/view/Plugins/WebHome], [Code
Snippets>http://code.xwiki.org/xwiki/bin/view/Snippets/WebHome],
[Applications>http://code.xwiki.org/xwiki/bin/view/Applications/WebHome] and
[Extensions>http://code.xwiki.org/xwiki/bin/view/Extensions/WebHome].";)
+</content></xwikidoc>
\ No newline at end of file
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
