X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FWiki%2FInterpreter%2FBase.hs;h=1af5c77e9844f7e5497b8c4ba364f3ac8440d101;hb=88747f2;hp=2f6aade45ac6ba8a86f88d2daa12cb02841ed29e;hpb=5ab256be8bbbb1f4a012b41ac1cc3f9b29aa7d57;p=Rakka.git diff --git a/Rakka/Wiki/Interpreter/Base.hs b/Rakka/Wiki/Interpreter/Base.hs index 2f6aade..1af5c77 100644 --- a/Rakka/Wiki/Interpreter/Base.hs +++ b/Rakka/Wiki/Interpreter/Base.hs @@ -10,7 +10,7 @@ import Rakka.Page import Rakka.SystemConfig import Rakka.Wiki import Rakka.Wiki.Interpreter -import Text.XML.HXT.Arrow +import Text.XML.HXT.XPath interpreters :: [Interpreter] @@ -93,7 +93,7 @@ otherLangsInterp (langName, name) : mergeTables m xs mkLangList :: [(LanguageName, PageName)] -> BlockElement - mkLangList xs = List Bullet (map mkLangLink xs) + mkLangList = List Bullet . map mkLangLink mkLangLink :: (LanguageName, PageName) -> ListItem mkLangLink (langName, name) @@ -103,7 +103,7 @@ otherLangsInterp -- +-- class="newButton controls" /> newPageInterp :: Interpreter newPageInterp = InlineCommandInterpreter { @@ -114,7 +114,7 @@ newPageInterp attrs = [ ("type" , "button") , ("value" , label) , ("onclick", "Rakka.newPage()") - , ("class" , "newButton") + , ("class" , "newButton controls") ] in return (Input attrs) @@ -124,7 +124,7 @@ newPageInterp -- +-- class="editButton controls" /> editPageInterp :: Interpreter editPageInterp = InlineCommandInterpreter { @@ -136,7 +136,7 @@ editPageInterp attrs = [ ("type" , "button") , ("value" , label) , ("onclick", "Rakka.editPage(\"" ++ name ++ "\")") - , ("class" , "editButton") + , ("class" , "editButton controls") ] in return (Input attrs) @@ -145,7 +145,7 @@ editPageInterp -- +-- class="loginButton controls" /> loginInterp :: Interpreter loginInterp = InlineCommandInterpreter { @@ -154,7 +154,7 @@ loginInterp = \ _ _ -> let attrs = [ ("type" , "button") , ("value", "Login") - , ("class", "loginButton") + , ("class", "loginButton controls") ] in return (Input attrs) @@ -178,7 +178,7 @@ searchFieldInterp -- +-- class="configButton controls" /> configurationInterp :: Interpreter configurationInterp = InlineCommandInterpreter { @@ -187,7 +187,7 @@ configurationInterp = \ _ _ -> let attrs = [ ("type" , "button") , ("value", "Configuration") - , ("class", "configButton") + , ("class", "configButton controls") ] in return (Input attrs)