diff --git a/Clckwrks/Page/Acid.hs b/Clckwrks/Page/Acid.hs
--- a/Clckwrks/Page/Acid.hs
+++ b/Clckwrks/Page/Acid.hs
@@ -87,7 +87,7 @@
Create an Account
-----------------
-Go [here](/clck/auth/auth/create) and create an account for yourself.
+Go [here](/authenticate/login) and create an account for yourself.
Give yourself Administrator permissions
-------------------------------
diff --git a/Clckwrks/Page/Admin/EditFeedConfig.hs b/Clckwrks/Page/Admin/EditFeedConfig.hs
--- a/Clckwrks/Page/Admin/EditFeedConfig.hs
+++ b/Clckwrks/Page/Admin/EditFeedConfig.hs
@@ -45,6 +45,7 @@
)
`transformEither` toFeedConfig
where
+ label' :: Text -> PageForm ()
label' str = (labelText str `setAttrs` [("class":="control-label") :: Attr Text Text])
divHorizontal = mapView (\xml -> [<% xml %>
])
divControlGroup = mapView (\xml -> [<% xml %>
])
diff --git a/Clckwrks/Page/Admin/EditPage.hs b/Clckwrks/Page/Admin/EditPage.hs
--- a/Clckwrks/Page/Admin/EditPage.hs
+++ b/Clckwrks/Page/Admin/EditPage.hs
@@ -69,13 +69,17 @@
) `transformEitherM` toPage
where
+ inputSubmit' :: Text.Text -> PageForm (Maybe Text.Text)
inputSubmit' str = inputSubmit str `setAttrs` [("class":="btn") :: Attr Text Text]
+ inputCheckboxLabel :: Text -> Bool -> PageForm Bool
inputCheckboxLabel lbl b =
mapView (\xml -> [])
(inputCheckbox b)
+ label' :: Text -> PageForm ()
label' str = (labelText str `setAttrs` [("class":="control-label") :: Attr Text Text])
+ labelCB :: Text -> PageForm ()
labelCB str = labelText str `setAttrs` [("class":="checkbox") :: Attr Text Text]
-- divInline = mapView (\xml -> [<% xml %>
])
divFormActions = mapView (\xml -> [<% xml %>
])
diff --git a/Clckwrks/Page/Atom.hs b/Clckwrks/Page/Atom.hs
--- a/Clckwrks/Page/Atom.hs
+++ b/Clckwrks/Page/Atom.hs
@@ -1,30 +1,29 @@
-{-# LANGUAGE RecordWildCards, OverloadedStrings #-}
-{-# OPTIONS_GHC -F -pgmFhsx2hs #-}
+{-# LANGUAGE RecordWildCards, OverloadedStrings, QuasiQuotes #-}
module Clckwrks.Page.Atom where
-import Control.Monad.Trans (liftIO)
-import Clckwrks.Monad (Clck, Content(..), query, withAbs)
+import Control.Monad.Trans (liftIO)
+import Clckwrks.Monad (Clck, Content(..), query, withAbs)
import Clckwrks.Page.Acid
-import Clckwrks.Page.Monad (PageM, markupToContent)
+import Clckwrks.Page.Monad (PageM, markupToContent)
import Clckwrks.Page.Types
import Clckwrks.ProfileData.Acid
import Clckwrks.Page.URL
-import qualified Data.ByteString.Lazy.UTF8 as UTF8
-import Data.Maybe (fromMaybe)
-import Data.Monoid ((<>))
-import Data.String (fromString)
-import qualified Data.Text as Text
-import Data.Text.Lazy (Text)
+import Data.Maybe (fromMaybe)
+import Data.Monoid ((<>))
+import Data.String (fromString)
+import qualified Data.Text as Text
+import Data.Text.Lazy (Text)
import qualified Data.Text.Lazy.Encoding as TL
-import Data.Time
-import Data.Time.Clock.POSIX (posixSecondsToUTCTime)
-import Data.Time.Format (formatTime)
-import Data.UUID (toString)
-import Happstack.Server (Happstack, Response, ok, toResponseBS)
+import Data.Time (UTCTime)
+import Data.Time.Clock.POSIX (posixSecondsToUTCTime)
+import Data.Time.Format (formatTime)
+import Data.UUID (toString)
+import Happstack.Server (Happstack, Response, ok, toResponseBS)
import HSP.XMLGenerator
-import HSP.XML (XML, cdata, renderXML, fromStringLit)
-import System.Locale (defaultTimeLocale)
-import Web.Routes (showURL)
+import HSP.XML (XML, cdata, renderXML, fromStringLit)
+import Language.Haskell.HSX.QQ (hsx)
+import Data.Time.Locale.Compat (defaultTimeLocale)
+import Web.Routes (showURL)
atom :: FeedConfig -- ^ feed configuration
-> [Page] -- ^ pages to publish in feed
@@ -32,7 +31,8 @@
atom FeedConfig{..} pages =
do blogURL <- withAbs $ showURL Blog
atomURL <- withAbs $ showURL AtomFeed
- unXMLGenT $
+ unXMLGenT $ [hsx|
+
<% feedTitle %>
@@ -42,7 +42,7 @@
<% atomDate $ mostRecentUpdate pages %>
<% "urn:uuid:" ++ toString feedUUID %>
<% mapM entry pages %>
-
+ |]
mostRecentUpdate :: [Page] -- ^ pages to consider
-> UTCTime -- ^ most recent updated time
@@ -54,14 +54,14 @@
-> PageM XML
entry Page{..} =
do viewPageSlug <- withAbs $ showURL (ViewPageSlug pageId (toSlug pageTitle pageSlug))
- unXMLGenT $
+ unXMLGenT $ [hsx|
<% pageTitle %>
<% "urn:uuid:" ++ toString pageUUID %>
<% author %>
<% atomDate pageUpdated %>
<% atomContent pageSrc %>
-
+ |]
where
author :: XMLGenT PageM XML
author =
@@ -71,10 +71,10 @@
(Just n)
| Text.null n ->
return $ cdata ""
- | otherwise ->
+ | otherwise -> [hsx|
<% n %>
-
+ |]
atomDate :: UTCTime -> String
atomDate time =
@@ -85,13 +85,13 @@
do c <- markupToContent markup
case c of
(PlainText txt) ->
- unXMLGenT $ <% txt %>
+ unXMLGenT $ [hsx| <% txt %> |]
(TrustedHtml html) ->
- unXMLGenT $ <% html %>
+ unXMLGenT $ [hsx| <% html %> |]
handleAtomFeed :: PageM Response
handleAtomFeed =
do ps <- query AllPosts
feedConfig <- query GetFeedConfig
xml <- atom feedConfig ps
- ok $ toResponseBS (fromString "application/atom+xml;charset=utf-8") ((UTF8.fromString $ "\n") <> (TL.encodeUtf8 $ renderXML xml))
+ ok $ toResponseBS "application/atom+xml;charset=utf-8" ((TL.encodeUtf8 $ "\n") <> (TL.encodeUtf8 $ renderXML xml))
diff --git a/Clckwrks/Page/PreProcess.hs b/Clckwrks/Page/PreProcess.hs
--- a/Clckwrks/Page/PreProcess.hs
+++ b/Clckwrks/Page/PreProcess.hs
@@ -67,6 +67,11 @@
do b <- transform (applyCmd pageAcid clckShowURL) segments
return $ B.toLazyText b
+applyCmd :: (Functor m, MonadIO m) =>
+ AcidState PageState
+ -> (PageURL -> [(Text, Maybe Text)] -> Text)
+ -> PageCmd
+ -> ClckT url m Builder
applyCmd pageAcid clckShowURL l@(PageTitle pid) =
do mttl <- query' pageAcid (GetPageTitle pid)
case mttl of
diff --git a/clckwrks-plugin-page.cabal b/clckwrks-plugin-page.cabal
--- a/clckwrks-plugin-page.cabal
+++ b/clckwrks-plugin-page.cabal
@@ -1,5 +1,5 @@
name: clckwrks-plugin-page
-version: 0.3.6
+version: 0.3.10
synopsis: support for CMS/Blogging in clckwrks
homepage: http://www.clckwrks.com/
license: BSD3
@@ -37,31 +37,32 @@
Clckwrks.Page.Atom
other-modules:
Clckwrks.Page.Verbatim
- build-depends: base >= 4.3 && < 4.8,
+ build-depends: base >= 4.3 && < 4.9,
aeson >= 0.6 && < 0.9,
acid-state == 0.12.*,
- attoparsec >= 0.10 && < 0.13,
- clckwrks >= 0.21 && < 0.23,
- containers >= 0.4 && < 0.6,
- directory >= 1.1 && < 1.3,
- filepath >= 1.2 && < 1.4,
- happstack-hsp >= 7.2 && < 7.4,
- happstack-server >= 7.0 && < 7.4,
- hsp >= 0.9 && < 0.11,
+ attoparsec >= 0.10 && < 0.14,
+ clckwrks >= 0.21 && < 0.24,
+ containers >= 0.4 && < 0.6,
+ directory >= 1.1 && < 1.3,
+ filepath >= 1.2 && < 1.5,
+ happstack-hsp >= 7.2 && < 7.4,
+ happstack-server >= 7.0 && < 7.5,
+ hsp >= 0.9 && < 0.11,
+ hsx2hs >= 0.13 && < 0.14,
ixset == 1.0.*,
- mtl >= 2.0 && < 2.3,
+ mtl >= 2.0 && < 2.3,
old-locale == 1.0.*,
- random == 1.0.*,
+ random >= 1.0 && < 1.2,
reform == 0.2.*,
reform-happstack == 0.2.*,
reform-hsp == 0.2.*,
safecopy == 0.8.*,
tagsoup == 0.13.*,
- text >= 0.11 && < 1.2,
- time == 1.4.*,
- template-haskell >= 2.7 && <= 2.10,
- uuid >= 1.2 && <= 1.4,
- utf8-string == 0.3.*,
+ text >= 0.11 && < 1.3,
+ time >= 1.4 && < 1.6,
+ time-locale-compat >= 0.1 && < 0.2,
+ template-haskell >= 2.7 && <= 2.11,
+ uuid >= 1.2 && <= 1.4,
web-plugins == 0.2.*,
web-routes == 0.27.*,
web-routes-happstack == 0.23.*,