diff options
| -rw-r--r-- | assets/mumi.scss | 16 | ||||
| -rw-r--r-- | mumi/web/view/html.scm | 130 |
2 files changed, 71 insertions, 75 deletions
diff --git a/assets/mumi.scss b/assets/mumi.scss index a2ff00c..66010e4 100644 --- a/assets/mumi.scss +++ b/assets/mumi.scss @@ -142,6 +142,10 @@ h1 { margin-bottom: 2rem; border-top: 1px dashed #ddd; padding-top: 1rem; + + header input { + height: 2rem; + } } h2 { @@ -243,7 +247,7 @@ nav span.navbar-text { margin-bottom: 0; } -footer { +body > footer { border-color: #1A1A1A1A; border-style: dashed none none none; border-width: 2px; @@ -273,7 +277,8 @@ table { border-radius: 10px; color: var(--primary-inverse); background-color: var(--primary); - padding: 0.3em; + padding: 0.25em 0.4em; + margin-right: 0.25rem; } .badge-primary { @@ -419,12 +424,7 @@ details { } .message header { - padding: 0.75rem 1.25rem; -} - -.message .body pre { - background: transparent; - border: none; + padding: 0.8em var(--block-spacing-horizontal); } .message .body .multipart { diff --git a/mumi/web/view/html.scm b/mumi/web/view/html.scm index 8339ea4..3f1f956 100644 --- a/mumi/web/view/html.scm +++ b/mumi/web/view/html.scm @@ -552,74 +552,72 @@ failed to process associated messages.") ((? number? n) (list (number->string n))))))))) '())))) - (define comment-box - `(div - (@ (class "comment-box")) - (a (@ (id "comment"))) - (div + (define mailer-form + `((form + (@ (action ,(format #f "/issue/~a/comment" + (number->string id))) + (enctype "multipart/form-data") + (method "POST")) + (input (@ (style "display:none") + (name "validation") + (placeholder "Please leave this empty.")) "") + (input (@ (type "hidden") + (name "timestamp") + (value ,(timestamp!))) "") + (div + (@ (class "avatar") + (style "background-color:#bc80bd")) "?") + (article + (@ (class "message")) + (header + (div (@ (class "from")) + (input (@ (class "address form-control") + (name "from") + (required "required") + (placeholder "Your name")) ""))) + (textarea (@ (name "text") + (required "required") + (class "form-control") + (placeholder "Please input your comment...")) + "") + (footer + (button (@ (type "submit")) "Send") + (span + (@ (class "ml-3")) + "You may also " + (a (@ (href ,(string-append "mailto:" + (number->string id) "@" (%config 'debbugs-domain) + "?subject=" (bug-subject* bug)))) + ,(string-append "send email to " + (number->string id) "@" (%config 'debbugs-domain))) + " to comment.")))))) + (define disabled-mailer + `((div (@ (class "avatar") (style "background-color:#bc80bd")) "?") - (div + (article (@ (class "message")) - (div - (@ (class "card")) - ,@(if (and (mailer-enabled?) - (not (bug-archived bug))) - `((form - (@ (action ,(format #f "/issue/~a/comment" - (number->string id))) - (enctype "multipart/form-data") - (method "POST")) - (input (@ (style "display:none") - (name "validation") - (placeholder "Please leave this empty.")) "") - (input (@ (type "hidden") - (name "timestamp") - (value ,(timestamp!))) "") - (div - (@ (class "card-header")) - (div (@ (class "from")) - (input (@ (class "address form-control") - (name "from") - (required "required") - (placeholder "Your name")) ""))) - (div - (@ (class "body card-body")) - (textarea (@ (name "text") - (required "required") - (class "form-control") - (placeholder "Please input your comment...")) - "")) - (div - (@ (class "card-footer")) - (button (@ (class "btn btn-primary") - (type "submit")) - "Send") - (span - (@ (class "ml-3")) - "You may also " - (a (@ (href ,(string-append "mailto:" - (number->string id) "@" (%config 'debbugs-domain) - "?subject=" (bug-subject* bug)))) - ,(string-append "send email to " - (number->string id) "@" (%config 'debbugs-domain))) - " to comment.")))) - `((div - (@ (class "card-header")) - (div (@ (class "from")) - (span (@ (class "address")) "Your comment"))) - (div - (@ (class "body card-body")) - ,(if (bug-archived bug) - '(p "This issue is archived.") - '(p "Commenting via the web interface is + (header + (div (@ (class "from")) + (span (@ (class "address")) "Your comment"))) + ,(if (bug-archived bug) + '(p "This issue is archived.") + '(p "Commenting via the web interface is currently disabled.")) - (p "To comment on this conversation " - (a (@ (href ,(string-append "mailto:" - (number->string id) "@" (%config 'debbugs-domain) - "?subject=" (bug-subject* bug)))) - ,(string-append "send email to " - (number->string id) "@" (%config 'debbugs-domain))))))))))) + (p "To comment on this conversation " + (a (@ (href ,(string-append "mailto:" + (number->string id) "@" (%config 'debbugs-domain) + "?subject=" (bug-subject* bug)))) + ,(string-append "send email to " + (number->string id) "@" (%config 'debbugs-domain))))))) + (define comment-box + `(div + (@ (class "comment-box")) + (a (@ (id "comment"))) + ,@(if (and (mailer-enabled?) + (not (bug-archived bug))) + mailer-form + disabled-mailer))) (define (show-message message-number message previous-subject) `((div (a (@ (class "message-anchor") @@ -669,9 +667,7 @@ currently disabled.")) (@ (class "message-id")) (label "Message-ID:") ,(message-id message)))) - (div - (@ (class "body card-body")) - ,(display-message-body id message-number message)))) + ,(display-message-body id message-number message))) ,@(if (closing? message id) '((div (@ (class "event")) |