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/04/03 23:52:42 UTC
[1/2] git commit: updated refs/heads/ui-add-remove-nics to 1a80f9e
Updated Branches:
refs/heads/ui-add-remove-nics 9bd6692be -> 1a80f9e1f
NICs, add action: Fix for when detail view isn't present anymore
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ece8b8c4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ece8b8c4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ece8b8c4
Branch: refs/heads/ui-add-remove-nics
Commit: ece8b8c423a46c5be84171520ffd130ec25d9249
Parents: 9bd6692
Author: Brian Federle <br...@citrix.com>
Authored: Wed Apr 3 14:52:16 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Wed Apr 3 14:52:16 2013 -0700
----------------------------------------------------------------------
ui/scripts/ui/widgets/detailView.js | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ece8b8c4/ui/scripts/ui/widgets/detailView.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/detailView.js b/ui/scripts/ui/widgets/detailView.js
index cd1135c..7b202ef 100644
--- a/ui/scripts/ui/widgets/detailView.js
+++ b/ui/scripts/ui/widgets/detailView.js
@@ -1087,10 +1087,12 @@
{ actions: tabData.actions, actionName: 'add' }, {
noRefresh: true,
complete: function(args) {
- loadTabContent(
- $detailView.find('div.detail-group:visible'),
- $detailView.data('view-args')
- );
+ if ($detailView.is(':visible')) {
+ loadTabContent(
+ $detailView.find('div.detail-group:visible'),
+ $detailView.data('view-args')
+ );
+ }
}
}
)
[2/2] git commit: updated refs/heads/ui-add-remove-nics to 1a80f9e
Posted by bf...@apache.org.
Detail view, multi-groups: Put 'add' button on top
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1a80f9e1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1a80f9e1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1a80f9e1
Branch: refs/heads/ui-add-remove-nics
Commit: 1a80f9e1f41bc92ef881e78282980b8d298c2259
Parents: ece8b8c
Author: Brian Federle <br...@citrix.com>
Authored: Wed Apr 3 14:52:38 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Wed Apr 3 14:52:38 2013 -0700
----------------------------------------------------------------------
ui/css/cloudstack3.css | 7 ++++++-
ui/scripts/ui/widgets/detailView.js | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a80f9e1/ui/css/cloudstack3.css
----------------------------------------------------------------------
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 015206b..a0b8602 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -1774,8 +1774,13 @@ div.list-view td.state.off span {
}
.detail-view .detail-group .button.add {
+ clear: both;
+ margin: 0px 21px 13px 0 !important;
+}
+
+.detail-view .details.group-multiple {
float: left;
- margin: 6px 0 17px 13px;
+ width: 100%;
}
/*List-view: subselect dropdown*/
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1a80f9e1/ui/scripts/ui/widgets/detailView.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/detailView.js b/ui/scripts/ui/widgets/detailView.js
index 7b202ef..427010a 100644
--- a/ui/scripts/ui/widgets/detailView.js
+++ b/ui/scripts/ui/widgets/detailView.js
@@ -1077,7 +1077,7 @@
// Add item action
if (tabData.multiple && tabData.actions && tabData.actions.add) {
- $tabContent.append(
+ $tabContent.prepend(
$('<div>').addClass('button add').append(
$('<span>').addClass('icon').html(' '),
$('<span>').html(_l(tabData.actions.add.label))