sorted out text designs

svn path=/trunk/; revision=55

diff --git a/templates/Home.css b/templates/Home.css
index a0e47e0a20fbce48110225dcc1c1f556b21699b6..4c7add03c13b175f59f5eff4941f24b17ac12be6 100644 (file)
--- a/templates/Home.css
+++ b/templates/Home.css
@@ -31,5 +31,5 @@ div.NEWS {
   border-color: #AAF;
 }
 
-.wikitext h2 { font-size: 1.5em; margin: .3em 0em; }
-.wikitext h3 { font-size: 1.2em; }
+.wikitext h1 { font-size: 1.5em; margin: .3em 0em; }
+.wikitext h2 { font-size: 1.2em; }

diff --git a/templates/Home.page b/templates/Home.page
index 67d41fb6c72232ea7c2d43f748344a70986f39fe..e12b78fa2e30264a17ecb1dab34caaf77202bf59 100644 (file)
--- a/templates/Home.page
+++ b/templates/Home.page
@@ -52,7 +52,7 @@ HomeEND
 }
 
 show_news(){
-  stat -c '' Home/<0000000000-9999999999>_<000-999>.news && for each in $(ls -c Home/<0000000000-9999999999>_<000-999>.news); do
+  for each in $(ls -r Home/<0000000000-9999999999>_<000-999>.news); do
     info="$(sed 's:Home/::;s:.news::' <<<"$each")"
 
     cat <<HomeEND

diff --git a/templates/Tasks.page b/templates/Tasks.page
index 423dec3af73edcdb55b64a113615349f9b668cbf..82f296d3657da7f35fc86b4c7b9bfb37999542e2 100644 (file)
--- a/templates/Tasks.page
+++ b/templates/Tasks.page
@@ -40,9 +40,9 @@ show_task(){
 TasksEND
 }
 
-setup_taks(){
+setup_task(){
   cat <<TaskEnd
-  <form class="Task" style="height:20em;" method="post" action="write/$($LOGIN && echo user_)taskmeta.cgi" accept-charset="UTF-8">
+  <form class="Task" style="height:20em;" method="post" action="?action=taskmeta" accept-charset="UTF-8">
     <h1>$new</h1>
     <input type="hidden" name="headline" value="$new">
     <input type="hidden" name="status" value="new">

diff --git a/templates/Wiki.css b/templates/Wiki.css
index 52186676c7c3dcdad91856a1fddf54a966d3ca16..17f69be1ccc3968f698697bdcae0af3fbb09195f 100644 (file)
--- a/templates/Wiki.css
+++ b/templates/Wiki.css
@@ -83,3 +83,15 @@
 .article a{
   text-decoration: none;
 }
+
+.wikitext h1.wikihead {
+  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.wikihead + h1{
+  margin: .5em 0em .3em 0em;
+}
+

diff --git a/templates/Wiki_show.page b/templates/Wiki_show.page
index 87e848f805e9d7b588240d1e5c415f3c031dd682..cfe86e4323dc480ce6208c93f441e385202813c9 100755 (executable)
--- a/templates/Wiki_show.page
+++ b/templates/Wiki_show.page
@@ -3,8 +3,7 @@
 list_comments() {
   base="$1"
   
-  stat -c '' Wiki/${base}.comment.<0000000001-9999999999>_<000-999> \
-  && for each in $(ls -c Wiki/${base}.comment.<0000000001-9999999999>_<000-999>); do
+  for each in $(ls -r Wiki/${base}.comment.<0000000001-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
@@ -68,7 +67,7 @@ cat <<WikiEND
     </div>
     <div id="MAIN">
       <div class="wiki"><div class="wikitext">
-        <h1>$title</h1>
+        <h1 class="wikihead">$title</h1>
         $(_wiki Wiki/"${info}${rev}")
       </div></div>
     </div>

diff --git a/templates/wikitext.css b/templates/wikitext.css
index 601d797f404d03534e6dbfe7b3ae4d8c0ffcc0b5..d9baa4a45b7c6ba432862069fe064e71442eefe6 100644 (file)
--- a/templates/wikitext.css
+++ b/templates/wikitext.css
@@ -18,35 +18,25 @@
   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 {
+.wikitext h1 + p { margin: 0em; }
+.wikitext h2 {
   text-align: left;
   font-size: 1.1em;
   margin: .6em 0em .3em 0em;
 }
-.wikitext h3 + p { margin: 0em; }
-.wikitext h4 {
+.wikitext h2 + p { margin: 0em; }
+.wikitext h3 {
   text-align: left;
   font-size: 1em;
   margin: .6em 0em .3em 0em;
 }
-.wikitext h4 + p { margin: 0em; }
+.wikitext h3 + p { margin: 0em; }
 .wikitext p {
   margin: .6em 0em;
 }