From c3ea1aa07b655bec89726cfc0153bedcc877ada6 Mon Sep 17 00:00:00 2001
From: Matthias Andreas Benkard <code@mail.matthias.benkard.de>
Date: Tue, 15 Mar 2011 02:31:05 +0100
Subject: Color info messages more meaningfully.

---
 mulkcms.lisp                   | 53 ++++++++++++++++++++++++------------------
 static-files/style/journal.css | 26 ++++++++++++++++++++-
 templates/journal_page.html    |  8 +++----
 3 files changed, 59 insertions(+), 28 deletions(-)

diff --git a/mulkcms.lisp b/mulkcms.lisp
index 8f1e2ce..03f57af 100644
--- a/mulkcms.lisp
+++ b/mulkcms.lisp
@@ -717,32 +717,39 @@
                               :none)
                        (setq submission-notice
                              (cond
-                               (spam-p "<p><strong>Warning:</strong></p>
-
-                                        <p>Your message could not be
-                                        verified as non-spam.  If
-                                        JavaScript is enabled in your
-                                        browser, it may be broken in
-                                        some way.  In this case, please
-                                        disable JavaScript support and
-                                        try again.  Otherwise, feel free
-                                        to contact one of the site
-                                        administrators, who will be able
-                                        to manually approve your
-                                        comment.</p>")
-                               (t "<p><strong>Note:</strong></p>
-
-                                   <p>Your message has been received and
-                                   classified as non-spam.  It has thus
-                                   been put into the moderation queue and
-                                   is now awaiting approval by one of the
-                                   site's administrators.</p>")))))))
+                               (spam-p
+                                (list
+                                 :content "<p><strong>Warning:</strong></p>
+
+                                           <p>Your message could not be
+                                           verified as non-spam.  If
+                                           JavaScript is enabled in your
+                                           browser, it may be broken in
+                                           some way.  In this case,
+                                           please disable JavaScript
+                                           support and try again.
+                                           Otherwise, feel free to
+                                           contact one of the site
+                                           administrators, who will be
+                                           able to manually approve your
+                                           comment.</p>"
+                                 :message-type "warning"))
+                               (t
+                                (list
+                                 :content "<p><strong>Note:</strong></p>
+
+                                           <p>Your message has been received and
+                                           classified as non-spam.  It has thus
+                                           been put into the moderation queue and
+                                           is now awaiting approval by one of the
+                                           site's administrators.</p>"
+                                 :message-type "success-message"))))))))
                (expand-page page-template
                             (getf article-params :title)
                             (list* :articles (list article-params)
-                                   :warnings (if submission-notice
-                                                 (list submission-notice)
-                                                 nil)
+                                   :info-messages (if submission-notice
+                                                      (list submission-notice)
+                                                      nil)
                                    template-params))))))))))
 
 
diff --git a/static-files/style/journal.css b/static-files/style/journal.css
index f33e464..0bbf778 100644
--- a/static-files/style/journal.css
+++ b/static-files/style/journal.css
@@ -138,7 +138,7 @@ img.article-portrait {
   font-style: oblique;
 }
 
-#warnings {
+#info-messages {
   align: center;
   width: 100%;
 }
@@ -155,6 +155,30 @@ img.article-portrait {
   text-align: justify;
 }
 
+.journal-success-message {
+  position: relative;
+  left: 15%;
+  width: 70%;
+  border: 3px outset #666;
+  color: #000;
+  background-color: #c0ffd0;
+  margin: 1em 0 0 0;
+  padding: 0 0.3em 0 0.3em;
+  text-align: justify;
+}
+
+.journal-info-message {
+  position: relative;
+  left: 15%;
+  width: 70%;
+  border: 3px outset #666;
+  color: #000;
+  background-color: #d0c0ff;
+  margin: 1em 0 0 0;
+  padding: 0 0.3em 0 0.3em;
+  text-align: justify;
+}
+
 .old-entries {
   border: 3px outset #666;
   color: #000;
diff --git a/templates/journal_page.html b/templates/journal_page.html
index f793ff2..8c0a974 100644
--- a/templates/journal_page.html
+++ b/templates/journal_page.html
@@ -13,11 +13,11 @@
   <h1 id="main-title">{site-name|html}</h1>
   <div id="main-subtitle">{site-subtitle|html}</div>
 
-  {.section warnings}
-  <div id="warnings">
+  {.section info-messages}
+  <div id="info-messages">
     {.repeated section @}
-    <div class="journal-warning">
-      {@}
+    <div class="journal-{message-type}">
+      {content}
     </div>
     {.end}
   </div>
-- 
cgit v1.2.3