From e0d159eab47235b638bb97a12a185a96d3943cc3 Mon Sep 17 00:00:00 2001 From: Christine Dodrill Date: Wed, 29 Jul 2015 18:55:58 -0700 Subject: [PATCH] Move user information into the left card --- web/src/Within/DBMemorial/Post.hs | 11 +---------- web/src/Within/DBMemorial/User.hs | 16 ++++++++++------ 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/web/src/Within/DBMemorial/Post.hs b/web/src/Within/DBMemorial/Post.hs index c78706c..a8395ba 100644 --- a/web/src/Within/DBMemorial/Post.hs +++ b/web/src/Within/DBMemorial/Post.hs @@ -34,13 +34,4 @@ render post user = H.div ! A.class_ "card-content white-text" $ do H.div ! A.class_ "row" $ do H.div ! A.class_ "col s12 m3" $ User.render user - H.div ! A.class_ "col s12 m6" $ writeHtml def state - H.div ! A.class_ "col s12 m3" $ do - H.div ! A.class_ "card blue-grey darken-5" $ do - H.div ! A.class_ "card-content info-card center" $ do - H.h5 $ "More information" - H.div ! A.class_ "card-action blue-text" $ do - H.a ! A.href (H.toValue ("/users/" ++ (unpack (User.oID user)))) $ "All their posts" - H.br - H.a ! A.href (H.toValue ("https://derpibooru.org/profiles/" ++ (unpack (User.oID user)))) $ "Derpibooru profile" - H.br + H.div ! A.class_ "col s12 m9" $ writeHtml def state diff --git a/web/src/Within/DBMemorial/User.hs b/web/src/Within/DBMemorial/User.hs index 77526f5..18ad3a2 100644 --- a/web/src/Within/DBMemorial/User.hs +++ b/web/src/Within/DBMemorial/User.hs @@ -21,9 +21,13 @@ instance FromRow User where render :: User -> H.Html render user = do - H.div ! A.class_ "card-panel blue-grey darken-3" $ do - H.div ! A.class_ "card-content white-text center user-card" $ do - H.h5 $ H.toHtml $ unpack (name user) - H.br - H.a ! A.href (H.toValue ("https://derpibooru.org/profiles/" ++ unpack (oID user))) $ do - H.img ! A.src (H.toValue $ unpack $ avatar user) ! A.width "125" + H.div ! A.class_ "card blue-grey darken-3" $ do + H.div ! A.class_ "card-content white-text center user-card" $ do + H.h5 $ H.toHtml $ unpack (name user) + H.br + H.a ! A.href (H.toValue ("https://derpibooru.org/profiles/" ++ unpack (oID user))) $ do + H.img ! A.src (H.toValue $ unpack $ avatar user) ! A.width "125" + H.div ! A.class_ "card-action blue-text" $ do + H.a ! A.href (H.toValue ("/users/" ++ (unpack (oID user)))) $ "All their posts" + H.br + H.a ! A.href (H.toValue ("https://derpibooru.org/profiles/" ++ (unpack (oID user)))) $ "Derpibooru profile"