You are being redirected.
" + ] + Just True -> fmap Left $ do + (url', html') <- processDestination destination + lift $ ok $ withBody $ concat + [ "Redirecting to " + , html' + , "...
" + ] + Just False -> do + cancelledRedirect destination >>= addMessage + return (Right page) + -- | Converts contents of page file to Page object. contentsToPage :: String -> ContentTransformer Page contentsToPage s = do @@ -358,6 +518,7 @@ _ -> JsMath (Just $ base' ++ "/js/jsMath/easy/load.js") , writerTableOfContents = toc + , writerHighlight = True , writerExtensions = if bird then Set.insert Ext_literate_haskell @@ -452,8 +613,8 @@ addPageTitleToPandoc title' (Pandoc _ blocks) = do updateLayout $ \layout -> layout{ pgTitle = title' } return $ if null title' - then Pandoc (Meta [] [] []) blocks - else Pandoc (Meta [Str title'] [] []) blocks + then Pandoc nullMeta blocks + else Pandoc (B.setMeta "title" (B.str title') nullMeta) blocks -- | Adds javascript links for math support. addMathSupport :: a -> ContentTransformer a @@ -516,6 +677,8 @@ LaTeX -> readLaTeX defPS HTML -> readHtml defPS Textile -> readTextile defPS + Org -> readOrg defPS + DocBook -> readDocBook defPS wikiLinksTransform :: Pandoc -> PluginM Pandoc wikiLinksTransform pandoc @@ -525,7 +688,7 @@ -- | Convert links with no URL to wikilinks. convertWikiLinks :: Config -> Inline -> Inline convertWikiLinks cfg (Link ref ("", "")) | useAbsoluteUrls cfg = - Link ref (baseUrl cfg inlinesToURL ref, "Go to wiki page") + Link ref ("/" baseUrl cfg inlinesToURL ref, "Go to wiki page") convertWikiLinks _cfg (Link ref ("", "")) = Link ref (inlinesToURL ref, "Go to wiki page") convertWikiLinks _cfg x = x @@ -553,9 +716,10 @@ LineBreak -> " " Math DisplayMath s -> "$$" ++ s ++ "$$" Math InlineMath s -> "$" ++ s ++ "$" - RawInline "tex" s -> s + RawInline (Format "tex") s -> s RawInline _ _ -> "" Link xs _ -> concatMap go xs Image xs _ -> concatMap go xs Note _ -> "" + Span _ xs -> concatMap go xs diff --git a/Network/Gitit/Export.hs b/Network/Gitit/Export.hs --- a/Network/Gitit/Export.hs +++ b/Network/Gitit/Export.hs @@ -22,37 +22,32 @@ module Network.Gitit.Export ( exportFormats ) where import Text.Pandoc hiding (HTMLMathMethod(..)) import qualified Text.Pandoc as Pandoc +import Text.Pandoc.PDF (makePDF) import Text.Pandoc.SelfContained as SelfContained -import Text.Pandoc.Shared (escapeStringUsing, readDataFileUTF8) +import Text.Pandoc.Shared (readDataFileUTF8) import Network.Gitit.Server import Network.Gitit.Framework (pathForPage, getWikiBase) -import Network.Gitit.Util (withTempDir, readFileUTF8) import Network.Gitit.State (getConfig) import Network.Gitit.Types import Network.Gitit.Cache (cacheContents, lookupCache) import Control.Monad.Trans (liftIO) -import Control.Monad (unless, when) +import Control.Monad (unless) import Text.XHtml (noHtml) import qualified Data.ByteString as B import qualified Data.ByteString.Lazy as L -import Data.ByteString.Lazy.UTF8 (fromString) -import System.FilePath ((<.>), (), takeDirectory) +import Data.ByteString.Lazy.UTF8 (fromString, toString) +import System.FilePath ((), takeDirectory) import Control.Exception (throwIO) -import System.Environment (getEnvironment) -import System.Exit (ExitCode(..)) -import System.IO (openTempFile) -import System.Directory (getCurrentDirectory, setCurrentDirectory, removeFile, - doesFileExist) -import System.Process (runProcess, waitForProcess) -import Codec.Binary.UTF8.String (encodeString) +import System.Directory (doesFileExist) import Text.HTML.SanitizeXSS import Text.Pandoc.Writers.RTF (writeRTFWithEmbeddedImages) import qualified Data.Text as T import Data.List (isPrefixOf) +import Text.Highlighting.Kate (styleToCss, pygments) import Paths_gitit (getDataFileName) defaultRespOptions :: WriterOptions -defaultRespOptions = def { writerStandalone = True } +defaultRespOptions = def { writerStandalone = True, writerHighlight = True } respond :: String -> String @@ -74,11 +69,10 @@ template <- case template' of Right t -> return t Left e -> liftIO $ throwIO e - doc' <- if ext `elem` ["odt","pdf","epub","docx","rtf"] + doc' <- if ext `elem` ["odt","pdf","beamer","epub","docx","rtf"] then fixURLs page doc else return doc respond mimetype ext (fn opts{writerTemplate = template - ,writerSourceDirectory = repositoryPath cfg ,writerUserDataDir = pandocUserData cfg}) page doc' @@ -132,9 +126,8 @@ else return "" let h = writeHtmlString opts'{ writerVariables = - ("body",body''):("dzslides-core",dzcore):variables' + ("body",body''):("dzslides-core",dzcore):("highlighting-css",pygmentsCss):variables' ,writerTemplate = template - ,writerSourceDirectory = repositoryPath cfg ,writerUserDataDir = pandocUserData cfg } (Pandoc meta []) h' <- liftIO $ makeSelfContained (pandocUserData cfg) h @@ -183,6 +176,10 @@ respondOrg = respondS "org" "text/plain; charset=utf-8" "" writeOrg defaultRespOptions +respondICML :: String -> Pandoc -> Handler +respondICML = respondS "icml" "application/xml; charset=utf-8" "" + writeICML defaultRespOptions + respondTextile :: String -> Pandoc -> Handler respondTextile = respondS "textile" "text/plain; charset=utf-8" "" writeTextile defaultRespOptions @@ -208,23 +205,8 @@ "application/vnd.openxmlformats-officedocument.wordprocessingml.document" "docx" writeDocx defaultRespOptions ---- | Run shell command and return error status. Assumes --- UTF-8 locale. Note that this does not actually go through \/bin\/sh! -runShellCommand :: FilePath -- ^ Working directory - -> Maybe [(String, String)] -- ^ Environment - -> String -- ^ Command - -> [String] -- ^ Arguments - -> IO ExitCode -runShellCommand workingDir environment command optionList = do - (errPath, err) <- openTempFile workingDir "err" - hProcess <- runProcess (encodeString command) (map encodeString optionList) - (Just workingDir) environment Nothing (Just err) (Just err) - status <- waitForProcess hProcess - removeFile errPath - return status - -respondPDF :: String -> Pandoc -> Handler -respondPDF page old_pndc = fixURLs page old_pndc >>= \pndc -> do +respondPDF :: Bool -> String -> Pandoc -> Handler +respondPDF useBeamer page old_pndc = fixURLs page old_pndc >>= \pndc -> do cfg <- getConfig unless (pdfExport cfg) $ error "PDF export disabled" let cacheName = pathForPage page ++ ".export.pdf" @@ -232,38 +214,26 @@ then lookupCache cacheName else return Nothing pdf' <- case cached of - Just (_modtime, bs) -> return $ Right (False, L.fromChunks [bs]) - Nothing -> liftIO $ withTempDir "gitit-tmp-pdf" $ \tempdir -> do - template' <- liftIO $ getDefaultTemplate (pandocUserData cfg) "latex" - template <- either throwIO return template' + Just (_modtime, bs) -> return $ Right $ L.fromChunks [bs] + Nothing -> do + template' <- liftIO $ getDefaultTemplate (pandocUserData cfg) + $ if useBeamer then "beamer" else "latex" + template <- liftIO $ either throwIO return template' let toc = tableOfContents cfg - let latex = writeLaTeX defaultRespOptions{writerTemplate = template - ,writerTableOfContents = toc} pndc - let tempfile = "export" <.> "tex" - curdir <- getCurrentDirectory - setCurrentDirectory tempdir - writeFile tempfile latex - -- run pdflatex twice to get the references and toc right - let cmd = "pdflatex" - oldEnv <- getEnvironment - let env = Just $ ("TEXINPUTS",".:" ++ - escapeStringUsing [(' ',"\\ "),('"',"\\\"")] - (curdir repositoryPath cfg) ++ ":") : oldEnv - let opts = ["-interaction=batchmode", "-no-shell-escape", tempfile] - _ <- runShellCommand tempdir env cmd opts - canary <- runShellCommand tempdir env cmd opts - setCurrentDirectory curdir -- restore original location - case canary of - ExitSuccess -> do pdfBS <- L.readFile (tempdir "export" <.> "pdf") - return $ Right (useCache cfg, pdfBS) - ExitFailure n -> do l <- readFileUTF8 (tempdir "export" <.> "log") - return $ Left (n, l) + res <- liftIO $ makePDF "pdflatex" writeLaTeX + defaultRespOptions{writerTemplate = template + ,writerSourceURL = Just $ baseUrl cfg + ,writerTableOfContents = toc + ,writerBeamer = useBeamer} pndc + return res case pdf' of - Left (n,logOutput) -> simpleErrorHandler ("PDF creation failed with code: " ++ - show n ++ "\n" ++ logOutput) - Right (needsCaching, pdfBS) -> do - when needsCaching $ - cacheContents cacheName $ B.concat . L.toChunks $ pdfBS + Left logOutput -> simpleErrorHandler ("PDF creation failed:\n" + ++ toString logOutput) + Right pdfBS -> do + case cached of + Nothing -> + cacheContents cacheName $ B.concat . L.toChunks $ pdfBS + _ -> return () ok $ setContentType "application/pdf" $ setFilename (page ++ ".pdf") $ (toResponse noHtml) {rsBody = pdfBS} @@ -300,7 +270,9 @@ exportFormats :: Config -> [(String, String -> Pandoc -> Handler)] exportFormats cfg = if pdfExport cfg - then ("PDF", respondPDF) : rest + then ("PDF", respondPDF False) : + ("Beamer", respondPDF True) : + rest else rest where rest = [ ("LaTeX", respondLaTeX) -- (description, writer) , ("ConTeXt", respondConTeXt) @@ -310,6 +282,7 @@ , ("Plain text",respondPlain) , ("MediaWiki", respondMediaWiki) , ("Org-mode", respondOrg) + , ("ICML", respondICML) , ("Textile", respondTextile) , ("AsciiDoc", respondAsciiDoc) , ("Man page", respondMan) @@ -319,5 +292,8 @@ , ("S5", respondSlides "s5" S5Slides) , ("EPUB", respondEPUB) , ("ODT", respondODT) - , ("Docx", respondDocx) + , ("DOCX", respondDocx) , ("RTF", respondRTF) ] + +pygmentsCss :: String +pygmentsCss = styleToCss pygments diff --git a/Network/Gitit/Framework.hs b/Network/Gitit/Framework.hs --- a/Network/Gitit/Framework.hs +++ b/Network/Gitit/Framework.hs @@ -269,8 +269,9 @@ isSourceCode :: String -> Bool isSourceCode path' = let langs = languagesByFilename $ takeFileName path' - in not (null langs || takeExtension path' == ".svg") - -- allow svg to be served as image + ext = takeExtension path' + in not (null langs || ext == ".svg" || ext == ".eps") + -- allow svg or eps to be served as image -- | Returns encoded URL path for the page with the given name, relative to -- the wiki base. diff --git a/Network/Gitit/Handlers.hs b/Network/Gitit/Handlers.hs --- a/Network/Gitit/Handlers.hs +++ b/Network/Gitit/Handlers.hs @@ -69,7 +69,8 @@ import Network.Gitit.State import Text.XHtml hiding ( (), dir, method, password, rev ) import qualified Text.XHtml as X ( method ) -import Data.List (intersperse, nub, sortBy, find, isPrefixOf, inits, sort) +import Data.List (intercalate, intersperse, delete, nub, sortBy, find, isPrefixOf, inits, sort, (\\)) +import Data.List.Split (wordsBy) import Data.Maybe (fromMaybe, mapMaybe, isJust, catMaybes) import Data.Ord (comparing) import Data.Char (toLower, isSpace) @@ -83,13 +84,14 @@ import System.Log.Logger (logM, Priority(..)) handleAny :: Handler -handleAny = uriRest $ \uri -> +handleAny = withData $ \(params :: Params) -> uriRest $ \uri -> let path' = uriPath uri in do fs <- getFileStore + let rev = pRevision params mimetype <- getMimeTypeForExtension (takeExtension path') res <- liftIO $ try - (retrieve fs path' Nothing :: IO B.ByteString) + (retrieve fs path' rev :: IO B.ByteString) case res of Right contents -> ignoreFilters >> -- don't compress (ok $ setContentType mimetype $ @@ -141,10 +143,18 @@ , pgTabs = [] , pgTitle = "Create " ++ page ++ "?" } $ - p << [ stringToHtml ("There is no page '" ++ page ++ - "'. You may create the page by "), - anchor ! [href $ base' ++ "/_edit" ++ urlForPage page] << - "clicking here." ] + (p << stringToHtml + ("There is no page named '" ++ page ++ "'. You can:")) + +++ + (unordList $ + [ anchor ! + [href $ base' ++ "/_edit" ++ urlForPage page] << + ("Create the page '" ++ page ++ "'") + , anchor ! + [href $ base' ++ "/_search?" ++ + (urlEncodeVars [("patterns", page)])] << + ("Search for pages containing the text '" ++ + page ++ "'")]) uploadForm :: Handler uploadForm = withData $ \(params :: Params) -> do @@ -153,18 +163,18 @@ let logMsg = pLogMsg params let upForm = form ! [X.method "post", enctype "multipart/form-data"] << fieldset << - [ p << [label << "File to upload:" + [ p << [label ! [thefor "file"] << "File to upload:" , br , afile "file" ! [value origPath] ] - , p << [ label << "Name on wiki, including extension" + , p << [ label ! [thefor "wikiname"] << "Name on wiki, including extension" , noscript << " (leave blank to use the same filename)" , stringToHtml ":" , br , textfield "wikiname" ! [value wikiname] , primHtmlChar "nbsp" , checkbox "overwrite" "yes" - , label << "Overwrite existing file" ] - , p << [ label << "Description of content or changes:" + , label ! [thefor "overwrite"] << "Overwrite existing file" ] + , p << [ label ! [thefor "logMsg"] << "Description of content or changes:" , br , textfield "logMsg" ! [size "60", value logMsg] , submit "upload" "Upload" ] @@ -377,10 +387,12 @@ showActivity :: Handler showActivity = withData $ \(params :: Params) -> do + cfg <- getConfig currTime <- liftIO getCurrentTime - let oneMonthAgo = addUTCTime (-60 * 60 * 24 * 30) currTime + let defaultDaysAgo = fromIntegral (recentActivityDays cfg) + let daysAgo = addUTCTime (defaultDaysAgo * (-60) * 60 * 24) currTime let since = case pSince params of - Nothing -> Just oneMonthAgo + Nothing -> Just daysAgo Just t -> Just t let forUser = pForUser params fs <- getFileStore @@ -392,14 +404,13 @@ let fileFromChange (Added f) = f fileFromChange (Modified f) = f fileFromChange (Deleted f) = f - let dropDotPage file = if isPageFile file - then dropExtension file - else file + base' <- getWikiBase - let fileAnchor revis file = - anchor ! [href $ base' ++ "/_diff" ++ urlForPage file ++ "?to=" ++ revis] << file - let filesFor changes revis = intersperse (primHtmlChar "nbsp") $ - map (fileAnchor revis . dropDotPage . fileFromChange) changes + let fileAnchor revis file = if isPageFile file + then anchor ! [href $ base' ++ "/_diff" ++ urlForPage (dropExtension file) ++ "?to=" ++ revis] << dropExtension file + else anchor ! [href $ base' ++ urlForPage file ++ "?revision=" ++ revis] << file + let filesFor changes revis = intersperse (stringToHtml " ") $ + map (fileAnchor revis . fileFromChange) changes let heading = h1 << ("Recent changes by " ++ fromMaybe "all users" forUser) let revToListItem rev = li << [ thespan ! [theclass "date"] << (show $ revDateTime rev) @@ -464,7 +475,8 @@ pgMessages = pMessages params, pgTabs = DiffTab : pgTabs defaultPageLayout, - pgSelectedTab = DiffTab + pgSelectedTab = DiffTab, + pgTitle = page } htmlDiff @@ -523,7 +535,7 @@ , textarea ! (readonly ++ [cols "80", name "editedText", identifier "editedText"]) << raw , br - , label << "Description of changes:" + , label ! [thefor "logMsg"] << "Description of changes:" , br , textfield "logMsg" ! (readonly ++ [value logMsg]) , submit "update" "Save" @@ -599,7 +611,7 @@ if pConfirm params && (file == page || file == page <.> "page") then do fs <- getFileStore - liftIO $ delete fs file author descrip + liftIO $ Data.FileStore.delete fs file author descrip seeOther (base' ++ "/") $ toResponse $ p << "File deleted" else seeOther (base' ++ urlForPage page) $ toResponse $ p << "Not deleted" @@ -674,8 +686,10 @@ li ! [theclass "page" ] << anchor ! [href $ base' ++ urlForPage (prefix ++ dropExtension f)] << dropExtension f - fileLink (FSFile f) = - li ! [theclass "upload"] << anchor ! [href $ base' ++ urlForPage (prefix ++ f)] << f + fileLink (FSFile f) = li ! [theclass "upload"] << concatHtml + [ anchor ! [href $ base' ++ urlForPage (prefix ++ f)] << f + , anchor ! [href $ base' ++ "_delete" ++ urlForPage (prefix ++ f)] << "(delete)" + ] fileLink (FSDirectory f) = li ! [theclass "folder"] << anchor ! [href $ base' ++ urlForPage (prefix ++ f) ++ "/"] << f @@ -694,30 +708,44 @@ -- more sophisticated searching options to filestore. categoryPage :: Handler categoryPage = do - category <- getPath + path' <- getPath cfg <- getConfig + let pcategories = wordsBy (==',') path' let repoPath = repositoryPath cfg - let categoryDescription = "Category: " ++ category + let categoryDescription = "Category: " ++ (intercalate " + " pcategories) fs <- getFileStore files <- liftIO $ index fs let pages = filter (\f -> isPageFile f && not (isDiscussPageFile f)) files matches <- liftM catMaybes $ forM pages $ \f -> do categories <- liftIO $ readCategories $ repoPath f - return $ if category `elem` categories - then Just f + return $ if all ( `elem` categories) pcategories + then Just (f, categories \\ pcategories) else Nothing base' <- getWikiBase let toMatchListItem file = li << [ anchor ! [href $ base' ++ urlForPage (dropExtension file)] << dropExtension file ] - let htmlMatches = ulist << map toMatchListItem matches + let toRemoveListItem cat = li << + [ anchor ! [href $ base' ++ + (if null (tail pcategories) + then "/_categories" + else "/_category" ++ urlForPage (intercalate "," $ Data.List.delete cat pcategories)) ] + << ("-" ++ cat) ] + let toAddListItem cat = li << + [ anchor ! [href $ base' ++ + "/_category" ++ urlForPage (path' ++ "," ++ cat) ] + << ("+" ++ cat) ] + let matchList = ulist << map toMatchListItem (fst $ unzip matches) +++ + thediv ! [ identifier "categoryList" ] << + ulist << (++) (map toAddListItem (nub $ concat $ snd $ unzip matches)) + (map toRemoveListItem pcategories) formattedPage defaultPageLayout{ pgPageName = categoryDescription, pgShowPageTools = False, pgTabs = [], pgScripts = ["search.js"], pgTitle = categoryDescription } - htmlMatches + matchList categoryListPage :: Handler categoryListPage = do diff --git a/Network/Gitit/Initialize.hs b/Network/Gitit/Initialize.hs --- a/Network/Gitit/Initialize.hs +++ b/Network/Gitit/Initialize.hs @@ -136,6 +136,8 @@ HTML -> writeHtmlString defOpts . toPandoc RST -> writeRST defOpts . toPandoc Textile -> writeTextile defOpts . toPandoc + Org -> writeOrg defOpts . toPandoc + DocBook -> writeDocbook defOpts . toPandoc welcomepath <- getDataFileName $ "data" "FrontPage" <.> "page" welcomecontents <- liftM converter $ readFileUTF8 welcomepath diff --git a/Network/Gitit/Layout.hs b/Network/Gitit/Layout.hs --- a/Network/Gitit/Layout.hs +++ b/Network/Gitit/Layout.hs @@ -83,6 +83,8 @@ scriptLink x = script ! [src (prefixedScript x), thetype "text/javascript"] << noHtml javascriptlinks = renderHtmlFragment $ concatHtml $ map scriptLink scripts + article = if isDiscussPage page then drop 1 page else page + discussion = '@':article tabli tab = if tab == pgSelectedTab layout then li ! [theclass "selected"] else li @@ -97,8 +99,14 @@ setStrAttr "pagetitle" (pgTitle layout) . T.setAttribute "javascripts" javascriptlinks . setStrAttr "pagename" page . + setStrAttr "articlename" article . + setStrAttr "discussionname" discussion . setStrAttr "pageUrl" (urlForPage page) . + setStrAttr "articleUrl" (urlForPage article) . + setStrAttr "discussionUrl" (urlForPage discussion) . setBoolAttr "ispage" (isPage page) . + setBoolAttr "isarticlepage" (isPage page && not (isDiscussPage page)) . + setBoolAttr "isdiscusspage" (isDiscussPage page) . setBoolAttr "pagetools" (pgShowPageTools layout) . setBoolAttr "sitenav" (pgShowSiteNav layout) . maybe id (T.setAttribute "markuphelp") (pgMarkupHelp layout) . @@ -106,13 +114,13 @@ maybe id (T.setAttribute "revision") rev . T.setAttribute "exportbox" (renderHtmlFragment $ exportBox base' cfg page rev) . - T.setAttribute "tabs" (renderHtmlFragment tabs) . - T.setAttribute "messages" (pgMessages layout) . + (if null (pgTabs layout) then id else T.setAttribute "tabs" + (renderHtmlFragment tabs)) . + (\f x xs -> if null xs then x else f xs) (T.setAttribute "messages") id (pgMessages layout) . T.setAttribute "usecache" (useCache cfg) . T.setAttribute "content" (renderHtmlFragment htmlContents) . setBoolAttr "wikiupload" ( uploadsAllowed cfg) $ templ - exportBox :: String -> Config -> String -> Maybe String -> Html diff --git a/Network/Gitit/Page.hs b/Network/Gitit/Page.hs --- a/Network/Gitit/Page.hs +++ b/Network/Gitit/Page.hs @@ -53,6 +53,7 @@ import Network.Gitit.Util (trim, splitCategories, parsePageType) import Text.ParserCombinators.Parsec import Data.Char (toLower) +import Data.List (intercalate) import Data.Maybe (fromMaybe) import Data.ByteString.UTF8 (toString) import qualified Data.ByteString as B @@ -134,23 +135,29 @@ pagelhs = pageLHS page' pagetoc = pageTOC page' pagecats = pageCategories page' + metadata = filter + (\(k, _) -> not (k `elem` + ["title", "format", "toc", "categories"])) + (pageMeta page') metadata' = (if pagename /= pagetitle - then "!title: " ++ pagetitle ++ "\n" + then "title: " ++ pagetitle ++ "\n" else "") ++ (if pageformat /= defaultPageType conf || pagelhs /= defaultLHS conf - then "!format: " ++ + then "format: " ++ map toLower (show pageformat) ++ if pagelhs then "+lhs\n" else "\n" else "") ++ (if pagetoc /= tableOfContents conf - then "!toc: " ++ + then "toc: " ++ (if pagetoc then "yes" else "no") ++ "\n" else "") ++ (if not (null pagecats) - then "!categories: " ++ unwords pagecats ++ "\n" - else "") - in metadata' ++ (if null metadata' then "" else "\n") ++ pageText page' + then "categories: " ++ intercalate ", " pagecats ++ "\n" + else "") ++ + (unlines (map (\(k, v) -> k ++ ": " ++ v) metadata)) + in (if null metadata' then "" else "---\n" ++ metadata' ++ "...\n\n") + ++ pageText page' -- | Read categories from metadata strictly. readCategories :: FilePath -> IO [String] diff --git a/Network/Gitit/Types.hs b/Network/Gitit/Types.hs --- a/Network/Gitit/Types.hs +++ b/Network/Gitit/Types.hs @@ -38,7 +38,7 @@ import Text.HTML.TagSoup.Entity (lookupEntity) import Data.Char (isSpace) -data PageType = Markdown | RST | LaTeX | HTML | Textile +data PageType = Markdown | RST | LaTeX | HTML | Textile | Org | DocBook deriving (Read, Show, Eq) data FileStoreType = Git | Darcs | Mercurial deriving Show @@ -147,7 +147,9 @@ -- | Directory to search for pandoc customizations pandocUserData :: Maybe FilePath, -- | Filter HTML through xss-sanitize - xssSanitize :: Bool + xssSanitize :: Bool, + -- | The default number of days in the past to look for \"recent\" activity + recentActivityDays :: Int } -- | Data for rendering a wiki page. @@ -290,6 +292,7 @@ , pSessionKey :: Maybe SessionKey , pRecaptcha :: Recaptcha , pResetCode :: String + , pRedirect :: Maybe Bool } deriving Show instance FromReqURI [String] where @@ -341,6 +344,10 @@ rc <- look' "recaptcha_challenge_field" `mplus` return "" rr <- look' "recaptcha_response_field" `mplus` return "" rk <- look' "reset_code" `mplus` return "" + rd <- (look' "redirect" >>= \r -> return (case r of + "yes" -> Just True + "no" -> Just False + _ -> Nothing)) `mplus` return Nothing return Params { pUsername = un , pPassword = pw , pPassword2 = p2 @@ -374,6 +381,7 @@ recaptchaChallengeField = rc, recaptchaResponseField = rr } , pResetCode = rk + , pRedirect = rd } data Command = Command (Maybe String) deriving Show @@ -400,7 +408,7 @@ fromEntities :: String -> String fromEntities ('&':xs) = case lookupEntity ent of - Just c -> c : fromEntities rest + Just c -> c ++ fromEntities rest Nothing -> '&' : fromEntities xs where (ent, rest) = case break (\c -> isSpace c || c == ';') xs of (zs,';':ys) -> (zs,ys) diff --git a/README.markdown b/README.markdown --- a/README.markdown +++ b/README.markdown @@ -6,11 +6,11 @@ files are stored in a [git][], [darcs][], or [mercurial][] repository and may be modified either by using the VCS's command-line tools or through the wiki's web interface. By default, pandoc's extended version -of markdown is used as a markup language, but reStructuredText, LaTeX, -or HTML can also be used. Pages can be exported in a number of different -formats, including LaTeX, RTF, OpenOffice ODT, and MediaWiki markup. -Gitit can be configured to display TeX math (using [texmath][]) and -highlighted source code (using [highlighting-kate][]). +of markdown is used as a markup language, but reStructuredText, LaTeX, HTML, +DocBook, or Emacs Org-mode markup can also be used. Pages can be exported in a +number of different formats, including LaTeX, RTF, OpenOffice ODT, and +MediaWiki markup. Gitit can be configured to display TeX math (using +[texmath][]) and highlighted source code (using [highlighting-kate][]). Other features include @@ -298,9 +298,10 @@ For more radical changes, you can override any of the default templates in `$CABALDIR/share/gitit-x.y.z/data/templates` by copying -the file into `templates` and modifying it. The `page.st` template is -the master template; it includes the others. Interpolated variables are -surrounded by `$`s, so `literal $` must be backslash-escaped. +the file into `templates`, modifying it, and restarting gitit. The +`page.st` template is the master template; it includes the others. +Interpolated variables are surrounded by `$`s, so `literal $` must +be backslash-escaped. Adding support for math ----------------------- @@ -348,9 +349,9 @@ ======= Plugins are small Haskell programs that transform a wiki page after it -has been converted from Markdown or RST. See the example plugins in the -`plugins` directory. To enable a plugin, include the path to the plugin -(or its module name) in the `plugins` field of the configuration file. +has been converted from Markdown or another source format. See the example +plugins in the `plugins` directory. To enable a plugin, include the path to the +plugin (or its module name) in the `plugins` field of the configuration file. (If the plugin name starts with `Network.Gitit.Plugin.`, gitit will assume that the plugin is an installed module and will not look for a source file.) @@ -544,6 +545,7 @@ SetOutputFilter proxy-html ProxyPassReverse / ProxyHTMLURLMap / /wiki/ + ProxyHTMLDocType "" XHTML RequestHeader unset Accept-Encoding diff --git a/data/default.conf b/data/default.conf --- a/data/default.conf +++ b/data/default.conf @@ -54,7 +54,7 @@ default-page-type: Markdown # specifies the type of markup used to interpret pages in the wiki. # Possible values are Markdown, RST, LaTeX, HTML, Markdown+LHS, RST+LHS, -# and LaTeX+LHS. (The +LHS variants treat the input as +# LaTeX+LHS, DocBook, Org. (The +LHS variants treat the input as # literate Haskell. See pandoc's documentation for more details.) If # Markdown is selected, pandoc's syntax extensions (for footnotes, # delimited code blocks, etc.) will be enabled. Note that pandoc's @@ -238,8 +238,8 @@ base-url: # the base URL of the wiki, to be used in constructing feed IDs -# and RPX token_urls. Set this if use-feed is 'yes' or -# authentication-method is 'rpx'. +# and RPX token_urls. +# Set this if use-feed is 'yes' or authentication-method is 'rpx'. absolute-urls: no # make wikilinks absolute with respect to the base-url. @@ -270,3 +270,8 @@ xss-sanitize: yes # if yes, all HTML (including that produced by pandoc) is filtered # through xss-sanitize. Set to no only if you trust all of your users. + +recent-activity-days: 30 +# if the activity page receives no 'since' parameter specifiying the time +# thereafter which to show the changes, it will by default show "recent" +# changes. This allows you to specify how recent "recent" means, in days. diff --git a/data/markup.DocBook b/data/markup.DocBook new file mode 100644 --- /dev/null +++ b/data/markup.DocBook @@ -0,0 +1,347 @@ +|
+ |
+
+ |
+
|
+ |
+
+ |
+
|
+ |
+
+ |
+
|
+ |
+ + *escaped special characters* + | +
|
+ |
+
+ |
+
|
+ |
+
+ |
+
|
+ Wikilink: |
+
+ Wikilink: |
+
|
+ |
+
+ H |
+
|
+ |
+
+ 10 |
+
|
+ |
+
+ |
+
|
+ |
+
+ $x = \frac{{ - b \pm \sqrt {b^2 - 4ac} }}{{2a}}$ |
+
|
+ |
+
+ A simple footnote. |
+
+ + > an indented paragraph, + > usually used for quotations ++ |
+
+ ++ |
+
+ + #!/bin/sh -e + # code, indented four spaces + echo "Hello world" ++ |
+
+ |
+
+ + * a bulleted list + * second item + - sublist + - and more + * back to main list + 1. this item has an ordered + 2. sublist + a) you can also use letters + b) another item ++ |
+
+ |
+
+ + Fruit Quantity + -------- ----------- + apples 30,200 + oranges 1,998 + pears 42 + + Table: Our fruit inventory ++ |
+
+ |
+
| +#+END_HTML + +=*emphasized text*= + +#+BEGIN_HTML + | ++#+END_HTML + +/emphasized text/ + +#+BEGIN_HTML + | +
| +#+END_HTML + +=**strong emphasis**= + +#+BEGIN_HTML + | ++#+END_HTML + +*strong emphasis* + +#+BEGIN_HTML + | +
| +#+END_HTML + +=`literal text`= + +#+BEGIN_HTML + | ++#+END_HTML + +=literal text= + +#+BEGIN_HTML + | +
| +#+END_HTML + +=\*escaped special characters\*= + +#+BEGIN_HTML + | ++#+END_HTML + +*escaped special characters* + +#+BEGIN_HTML + | +
| +#+END_HTML + +=[external link](http://google.com)= + +#+BEGIN_HTML + | ++#+END_HTML + +[[http://google.com][external link]] + +#+BEGIN_HTML + | +
| +#+END_HTML + +== + +#+BEGIN_HTML + | ++#+END_HTML + +[[/img/icons/folder.png]] + +#+BEGIN_HTML + | +
| +#+END_HTML + +Wikilink: =[Front Page]()= + +#+BEGIN_HTML + | ++#+END_HTML + +Wikilink: [[][Front Page]] + +#+BEGIN_HTML + | +
| +#+END_HTML + +=H~2~O= + +#+BEGIN_HTML + | ++#+END_HTML + +H_{2}O + +#+BEGIN_HTML + | +
| +#+END_HTML + +=10^100^= + +#+BEGIN_HTML + | ++#+END_HTML + +10^{100} + +#+BEGIN_HTML + | +
| +#+END_HTML + +=~~strikeout~~= + +#+BEGIN_HTML + | ++#+END_HTML + ++strikeout+ + +#+BEGIN_HTML + | +
| +#+END_HTML + +=$x = \frac{{ - b \pm \sqrt {b^2 - 4ac} }}{{2a}}$= + +#+BEGIN_HTML + | ++#+END_HTML + +$x = \frac{{ - b \pm \sqrt {b^2 - 4ac} }}{{2a}}$ [1] + +#+BEGIN_HTML + | +
| +#+END_HTML + +=A simple footnote.^[Or is it so simple?]= + +#+BEGIN_HTML + | ++#+END_HTML + +A simple footnote. [2] + +#+BEGIN_HTML + | +
+ + > an indented paragraph, + > usually used for quotations ++ |
+ +#+END_HTML + +#+BEGIN_QUOTE + an indented paragraph, usually used for quotations +#+END_QUOTE + +#+BEGIN_HTML + | +
+ + #!/bin/sh -e + # code, indented four spaces + echo "Hello world" ++ |
+ +#+END_HTML + +#+BEGIN_EXAMPLE + #!/bin/sh -e + # code, indented four spaces + echo "Hello world" +#+END_EXAMPLE + +#+BEGIN_HTML + | +
+ + * a bulleted list + * second item + - sublist + - and more + * back to main list + 1. this item has an ordered + 2. sublist + a) you can also use letters + b) another item ++ |
+ +#+END_HTML + +- a bulleted list +- second item + + - sublist + - and more + +- back to main list + + 1. this item has an ordered + 2. sublist + + 1) you can also use letters + 2) another item + +#+BEGIN_HTML + | +
+ + Fruit Quantity + -------- ----------- + apples 30,200 + oranges 1,998 + pears 42 + + Table: Our fruit inventory ++ |
+ +#+END_HTML + +| Fruit | Quantity | +|-----------+------------| +| apples | 30,200 | +| oranges | 1,998 | +| pears | 42 | +#+CAPTION: Our fruit inventory + +#+BEGIN_HTML + | +
| +@*emphasized text*@ + | ++_emphasized text_ + | +||||||||
| +@**strong emphasis**@ + | ++*strong emphasis* + | +||||||||
| +@`literal text`@ + | ++@literal text@ + | +||||||||
| +@\*escaped special characters\*@ + | ++*escaped special characters* + | +||||||||
| +@[external link](http://google.com)@ + | ++"external link":http://google.com + | +||||||||
| +@@ + | ++!/img/icons/folder.png(folder)! + | +||||||||
| +Wikilink: @[Front Page]()@ + | ++Wikilink: "Front Page": + | +||||||||
| +@H~2~O@ + | ++H[~2~]O + | +||||||||
| +@10^100^@ + | ++10[^100^] + | +||||||||
| +@~~strikeout~~@ + | ++-strikeout- + | +||||||||
| +@$x = \frac{{ - b \pm \sqrt {b^2 - 4ac} }}{{2a}}$@ + | ++x = \frac{{ - b \pm \sqrt {b^2 - 4ac} }}{{2a}}[1] + | +||||||||
| +@A simple footnote.^[Or is it so simple?]@ + | ++A simple footnote.[2] + | +||||||||
++> an indented paragraph, +> usually used for quotations ++ |
++ +bq. an indented paragraph, usually used for quotations + + + + | +||||||||
++ #!/bin/sh -e + # code, indented four spaces + echo "Hello world" ++ |
++ +bc. #!/bin/sh -e +# code, indented four spaces +echo "Hello world" + + + | +||||||||
++* a bulleted list +* second item + - sublist + - and more +* back to main list + 1. this item has an ordered + 2. sublist + a) you can also use letters + b) another item ++ |
+
+
+
|
+||||||||
++Fruit Quantity +-------- ----------- +apples 30,200 +oranges 1,998 +pears 42 + +Table: Our fruit inventory ++ |
+
+
+
|
+
+# Markdown + +Text... + +## Some examples... + +Text... ++ +h2(#wiki-links). Wiki links + +Links to other wiki pages are formed this way: @[Page Name]()@. (Gitit converts markdown links with empty targets into wikilinks.) + +To link to a wiki page using something else as the link text: @[something else](Page Name)@. + +Note that page names may contain spaces and some special characters. They need not be CamelCase. CamelCase words are _not_ automatically converted to wiki links. + +Wiki pages may be organized into directories. So, if you have several pages on wine, you may wish to organize them like so: + +bc. Wine/Pinot Noir +Wine/Burgundy +Wine/Cabernet Sauvignon + + +Note that a wiki link @[Burgundy]()@ that occurs inside the @Wine@ directory will link to @Wine/Burgundy@, and not to @Burgundy@. To link to a top-level page called @Burgundy@, you'd have to use @[Burgundy](/Burgundy)@. + +To link to a directory listing for a subdirectory, use a trailing slash: @[Wine/]()@ will link to a listing of the @Wine@ subdirectory. + + +fn1. If this looks like code, it's because jsMath is not installed on your system. Contact your administrator to request it. + + +fn2. Or is it so simple? + + + diff --git a/data/static/css/screen.css b/data/static/css/screen.css --- a/data/static/css/screen.css +++ b/data/static/css/screen.css @@ -16,7 +16,7 @@ table, tr, td, th { border: none; } hr { height: 1px; color: #aaa; background-color: #aaa; border: 0; margin: .2em 0 .2em 0; } -h1, h2, h3, h4, h5, h6 { font-weight: normal; border-bottom: 1px solid black; } +h1, h2, h3, h4, h5, h6 { font-weight: normal; border-bottom: 1px solid #aaa; } h1.pageTitle { font-size: 197%; margin: 0.2em 0 .5em; } @@ -106,7 +106,8 @@ .search_result { margin-bottom: 15px; } .search_result .match { margin-bottom: 15px; } -code { font-size: 93%; } +pre>code { display: block; padding: 0.7em 1em; } +code { font-size: 93%; background-color: #f8f8f8; border: 1px solid #ddd; overflow: auto; border-radius: 0.2em; } pre.matches { margin: 0; padding: 0; } #pattern { background-color: yellow; font-weight: bold; } pre.matches span.highlighted { background-color: yellow; } @@ -130,6 +131,7 @@ .index li.page { background-image: url(../img/icons/page.png); } .index li.folder { background-image: url(../img/icons/folder.png); } .index a { color: #000000; cursor: pointer; text-decoration: none; } +.index a + a { margin-left: 0.5em; } .index a:hover { text-decoration: underline; } a.updir { font-weight: bold; } diff --git a/data/static/js/search.js b/data/static/js/search.js --- a/data/static/js/search.js +++ b/data/static/js/search.js @@ -2,7 +2,7 @@ { // patt is a space separated list of strings - we want to highlight // an occurrence of any of these strings as a separate word. - var regex = new RegExp('\\b(' + patt.replace(/ /, '|') + ')\\b', 'g'); + var regex = new RegExp('\\b(' + patt.replace(/ /g, '|') + ')\\b', 'gi'); return this.each(function () { diff --git a/data/templates/sitenav.st b/data/templates/sitenav.st --- a/data/templates/sitenav.st +++ b/data/templates/sitenav.st @@ -15,7 +15,7 @@ $endif$