[Fencommits] fenserve: fix problems with potion rendering

[Benja Fallenstein]

Sun Jun 17 01:28:51 EEST 2007  Benja Fallenstein <benja.fallenstein at gmail.com>
  * fix problems with potion rendering
diff -rN -u old-fenserve/fendata/Potions.hs new-fenserve/fendata/Potions.hs
--- old-fenserve/fendata/Potions.hs	2007-06-17 01:28:59.000000000 +0300
+++ new-fenserve/fendata/Potions.hs	2007-06-17 01:28:59.000000000 +0300
@@ -97,13 +97,13 @@
       , \env -> do ItemValue _ item <- runExp env exp; getValue item field )
 
   , Potion "allItems" $ \(I cat) ->
-      ( ( "all the ", plural $ uncapitalize $ catName $ getCategory cat
+      ( ( "all ", plural $ uncapitalize $ catName $ getCategory cat
         , " in the database" )
       , \_ -> map (ItemValue cat) $ map itemId $ getItems cat )
 
   , Potion "sort" $ \(ty, e1, e2, order) -> mint (Single ty)
-      ( \var -> ( E 0 e1, " ", varName undefined, ", sorted by ", E 1 e2, ", "
-                , case order of Asc -> "asc"; Desc -> "desc" )
+      ( \var -> ( E 0 e1, " ", varName var, ", sorted by ", E 1 e2, ", "
+                , case order of Asc -> "ascending"; Desc -> "descending" )
       , \env -> let values = runExp env e1
                     sortKeys = map (\v -> runExp ([v]:env) e2) values
                     sorted = map snd $ sort $ zip sortKeys values
@@ -153,7 +153,7 @@
                  in [DateValue (ctYear t) (fromEnum (ctMonth t)+1) (ctDay t)] )
                  
   , Potion "tableView" $ \(exp, columns :: [(String,Exp)]) ->
-      ( I "XXX table view"
+      ( ( "A table of ", E 0 exp )
       , \env -> return $ BlockValue $ tag "table" [P "border" "1"]
           ( tag "tr" [] $ catFor columns $ tag "th" [] . fst
           , catFor (runExp env exp) $ \item -> tag "tr" [] $
diff -rN -u old-fenserve/fendata/Rendering.hs new-fenserve/fendata/Rendering.hs
--- old-fenserve/fendata/Rendering.hs	2007-06-17 01:28:59.000000000 +0300
+++ new-fenserve/fendata/Rendering.hs	2007-06-17 01:28:59.000000000 +0300
@@ -33,7 +33,7 @@
     f EmailType = "email address"
     f WebLinkType = "web link"
     f DateType = "date"
-    f (ItemType cat) = catName $ getCategory cat
+    f (ItemType cat) = uncapitalize $ catName $ getCategory cat
 
 renderValue (InlineValue s) = s
 renderValue (BlockValue s) = s