diff --git a/ui/index.html b/ui/index.html index e6ee553973..c22038df9f 100644 --- a/ui/index.html +++ b/ui/index.html @@ -569,11 +569,13 @@ {{ sessionName session }} + + {{ sessionMeta session }} {{/each}} diff --git a/ui/javascripts/app/helpers.js b/ui/javascripts/app/helpers.js index 0dcf63d51e..b1f213f604 100644 --- a/ui/javascripts/app/helpers.js +++ b/ui/javascripts/app/helpers.js @@ -21,11 +21,25 @@ Ember.Handlebars.helper('listBar', function(status) { }); Ember.Handlebars.helper('sessionName', function(session) { + var name; + if (session.Name === "") { - return session.ID; + name = '' + session.ID + ''; } else { - return new Handlebars.SafeString('' + session.Name + '' + ' ' + session.ID + ''); + name = '' + session.Name + '' + ' ' + session.ID + ''; } + + return new Handlebars.SafeString(name); +}); + +Ember.Handlebars.helper('sessionMeta', function(session) { + var meta = '
' + session.Behavior + ' behavior
'; + + if (session.TTL !== "") { + meta = meta + '
, ' + session.TTL + ' TTL
'; + } + + return new Handlebars.SafeString(meta); }); Ember.Handlebars.helper('aclName', function(name, id) { diff --git a/ui/styles/_lists.scss b/ui/styles/_lists.scss index 956bebd0ab..7a34c50796 100644 --- a/ui/styles/_lists.scss +++ b/ui/styles/_lists.scss @@ -74,7 +74,7 @@ } small { - display:inline-block; + display: inline-block; padding-right: 8px; padding-top: 2px; font-size: 12px; @@ -82,6 +82,13 @@ } } + .metadata { + display: block; + font-size: 12px; + float: left; + color: $gray-light; + } + ul.sub { li { padding: 0;