You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/12/17 20:14:51 UTC
git commit: updated refs/heads/4.3 to 2191493
Updated Branches:
refs/heads/4.3 11ef692ac -> 21914937c
CLOUDSTACK-5532: Tag UI: Truncate long tag key/value
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/21914937
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/21914937
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/21914937
Branch: refs/heads/4.3
Commit: 21914937c34c6fa9a43e2512a286dcb35853ce55
Parents: 11ef692
Author: Brian Federle <br...@citrix.com>
Authored: Tue Dec 17 11:14:36 2013 -0800
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Dec 17 11:14:36 2013 -0800
----------------------------------------------------------------------
ui/css/cloudstack3.css | 31 ++++++++++++++++++++++++++++++-
ui/scripts/ui/widgets/tagger.js | 6 +++++-
2 files changed, 35 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/21914937/ui/css/cloudstack3.css
----------------------------------------------------------------------
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 4fb9098..b1811f1 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -10296,6 +10296,11 @@ div.container div.panel div#details-tab-addloadBalancer.detail-group div.loadBal
color: #000000;
}
+.tagger ul li span.label span.value {
+ max-width: 100px;
+ overflow: hidden;
+}
+
.tagger ul li span.label {
font-size: 10px;
position: relative;
@@ -10307,11 +10312,35 @@ div.container div.panel div#details-tab-addloadBalancer.detail-group div.loadBal
left: 6px;
}
+.tagger ul li span.label > span {
+ float: left;
+ display: block;
+ margin-top: 2px;
+}
+
+.tagger ul li span.label > span.key {
+ font-weight: bold;
+ max-width: 134px;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ margin-left: 15px;
+ margin-right: 5px;
+}
+
+.tagger ul li span.label > span.value {
+ max-width: 160px;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ margin-left: 6px;
+}
+
.tagger ul li span.remove {
width: 15px !important;
overflow: hidden !important;
height: 11px !important;
- background: #DFDFDF url(../images/sprites.png) no-repeat -596px -1183px;
+ background: #DFDFDF;
display: block;
top: 0px !important;
left: -3px !important;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/21914937/ui/scripts/ui/widgets/tagger.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/tagger.js b/ui/scripts/ui/widgets/tagger.js
index 4a02d8b..673bd43 100644
--- a/ui/scripts/ui/widgets/tagger.js
+++ b/ui/scripts/ui/widgets/tagger.js
@@ -95,9 +95,13 @@
},
tagItem: function(title, onRemove, data) {
var $li = $('<li>');
- var $label = $('<span>').addClass('label').html(_s(title));
+ var $label = $('<span>').addClass('label');
var $remove = $('<span>').addClass('remove').html('X');
+ var $key = $('<span>').addClass('key').html(_s(data.key));
+ var $value = $('<span>').addClass('value').html(_s(data.value));
+ $label.append($key, '<span>=</span>', $value);
+ $label.attr('title', title);
$remove.click(function() {
if (onRemove) onRemove($li, data);
});