X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=Main.hs;h=2dafbccda09d522a9cea358208d07371d59049fe;hb=85eacfb829b94b0e1d7a6ca77f39546f6285fb4c;hp=c89ebf27f6fe76e54e40bb372944a69219cba3e8;hpb=b0821b704ddf955948416ec8bfa0afcc6512c933;p=yawbih.git diff --git a/Main.hs b/Main.hs index c89ebf2..2dafbcc 100644 --- a/Main.hs +++ b/Main.hs @@ -21,7 +21,7 @@ test key = do main = do db <- testDB - runWithHook [] (\(key:act) -> showPage db (filter (/= '\\') key)) $ showPage db "MainPage" + runWithHook [] (\(key:act) -> showPage db (filter (/= '\\') key)) $ showPage db "itproj3" editPage db key = do s <- io $ getCurrent db key @@ -29,7 +29,7 @@ editPage db key = do Nothing -> return "" Just (x,_) -> return x standardQuery key $ do - t <- p $ makeTextarea s' (attr_SS "rows" "10" ## attr_SS "cols" "75" ## attr_SS "colspan" "2") + t <- p $ makeTextarea s' (attr_SS "rows" "25" ## attr_SS "cols" "120" ## attr_SS "colspan" "2") p empty text "Author: " a <- textInputField (fieldSIZE 20) @@ -66,7 +66,7 @@ parseText full = case parse wikiParser "" full of footer db key = do hr empty table $ tr $ do - td $ submitLink0 (showPage db "MainPage") (text "Back to main page") + td $ submitLink0 (showPage db "itproj3") (text "Back to main page") when (e key) $ td $ submitLink0 (editPage db key) (text "Edit this keyword") when (e key) $ td $ submitLink0 (listRevs db key) (text "List old versions") td $ submitLink0 (listKeywords db) (text "List all keywords") @@ -147,7 +147,7 @@ toWash ((Url l):xs) = do hlink (URL {unURL = (l)}) (text $ stripMailto l) toWash xs toWash ((Pre s):xs) = do - pre $ text s + pre $ toWash s toWash xs toWash ((List o l):xs) = do listType o $ mapM (\s -> li $ toWash s) l