Updated Branches: refs/heads/master 9e9b2cbdc -> 01f172cd3
CS-14110: Show timestamp for general alerts Original patch by: olga.smola reviewed-by: brian Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/01f172cd Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/01f172cd Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/01f172cd Branch: refs/heads/master Commit: 01f172cd373f355d38cd61922819091631f2d92b Parents: 9e9b2cb Author: bfederle <[email protected]> Authored: Wed Jun 20 14:50:26 2012 -0700 Committer: bfederle <[email protected]> Committed: Wed Jun 20 14:51:36 2012 -0700 ---------------------------------------------------------------------- ui/index.jsp | 1 + ui/scripts/dashboard.js | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/01f172cd/ui/index.jsp ---------------------------------------------------------------------- diff --git a/ui/index.jsp b/ui/index.jsp index 12361a4..bf02640 100644 --- a/ui/index.jsp +++ b/ui/index.jsp @@ -1158,6 +1158,7 @@ <div class="content"> <span class="title" data-list-item="name">Alert 1</span> <p data-list-item="description">Alert 1</p> + <p data-list-item="sent">Alert 1</p> </div> </li> </ul> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/01f172cd/ui/scripts/dashboard.js ---------------------------------------------------------------------- diff --git a/ui/scripts/dashboard.js b/ui/scripts/dashboard.js index 7a7df08..0758177 100644 --- a/ui/scripts/dashboard.js +++ b/ui/scripts/dashboard.js @@ -202,7 +202,8 @@ alerts: $.map(alerts, function(alert) { return { name: cloudStack.converters.toAlertType(alert.type), - description: alert.description + description: alert.description, + sent: cloudStack.converters.toLocalDate(alert.sent) }; }) }));
