[login working better
thomashartman1@gmail.com**20080906000013] hunk ./src/Misc.hs 108
-
+-- don't like this type sig
hunk ./src/View.hs 12
-tutlayout :: [(String,String)] -> String -> (Maybe String) -> IO (StringTemplate String)
+-- tutlayout :: [(String,String)] -> String -> (Maybe String) -> IO (StringTemplate String)
hunk ./src/View.hs 15
-  header <- getHeaderArea contentTmpl -- *****!!!!!
+  header <- getHeaderArea contentTmpl mbLoggedInAs 
hunk ./src/View.hs 20
-getHeaderArea contentTmpl = do
-  menuAttrs <- return $ getMenuAttrs contentTmpl
-  -- loggedInMsg <- return getLoginMsg
-  return . toString =<< renderTemplateDir "templates" (menuAttrs ++ [] ) "header"
+getHeaderArea contentTmpl mbLoggedInAs = do
+  let menuAttrs = getMenuAttrs contentTmpl
+  userMenu <- maybe 
+    (return . toString =<< renderTemplateDir "templates" [] "menuNotLoggedIn")
+    getMenuLoggedIn
+    mbLoggedInAs
+  return . toString =<< renderTemplateDir "templates" (menuAttrs ++ [("userMenu",userMenu)] ) "header"
+  where getMenuLoggedIn loggedInAs = return . toString =<< renderTemplateDir "templates" [("user",loggedInAs)] "menuLoggedIn"
hunk ./templates/menuLoggedIn.st 1
-<a href="/tutorial/actions/logout">logout $ loggedInAs $ </a>
+<a href="/tutorial/actions/logout">logout $ user $ </a>
hunk ./templates/menubar.st 15
-           $ menuNotLoggedIn() $
-	   | $ menuLoggedIn() $
+           $ userMenu $
+
+
hunk ./templates/menubar.st 20
-           
-           
-           | $ menuLoginStatus $