globalized wiki engine

svn path=/trunk/; revision=6

diff --git a/Wiki.css b/Wiki.css
index 7d760ef8c7d05ffff2f584ad6a129c9751f508af..f519acca3b3a76bce8bc4d3d656bfd31caf44596 100644 (file)
--- a/Wiki.css
+++ b/Wiki.css
@@ -78,57 +78,6 @@
   width: 99%;
   min-height: 30em;
 }
-.wiki h1 {
-  text-align: center;
-  font: normal bold 2em sans-serif;
-  margin: 0em 0em 0em 0em;
-  border-style: none none solid none;
-  border-width: 1px;
-}
-.wiki h1 + h2{
-  margin: .5em 0em .3em 0em;
-}
-.wiki h2 {
-  text-align: left;
-  font: normal bold 1.3em sans-serif;
-  margin: 1em 0em .3em 0em;
-  border-style: none none solid none;
-  border-width: 1px; border-color: #AAF;
-}
-.wiki h2 + p { margin: 0em; }
-.wiki h3 {
-  text-align: left;
-  font-size: 1.1em;
-  margin: .6em 0em .3em 0em;
-}
-.wiki h3 + p { margin: 0em; }
-.wiki h4 {
-  text-align: left;
-  font-size: 1em;
-  margin: .6em 0em .3em 0em;
-}
-.wiki h4 + p { margin: 0em; }
-.wiki p {
-  margin: .6em 0em;
-}
-.wiki ul {
-  text-indent: 0em;
-  margin: .3em 0em;
-  padding: 0em 4ex;
-}
-.wiki ul ol {font-size: .9em; margin: 0em;}
-.wiki ol {
-  text-indent: 0em;
-  margin: .3em 0em;
-  padding: 0em 4ex;
-}
-.wiki ol ul {font-size: .9em; margin: 0em;}
-.wiki pre {
-  background-color: #EEE;
-  padding: .5em;
-  border-style: solid; border-width: 1px;
-  border-color: #AAF;
-}
 
 .article {
   float: left;

diff --git a/Wiki.page b/Wiki.page
index 5effa39776e13d0c6c3e8ef2564ecebc523b760f..490966367705b8b8d744062aa4e6aa007612c0a3 100755 (executable)
--- a/Wiki.page
+++ b/Wiki.page
@@ -25,10 +25,9 @@ if [ -n "$edit" -a -r "Wiki/$edit" ]; then
   title="$(egrep -x 'title=.+' "Wiki/$edit.meta" |cut -d= -f2- || echo '(Untitled)')"
   cat <<WikiEND
     <form class="edit" action="write/scriptedit.cgi?i=$edit" method="post" accept-charset="UTF-8">
-      <div id="RIGHT"></div>
       <div id="LEFT">
        Editing <b>$title</b><br>
-        <input type="submit">
+        <input type="submit" value="Submit">
         <input type="submit" name="cancel" value="Cancel">
        <hr>
       </div>
@@ -39,6 +38,14 @@ if [ -n "$edit" -a -r "Wiki/$edit" ]; then
         </div>
       </div>
     </form>
+    <div id="RIGHT">
+    $(stat -c '' Wiki/${edit}.comment.<0000000000-9999999999>_<000-999> && for each in $(ls -c Wiki/${edit}.comment.<0000000000-9999999999>_<000-999>); do
+      author=$(grep -m1 '^author=' "$each" |cut -d= -f2-)
+      echo "<div class='comment'><h1>$author wrote:</h1><div class='wikitext'>"
+      tail -n+2 $each |_wiki
+      echo '</div></div>'
+    done)
+    </div>
 WikiEND
 
 elif [ -n "$info" -a -r "Wiki/${info}${rev}" ]; then
@@ -81,10 +88,10 @@ elif [ -n "$info" -a -r "Wiki/${info}${rev}" ]; then
       <hr>
     </div>
     <div id="MAIN">
-      <div class="wiki">
+      <div class="wiki"><div class="wikitext">
         <h1>$title</h1>
         $(_wiki Wiki/"${info}${rev}")
-      </div>
+      </div></div>
     </div>
 WikiEND
 
@@ -95,16 +102,16 @@ $LOGIN && cat <<WikiEND
         <form action="/write/wikimeta.cgi?i=$info" method="post" accept-charset="UTF-8">
           <b>Comment:</b><br>
           <textarea name="comm" rows="6" style="width:99%;"></textarea><br>
-          <input type="submit">
+          <input type="submit" value="Submit">
           <a class="function" href="#" onclick="javascript:hide_screen('comment');show_screen('comment_button');">Cancel</a>
         </form>
       </div>
 WikiEND
   stat -c '' Wiki/${info}.comment.<0000000000-9999999999>_<000-999> && for each in $(ls -c Wiki/${info}.comment.<0000000000-9999999999>_<000-999>); do
     author=$(grep -m1 '^author=' "$each" |cut -d= -f2-)
-    echo "<div class="comment"><h1>$author wrote:</h1>"
-    tail -n-1 $each
-    echo '</div>'
+    echo "<div class='comment'><h1>$author wrote:</h1><div class='wikitext'>"
+    tail -n+2 $each |_wiki
+    echo '</div></div>'
   done
   echo '</div>'
   
@@ -136,7 +143,7 @@ WikiEND
        <input type="text" name="title" placeholder="Fill in a title"><br>
         <b>Description:</b><br>
         <textarea name="desc" rows="6" ></textarea><br>
-        <input type="submit">
+        <input type="submit" value="Submit">
         <a class="function" href="#" onclick="javascript:hide_screen('add_page');show_screen('addp_button');">Cancel</a>
       </form>
     </div>
@@ -155,7 +162,7 @@ WikiEND
         <a name="$info" href="/?p=Wiki&amp;i=$info"><h1>$title</h1></a>
         $description<br><br>
         <a class="function" href="/?p=Wiki&amp;i=$info">View</a> 
-        $($LOGIN && echo "<a class='function' href='#' onclick=\"javascript:show_screen('change_$info');hide_screen('display_$info');\">Change Title</a>")
+        $($LOGIN && echo "<a class='function' href='#' onclick=\"javascript:show_screen('change_$info');hide_screen('display_$info');\">Change Info</a>")
       </div>
 WikiEND
     $LOGIN && cat <<WikiEND
@@ -164,7 +171,7 @@ WikiEND
          <b>Title:</b> <input type="text" name="title" value="$title"><br>
          <b>Description:</b><br>
          <textarea name="desc" rows="6" style="width:100%;">$description</textarea><br>
-         <input type="submit">
+         <input type="submit" value="Submit">
           <a class="function" href="#" onclick="javascript:hide_screen('change_$info');show_screen('display_$info');">Cancel</a>
        </form>
       </div>

diff --git a/index.cgi b/index.cgi
index 4f3a10f47c36510a8c649abc4028e8c630f6b9d2..6710ea357e3041dc8e735d66a587dd2d7cfe0140 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -42,6 +42,7 @@ cat <<END_index.cgi
     <title>Busy</title>
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
     <link rel="stylesheet" type="text/css" href="busy.css">
+    <link rel="stylesheet" type="text/css" href="wikitext.css">
     $([ -r "${page}.css" ] && echo '<link rel="stylesheet" type="text/css" href="'"$page"'.css">')
     <style type="text/css"><!-- --></style>
     <script type="text/javascript">

diff --git a/wikitext.css b/wikitext.css
new file mode 100644 (file)
index 0000000..d635d64
--- /dev/null
+++ b/wikitext.css
@@ -0,0 +1,70 @@
+/* Copyright 2011 Paul Haensch*/
+/* This file is part of Busy*/
+/**/
+/* Busy is free software: you can redistribute it and/or modify*/
+/* it under the terms of the GNU Affero General Public License as published by*/
+/* the Free Software Foundation, either version 3 of the License, or*/
+/* (at your option) any later version.*/
+/**/
+/* Busy 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 Affero General Public License for more details.*/
+/**/
+/* You should have received a copy of the GNU Affero General Public License*/
+/* along with Busy.  If not, see <http://www.gnu.org/licenses/>.*/
+
+.wikitext {
+  padding: 0em; margin: 0em;
+}
+.wikitext h1 {
+  text-align: center;
+  font: normal bold 2em sans-serif;
+  margin: 0em 0em 0em 0em;
+  border-style: none none solid none;
+  border-width: 1px;
+}
+.wikitext h1 + h2{
+  margin: .5em 0em .3em 0em;
+}
+.wikitext h2 {
+  text-align: left;
+  font: normal bold 1.3em sans-serif;
+  margin: 1em 0em .3em 0em;
+  border-style: none none solid none;
+  border-width: 1px; border-color: #AAF;
+}
+.wikitext h2 + p { margin: 0em; }
+.wikitext h3 {
+  text-align: left;
+  font-size: 1.1em;
+  margin: .6em 0em .3em 0em;
+}
+.wikitext h3 + p { margin: 0em; }
+.wikitext h4 {
+  text-align: left;
+  font-size: 1em;
+  margin: .6em 0em .3em 0em;
+}
+.wikitext h4 + p { margin: 0em; }
+.wikitext p {
+  margin: .6em 0em;
+}
+.wikitext ul {
+  text-indent: 0em;
+  margin: .3em 0em;
+  padding: 0em 4ex;
+}
+.wikitext ul ol {font-size: .9em; margin: 0em;}
+.wikitext ol {
+  text-indent: 0em;
+  margin: .3em 0em;
+  padding: 0em 4ex;
+}
+.wikitext ol ul {font-size: .9em; margin: 0em;}
+.wikitext pre {
+  background-color: #EEE;
+  padding: .5em;
+  border-style: solid; border-width: 1px;
+  border-color: #AAF;
+}