]> asedeno.scripts.mit.edu Git - bluechips.git/commitdiff
projects / bluechips.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3b08315)
style flash messages more obviously
authorScott Torborg <scott@crookedmedia.com>
Tue, 3 Nov 2009 01:15:51 +0000 (15:15 -1000)
committerScott Torborg <scott@crookedmedia.com>
Tue, 3 Nov 2009 01:15:51 +0000 (15:15 -1000)
bluechips/public/css/main.css patch | blob | history
bluechips/templates/base.mako patch | blob | history
bluechips/templates/status/index.mako patch | blob | history

diff --git a/bluechips/public/css/main.css b/bluechips/public/css/main.css
index fe58b9995a557556fd3bb69d23cbed3e647345fa..008d925aa211a1ebbb20ec5c6271d9207d6f724c 100644 (file)
--- a/bluechips/public/css/main.css
+++ b/bluechips/public/css/main.css
@@ -65,6 +65,12 @@ table.list td.amount {
 #totals th {
     text-align: right;
 }
+#balance {
+    margin-bottom: 10px;
+}
+#balance th {
+    text-align: left;
+}
 td.labelcol {
     text-align: right;
     font-weight: bold;
@@ -72,3 +78,13 @@ td.labelcol {
 tr.user-not-involved {
     color: #aaa;
 }
+div.flash {
+    margin: 10px 0;
+    padding: 0.5em;
+    font-weight: bold;
+    background: #fffa98;
+    border: 1px solid #e6e000;
+}
+div.flash ul {
+    margin-bottom: 0;
+}
diff --git a/bluechips/templates/base.mako b/bluechips/templates/base.mako
index 97ae8576a4281ee0bae862eb6aff564d19d2cec6..73fb66404aa1cd1775c2fea28a22d19cb53014e1 100644 (file)
--- a/bluechips/templates/base.mako
+++ b/bluechips/templates/base.mako
@@ -7,14 +7,6 @@
     ${h.stylesheet_link('/css/main.css')}
   </head>
   <body>
-    <% messages = h.flash.pop_messages() %>
-    % if messages:
-    <ul id="flash-messages">
-    % for message in messages:
-        <li>${message}</li>
-    % endfor
-    </ul>
-    % endif
     <div id="nav" class="block">
       <table>
         <tr>
@@ -54,6 +46,9 @@
         </tr>
       </table>
     </div>
+    % for message in h.flash.pop_messages():
+      <div class="flash">${message | n}</div>
+    % endfor
     <div id="content">
       ${next.body()}
     </div>
diff --git a/bluechips/templates/status/index.mako b/bluechips/templates/status/index.mako
index f1c21e364d02fac36bc21e5067492682b6d1b2f8..014e7cb4dcf9254c333c8a4acb909e5fcc253dea 100644 (file)
--- a/bluechips/templates/status/index.mako
+++ b/bluechips/templates/status/index.mako
@@ -8,7 +8,7 @@
   % else:
     <p>To balance the books, the following transfers need to be made:</p>
 
-    <table>
+    <table id="balance">
       <tr>
         <th>From</th>
         <th>To</th>
http://bluechi.ps/