You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sw...@apache.org on 2016/04/11 14:46:48 UTC
[1/4] git commit: updated refs/heads/master to 67b4e66
Repository: cloudstack
Updated Branches:
refs/heads/master 6dc514738 -> 67b4e6641
Improve ordering of fields of VPC router detail tab
The field we use most are now on the top:
- name
- state
- hypervisor
- link local ip
- redundant state
The other fields are nice, but not needed most of the time.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d2fdab07
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d2fdab07
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d2fdab07
Branch: refs/heads/master
Commit: d2fdab0750468e21fda350bbed8f9d1d2c3f262f
Parents: a243339
Author: Remi Bergsma <gi...@remi.nl>
Authored: Sun Feb 21 20:20:56 2016 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Sun Feb 21 20:26:46 2016 +0100
----------------------------------------------------------------------
ui/scripts/network.js | 50 +++++++++++++++++++++++++---------------------
1 file changed, 27 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d2fdab07/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index bb599fd..f4e0f9a 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -5838,15 +5838,36 @@
label: 'label.name'
}
}, {
+ state: {
+ label: 'label.state'
+ },
+ hostname: {
+ label: 'label.host'
+ },
+ linklocalip: {
+ label: 'label.linklocal.ip'
+ },
+ isredundantrouter: {
+ label: 'label.redundant.router',
+ converter: function(booleanValue) {
+ if (booleanValue == true) {
+ return "Yes";
+ }
+ return "No";
+ }
+ },
+ redundantstate: {
+ label: 'label.redundant.state'
+ },
id: {
label: 'label.id'
},
+ serviceofferingname: {
+ label: 'label.service.offering'
+ },
zonename: {
label: 'label.zone'
},
- dns1: {
- label: 'label.dns'
- },
gateway: {
label: 'label.gateway'
},
@@ -5856,26 +5877,8 @@
guestipaddress: {
label: 'label.guest.ip'
},
- linklocalip: {
- label: 'label.linklocal.ip'
- },
- hostname: {
- label: 'label.host'
- },
- state: {
- label: 'label.state'
- },
- serviceofferingname: {
- label: 'label.service.offering'
- },
- isredundantrouter: {
- label: 'label.redundant.router',
- converter: function(booleanValue) {
- if (booleanValue == true) {
- return "Yes";
- }
- return "No";
- }
+ dns1: {
+ label: 'label.dns'
},
account: {
label: 'label.account'
@@ -5884,6 +5887,7 @@
label: 'label.domain'
}
}],
+
dataProvider: function(args) {
$.ajax({
url: createURL("listRouters&listAll=true&vpcid=" + args.context.vpc[0].id),
[2/4] git commit: updated refs/heads/master to 67b4e66
Posted by sw...@apache.org.
Merge pull request #1422 from remibergsma/ui-vpc-routers-improvement_47
Improve ordering of fields of VPC router detail tabThe field we use most are now on the top:
- name
- state
- hypervisor
- link local ip
- redundant state
The other fields are nice, but not needed most of the time.
Result:
Before:
* pr/1422:
Improve ordering of fields of VPC router detail tab
Signed-off-by: Will Stevens <wi...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2d68893e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2d68893e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2d68893e
Branch: refs/heads/master
Commit: 2d68893ee6de6be7856eb2fbe1ce5fc3077e1067
Parents: f33b4a1 d2fdab0
Author: Will Stevens <wi...@gmail.com>
Authored: Mon Apr 11 08:44:21 2016 -0400
Committer: Will Stevens <wi...@gmail.com>
Committed: Mon Apr 11 08:44:21 2016 -0400
----------------------------------------------------------------------
ui/scripts/network.js | 50 +++++++++++++++++++++++++---------------------
1 file changed, 27 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2d68893e/ui/scripts/network.js
----------------------------------------------------------------------
[3/4] git commit: updated refs/heads/master to 67b4e66
Posted by sw...@apache.org.
Merge release branch 4.7 to 4.8
* 4.7:
Improve ordering of fields of VPC router detail tab
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/594fe53f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/594fe53f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/594fe53f
Branch: refs/heads/master
Commit: 594fe53f6d0569720582b8e38f79b727c6622c8a
Parents: 713c2f5 2d68893
Author: Will Stevens <wi...@gmail.com>
Authored: Mon Apr 11 08:45:14 2016 -0400
Committer: Will Stevens <wi...@gmail.com>
Committed: Mon Apr 11 08:45:14 2016 -0400
----------------------------------------------------------------------
ui/scripts/network.js | 50 +++++++++++++++++++++++++---------------------
1 file changed, 27 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
[4/4] git commit: updated refs/heads/master to 67b4e66
Posted by sw...@apache.org.
Merge release branch 4.8 to master
* 4.8:
Improve ordering of fields of VPC router detail tab
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/67b4e664
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/67b4e664
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/67b4e664
Branch: refs/heads/master
Commit: 67b4e66414b9200e1fa678754122aa7d50d5058b
Parents: 6dc5147 594fe53
Author: Will Stevens <wi...@gmail.com>
Authored: Mon Apr 11 08:46:35 2016 -0400
Committer: Will Stevens <wi...@gmail.com>
Committed: Mon Apr 11 08:46:35 2016 -0400
----------------------------------------------------------------------
ui/scripts/network.js | 50 +++++++++++++++++++++++++---------------------
1 file changed, 27 insertions(+), 23 deletions(-)
----------------------------------------------------------------------