X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FWiki%2FInterpreter%2FBase.hs;h=9a02ae255668be349716a141300996bbe74aba1c;hb=656fdb2772ab4de5cd083cbe9e7c1610cccef73b;hp=3d38c2c3c9dc2c34478e36de00175d73d1aa0784;hpb=f4a655a34bc6017db008c2e915053958ae13ee81;p=Rakka.git

diff --git a/Rakka/Wiki/Interpreter/Base.hs b/Rakka/Wiki/Interpreter/Base.hs
index 3d38c2c..9a02ae2 100644
--- a/Rakka/Wiki/Interpreter/Base.hs
+++ b/Rakka/Wiki/Interpreter/Base.hs
@@ -3,12 +3,18 @@ module Rakka.Wiki.Interpreter.Base
     )
     where
 
+import           Control.Arrow
+import           Control.Arrow.ListArrow
 import           Data.Map (Map)
 import qualified Data.Map as M
+import           Data.Maybe
+import           Network.URI
 import           Rakka.Page
 import           Rakka.SystemConfig
 import           Rakka.Wiki
 import           Rakka.Wiki.Interpreter
+import           Text.XML.HXT.Arrow.XmlArrow
+import           Text.XML.HXT.Arrow.XmlNodeSet
 
 
 interpreters :: [Interpreter]
@@ -16,7 +22,8 @@ interpreters = [ lineBreakInterp
                , spanInterp
                , divInterp
                , pageNameInterp
---               , otherLangsInterp
+               , otherLangsInterp
+               , editPageInterp
                ]
 
 
@@ -40,7 +47,8 @@ divInterp :: Interpreter
 divInterp = BlockCommandInterpreter {
               bciName      = "div"
             , bciInterpret
-                = \ _ (BlockCommand _ attrs contents) -> return $ Div attrs contents
+                = \ _ (BlockCommand _ attrs contents)
+                -> return $ Div attrs (map Block contents)
             }
 
 
@@ -51,26 +59,67 @@ pageNameInterp = InlineCommandInterpreter {
                      = \ ctx _ -> return $ Text (ctxPageName ctx)
                  }
 
-{-
+
 otherLangsInterp :: Interpreter
 otherLangsInterp
     = BlockCommandInterpreter {
         bciName      = "inOtherLanguages"
       , bciInterpret
           = \ ctx _ ->
-            case fmap pageOtherLang (ctxMainPage ctx) of
-              Nothing
-                -> return EmptyBlock
-
-              Just linkTable
-                  -> do Languages langTable <- getSysConf (ctxSysConf ctx) (Languages undefined)
-                        let merged = mergeTables langTable (M.toList linkTable)
-                        -- FIXME
+            let linkTable = case ctxMainPage ctx of
+                              Just page -> runLA ( getXPathTreesInDoc "/page/otherLang/link"
+                                                   >>>
+                                                   ( getAttrValue0 "lang"
+                                                     &&&
+                                                     getAttrValue0 "page"
+                                                   )
+                                                 ) page
+                              Nothing   -> []
+            in
+              case linkTable of
+                [] -> return EmptyBlock
+                xs -> do Languages langTable <- getSysConf (ctxSysConf ctx)
+                         let merged = mergeTables langTable linkTable
+                         return $ mkLangList merged
       }
     where
       mergeTables :: Map LanguageTag LanguageName
                   -> [(LanguageTag, PageName)]
                   -> [(LanguageName, PageName)]
       mergeTables _ []     = []
-      mergeTables m (x:xs) = fromMaybe x (M.lookup x m) : mergeTables m xs
--}
\ No newline at end of file
+      mergeTables m (x:xs) = let (langTag, pageName) = x
+                                 langName            = fromMaybe langTag (M.lookup langTag m)
+                             in
+                               (langName, pageName) : mergeTables m xs
+
+      mkLangList :: [(LanguageName, PageName)] -> BlockElement
+      mkLangList xs = List Bullet (map mkLangLink xs)
+
+      mkLangLink :: (LanguageName, PageName) -> ListItem
+      mkLangLink (langName, pageName)
+          = [Inline (PageLink (Just pageName) Nothing (Just langName))]
+
+
+-- <input type="button"
+--        value="Edit"
+--        onclick="Rakka.editPage(\"http://example.org/\", \"Foo\")"
+--        class="editButton" />
+editPageInterp :: Interpreter
+editPageInterp 
+    = InlineCommandInterpreter {
+        iciName      = "editPage"
+      , iciInterpret
+          = \ ctx (InlineCommand _ args _) ->
+            do BaseURI baseURI <- getSysConf (ctxSysConf ctx)
+
+               let pageName = fromMaybe (ctxPageName ctx) (lookup "page" args)
+                   label    = fromMaybe "Edit this page" (lookup "label" args)
+                   uri      = uriToString id baseURI ""
+                   attrs    = [ ("type"   , "button")
+                              , ("value"  , label)
+                              , ("onclick", "Rakka.editPage(\"" ++ uri ++ "\", \"" ++ pageName ++ "\")")
+                              , ("class"  , "editButton")
+                              ]
+
+               return (Input attrs)
+      }