From bba4db779564799c75af113206be45c0264936fd Mon Sep 17 00:00:00 2001 From: nek0 Date: Mon, 12 Jan 2015 15:15:52 +0100 Subject: [PATCH] working on medium site --- Foundation.hs | 5 +- Handler/AdminMediumSettings.hs | 2 +- Handler/Medium.hs | 2 +- static/js/init.js | 2 +- templates/adminAlbumMedia.hamlet | 4 +- templates/adminMediumSet.hamlet | 7 +- templates/adminProfileSettings.cassius | 10 --- templates/albumSettings.hamlet | 2 +- templates/default-layout.cassius | 4 + templates/medium.cassius | 1 + templates/medium.hamlet | 101 +++++++++++++------------ 11 files changed, 68 insertions(+), 72 deletions(-) delete mode 100644 templates/adminProfileSettings.cassius diff --git a/Foundation.hs b/Foundation.hs index e0fe008..450d3f7 100644 --- a/Foundation.hs +++ b/Foundation.hs @@ -83,8 +83,9 @@ renderLayout widget = do , js_init_js ]) $(combineStylesheets 'StaticR - [ css_normalize_css - , css_bootstrap_css + [ + -- css_normalize_css + css_bootstrap_css ]) $(widgetFile "default-layout") withUrlRenderer $(hamletFile "templates/default-layout-wrapper.hamlet") diff --git a/Handler/AdminMediumSettings.hs b/Handler/AdminMediumSettings.hs index 3d4ef24..8b3f990 100644 --- a/Handler/AdminMediumSettings.hs +++ b/Handler/AdminMediumSettings.hs @@ -28,7 +28,7 @@ getAdminMediumSettingsR mediumId = do case tempMedium of Just medium -> do (adminMediumSetWidget, enctype) <- generateFormPost $ adminMediumSetForm medium - defaultLayout $ do + formLayout $ do setTitle "Administration: Medium Settings" $(widgetFile "adminMediumSet") Nothing -> do diff --git a/Handler/Medium.hs b/Handler/Medium.hs index 32a07dc..ec72645 100644 --- a/Handler/Medium.hs +++ b/Handler/Medium.hs @@ -33,7 +33,7 @@ getMediumR mediumId = do (commentWidget, enctype) <- generateFormPost $ commentForm userId userSl mediumId Nothing comments <- runDB $ selectList [CommentOrigin ==. mediumId, CommentParent ==. Nothing] [Desc CommentTime] replies <- runDB $ selectList [CommentOrigin ==. mediumId, CommentParent !=. Nothing] [Desc CommentTime] - defaultLayout $ do + formLayout $ do setTitle $ toHtml ("Eidolon :: Medium " `T.append` (mediumTitle medium)) $(widgetFile "medium") Nothing -> do diff --git a/static/js/init.js b/static/js/init.js index 015e917..0959ed3 100644 --- a/static/js/init.js +++ b/static/js/init.js @@ -499,7 +499,7 @@ console.log(itemsWidth,itemHeight) overlayColor: _.settings.popupOverlayColor, overlayOpacity: _.settings.popupOverlayOpacity, popupCloserText: '', - popupLoaderText: '', + popupLoaderText: 'loading', selector: '.thumb a', usePopupCaption: true, usePopupCloser: false, diff --git a/templates/adminAlbumMedia.hamlet b/templates/adminAlbumMedia.hamlet index 69331b0..b63d7d5 100644 --- a/templates/adminAlbumMedia.hamlet +++ b/templates/adminAlbumMedia.hamlet @@ -6,8 +6,8 @@ $newline always

#{albumTitle album} has no media yet $forall (Entity mId m) <- media -

- #{mediumTitle m} +
+
#{mediumTitle m} diff --git a/templates/adminMediumSet.hamlet b/templates/adminMediumSet.hamlet index e76c085..c361126 100644 --- a/templates/adminMediumSet.hamlet +++ b/templates/adminMediumSet.hamlet @@ -1,8 +1,7 @@ $newline always -

Medium settings - -
-
+