*) Added a Wiki Code help page and links to it at every textbox Wiki Code can be used in. Maybe this will encourage people to play around with the Wiki and the Blog more.

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@2437 6c8d7289-2bf4-0310-a012-ef5d649a1542

6 files changed, 224 insertions, 3 deletions

diff --git a/htroot/Blog.html b/htroot/Blog.html
index 389f5dcad..2e12efc1e 100644
--- a/htroot/Blog.html
+++ b/htroot/Blog.html
@@ -25,7 +25,9 @@
 <form action="Blog.html" method="POST" enctype="multipart/form-data" accept-charset="UTF-8">

 <p>Author:<br><input name="author" type="text" size="20" maxlength="80" value="#[author]#"></p>

 <p>Subject:<br><input name="subject" type="text" size="20" maxlength="80" value="#[subject]#"></p>

-<p>Text:<br><textarea name="content" cols="80" rows="24">#[page-code]#</textarea></p>

+<p>Text:<br><textarea name="content" cols="80" rows="24">#[page-code]#</textarea>

+<br><font size="-1">You can use <a href="WikiHelp.html" target="_blank" onClick="window.open('WikiHelp.html','WikiHelp','toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=1',width=640,height=480);return false;">Yacy-Wiki Code</a> here.</font>

+</p>

 <input type="hidden" name="page" value="#[pageid]#">

 <input type="submit" name="submit" value="Submit">

 <input type="submit" name="preview" value="Preview">

diff --git a/htroot/ConfigProfile_p.html b/htroot/ConfigProfile_p.html
index 351c4a086..da70f9b85 100644
--- a/htroot/ConfigProfile_p.html
+++ b/htroot/ConfigProfile_p.html
@@ -65,7 +65,9 @@ You do not need to provide any personal data here, but if you want to distribute
 

 <tr>

 <td valign="top" class="TableCellDark">Comment</td>

-<td  valign="top" class="TableCellLight"><textarea name="comment" cols="40" rows="10">#[comment]#</textarea></td>

+<td  valign="top" class="TableCellLight"><textarea name="comment" cols="40" rows="10">#[comment]#</textarea>

+<br><font size="-1">You can use <a href="WikiHelp.html" target="_blank" onClick="window.open('WikiHelp.html','WikiHelp','toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=1',width=640,height=480);return false;">Wiki Code</a> here.</font>

+</td>

 </tr>

 

 <tr>

diff --git a/htroot/MessageSend_p.html b/htroot/MessageSend_p.html
index 401113ac1..d49de65d8 100644
--- a/htroot/MessageSend_p.html
+++ b/htroot/MessageSend_p.html
@@ -33,6 +33,7 @@
                 </p>

                 <p>Text:<br>

                    <textarea name="message" cols="80" rows="8">#[message]#</textarea>

+                   <br><font size="-1">You can use <a href="WikiHelp.html" target="_blank" onClick="window.open('WikiHelp.html','WikiHelp','toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=1',width=640,height=480);return false;">Wiki Code</a> here.</font>

                 </p>

                 <input type="hidden" name="hash" value="#[hash]#">

                 <input type="hidden" name="messagesize" value="#[messagesize]#">

diff --git a/htroot/Wiki.html b/htroot/Wiki.html
index 0a6afda07..e86c71010 100644
--- a/htroot/Wiki.html
+++ b/htroot/Wiki.html
@@ -39,7 +39,9 @@
 <!-- 1: edit -->

 <form action="Wiki.html" method="POST" enctype="multipart/form-data" accept-charset="UTF-8">

 <p>Author:<br><input name="author" type="text" size="80" maxlength="80" value="#[author]#"></p>

-<p>Text:<br><textarea name="content" cols="80" rows="24">#[page-code]#</textarea></p>

+<p>Text:<br><textarea name="content" cols="80" rows="24">#[page-code]#</textarea>

+<br><font size="-1">You can use <a href="WikiHelp.html" target="_blank" onClick="window.open('WikiHelp.html','WikiHelp','toolbar=0,scrollbars=1,location=0,statusbar=0,menubar=0,resizable=1',width=640,height=480);return false;">Wiki Code</a> here.</font>

+</p>

 <input type="hidden" name="page" value="#[pagename]#">

 <input type="hidden" name="reason" value="edit">

 <input type="submit" name="submit" value="Submit">

diff --git a/htroot/WikiHelp.html b/htroot/WikiHelp.html
new file mode 100644
index 000000000..65818141c
--- /dev/null
+++ b/htroot/WikiHelp.html
@@ -0,0 +1,152 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
+<html>
+ <head>
+  <title>YaCy '#[clientname]#': Wiki Help</title>
+#%env/templates/metas.template%#
+ </head>
+ <body>
+ <br>
+ <h2>Index Creation</h2>
+ <br>
+ <div align="center">
+  <table width="95%" border="1">
+   <caption>This table contains a short description of the tags that can be used in the Wiki and several other servlets of YaCy. For a more detailed description visit the <a href="http://www.yacy-websuche.de/wiki/index.php/Hauptseite">YaCy Wiki</a>.</caption>
+   <tr valign="top">
+    <th>
+     Code
+    </th>
+    <th>
+     Description
+    </th>
+   </tr>
+   <tr valign="top">
+    <td>
+     ==headline1==<br>===headline2===<br>====headline3====
+    </td>
+    <td>
+     This tags create headlines. If a page has three or more headlines, a directory will be created automaticly.
+    </td>
+   </tr>
+
+   <tr valign="top">
+    <td>
+     ''text''<br>'''text'''<br>'''''text'''''
+    </td>
+    <td>
+     This tags create stressed texts. Most browsers will display the texts in italics, bold, and a combination of both.
+    </td>
+   </tr>
+
+   <tr valign="top">
+    <td>
+     :text<br>::text
+    </td>
+    <td>
+     Lines will be indented. This tag is supposed to mark citations.
+    </td>
+   </tr>
+
+   <tr valign="top">
+    <td>
+     #point1<br>##point1.1<br>##point1.2<br>#point2
+    </td>
+    <td>
+     This tags create a numbered list.
+    </td>
+   </tr>
+
+   <tr valign="top">
+    <td>
+     *something<br>**another thing<br>***and yet another<br>*something else
+    </td>
+    <td>
+     This tags create a unnumbered list.
+    </td>
+   </tr>
+
+   <tr valign="top">
+    <td>
+     ;word 1:definition 1<br>;word 2:definition 2<br>;;word 3:definition 3<br>;word 4:definition 4
+    </td>
+    <td>
+     This tags create a definition list.
+    </td>
+   </tr>
+
+   <tr valign="top">
+    <td>
+     ----
+    </td>
+    <td>
+     This tag creates a horizontal line.
+    </td>
+   </tr>
+
+   <tr valign="top">
+    <td>
+     [[pagename]]<br>[[pagename|description]]
+    </td>
+    <td>
+     This tag creates links to other pages of the wiki.
+    </td>
+   </tr>
+
+   <tr valign="top">
+    <td>
+     [url]<br>[url description]
+    </td>
+    <td>
+     This tag creates links to external websites.
+    </td>
+   </tr>
+
+   <tr valign="top">
+    <td>
+     [[Image:url]]<br>[[Image:url|alt text]]<br>[[Image:url|align|alt text]]
+    </td>
+    <td>
+     This tag displays an image, it can be aligned left, right or center.
+    </td>
+   </tr>
+
+   <tr valign="top">
+    <td>
+     {|<br>|-<br>||row 1, col 1||row 1, col 2<br>|-<br>||row 2, col 1||row 2, col 2<br>|}
+    </td>
+    <td>
+     This tags create a table.
+    </td>
+   </tr>
+
+   <tr valign="top">
+    <td>
+     [= text =]
+    </td>
+    <td>
+     The escape tags will cause all tags in the text between the starting and the closing tag to not be treated as regular text.
+    </td>
+   </tr>
+
+   <tr valign="top">
+    <td>
+     &lt;pre&gt; text &lt;/pre&gt;
+    </td>
+    <td>
+     A text between this text will keep all the spaces an linebreaks in it. Great for ASCII-art and program code.
+    </td>
+   </tr>
+
+   <tr valign="top">
+    <td>
+     text<br>&nbsp;text<br>text
+    </td>
+    <td>
+     If a line starts with a space, it will be displayed in a non-proportional font.
+    </td>
+   </tr>
+
+  </table>
+ </div>
+ <br>
+ </body>
+</html>
\ No newline at end of file
diff --git a/htroot/WikiHelp.java b/htroot/WikiHelp.java
new file mode 100644
index 000000000..b7860a10c
--- /dev/null
+++ b/htroot/WikiHelp.java
@@ -0,0 +1,62 @@
+// WikiHelp.java

+// -----------------------

+// part of the AnomicHTTPD caching proxy

+// (C) by Michael Peter Christen; mc@anomic.de

+// first published on http://www.anomic.de

+// Frankfurt, Germany, 2004

+//

+// $LastChangedDate: 2006-08-21 22:40:00 +0200 (Mo, 21 Aug 2006) $

+// $LastChangedRevision: 2436 $

+// $LastChangedBy: low012 $

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Using this software in any meaning (reading, learning, copying, compiling,

+// running) means that you agree that the Author(s) is (are) not responsible

+// for cost, loss of data or any harm that may be caused directly or indirectly

+// by usage of this softare or this documentation. The usage of this software

+// is on your own risk. The installation and usage (starting/running) of this

+// software may allow other people or application to access your computer and

+// any attached devices and is highly dependent on the configuration of the

+// software which must be done by the user of the software; the author(s) is

+// (are) also not responsible for proper configuration and usage of the

+// software, even if provoked by documentation provided together with

+// the software.

+//

+// Any changes to this file according to the GPL as documented in the file

+// gpl.txt aside this file in the shipment you received can be done to the

+// lines that follows this copyright notice here, but changes must not be

+// done inside the copyright notive above. A re-distribution must contain

+// the intact and unchanged copyright notice.

+// Contributions and changes to the program code must be marked as such.

+//

+// You must compile this file with

+// javac -classpath .:../classes WikiHelp.java

+// if the shell's current path is HTROOT

+

+import de.anomic.http.httpHeader;

+import de.anomic.plasma.plasmaSwitchboard;

+import de.anomic.server.serverObjects;

+import de.anomic.server.serverSwitch;

+

+public class WikiHelp {

+

+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {

+        final plasmaSwitchboard sb = (plasmaSwitchboard) env;

+        final serverObjects prop = new serverObjects();

+        return prop;

+    }

+

+}