Author: croberts
Date: 2012-02-14 20:13:05 +0000 (Tue, 14 Feb 2012)
New Revision: 5220
Modified:
trunk/cumin/python/cumin/task.py
trunk/cumin/python/cumin/widgets.strings
Log:
Adding timestamp to the display of yellow notification banner items. This satisfies BZ
787138.
Modified: trunk/cumin/python/cumin/task.py
===================================================================
--- trunk/cumin/python/cumin/task.py 2012-02-14 18:34:26 UTC (rev 5219)
+++ trunk/cumin/python/cumin/task.py 2012-02-14 20:13:05 UTC (rev 5220)
@@ -122,9 +122,11 @@
self.task = task
session.add_notice(self)
-
+
self.user = session.get_user()
+ self.timestamp = datetime.now()
+
self.start_time = None
self.end_time = None
self.update_time = None
@@ -137,7 +139,16 @@
self.output_args = None
self.dismissed = False
+
+ def __setattr__(self, name, value):
+ if name in ("status"):
+ self.timestamp = datetime.now()
+ super(TaskInvocation, self).__setattr__(name, value)
+ def get_timestamp(self, session):
+ if self.timestamp:
+ return self.timestamp
+
def get_description(self, session):
if self.description:
return self.description
@@ -156,11 +167,12 @@
return self.status
def get_message(self, session):
+ timestamp = self.get_timestamp(session)
description = xml_escape(self.get_description(session))
if not description:
description = ""
status = xml_escape(str(self.get_status(session)))
- return "%s: %s" % (description, status)
+ return "<span class='notification_time'>%s</span> %s:
%s" % ("%s-%02d-%02d %02d:%02d:%02d" % (timestamp.year, timestamp.month,
timestamp.day, timestamp.hour, timestamp.minute, timestamp.second), description, status)
def end(self):
log.debug("Ending %s", self.task)
Modified: trunk/cumin/python/cumin/widgets.strings
===================================================================
--- trunk/cumin/python/cumin/widgets.strings 2012-02-14 18:34:26 UTC (rev 5219)
+++ trunk/cumin/python/cumin/widgets.strings 2012-02-14 20:13:05 UTC (rev 5220)
@@ -906,6 +906,11 @@
font-size: 0.9em;
}
+div.NotificationSet .notification_time {
+ font-style: italic;
+ color: #707070;
+}
+
[NotificationSet.html]
<div id="{id}" class="{class}">
<a class="dismiss" href="{dismiss_all_href}">Dismiss all
notifications</a><br/>
Show replies by date