From dc587c5a4074ceff87ef9d3b21d23d082071f2f1 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 5 Apr 2013 17:17:00 +0200 Subject: [PATCH] messages are a bit nicer - need fancier colors though --- plugins/messages/messages.css | 23 ++++++++++++++++++----- plugins/messages/messages.js | 33 +++++++++++++++++++++------------ trash/sliceview.py | 21 ++++++++++++++------- 3 files changed, 53 insertions(+), 24 deletions(-) diff --git a/plugins/messages/messages.css b/plugins/messages/messages.css index bde7799c..c886ce0e 100644 --- a/plugins/messages/messages.css +++ b/plugins/messages/messages.css @@ -1,9 +1,22 @@ -.messages { - background-color: #f4f8f4; +/* http://www.w3schools.com/html/html_colornames.asp */ +/* someone please feel free to pick a better set of colors */ +ul.messages { + background-color: #d0f0d0; + list-style-type: none; } -// http://www.w3schools.com/html/html_colornames.asp -li.fatal { background-color: Chocolate;} +li.fatal { background-color: CornflowerBlue;} li.error { background-color: Coral; } -li.warning { background-color: BurlyWood; } +li.warning { background-color: Gold; } li.info { background-color: LightGreen; } li.debug { background-color: Azure; } + +span.messages-date { + font-size: 75%; + padding: 0px 1em 0px 2em; +} + +span.messages-level { + float: left; + width: 40px; + font-size: 90%; +} diff --git a/plugins/messages/messages.js b/plugins/messages/messages.js index d4265a30..18568bea 100644 --- a/plugins/messages/messages.js +++ b/plugins/messages/messages.js @@ -73,8 +73,8 @@ var domid=e.data.plugindiv.data('Messages').plugin_uuid; var html=""; html += "
  • "; - html += "[" + level + "]"; - html += " " + new Date() + " "; + html += "" + new Date() + ""; + html += "[" + level + "]"; // html += "[" + domid + "]"; html += " " + message + "
  • "; $("ul#"+domid+".messages").append(html); @@ -84,13 +84,22 @@ // temporary -var tests=true; -if (tests) // arm this with a timeout rather - window.setInterval( - function () { - $.publish("messages:fatal","a fatal message"); - $.publish("messages:error","an error message"); - $.publish("messages:warning","a warning message"); - $.publish("messages:info","an info message"); - $.publish("messages:debug","a debug message"); - }, 5000); +var messages_test = { + // set this to 0 to disable + counter : 3, + period : 3000, + sample : function () { + $.publish("messages:fatal","a fatal message (" + messages_test.counter + " runs to go)"); + $.publish("messages:error","an error message"); + $.publish("messages:warning","a warning message"); + $.publish("messages:info","an info message"); + $.publish("messages:debug","a debug message"); + messages_test.counter -= 1; + if (messages_test.counter == 0) + window.clearInterval (messages_test.interval_id); + }, + run: function () { + messages_test.interval_id=window.setInterval(messages_test.sample , 5000); + } +} +messages_test.run() diff --git a/trash/sliceview.py b/trash/sliceview.py index b7fe2c9f..7796a14f 100644 --- a/trash/sliceview.py +++ b/trash/sliceview.py @@ -42,7 +42,14 @@ def slice_view (request, slicename=tmp_default_slice): title="Slice view for %s"%slicename, domid='thestack', togglable=False, - sons=[Tabs ( + sons=[ + Messages ( + page=page, + title="Runtime messages", + domid="msgs-pre", + toggled=False, + ), + Tabs ( page=page, title="2 tabs : w/ and w/o checkboxes", domid='thetabs', @@ -92,7 +99,7 @@ def slice_view (request, slicename=tmp_default_slice): query=main_query, ), ]), - Hazelnut ( + Hazelnut ( page=page, title='not in tabs', domid='standalone', @@ -102,24 +109,24 @@ def slice_view (request, slicename=tmp_default_slice): ), # you don't *have to* set a domid, but if you plan on using toggled=persistent then it's required # because domid is the key for storing toggle status in the browser - QueryCode ( + QueryCode ( page=page, title='xmlrpc code (toggled=False)', query=main_query, # domid='xmlrpc', toggled=False, ), - QuickFilter ( + QuickFilter ( page=page, title="QuickFilter - requires metadata (toggled=False)", criterias=quickfilter_criterias, domid='filters', toggled=False, ), - Messages ( + Messages ( page=page, - title="Runtime messages", - domid="msgs", + title="Runtime messages (again)", + domid="msgs-post", ) ]) -- 2.43.0