Updated Branches: refs/heads/master 1a7872d18 -> 0019e42ce
Notification area: Show more detail in errors -Show actual error message (if available) in the notification item -Minor layout/padding tweaks Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0019e42c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0019e42c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0019e42c Branch: refs/heads/master Commit: 0019e42ce029a5624b6c021152222878d7026b45 Parents: 1a7872d Author: Brian Federle <brian.fede...@citrix.com> Authored: Thu Oct 31 16:17:52 2013 -0700 Committer: Brian Federle <brian.fede...@citrix.com> Committed: Thu Oct 31 16:17:52 2013 -0700 ---------------------------------------------------------------------- ui/css/cloudstack3.css | 31 ++++++++++++++++++++++++----- ui/scripts/ui/widgets/notifications.js | 6 +++++- 2 files changed, 31 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0019e42c/ui/css/cloudstack3.css ---------------------------------------------------------------------- diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css index abd112a..3e5ab98 100644 --- a/ui/css/cloudstack3.css +++ b/ui/css/cloudstack3.css @@ -988,9 +988,9 @@ div.notification-box .container ul { } div.notification-box .container ul li { - height: 40px; + width: 100%; + height: 41px; border-bottom: 1px solid #CECECE; - overflow: auto; overflow-x: hidden; text-indent: 0; font-size: 12px; @@ -1000,16 +1000,37 @@ div.notification-box .container ul li { } div.notification-box .container ul li.error { - background: url(../images/icons.png) no-repeat 10px -179px; + height: 53px; + background: url(../images/icons.png) no-repeat 10px -171px; +} + +div.notification-box .container ul li.error .subtitle { + display: block; + width: 213px; + height: 10px; + overflow: hidden; + white-space: nowrap; + float: left; + text-overflow: ellipsis; + color: #808080; + text-indent: 0; + padding: 0; + margin: 0; + /*+placement:shift 48px 17px;*/ + position: relative; + left: 48px; + top: 17px; } div.notification-box .container ul li span { float: left; - /*+placement:shift 48px 16px;*/ + /*+placement:shift 48px 15px;*/ position: relative; left: 48px; - top: 16px; + top: 15px; max-width: 202px; + font-size: 14px; + font-weight: 100; overflow: hidden; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0019e42c/ui/scripts/ui/widgets/notifications.js ---------------------------------------------------------------------- diff --git a/ui/scripts/ui/widgets/notifications.js b/ui/scripts/ui/widgets/notifications.js index 68a054c..5fd91f1 100644 --- a/ui/scripts/ui/widgets/notifications.js +++ b/ui/scripts/ui/widgets/notifications.js @@ -124,7 +124,11 @@ }, { error: _l('label.error') }); - $item.removeClass('pending').addClass('error'); + $item.removeClass('pending').addClass('error').append( + $('<div>').addClass('subtitle').html(args && args.message ? + args.message : _l('label.error')) + ); + $item.attr('title', args && args.message ? args.message : _l('label.error')); if (additionalComplete) additionalComplete(); }
