From af43221d2b4a01bad2a9e2b999e09c23c834572f Mon Sep 17 00:00:00 2001
From: Mitchell Rosen <mitchellwrosen@gmail.com>
Date: Fri, 5 Sep 2014 12:54:04 -0700
Subject: [PATCH] remove duplicate preview warning/buttons, added 'post' action
 alongside 'preview'

---
 View/Comment.hs    | 29 ++++++++++++++++-------------
 Widgets/Preview.hs |  7 -------
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/View/Comment.hs b/View/Comment.hs
index 3bc438d3..4aa96966 100644
--- a/View/Comment.hs
+++ b/View/Comment.hs
@@ -68,29 +68,31 @@ commentForm label content = renderBootstrap3 $ NewComment
 --    toVisibility True = VisPrivate
 --    toVisibility _ = VisPublic
 
-commentFormWidget :: SomeMessage App -> Maybe Markdown -> Widget
-commentFormWidget label = commentFormWidget' . commentForm label
+commentFormWidget :: Text -> SomeMessage App -> Maybe Markdown -> Widget
+commentFormWidget post_text label content = commentFormWidget' post_text (commentForm label content)
 
 -- intentional duplication of commentFormWidget' because some aspects
 -- of closing and other markdown aren't identical (such as marking privacy)
-closureFormWidget' :: Form NewClosure -> Widget
-closureFormWidget' form = do
+closureFormWidget' :: Text -> Form NewClosure -> Widget
+closureFormWidget' post_text form = do
     (widget, enctype) <- handlerToWidget $ generateFormPost form
     [whamlet|
         <div>
             <form method="POST" enctype=#{enctype}>
                 ^{widget}
                 <button type="submit" name="mode" value="preview">preview
+                <button type="submit" name="mode" value="post">#{post_text}
     |]
 
-commentFormWidget' :: Form a -> Widget
-commentFormWidget' form = do
+commentFormWidget' :: Text -> Form a -> Widget
+commentFormWidget' post_text form = do
     (widget, enctype) <- handlerToWidget $ generateFormPost form
     [whamlet|
         <div>
             <form method="POST" enctype=#{enctype}>
                 ^{widget}
                 <button type="submit" name="mode" value="preview">preview
+                <button type="submit" name="mode" value="post">#{post_text}
     |]
 
 closeCommentForm    :: Maybe Markdown -> Form NewClosure
@@ -114,13 +116,13 @@ commentNewTopicFormWidget ::                       Widget
 commentReplyFormWidget    ::                       Widget
 editCommentFormWidget     :: Markdown           -> Widget
 
-closeCommentFormWidget    = closureFormWidget' . closeCommentForm
-retractCommentFormWidget  = closureFormWidget' . retractCommentForm
+closeCommentFormWidget    = closureFormWidget' "close" . closeCommentForm
+retractCommentFormWidget  = closureFormWidget' "retract" . retractCommentForm
 
-claimCommentFormWidget    = commentFormWidget' . claimCommentForm
-commentNewTopicFormWidget = commentFormWidget' commentNewTopicForm
-commentReplyFormWidget    = commentFormWidget' commentReplyForm
-editCommentFormWidget     = commentFormWidget' . editCommentForm
+claimCommentFormWidget    = commentFormWidget' "claim" . claimCommentForm
+commentNewTopicFormWidget = commentFormWidget' "post" commentNewTopicForm
+commentReplyFormWidget    = commentFormWidget' "post" commentReplyForm
+editCommentFormWidget     = commentFormWidget' "post" . editCommentForm
 
 approveCommentFormWidget :: Widget
 approveCommentFormWidget =
@@ -177,7 +179,8 @@ flagCommentFormWidget def_reasons def_message = do
         <form method="POST" enctype=#{enctype}>
             <h4>Code of Conduct Violation(s):
             ^{form}
-            <button type="submit" name="mode" value="preview">preview flag message
+            <button type="submit" name="mode" value="preview">preview
+            <button type="submit" name="mode" value="post">flag
     |]
 
 generateFlagCommentForm :: Maybe (Maybe [FlagReason]) -> Maybe (Maybe Markdown) -> Widget
diff --git a/Widgets/Preview.hs b/Widgets/Preview.hs
index 8b49b6fd..402b7492 100644
--- a/Widgets/Preview.hs
+++ b/Widgets/Preview.hs
@@ -11,15 +11,8 @@ previewWidget form action widget =
 
         ^{widget}
 
-        <div .alert .alert-danger>
-            This is a preview; your changes have <em>not</em> been saved!
-
         <form #edit-preview method="POST">
-            <button type="submit" name="mode" value="preview">preview
-            <button .preview-action-button type="submit" name="mode" value="post">#{action}
-
             ^{form}
-
             <button type="submit" name="mode" value="preview">preview
             <button .preview-action-button type="submit" name="mode" value="post">#{action}
     |]
-- 
GitLab