Add link to d9#3 to quick reply box + allow customizing TextPreview header

5 files changed, 30 insertions, 27 deletions

diff --git a/elm/Discussions/Reply.elm b/elm/Discussions/Reply.elm
index 79278a20..ed239cbe 100644
--- a/elm/Discussions/Reply.elm
+++ b/elm/Discussions/Reply.elm
@@ -60,8 +60,11 @@ view model =
   form_ Submit (model.state == Api.Loading)
   [ div [ class "mainbox" ]
     [ fieldset [ class "submit" ]
-      [ h2 [] [ text "Quick reply", b [ class "standout" ] [ text " (English please!)" ] ]
-      , TP.view "msg" model.msg Content 600 ([rows 4, cols 50] ++ GDR.valMsg)
+      [ TP.view "msg" model.msg Content 600 ([rows 4, cols 50] ++ GDR.valMsg)
+        [ b [] [ text "Quick reply" ]
+        , b [ class "standout" ] [ text " (English please!) " ]
+        , a [ href "/d9#3" ] [ text "Formatting" ]
+        ]
       , submitButton "Submit" model.state True
       ]
     ]
diff --git a/elm/DocEdit.elm b/elm/DocEdit.elm
index b9d70622..c0ab746c 100644
--- a/elm/DocEdit.elm
+++ b/elm/DocEdit.elm
@@ -88,13 +88,13 @@ view model =
         , formField "none"
           [ br_ 1
           , b [] [ text "Contents" ]
-          , br_ 1
-          , text "HTML and MultiMarkdown supported, which is "
-          , a [ href "https://daringfireball.net/projects/markdown/basics", target "_blank" ] [ text "Markdown" ]
-          , text " with some "
-          , a [ href "http://fletcher.github.io/MultiMarkdown-5/syntax.html", target "_blank" ][ text "extensions" ]
-          , text "."
           , TP.view "content" model.content Content 850 ([rows 50, cols 90] ++ GD.valContent)
+            [ text "HTML and MultiMarkdown supported, which is "
+            , a [ href "https://daringfireball.net/projects/markdown/basics", target "_blank" ] [ text "Markdown" ]
+            , text " with some "
+            , a [ href "http://fletcher.github.io/MultiMarkdown-5/syntax.html", target "_blank" ][ text "extensions" ]
+            , text "."
+            ]
           ]
         ]
       ]
diff --git a/elm/Lib/Editsum.elm b/elm/Lib/Editsum.elm
index 99a4be29..09553a40 100644
--- a/elm/Lib/Editsum.elm
+++ b/elm/Lib/Editsum.elm
@@ -57,9 +57,6 @@ view model =
   in fieldset [] <|
     (if model.authmod then lockhid else [])
     ++
-    [ h2 []
-      [ text "Edit summary"
-      , b [class "standout"] [text " (English please!)"]
-      ]
-    , TP.view "" model.editsum Editsum 600 [rows 4, cols 50, minlength 2, maxlength 5000, required True]
+    [ TP.view "" model.editsum Editsum 600 [rows 4, cols 50, minlength 2, maxlength 5000, required True]
+      [ b [class "title"] [ text "Edit summary", b [class "standout"] [text " (English please!)"] ] ]
     ]
diff --git a/elm/Lib/TextPreview.elm b/elm/Lib/TextPreview.elm
index 2d565e5f..fba61ff3 100644
--- a/elm/Lib/TextPreview.elm
+++ b/elm/Lib/TextPreview.elm
@@ -66,23 +66,26 @@ update msg model =
     HandlePreview r -> ({ model | state = Api.Error r }, Cmd.none)
 
 
-view : String -> Model -> (Msg -> m) -> Int -> List (Attribute m) -> Html m
-view name model cmdmap width attr =
+view : String -> Model -> (Msg -> m) -> Int -> List (Attribute m) -> List (Html m) -> Html m
+view name model cmdmap width attr header =
   let
     display = model.display && model.preview /= ""
   in
     div [ class "textpreview", style "width" (String.fromInt width ++ "px") ]
-    [ p (class "head" :: (if model.data == "" then [class "invisible"] else []))
-      [ case model.state of
-          Api.Loading -> span [ class "spinner" ] []
-          Api.Error _ -> b [ class "grayedout" ] [ text "Error loading preview. " ]
-          Api.Normal  -> text ""
-      , if display
-        then a [ onClickN (cmdmap TextArea) ] [ text "Edit" ]
-        else i [] [text "Edit"]
-      , if display
-        then i [] [text "Preview"]
-        else a [ onClickN (cmdmap Preview) ] [ text "Preview" ]
+    [ span []
+      [ p [] header
+      , p [ class "right", classList [("invisible", model.data == "")] ]
+        [ case model.state of
+            Api.Loading -> span [ class "spinner" ] []
+            Api.Error _ -> b [ class "grayedout" ] [ text "Error loading preview. " ]
+            Api.Normal  -> text ""
+        , if display
+          then a [ onClickN (cmdmap TextArea) ] [ text "Edit" ]
+          else i [] [text "Edit"]
+        , if display
+          then i [] [text "Preview"]
+          else a [ onClickN (cmdmap Preview) ] [ text "Preview" ]
+        ]
       ]
     , inputTextArea name model.data (cmdmap << Edit) (class (if display then "hidden" else "") :: attr)
     , if not display then text ""
diff --git a/elm/StaffEdit/Main.elm b/elm/StaffEdit/Main.elm
index b7bef54a..d3e287da 100644
--- a/elm/StaffEdit/Main.elm
+++ b/elm/StaffEdit/Main.elm
@@ -205,7 +205,7 @@ view model =
       [ h1 [] [ text "General info" ]
       , table [ class "formtable" ]
         [ formField "Names" [ names, br_ 1 ]
-        , formField "desc::Biography#eng" [ TP.view "desc" model.desc Desc 500 GSE.valDesc ]
+        , formField "desc::Biography" [ TP.view "desc" model.desc Desc 500 GSE.valDesc [ b [ class "standout" ] [ text "English please!" ] ] ]
         , formField "gender::Gender" [ inputSelect "gender" model.gender Gender []
           [ ("unknown", "Unknown or N/A")
           , ("f",       "Female")