[clckwrks-theme-clckwrks-0.4.0: updated to happstack 0.16 Jeremy Shaw **20130218233834 Ignore-this: b654c8d25d2d07aad1a612d4877ae3c5 ] adddir ./clckwrks-theme-happstack/data/css rmdir ./clckwrks-theme-happstack/data/icons adddir ./clckwrks-theme-happstack/data/img adddir ./clckwrks-theme-happstack/swatchmaker adddir ./clckwrks-theme-happstack/swatchmaker/img adddir ./clckwrks-theme-happstack/swatchmaker/swatch adddir ./clckwrks-theme-happstack/swatchmaker/test hunk ./clckwrks-theme-happstack/Theme.hs 6 -import Clckwrks.Monad -import Clckwrks.Menu.API (getMenu) -import Clckwrks.ProfileData.Acid (HasRole(..)) -import Data.Maybe (fromMaybe) -import qualified Data.Set as Set -import Data.Text (Text, unpack) --- import Happstack.Server +import Clckwrks.NavBar.API (getNavBarData) +import Clckwrks.NavBar.Types (NavBar(..), NavBarItem(..)) +import Clckwrks.ProfileData.Acid (HasRole(..)) +import Data.Maybe (fromMaybe) +import qualified Data.Set as Set +import Data.Text (Text, unpack) hunk ./clckwrks-theme-happstack/Theme.hs 15 +------------------------------------------------------------------------------ +-- theme +------------------------------------------------------------------------------ + hunk ./clckwrks-theme-happstack/Theme.hs 22 - , _themeTemplate = pageTemplate --- , themeBlog = blog + , _themeTemplate = standardTemplate hunk ./clckwrks-theme-happstack/Theme.hs 26 -pageTemplate :: ( EmbedAsChild (ClckT ClckURL (ServerPartT IO)) headers - , EmbedAsChild (ClckT ClckURL (ServerPartT IO)) body - ) => - Text - -> headers - -> body - -> XMLGenT (ClckT ClckURL (ServerPartT IO)) XML -pageTemplate ttl hdr bdy = standardTemplate ttl hdr bdy -{- - do pid <- XMLGenT $ getPageId - case pid of - (PageId 1) -> home ttl hdr bdy - _ -> standardTemplate ttl hdr
-

<% ttl %>

- <% bdy %> -
--} +------------------------------------------------------------------------------ +-- custom NavBar +------------------------------------------------------------------------------ + + +genNavBar :: GenXML (Clck ClckURL) +genNavBar = + do menu <- lift getNavBarData + navBarHTML menu + +navBarHTML :: NavBar -> GenXML (Clck ClckURL) +navBarHTML (NavBar menuItems) = + + +mkNavBarItem :: NavBarItem -> GenXML (Clck ClckURL) +mkNavBarItem (NBLink (NamedLink ttl lnk)) = +
  • <% ttl %>
  • + hunk ./clckwrks-theme-happstack/Theme.hs 70 - + hunk ./clckwrks-theme-happstack/Theme.hs 76 -