nek0/eidolon
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

introduced parallelism to medium et al

Browse source
This commit is contained in:
nek0 2015-01-12 21:31:29 +01:00
parent bba4db7795
commit c777812ddd
9 changed files with 40 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Handler/Medium.hs
View file

@ -102,7 +102,7 @@ getCommentReplyR commentId = do
userSl <- return $ Just $ userSlug u userSl <- return $ Just $ userSlug u
mediumId <- return $ commentOrigin comment mediumId <- return $ commentOrigin comment
(replyWidget, enctype) <- generateFormPost $ commentForm userId userSl mediumId (Just commentId) (replyWidget, enctype) <- generateFormPost $ commentForm userId userSl mediumId (Just commentId)
defaultLayout $ do formLayout $ do
setTitle "Eidolon :: Reply to comment" setTitle "Eidolon :: Reply to comment"
$(widgetFile "commentReply") $(widgetFile "commentReply")
Nothing -> do Nothing -> do
@ -179,7 +179,7 @@ getCommentDeleteR commentId = do
presence <- return $ (Just userId) == (commentAuthor comment) presence <- return $ (Just userId) == (commentAuthor comment)
case presence of case presence of
True -> do True -> do
defaultLayout $ do formLayout $ do
setTitle "Eidolon :: Delete comment" setTitle "Eidolon :: Delete comment"
$(widgetFile "commentDelete") $(widgetFile "commentDelete")
False -> do False -> do

8
templates/commentDelete.hamlet
View file

@ -1,10 +1,12 @@
$newline always $newline always
<h3>Delete comment <div id="header" class="item" data-width="300">
<div class="inner">
<h3>Delete comment
<p> <p>
Do you wish to delete this comment? Do you wish to delete this comment?
<form method="POST" action=@{CommentDeleteR commentId}> <form method="POST" action=@{CommentDeleteR commentId}>
<label for="confirm">Really delete this comment <label for="confirm">Really delete this comment
<input type="checkbox" id="confirm" name="confirm" value="confirm" required> <input type="checkbox" id="confirm" name="confirm" value="confirm" required>
<input id="delete" type="submit" value="Delete comment"> <input id="delete" type="submit" value="Delete comment">

10
templates/commentReply.hamlet
View file

@ -1,8 +1,10 @@
<h4>Reply to comment <div id="header" class="item" data-width="600">
<strong>#{fromJust $ commentAuthorSlug comment}</strong> posted on #{formatTime defaultTimeLocale "%A %F %H:%M" (commentTime comment)}: <div class="inner">
<hr> <h4>Reply to comment
<strong>#{fromJust $ commentAuthorSlug comment}</strong> posted on #{formatTime defaultTimeLocale "%A %F %H:%M" (commentTime comment)}:
<hr>
<p>#{markdownToHtml $ commentContent comment} <p>#{markdownToHtml $ commentContent comment}
<hr> <hr>
<form method=post enctype=#{enctype}> <form method=post enctype=#{enctype}>
^{replyWidget} ^{replyWidget}
<div> <div>

4
templates/default-layout-wrapper.hamlet
View file

@ -4,7 +4,7 @@ $doctype 5
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>#{pageTitle pc} <title>#{pageTitle wc}
<meta name="description" content=""> <meta name="description" content="">
<meta name="author" content=""> <meta name="author" content="">
@ -15,8 +15,8 @@ $doctype 5
<link rel="stylesheet" href=@{StaticR css_style_desktop_css} /> <link rel="stylesheet" href=@{StaticR css_style_desktop_css} />
<link rel="stylesheet" href=@{StaticR css_style_noscript_css} /> <link rel="stylesheet" href=@{StaticR css_style_noscript_css} />
^{pageHead wc}
^{pageHead pc} ^{pageHead pc}
^{pageHead wc}
<body> <body>
<div id="wrapper"> <div id="wrapper">

3
templates/default-layout.cassius
View file

@ -13,3 +13,6 @@ nav li
.center .center
text-align: center text-align: center
nav
padding: 1em 2em !important

3
templates/default-layout.hamlet
View file

@ -1,3 +1,6 @@
<head>
^{pageHead wc}
<nav id="header"> <nav id="header">
<div id="top-nav"> <div id="top-nav">
<ul id="user-nav"> <ul id="user-nav">

2
templates/form-widget.cassius
View file

@ -1,3 +1,3 @@
#main, #reel, #header #main, #reel, #header
overflow: auto !important overflow-y: auto !important
height: auto !important height: auto !important

4
templates/medium.cassius
View file

@ -12,3 +12,7 @@ img
border-radius: 6px border-radius: 6px
box-shadow: 0 0 3px #c4c4c4 box-shadow: 0 0 3px #c4c4c4
background-color: #f5f5f5 background-color: #f5f5f5
div #main
margin-top: 0 !important
top : 20% !important

10
templates/medium.hamlet
View file

@ -4,11 +4,10 @@
by <a href=@{UserR ownerName}>#{ownerName}</a> from album <a href=@{AlbumR albumId}>#{albumTitle album}</a> by <a href=@{UserR ownerName}>#{ownerName}</a> from album <a href=@{AlbumR albumId}>#{albumTitle album}</a>
<img src=#{mediumPath medium}> <img src=#{mediumPath medium}>
<div id="header" class="item" data-width="400">
<div class="inner">
<div class="desc"> <div class="desc">
Uploaded on: #{formatTime defaultTimeLocale "%A %F %H:%M" (mediumTime medium)}<br> Uploaded on: #{formatTime defaultTimeLocale "%A %F %H:%M" (mediumTime medium)}<br>
Description:<br> Description:<br>
@ -39,14 +38,15 @@
<a href=@{CommentReplyR commentId}>Reply to this comment <a href=@{CommentReplyR commentId}>Reply to this comment
$if userId == (commentAuthor comment) $if userId == (commentAuthor comment)
<a href=@{CommentDeleteR commentId}>Delete this comment <a href=@{CommentDeleteR commentId}>Delete this comment
$forall (Entity _ reply) <- replies $forall (Entity replyId reply) <- replies
$if commentParent reply == Just commentId $if commentParent reply == Just commentId
<div #comment class="reply"> <div #comment class="reply">
<a href=@{ProfileR $ fromJust $ commentAuthor reply}>#{fromJust $ commentAuthorSlug reply}</a> wrote on #{formatTime defaultTimeLocale "%A %F %H:%M" $ commentTime reply}: <a href=@{ProfileR $ fromJust $ commentAuthor reply}>#{fromJust $ commentAuthorSlug reply}</a> wrote on #{formatTime defaultTimeLocale "%A %F %H:%M" $ commentTime reply}:
<hr> <hr>
#{commentContent reply} #{commentContent reply}
<hr>
$if userId == (commentAuthor comment) $if userId == (commentAuthor comment)
<a href=@{CommentDeleteR commentId}>Delete this comment <a href=@{CommentDeleteR replyId}>Delete this comment
$if userId /= Nothing $if userId /= Nothing
<form method=post enctype=#{enctype}> <form method=post enctype=#{enctype}>