small changes

diff --git a/Main.hs b/Main.hs
index 471fee40b9b45dc439b1acf8a5851ef2b4e1495b..05414b4f3ec15786ccd05f14d094f5ce63b5287a 100644 (file)
--- a/Main.hs
+++ b/Main.hs
@@ -26,9 +26,11 @@ editPage db key = do
                Just (x,_) -> return x
        standardQuery key $ do
                t <- p $ makeTextarea s' (attr_SS "rows" "10" ## attr_SS "cols" "75" ## attr_SS "colspan" "2")
-               p (text "Author: ") 
+               p empty
+               text "Author: "
                a <- textInputField (fieldSIZE 20)
-               p (text "Comment: ") 
+               p empty
+               text "Comment: "
                c <- textInputField (fieldSIZE 20)
                --p $ submit (F2 t a) testing (attr "value" "Send")
                p $ defaultSubmit (F3 t a c) (savePage db key) (attr "value" "Send")
@@ -39,11 +41,10 @@ sp db key _ = do
        standardQuery key $ showPage db key s
 
 savePage db key (F3 t a c) = do
-       s <- io $ update db key fulltext author comment
+       io $ update db key fulltext author comment
+       s <- io $ getCurrent db key 
        standardQuery key $ do
-       text "Updated with revision: "
-       text s
-       address (hlink (URL {unURL = ("wiki?"++key)}) (text "Back to keyword") )
+               showPage db key s
   where
        fulltext = value t
        author = value a

diff --git a/Wiki.hs b/Wiki.hs
index f2a68f28e432b1f8005e7ebc31c2b1c4aab5a295..dee41a10e38dbba467d315c164f5f7aff81b0885 100644 (file)
--- a/Wiki.hs
+++ b/Wiki.hs
@@ -80,11 +80,15 @@ pText = do
        return (Text t)
 
 validChar ',' = True
+validChar ';' = True
 validChar '.' = True
+validChar ':' = True
 validChar '!' = True
 validChar '?' = True
 validChar '[' = True
 validChar ']' = True
+validChar '(' = True
+validChar ')' = True
 validChar '\'' = True
 validChar '"' = True
 validChar '=' = True