From 0c6dd605b59c2f36cdd76eabdf4540dae424d105 Mon Sep 17 00:00:00 2001
From: Michael Andreen <harv@ruin.nu>
Date: Sat, 11 Dec 2004 15:08:01 +0000
Subject: [PATCH] keyword field and link instead of button

---
 Main.hs |  8 +++++---
 Wiki.hs | 30 +++---------------------------
 2 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/Main.hs b/Main.hs
index 05414b4..a52b038 100644
--- a/Main.hs
+++ b/Main.hs
@@ -15,7 +15,7 @@ testDB = createPGB "wave" "wiki" "wiki" "12wiki34db"
 
 main = do 
 	db <- testDB
-	runWithHook [] (\(key:act) -> sp db key act ) $ sp db "MainPage" [] 
+	runWithHook [] (\(key:act) -> sp db key) $ sp db "MainPage"
 
 ps a = standardQuery "Hello" a
 
@@ -36,7 +36,7 @@ editPage db key = do
 		p $ defaultSubmit (F3 t a c) (savePage db key) (attr "value" "Send")
 		--submit0 (sp db key []) (attr "value" "Send1")
 
-sp db key _ = do
+sp db key = do
 	s <- io $ getCurrent db key 
 	standardQuery key $ showPage db key s
 
@@ -65,7 +65,9 @@ showPage db key s = do
 
 footer db key = do
 	hr empty
-	submit0 (editPage db key) (attr "value" "Edit")
+	submitLink0 (editPage db key) (text "Edit this page")
+	text " Keyword: "
+	activate (sp db) textInputField empty
 	--address (hlink (URL {unURL = ("wiki?"++key++"+edit")}) (text "Edit this page") 
 
 ex [] = return ()
diff --git a/Wiki.hs b/Wiki.hs
index dee41a1..337d715 100644
--- a/Wiki.hs
+++ b/Wiki.hs
@@ -63,46 +63,22 @@ pLinkLong = do
 	string "[["
 	l <- many1 $ noneOf ['|']
 	char '|'
-	d <- many1 $ noneOf [']'] 
+	d <- many1 $ noneOf "]" 
 	string "]]"
 	return (Link l d)
 pLink = do
 	string "[["
-	l <- many1 $ noneOf ['|','[',']']
+	l <- many1 $ noneOf "]"
 	string "]]"
 	return (Link l l)
 pOtherChar = do
-	c <- satisfy validChar
+	c <- oneOf ",;.:!?[]()\'\"=-%$£<>/\\|"
 	return (Text (c:[]))
 
 pText = do
 	t <- many1 alphaNum--(noneOf ['\n','\r','[',']'])
 	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
-validChar '-' = True
-validChar '%' = True
-validChar '$' = True
-validChar '£' = True
-validChar '<' = True
-validChar '>' = True
-validChar '/' = True
-validChar '\\' = True
-validChar '|' = True
-validChar _ = False
-
 
 newtype PGB = PGB DBService
 
-- 
2.39.2